diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-02-10 18:38:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 18:38:04 +0100 |
| commit | 40bdb0ffd6dd1c028f12b5a5b145325a200e056e (patch) | |
| tree | b186bc192d26a07f881f58199f89cb23fbf8cc73 /application/pages/modplatform | |
| parent | 1e59dafd7586126e88e60b6d302462c4f538f78f (diff) | |
| parent | 003e0190482e7a8db669d82578c389b0339c2e4e (diff) | |
| download | PrismLauncher-40bdb0ffd6dd1c028f12b5a5b145325a200e056e.tar.gz PrismLauncher-40bdb0ffd6dd1c028f12b5a5b145325a200e056e.tar.bz2 PrismLauncher-40bdb0ffd6dd1c028f12b5a5b145325a200e056e.zip | |
Merge pull request #3593 from jamierocks/atl/description-view
NOISSUE Show ATLauncher pack descriptions in text browser
Diffstat (limited to 'application/pages/modplatform')
| -rw-r--r-- | application/pages/modplatform/atlauncher/AtlModel.cpp | 2 | ||||
| -rw-r--r-- | application/pages/modplatform/atlauncher/AtlPage.cpp | 2 | ||||
| -rw-r--r-- | application/pages/modplatform/atlauncher/AtlPage.ui | 39 |
3 files changed, 24 insertions, 19 deletions
diff --git a/application/pages/modplatform/atlauncher/AtlModel.cpp b/application/pages/modplatform/atlauncher/AtlModel.cpp index 46e35ec6..4b1b1c8e 100644 --- a/application/pages/modplatform/atlauncher/AtlModel.cpp +++ b/application/pages/modplatform/atlauncher/AtlModel.cpp @@ -39,7 +39,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const } else if (role == Qt::ToolTipRole) { - return pack.description; + return pack.name; } else if(role == Qt::DecorationRole) { diff --git a/application/pages/modplatform/atlauncher/AtlPage.cpp b/application/pages/modplatform/atlauncher/AtlPage.cpp index cfc61e8d..4518248d 100644 --- a/application/pages/modplatform/atlauncher/AtlPage.cpp +++ b/application/pages/modplatform/atlauncher/AtlPage.cpp @@ -80,6 +80,8 @@ void AtlPage::onSelectionChanged(QModelIndex first, QModelIndex second) selected = filterModel->data(first, Qt::UserRole).value<ATLauncher::IndexedPack>(); + ui->packDescription->setHtml(selected.description.replace("\n", "<br>")); + for(const auto& version : selected.versions) { ui->versionSelectionBox->addItem(version.version); } diff --git a/application/pages/modplatform/atlauncher/AtlPage.ui b/application/pages/modplatform/atlauncher/AtlPage.ui index fa88597e..dd17283c 100644 --- a/application/pages/modplatform/atlauncher/AtlPage.ui +++ b/application/pages/modplatform/atlauncher/AtlPage.ui @@ -11,11 +11,30 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="0" colspan="2"> - <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0"> + <item row="0" column="0" colspan="2"> + <widget class="QTreeView" name="packView"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="iconSize"> + <size> + <width>96</width> + <height>48</height> + </size> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QTextBrowser" name="packDescription"/> + </item> + <item row="1" column="0" colspan="3"> + <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0"> <item row="0" column="2"> <widget class="QComboBox" name="versionSelectionBox"/> </item> + <item row="0" column="0"> + <widget class="QComboBox" name="sortByBox"/> + </item> <item row="0" column="1"> <widget class="QLabel" name="label"> <property name="text"> @@ -26,24 +45,8 @@ </property> </widget> </item> - <item row="0" column="0"> - <widget class="QComboBox" name="sortByBox"/> - </item> </layout> </item> - <item row="0" column="0" colspan="2"> - <widget class="QTreeView" name="packView"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="iconSize"> - <size> - <width>96</width> - <height>48</height> - </size> - </property> - </widget> - </item> </layout> </widget> <tabstops> |