diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-31 01:24:28 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-31 01:32:51 +0100 |
| commit | 952b63f68de93e8acf7aab81373661dae8d5098b (patch) | |
| tree | a3be2560a2c34f8827a37998c7baa5a525dde22f /MultiMC.cpp | |
| parent | c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc (diff) | |
| download | MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.gz MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.lz MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.xz MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.zip | |
Refactor icon lists heavily
* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM.
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 865d0cf1..fe83fbd1 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -13,7 +13,7 @@ #include "gui/dialogs/VersionSelectDialog.h" #include "logic/lists/InstanceList.h" #include "logic/auth/MojangAccountList.h" -#include "logic/lists/IconList.h" +#include "logic/icons/IconList.h" #include "logic/lists/LwjglVersionList.h" #include "logic/lists/MinecraftVersionList.h" #include "logic/lists/ForgeVersionList.h" @@ -382,6 +382,7 @@ void MultiMC::initGlobalSettings() m_settings->registerSetting(new Setting("InstanceDir", "instances")); m_settings->registerSetting(new Setting("CentralModsDir", "mods")); m_settings->registerSetting(new Setting("LWJGLDir", "lwjgl")); + m_settings->registerSetting(new Setting("IconsDir", "icons")); // Editors m_settings->registerSetting(new Setting("JsonEditor", QString())); @@ -420,15 +421,6 @@ void MultiMC::initGlobalSettings() m_settings->registerSetting(new Setting("InstSortMode", "Name")); m_settings->registerSetting(new Setting("SelectedInstance", QString())); - // Persistent value for the client ID - m_settings->registerSetting(new Setting("YggdrasilClientToken", "")); - QString currentYggID = m_settings->get("YggdrasilClientToken").toString(); - if (currentYggID.isEmpty()) - { - QUuid uuid = QUuid::createUuid(); - m_settings->set("YggdrasilClientToken", uuid.toString()); - } - // Window state and geometry m_settings->registerSetting(new Setting("MainWindowState", "")); m_settings->registerSetting(new Setting("MainWindowGeometry", "")); |