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

Version revert logic improvements, colorful icons for mod lists and resource pack list.

Browse Source 
Icons are from Oxygen.
This commit is contained in:
Petr Mrázek
2014-06-08 21:26:48 +02:00
parent bf7b070508
commit be73eb3322
26 changed files with 150 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/pages/LegacyJarModPage.cpp
View File

@ -56,7 +56,7 @@ QString LegacyJarModPage::displayName()
QIcon LegacyJarModPage::icon()
{
return QIcon::fromTheme("settings");
return QIcon::fromTheme("plugin-red");
}
QString LegacyJarModPage::id()

2
gui/pages/LegacyUpgradePage.cpp
View File

@ -8,7 +8,7 @@ QString LegacyUpgradePage::displayName()
QIcon LegacyUpgradePage::icon()
{
return QIcon::fromTheme("bug");
return QIcon::fromTheme("checkupdate");
}
QString LegacyUpgradePage::id()

23
gui/pages/ResourcePackPage.h Normal file
View File

@ -0,0 +1,23 @@
#pragma once
#include "ModFolderPage.h"
class ResourcePackPage : public ModFolderPage
{
public:
explicit ResourcePackPage(BaseInstance *instance, QWidget *parent = 0)
: ModFolderPage(instance->texturePackList(), "resourcepacks", "resourcepacks",
tr("Resource packs"), parent)
{
m_inst = instance;
}
virtual ~ResourcePackPage() {};
virtual bool shouldDisplay() override
{
return !m_inst->traits().contains("no-texturepacks") &&
!m_inst->traits().contains("texturepacks");
}
private:
BaseInstance *m_inst;
};

20
gui/pages/TexturePackPage.h Normal file
View File

@ -0,0 +1,20 @@
#pragma once
#include "ModFolderPage.h"
class TexturePackPage : public ModFolderPage
{
public:
explicit TexturePackPage(BaseInstance *instance, QWidget *parent = 0)
: ModFolderPage(instance->texturePackList(), "texturepacks", "resourcepacks",
tr("Texture packs"), parent)
{
m_inst = instance;
}
virtual ~TexturePackPage() {};
virtual bool shouldDisplay() override
{
return m_inst->traits().contains("texturepacks");
}
private:
BaseInstance *m_inst;
};

28
gui/pages/VersionPage.cpp
View File

@ -44,6 +44,7 @@
#include <QAbstractItemModel>
#include <logic/Mod.h>
#include <logic/icons/IconList.h>
#include <QMessageBox>
#include <QListView>
@ -57,7 +58,7 @@ QString VersionPage::displayName()
QIcon VersionPage::icon()
{
return QIcon::fromTheme("settings");
return MMC->icons()->getIcon(m_inst->iconKey());
}
QString VersionPage::id()
@ -157,7 +158,7 @@ void VersionPage::on_jarmodBtn_clicked()
auto f = [&](QStandardPaths::StandardLocation l)
{
QString location = QStandardPaths::writableLocation(l);
if(!QFileInfo::exists(location))
if (!QFileInfo::exists(location))
return;
locations.insert(location);
};
@ -166,7 +167,7 @@ void VersionPage::on_jarmodBtn_clicked()
f(QStandardPaths::DownloadLocation);
f(QStandardPaths::HomeLocation);
QList<QUrl> urls;
for(auto location: locations)
for (auto location : locations)
{
urls.append(QUrl::fromLocalFile(location));
}
@ -178,8 +179,9 @@ void VersionPage::on_jarmodBtn_clicked()
w.setDirectory(modsFolder);
w.setSidebarUrls(urls);
if(w.exec());
m_version->installJarMods(w.selectedFiles());
if (w.exec())
;
m_version->installJarMods(w.selectedFiles());
}
void VersionPage::on_resetLibraryOrderBtn_clicked()
@ -292,15 +294,16 @@ void VersionPage::on_forgeBtn_clicked()
m_version->removeFtbPack();
reloadInstanceVersion();
}
if (m_version->usesLegacyCustomJson())
if (m_version->hasDeprecatedVersionFiles())
{
if (QMessageBox::question(this, tr("Revert?"),
tr("This action will remove your custom.json. Continue?")) !=
tr("This action will remove deprecated version files "
"(custom.json and version.json). Continue?")) !=
QMessageBox::Yes)
{
return;
}
m_version->revertToVanilla();
m_version->removeDeprecatedVersionFiles();
reloadInstanceVersion();
}
VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
@ -329,15 +332,16 @@ void VersionPage::on_liteloaderBtn_clicked()
m_version->removeFtbPack();
reloadInstanceVersion();
}
if (m_version->usesLegacyCustomJson())
if (m_version->hasDeprecatedVersionFiles())
{
if (QMessageBox::question(this, tr("Revert?"),
tr("This action will remove your custom.json. Continue?")) !=
tr("This action will remove deprecated version files "
"(custom.json and version.json). Continue?")) !=
QMessageBox::Yes)
{
return;
}
m_version->revertToVanilla();
m_version->removeDeprecatedVersionFiles();
reloadInstanceVersion();
}
VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"),
@ -369,7 +373,7 @@ void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &
ui->moveLibraryUpBtn->setEnabled(enabled);
}
QString selectedId = m_version->versionFileId(current.row());
if(selectedId == "net.minecraft" || selectedId == "org.multimc.custom.json")
if (selectedId == "net.minecraft" || selectedId == "org.multimc.custom.json")
{
ui->changeMCVersionBtn->setEnabled(true);
}