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

SCRATCH no more gui includes in logic

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-07 10:43:09 +01:00
parent 141e0a02a0
commit 4e94de413b
7 changed files with 72 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
logic/minecraft/OneSixInstance.cpp
View File

@ -28,15 +28,7 @@
#include "logic/minecraft/AssetsUtils.h"
#include "logic/icons/IconList.h"
#include "gui/pagedialog/PageDialog.h"
#include "gui/pages/VersionPage.h"
#include "gui/pages/ModFolderPage.h"
#include "gui/pages/ResourcePackPage.h"
#include "gui/pages/TexturePackPage.h"
#include "gui/pages/InstanceSettingsPage.h"
#include "gui/pages/NotesPage.h"
#include "gui/pages/ScreenshotsPage.h"
#include "gui/pages/OtherLogsPage.h"
OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: MinecraftInstance(globalSettings, settings, rootDir)
{
@ -53,29 +45,6 @@ void OneSixInstance::createProfile()
m_version.reset(new MinecraftProfile(new OneSixProfileStrategy(this)));
}
QList<BasePage *> OneSixInstance::getPages()
{
QList<BasePage *> values;
values.append(new VersionPage(this));
values.append(new ModFolderPage(this, loaderModList(), "mods", "loadermods",
tr("Loader mods"), "Loader-mods"));
values.append(new CoreModFolderPage(this, coreModList(), "coremods", "coremods",
tr("Core mods"), "Core-mods"));
values.append(new ResourcePackPage(this));
values.append(new TexturePackPage(this));
values.append(new NotesPage(this));
values.append(new ScreenshotsPage(PathCombine(minecraftRoot(), "screenshots")));
values.append(new InstanceSettingsPage(this));
values.append(new OtherLogsPage(minecraftRoot()));
return values;
}
QString OneSixInstance::dialogTitle()
{
return tr("Edit Instance (%1)").arg(name());
}
QSet<QString> OneSixInstance::traits()
{
auto version = getMinecraftProfile();

7
logic/minecraft/OneSixInstance.h
View File

@ -19,9 +19,8 @@
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/ModList.h"
#include "gui/pages/BasePageProvider.h"
class OneSixInstance : public MinecraftInstance, public BasePageProvider
class OneSixInstance : public MinecraftInstance
{
Q_OBJECT
public:
@ -30,10 +29,6 @@ public:
virtual void init();
////// Edit Instance Dialog stuff //////
virtual QList<BasePage *> getPages();
virtual QString dialogTitle();
////// Mod Lists //////
std::shared_ptr<ModList> loaderModList() const;
std::shared_ptr<ModList> coreModList() const;