diff options
| -rw-r--r-- | application/pages/modplatform/ftb/FtbPage.cpp | 6 | ||||
| -rw-r--r-- | application/pages/modplatform/ftb/FtbPage.ui | 52 |
2 files changed, 37 insertions, 21 deletions
diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/application/pages/modplatform/ftb/FtbPage.cpp index 60294de0..dd2ff666 100644 --- a/application/pages/modplatform/ftb/FtbPage.cpp +++ b/application/pages/modplatform/ftb/FtbPage.cpp @@ -6,6 +6,8 @@ #include "dialogs/NewInstanceDialog.h" #include "modplatform/modpacksch/FTBPackInstallTask.h" +#include "HoeDown.h" + FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent) : QWidget(parent), ui(new Ui::FtbPage), dialog(dialog) { @@ -108,6 +110,10 @@ void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex second) selected = filterModel->data(first, Qt::UserRole).value<ModpacksCH::Modpack>(); + HoeDown hoedown; + QString output = hoedown.process(selected.description.toUtf8()); + ui->packDescription->setHtml(output); + // reverse foreach, so that the newest versions are first for (auto i = selected.versions.size(); i--;) { ui->versionSelectionBox->addItem(selected.versions.at(i).name); diff --git a/application/pages/modplatform/ftb/FtbPage.ui b/application/pages/modplatform/ftb/FtbPage.ui index 3a2203db..475d78bb 100644 --- a/application/pages/modplatform/ftb/FtbPage.ui +++ b/application/pages/modplatform/ftb/FtbPage.ui @@ -11,16 +11,6 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="1"> - <widget class="QPushButton" name="searchButton"> - <property name="text"> - <string>Search</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLineEdit" name="searchEdit"/> - </item> <item row="2" column="0" colspan="2"> <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0"> <item row="0" column="2"> @@ -41,25 +31,45 @@ </item> </layout> </item> - <item row="1" column="0" colspan="2"> - <widget class="QTreeView" name="packView"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="iconSize"> - <size> - <width>48</width> - <height>48</height> - </size> + <item row="0" column="0"> + <widget class="QLineEdit" name="searchEdit"/> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="searchButton"> + <property name="text"> + <string>Search</string> </property> </widget> </item> + <item row="1" column="0" colspan="2"> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QTreeView" name="packView"> + <property name="iconSize"> + <size> + <width>48</width> + <height>48</height> + </size> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QTextBrowser" name="packDescription"> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + <property name="openLinks"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> <tabstops> <tabstop>searchEdit</tabstop> <tabstop>searchButton</tabstop> - <tabstop>packView</tabstop> <tabstop>versionSelectionBox</tabstop> </tabstops> <resources/> |