CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show texture/resource packs when appropriate.

Browse Source
This commit is contained in:
Petr Mrázek
2014-06-08 20:11:09 +02:00
parent 223a7aba7b
commit bf7b070508
10 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gui/pagedialog/PageDialog.cpp
View File

@ -40,14 +40,13 @@ public:
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
// Regular contents check, then check page-filter.
if (QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent))
return true;
const QString pattern = filterRegExp().pattern();
const auto model = static_cast<PageModel *>(sourceModel());
const auto page = model->pages().at(sourceRow);
return page->shouldDisplay();
if(!page->shouldDisplay())
return false;
// Regular contents check, then check page-filter.
return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
}
};
@ -92,7 +91,7 @@ void PageDialog::createUI()
m_filter = new QLineEdit;
m_pageList = new PageView;
m_header = new QLabel();
m_iconHeader = new IconLabel(this, QIcon::fromTheme("bug"), QSize(24,24));
m_iconHeader = new IconLabel(this, QIcon(), QSize(24,24));
QFont headerLabelFont = m_header->font();
headerLabelFont.setBold(true);
@ -125,7 +124,7 @@ void PageDialog::createUI()
mainGridLayout->addLayout(headerHLayout, 0, 1, 1, 1);
mainGridLayout->addWidget(m_pageList, 0, 0, 2, 1);
mainGridLayout->addLayout(m_pageStack, 1, 1, 1, 1);
mainGridLayout->addWidget(buttons, 2, 0, 1, 2);
//mainGridLayout->addWidget(buttons, 2, 0, 1, 2);
mainGridLayout->setColumnStretch(1, 4);
setLayout(mainGridLayout);
}

2
gui/pages/LegacyUpgradePage.ui
View File

@ -47,7 +47,7 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QCommandLinkButton" name="upgradeButton">
<property name="text">
<string>Start the upgrade!</string>
<string>Start the upgrade! (Not Yet Implemented, Coming Soon™)</string>
</property>
</widget>
</item>

3
gui/pages/VersionPage.cpp
View File

@ -368,7 +368,8 @@ void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &
ui->moveLibraryDownBtn->setEnabled(enabled);
ui->moveLibraryUpBtn->setEnabled(enabled);
}
if(m_version->versionFileId(current.row()) == "net.minecraft")
QString selectedId = m_version->versionFileId(current.row());
if(selectedId == "net.minecraft" || selectedId == "org.multimc.custom.json")
{
ui->changeMCVersionBtn->setEnabled(true);
}