Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show changelog in the update dialog.

Browse Source
This commit is contained in:
Petr Mrázek 2014-07-09 00:49:37 +02:00
parent 6349800f07
commit fc911add58
3 changed files with 236 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
gui/dialogs/UpdateDialog.cpp
View File

@ -1,17 +1,162 @@
#include "UpdateDialog.h" #include "UpdateDialog.h"
#include "ui_UpdateDialog.h" #include "ui_UpdateDialog.h"
#include "gui/Platform.h" #include "gui/Platform.h"
#include <BuildConfig.h>
#include "logger/QsLog.h"
UpdateDialog::UpdateDialog(QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDialog) UpdateDialog::UpdateDialog(QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDialog)
{ {
MultiMCPlatform::fixWM_CLASS(this); MultiMCPlatform::fixWM_CLASS(this);
ui->setupUi(this); ui->setupUi(this);
loadChangelog();
} }
UpdateDialog::~UpdateDialog() UpdateDialog::~UpdateDialog()
{ {
} }
void UpdateDialog::loadChangelog()
{
dljob.reset(new NetJob("Changelog"));
auto url = QString("https://raw.githubusercontent.com/MultiMC/MultiMC5/%1/changelog.md").arg(BuildConfig.VERSION_CHANNEL);
changelogDownload = ByteArrayDownload::make(QUrl(url));
dljob->addNetAction(changelogDownload);
connect(dljob.get(), &NetJob::succeeded, this, &UpdateDialog::changelogLoaded);
connect(dljob.get(), &NetJob::failed, this, &UpdateDialog::changelogFailed);
dljob->start();
}
// TODO: this will be replaced.
QString reprocessMarkdown(QString markdown)
{
QString htmlData;
QTextStream html(&htmlData);
auto lines = markdown.split(QRegExp("[\r]?[\n]"),QString::KeepEmptyParts);
enum
{
BASE,
LIST1,
LIST2
}state = BASE;
html << "<html>";
int i = 0;
auto procLine = [&](QString line) -> QString
{
// [GitHub issues](https://github.com/MultiMC/MultiMC5/issues)
line.replace(QRegExp("\\[(.+)\\]\\((.+)\\)"), "<a href=\"\\2\">\\1</a>");
return line;
};
for(auto line: lines)
{
if(line.isEmpty())
{
// html << "<br />\n";
}
else switch (state)
{
case BASE:
if(line.startsWith("##"))
{
html << "<h2>" << procLine(line.mid(2)) << "</h2>\n";
}
else if(line.startsWith("#"))
{
html << "<h1>" << procLine(line.mid(1)) << "</h1>\n";
}
else if(line.startsWith("- "))
{
state = LIST1;
html << "<ul>\n";
html << "<li>" << procLine(line.mid(2)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
break;
case LIST1:
if(line.startsWith("##"))
{
state = BASE;
html << "</ul>\n";
html << "<h2>" << procLine(line.mid(2)) << "</h2>\n";
}
else if(line.startsWith("#"))
{
state = BASE;
html << "</ul>\n";
html << "<h1>" << procLine(line.mid(1)) << "</h1>\n";
}
else if(line.startsWith("- "))
{
html << "<li>" << procLine(line.mid(2)) << "</li>\n";
}
else if(line.startsWith(" - "))
{
state = LIST2;
html << "<ul>\n";
html << "<li>" << procLine(line.mid(4)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
break;
case LIST2:
if(line.startsWith("##"))
{
state = BASE;
html << "</ul>\n";
html << "</ul>\n";
html << "<h2>" << procLine(line.mid(2)) << "</h2>\n";
}
else if(line.startsWith("#"))
{
state = BASE;
html << "</ul>\n";
html << "</ul>\n";
html << "<h1>" << procLine(line.mid(1)) << "</h1>\n";
}
else if(line.startsWith("- "))
{
state = LIST1;
html << "</ul>\n";
html << "<li>" << procLine(line.mid(2)) << "</li>\n";
}
else if(line.startsWith(" - "))
{
html << "<li>" << procLine(line.mid(4)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
break;
}
i++;
}
if(state == LIST2)
{
html << "</ul>\n";
state = LIST1;
}
if(state == LIST1)
{
html << "</ul>\n";
state = BASE;
}
if (state != BASE)
{
QLOG_ERROR() << "Reprocessing markdown didn't end in a final state!";
}
html << "</html>\n";
QLOG_DEBUG() << htmlData;
return htmlData;
}
void UpdateDialog::changelogLoaded()
{
auto rawMarkdown = QString::fromUtf8(changelogDownload->m_data);
auto html = reprocessMarkdown(rawMarkdown);
ui->changelogBrowser->setHtml(html);
}
void UpdateDialog::changelogFailed()
{
ui->changelogBrowser->setHtml(tr("<p align=\"center\" <span style=\"font-size:22pt;\">Failed to fetch changelog...</span></p>"));
}
void UpdateDialog::on_btnUpdateLater_clicked() void UpdateDialog::on_btnUpdateLater_clicked()
{ {
reject(); reject();

15
gui/dialogs/UpdateDialog.h
View File

@ -16,6 +16,8 @@
#pragma once #pragma once
#include <QDialog> #include <QDialog>
#include "logic/net/ByteArrayDownload.h"
#include "logic/net/NetJob.h"
namespace Ui namespace Ui
{ {
@ -43,4 +45,17 @@ public slots:
void on_btnUpdateNow_clicked(); void on_btnUpdateNow_clicked();
void on_btnUpdateOnExit_clicked(); void on_btnUpdateOnExit_clicked();
void on_btnUpdateLater_clicked(); void on_btnUpdateLater_clicked();
/// Starts loading the changelog
void loadChangelog();
/// Slot for when the chengelog loads successfully.
void changelogLoaded();
/// Slot for when the chengelog fails to load...
void changelogFailed();
private:
ByteArrayDownloadPtr changelogDownload;
NetJobPtr dljob;
}; };

46
gui/dialogs/UpdateDialog.ui
View File

@ -6,28 +6,56 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>350</width> <width>657</width>
<height>260</height> <height>673</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MultiMC Update</string> <string>MultiMC Update</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../graphics.qrc"> <iconset>
<normaloff>:/icons/toolbar/checkupdate</normaloff>:/icons/toolbar/checkupdate</iconset> <normaloff>:/icons/toolbar/checkupdate</normaloff>:/icons/toolbar/checkupdate</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>A new MultiMC update is available!</string> <string>A new MultiMC update is available!</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>changelogBrowser</cstring>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<widget class="QTextBrowser" name="changelogBrowser">
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Loading changelog...&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="btnUpdateNow"> <widget class="QPushButton" name="btnUpdateNow">
<property name="sizePolicy"> <property name="sizePolicy">
@ -62,9 +90,17 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<tabstops>
<tabstop>changelogBrowser</tabstop>
<tabstop>btnUpdateNow</tabstop>
<tabstop>btnUpdateOnExit</tabstop>
<tabstop>btnUpdateLater</tabstop>
</tabstops>
<resources> <resources>
<include location="../../graphics.qrc"/> <include location="../../resources/multimc/multimc.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>