diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-13 00:23:45 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-26 17:05:27 +0100 |
| commit | 02c1df2c3c260fe625b9c3314e9eed2885a97456 (patch) | |
| tree | 1ca64f44fc609ba47a6a1fde4b9e93fe15b1e618 /application/pages | |
| parent | 1854e05e1bb14d8f2bbc4676f44024a83e972f6f (diff) | |
| download | PrismLauncher-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar.gz PrismLauncher-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar.bz2 PrismLauncher-02c1df2c3c260fe625b9c3314e9eed2885a97456.zip | |
NOISSUE continue version file format refactors
Diffstat (limited to 'application/pages')
| -rw-r--r-- | application/pages/ModFolderPage.cpp | 13 | ||||
| -rw-r--r-- | application/pages/VersionPage.cpp | 9 |
2 files changed, 14 insertions, 8 deletions
diff --git a/application/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp index bbe16671..cef4ed73 100644 --- a/application/pages/ModFolderPage.cpp +++ b/application/pages/ModFolderPage.cpp @@ -47,8 +47,7 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, ui->modTreeView->setModel(m_mods.get()); ui->modTreeView->installEventFilter(this); auto smodel = ui->modTreeView->selectionModel(); - connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), - SLOT(modCurrent(QModelIndex, QModelIndex))); + connect(smodel, &QItemSelectionModel::currentChanged, this, &ModFolderPage::modCurrent); } void ModFolderPage::opened() @@ -91,7 +90,15 @@ bool CoreModFolderPage::shouldDisplay() const auto version = inst->getMinecraftProfile(); if (!version) return true; - if (version->m_releaseTime < g_VersionFilterData.legacyCutoffDate) + if(!version->versionPatch("net.minecraftforge")) + { + return false; + } + if(!version->versionPatch("net.minecraft")) + { + return false; + } + if(version->versionPatch("net.minecraft")->getReleaseDateTime() < g_VersionFilterData.legacyCutoffDate) { return true; } diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp index 42e4a9bf..137abcfc 100644 --- a/application/pages/VersionPage.cpp +++ b/application/pages/VersionPage.cpp @@ -156,10 +156,10 @@ void VersionPage::packageCurrent(const QModelIndex ¤t, const QModelIndex & switch(severity) { case PROBLEM_WARNING: - ui->frame->setModText(tr("%1 possibly has issues.").arg(patch->getPatchName())); + ui->frame->setModText(tr("%1 possibly has issues.").arg(patch->getName())); break; case PROBLEM_ERROR: - ui->frame->setModText(tr("%1 has issues!").arg(patch->getPatchName())); + ui->frame->setModText(tr("%1 has issues!").arg(patch->getName())); break; default: case PROBLEM_NONE: @@ -251,8 +251,7 @@ void VersionPage::on_modBtn_clicked() void VersionPage::on_jarmodBtn_clicked() { bool nagShown = false; - auto traits = m_version->traits; - if (!traits.contains("legacyLaunch") && !traits.contains("alphaLaunch")) + if (!m_version->hasTrait("legacyLaunch") && !m_version->hasTrait("alphaLaunch")) { // not legacy launch... nag auto seenNag = MMC->settings()->get("JarModNagSeen").toBool(); @@ -513,7 +512,7 @@ void VersionPage::on_editBtn_clicked() { return; } - auto filename = version->getPatchFilename(); + auto filename = version->getFilename(); if(!QFileInfo::exists(filename)) { qWarning() << "file" << filename << "can't be opened for editing, doesn't exist!"; |