diff options
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index bc2ba3fb..7e7c6c88 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -12,13 +12,14 @@ #include <QDesktopServices> #include "gui/dialogs/VersionSelectDialog.h" -#include "logic/lists/InstanceList.h" +#include "logic/InstanceList.h" #include "logic/auth/MojangAccountList.h" #include "logic/icons/IconList.h" -#include "logic/lists/LwjglVersionList.h" -#include "logic/lists/MinecraftVersionList.h" -#include "logic/lists/ForgeVersionList.h" -#include "logic/lists/LiteLoaderVersionList.h" +#include "logic/LwjglVersionList.h" +#include "logic/minecraft/MinecraftVersionList.h" +#include "logic/liteloader/LiteLoaderVersionList.h" + +#include "logic/forge/ForgeVersionList.h" #include "logic/news/NewsChecker.h" @@ -28,7 +29,7 @@ #include "logic/net/HttpMetaCache.h" #include "logic/net/URLConstants.h" -#include "logic/JavaUtils.h" +#include "logic/java/JavaUtils.h" #include "logic/updater/UpdateChecker.h" #include "logic/updater/NotificationChecker.h" @@ -37,12 +38,14 @@ #include "logic/tools/JVisualVM.h" #include "logic/tools/MCEditTool.h" +#include "logic/URNResolver.h" + #include "pathutils.h" #include "cmdutils.h" -#include <inisettingsobject.h> -#include <setting.h> +#include "logic/settings/INISettingsObject.h" +#include "logic/settings/Setting.h" #include "logger/QsLog.h" -#include <logger/QsLogDest.h> +#include "logger/QsLogDest.h" #ifdef Q_OS_WIN32 #include <windows.h> @@ -216,7 +219,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool root_override) m_instances.reset(new InstanceList(InstDirSetting->get().toString(), this)); QLOG_INFO() << "Loading Instances..."; m_instances->loadList(); - connect(InstDirSetting.get(), SIGNAL(settingChanged(const Setting &, QVariant)), + connect(InstDirSetting.get(), SIGNAL(SettingChanged(const Setting &, QVariant)), m_instances.get(), SLOT(on_InstFolderChanged(const Setting &, QVariant))); // and accounts @@ -336,7 +339,7 @@ void MultiMC::initLogger() QsLogging::Logger &logger = QsLogging::Logger::instance(); logger.setLoggingLevel(QsLogging::TraceLevel); m_fileDestination = QsLogging::DestinationFactory::MakeFileDestination(logBase.arg(0)); - m_debugDestination = QsLogging::DestinationFactory::MakeQDebugDestination(); + m_debugDestination = QsLogging::DestinationFactory::MakeDebugOutputDestination(); logger.addDestination(m_fileDestination.get()); logger.addDestination(m_debugDestination.get()); // log all the things @@ -352,6 +355,7 @@ void MultiMC::initGlobalSettings() // Updates m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL); m_settings->registerSetting("AutoUpdate", true); + m_settings->registerSetting("IconTheme", QString("multimc")); // Notifications m_settings->registerSetting("ShownNotifications", QString()); @@ -505,6 +509,8 @@ void MultiMC::initGlobalSettings() m_settings->registerSetting("ConsoleWindowGeometry", ""); m_settings->registerSetting("SettingsGeometry", ""); + + m_settings->registerSetting("PagedGeometry", ""); } void MultiMC::initHttpMetaCache() @@ -644,6 +650,16 @@ std::shared_ptr<JavaVersionList> MultiMC::javalist() return m_javalist; } +std::shared_ptr<URNResolver> MultiMC::resolver() +{ + if (!m_resolver) + { + m_resolver.reset(new URNResolver()); + } + return m_resolver; +} + + void MultiMC::installUpdates(const QString updateFilesDir, UpdateFlags flags) { // if we are going to update on exit, save the params now |