summaryrefslogtreecommitdiffstats
path: root/logic/OneSixInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-30 02:02:57 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-30 02:02:57 +0200
commit421a46e3d3036ea0dea4889125ee58309d0ed21e (patch)
treeb3665ec5c94c991c7dba5436580ffd4047395aa8 /logic/OneSixInstance.cpp
parent5179aed3a066dfc9885a75d36a0e64c48aa448f7 (diff)
downloadMultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar
MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.gz
MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.lz
MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.xz
MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.zip
Redo the console window. Log is now a page. Console window has relevant pages.
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
Diffstat (limited to 'logic/OneSixInstance.cpp')
-rw-r--r--logic/OneSixInstance.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 2069faad..7bac3424 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -63,15 +63,15 @@ 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(this, loaderModList(), "mods", "plugin-blue", tr("Loader mods"),
"Loader-mods"));
- values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core mods"),
+ values.append(new ModFolderPage(this, coreModList(), "coremods", "plugin-green", tr("Core mods"),
"Core-mods"));
values.append(new ResourcePackPage(this));
values.append(new TexturePackPage(this));
values.append(new NotesPage(this));
values.append(new ScreenshotsPage(this));
- values.append(new InstanceSettingsPage(&settings()));
+ values.append(new InstanceSettingsPage(this));
return values;
}