summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-10 00:46:05 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-10 00:46:05 +0200
commit9ec6deea848f8cdbebeb5c6be8b042c754ad9de7 (patch)
treefe6f72f3575ae9eb03cdb859e0d747e0fadd245c /logic
parent0bccc94471d0223cf493ad860fa890614480433d (diff)
downloadMultiMC-9ec6deea848f8cdbebeb5c6be8b042c754ad9de7.tar
MultiMC-9ec6deea848f8cdbebeb5c6be8b042c754ad9de7.tar.gz
MultiMC-9ec6deea848f8cdbebeb5c6be8b042c754ad9de7.tar.lz
MultiMC-9ec6deea848f8cdbebeb5c6be8b042c754ad9de7.tar.xz
MultiMC-9ec6deea848f8cdbebeb5c6be8b042c754ad9de7.zip
Add close button to page dialog. Add help button to page dialog.
Smile.
Diffstat (limited to 'logic')
-rw-r--r--logic/LegacyInstance.cpp8
-rw-r--r--logic/OneSixInstance.cpp6
2 files changed, 9 insertions, 5 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index 5096d50d..0bd1bda8 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -50,8 +50,10 @@ QList<BasePage *> LegacyInstance::getPages()
QList<BasePage *> values;
values.append(new LegacyUpgradePage(this));
values.append(new LegacyJarModPage(this));
- values.append(new ModFolderPage(loaderModList(), "mods", "plugin-blue", tr("Loader Mods")));
- values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods")));
+ values.append(new ModFolderPage(loaderModList(), "mods", "plugin-blue", tr("Loader Mods"),
+ "LoaderModsPage"));
+ values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods"),
+ "CoreModsPage"));
values.append(new TexturePackPage(this));
values.append(new InstanceSettingsPage(&settings()));
return values;
@@ -70,7 +72,7 @@ std::shared_ptr<Task> LegacyInstance::doUpdate()
return std::shared_ptr<Task>(new LegacyUpdate(this, this));
}
-bool LegacyInstance::prepareForLaunch(AuthSessionPtr account, QString & launchScript)
+bool LegacyInstance::prepareForLaunch(AuthSessionPtr account, QString &launchScript)
{
QIcon icon = MMC->icons()->getIcon(iconKey());
auto pixmap = icon.pixmap(128, 128);
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 1033c624..c1d5f2b1 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -61,8 +61,10 @@ QList<BasePage *> OneSixInstance::getPages()
{
QList<BasePage *> values;
values.append(new VersionPage(this));
- values.append(new ModFolderPage(loaderModList(), "mods", "plugin-blue", tr("Loader Mods")));
- values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods")));
+ values.append(new ModFolderPage(loaderModList(), "mods", "plugin-blue", tr("Loader Mods"),
+ "LoaderModsPage"));
+ values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods"),
+ "CoreModsPage"));
values.append(new ResourcePackPage(this));
values.append(new TexturePackPage(this));
values.append(new InstanceSettingsPage(&settings()));