From 3b422b54aa13be4eb59c80b1f7bb2a514aac583f Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 18 Jan 2013 12:15:59 -0600 Subject: Re-added settings files to project. --- MultiMC.pro | 10 ++++++++-- MultiMC.pro.user | 2 +- data/settingsmacros.h | 35 ----------------------------------- data/settingsmacrosundef.h | 26 -------------------------- util/settingsmacros.h | 35 +++++++++++++++++++++++++++++++++++ util/settingsmacrosundef.h | 26 ++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 data/settingsmacros.h delete mode 100644 data/settingsmacrosundef.h create mode 100644 util/settingsmacros.h create mode 100644 util/settingsmacrosundef.h diff --git a/MultiMC.pro b/MultiMC.pro index 0ca6daee..4da6e82f 100644 --- a/MultiMC.pro +++ b/MultiMC.pro @@ -20,7 +20,9 @@ SOURCES += main.cpp\ data/stdinstance.cpp \ data/inifile.cpp \ gui/settingsdialog.cpp \ - gui/modeditwindow.cpp + gui/modeditwindow.cpp \ + data/appsettings.cpp \ + data/settingsbase.cpp HEADERS += gui/mainwindow.h \ data/instancebase.h \ @@ -29,7 +31,11 @@ HEADERS += gui/mainwindow.h \ data/stdinstance.h \ data/inifile.h \ gui/settingsdialog.h \ - gui/modeditwindow.h + gui/modeditwindow.h \ + data/appsettings.h \ + data/settingsbase.h \ + util/settingsmacros.h \ + util/settingsmacrosundef.h FORMS += gui/mainwindow.ui \ gui/settingsdialog.ui \ diff --git a/MultiMC.pro.user b/MultiMC.pro.user index 21852a10..55968de6 100644 --- a/MultiMC.pro.user +++ b/MultiMC.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/data/settingsmacros.h b/data/settingsmacros.h deleted file mode 100644 index 94e52155..00000000 --- a/data/settingsmacros.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSMACROS_H -#define SETTINGSMACROS_H - -#define STR_VAL(val) # val - -#define DEFINE_SETTING(funcName, name, defVal, typeName, toFunc) \ - virtual typeName Get ## funcName() const { return value(name). ## toFunc(); } \ - virtual void Set ## funcName(typeName value) { setValue(name, value); } \ - virtual void Reset ## funcName() { - -#define DEFINE_SETTING_STR(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, QString, toString) - -#define DEFINE_SETTING_BOOL(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, bool, toBool) - -#define DEFINE_SETTING_INT(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, int, toInt) - -#endif // SETTINGSMACROS_H diff --git a/data/settingsmacrosundef.h b/data/settingsmacrosundef.h deleted file mode 100644 index 85b13bac..00000000 --- a/data/settingsmacrosundef.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSMACROSUNDEF_H -#define SETTINGSMACROSUNDEF_H - -#undef DEFINE_SETTING -#undef DEFINE_SETTING_STR -#undef DEFINE_SETTING_BOOL -#undef DEFINE_SETTING_INT - -#undef STR_VAL - -#endif // SETTINGSMACROSUNDEF_H diff --git a/util/settingsmacros.h b/util/settingsmacros.h new file mode 100644 index 00000000..94e52155 --- /dev/null +++ b/util/settingsmacros.h @@ -0,0 +1,35 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SETTINGSMACROS_H +#define SETTINGSMACROS_H + +#define STR_VAL(val) # val + +#define DEFINE_SETTING(funcName, name, defVal, typeName, toFunc) \ + virtual typeName Get ## funcName() const { return value(name). ## toFunc(); } \ + virtual void Set ## funcName(typeName value) { setValue(name, value); } \ + virtual void Reset ## funcName() { + +#define DEFINE_SETTING_STR(name, defVal) \ + DEFINE_SETTING(name, STR_VAL(name), defVal, QString, toString) + +#define DEFINE_SETTING_BOOL(name, defVal) \ + DEFINE_SETTING(name, STR_VAL(name), defVal, bool, toBool) + +#define DEFINE_SETTING_INT(name, defVal) \ + DEFINE_SETTING(name, STR_VAL(name), defVal, int, toInt) + +#endif // SETTINGSMACROS_H diff --git a/util/settingsmacrosundef.h b/util/settingsmacrosundef.h new file mode 100644 index 00000000..85b13bac --- /dev/null +++ b/util/settingsmacrosundef.h @@ -0,0 +1,26 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SETTINGSMACROSUNDEF_H +#define SETTINGSMACROSUNDEF_H + +#undef DEFINE_SETTING +#undef DEFINE_SETTING_STR +#undef DEFINE_SETTING_BOOL +#undef DEFINE_SETTING_INT + +#undef STR_VAL + +#endif // SETTINGSMACROSUNDEF_H -- cgit From 8926b2422628a288fb6a04417f90e0a9739b82d1 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 25 Jan 2013 13:29:45 -0600 Subject: Add .user files to gitignore and remove deleted files from CMakeLists. --- .gitignore | 3 + CMakeLists.txt | 2 - MultiMC.pro.user | 239 ------------------------------------------------------- 3 files changed, 3 insertions(+), 241 deletions(-) delete mode 100644 MultiMC.pro.user diff --git a/.gitignore b/.gitignore index 529735db..3221c2d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ Thumbs.db .kdev4 MultiMC5.kdev4 +MultiMC.pro.user +CMakeLists.txt.user +.user build resources/CMakeFiles resources/MultiMCLauncher.jar diff --git a/CMakeLists.txt b/CMakeLists.txt index 05513f2c..3fa89d5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,8 +127,6 @@ data/inifile.h data/instancebase.h data/instancemodel.h data/settingsbase.h -data/settingsmacros.h -data/settingsmacrosundef.h data/stdinstance.h util/pathutils.h diff --git a/MultiMC.pro.user b/MultiMC.pro.user deleted file mode 100644 index 55968de6..00000000 --- a/MultiMC.pro.user +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - true - 1 - true - 2 - true - 1 - 8 - true - 1 - true - false - false - true - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.0.0 MSVC2010 32bit (SDK) - Desktop Qt 5.0.0 MSVC2010 32bit (SDK) - qt.500.win32_msvc2010.essentials_kit - 0 - 0 - 0 - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Debug - true - - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Release - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - - false - false - false - false - true - 0.01 - 10 - true - 25 - - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - MultiMC - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Andrew/Projects/MultiMC5/MultiMC/MultiMC.pro - 2 - - MultiMC.pro - false - false - - - 3768 - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {d833f846-3a8b-4e2a-9d77-5f93cddd0a0f} - - - ProjectExplorer.Project.Updater.FileVersion - 12 - - -- cgit From a25bedd7706b14cdae91556e4a577e410745f29a Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 28 Jan 2013 15:35:09 -0600 Subject: Implemented settings dialog. --- CMakeLists.txt | 3 +- MultiMC.pro | 9 ++-- data/appsettings.cpp | 22 ++++++++- data/appsettings.h | 89 ++++++++++++++++++++++++++++++++++- data/settingsbase.cpp | 22 --------- data/settingsbase.h | 33 ------------- data/stdinstance.cpp | 4 +- data/stdinstance.h | 2 +- gui/settingsdialog.cpp | 112 +++++++++++++++++++++++++++++++++++++++++++-- gui/settingsdialog.h | 7 +++ gui/settingsdialog.ui | 107 ++++++++++--------------------------------- main.cpp | 7 +++ util/apputils.h | 21 +++++++++ util/osutils.h | 27 +++++++++++ util/settingsmacros.h | 35 -------------- util/settingsmacrosundef.h | 26 ----------- 16 files changed, 308 insertions(+), 218 deletions(-) delete mode 100644 data/settingsbase.cpp delete mode 100644 data/settingsbase.h create mode 100644 util/apputils.h create mode 100644 util/osutils.h delete mode 100644 util/settingsmacros.h delete mode 100644 util/settingsmacrosundef.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fa89d5b..66e18484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,6 @@ data/appsettings.cpp data/inifile.cpp data/instancebase.cpp data/instancemodel.cpp -data/settingsbase.cpp data/stdinstance.cpp gui/mainwindow.cpp @@ -126,9 +125,9 @@ data/appsettings.h data/inifile.h data/instancebase.h data/instancemodel.h -data/settingsbase.h data/stdinstance.h +util/apputils.h util/pathutils.h multimc_pragma.h diff --git a/MultiMC.pro b/MultiMC.pro index 4da6e82f..3f480529 100644 --- a/MultiMC.pro +++ b/MultiMC.pro @@ -21,8 +21,7 @@ SOURCES += main.cpp\ data/inifile.cpp \ gui/settingsdialog.cpp \ gui/modeditwindow.cpp \ - data/appsettings.cpp \ - data/settingsbase.cpp + util/appsettings.cpp HEADERS += gui/mainwindow.h \ data/instancebase.h \ @@ -32,10 +31,8 @@ HEADERS += gui/mainwindow.h \ data/inifile.h \ gui/settingsdialog.h \ gui/modeditwindow.h \ - data/appsettings.h \ - data/settingsbase.h \ - util/settingsmacros.h \ - util/settingsmacrosundef.h + util/apputils.h \ + util/appsettings.h FORMS += gui/mainwindow.ui \ gui/settingsdialog.ui \ diff --git a/data/appsettings.cpp b/data/appsettings.cpp index 525def6e..1d9c4312 100644 --- a/data/appsettings.cpp +++ b/data/appsettings.cpp @@ -15,8 +15,26 @@ #include "appsettings.h" -AppSettings::AppSettings(QString fileName) : - SettingsBase(fileName) +AppSettings* settings; + +SettingsBase::SettingsBase(QObject *parent) : + QObject(parent) +{ + +} + +AppSettings::AppSettings(QObject *parent) : + SettingsBase(parent) { } + +QVariant AppSettings::getValue(const QString& name, QVariant defVal) const +{ + return config.value(name, defVal); +} + +void AppSettings::setValue(const QString& name, QVariant val) +{ + config.setValue(name, val); +} diff --git a/data/appsettings.h b/data/appsettings.h index f8c7ff73..eff22b11 100644 --- a/data/appsettings.h +++ b/data/appsettings.h @@ -16,12 +16,97 @@ #ifndef APPSETTINGS_H #define APPSETTINGS_H -#include "settingsbase.h" +#include +#include +#include + +#include "util/apputils.h" +#include "util/osutils.h" + +#if WINDOWS +#define JPATHKEY "JavaPathWindows" +#elif OSX +#define JPATHKEY "JavaPathOSX" +#else +#define JPATHKEY "JavaPathLinux" +#endif + +#define DEFINE_SETTING_ADVANCED(funcName, name, valType, defVal) \ + virtual valType get ## funcName() const { return getValue(name, defVal).value(); } \ + virtual void set ## funcName(valType value) { setValue(name, value); } + +#define DEFINE_SETTING(name, valType, defVal) \ + DEFINE_SETTING_ADVANCED(name, STR_VAL(name), valType, defVal) + +#define DEFINE_OVERRIDE_SETTING(overrideName) \ + + +class SettingsBase : public QObject +{ + Q_OBJECT +public: + explicit SettingsBase(QObject *parent = 0); + + // Updates + DEFINE_SETTING(UseDevBuilds, bool, false) + DEFINE_SETTING(AutoUpdate, bool, true) + + // Folders + DEFINE_SETTING(InstanceDir, QString, "instances") + DEFINE_SETTING(CentralModsDir, QString, "mods") + DEFINE_SETTING(LWJGLDir, QString, "lwjgl") + + // Console + DEFINE_SETTING(ShowConsole, bool, true) + DEFINE_SETTING(AutoCloseConsole, bool, true) + + // Console Colors + DEFINE_SETTING(SysMessageColor, QColor, QColor(Qt::blue)) + DEFINE_SETTING(StdOutColor, QColor, QColor(Qt::black)) + DEFINE_SETTING(StdErrColor, QColor, QColor(Qt::red)) + + // Window Size + DEFINE_SETTING(LaunchCompatMode, bool, false) + DEFINE_SETTING(LaunchMaximized, bool, false) + DEFINE_SETTING(MinecraftWinWidth, int, 854) + DEFINE_SETTING(MinecraftWinHeight, int, 480) + + // Auto login + DEFINE_SETTING(AutoLogin, bool, false) + + // Memory + DEFINE_SETTING(MinMemAlloc, int, 512) + DEFINE_SETTING(MaxMemAlloc, int, 1024) + + // Java Settings + DEFINE_SETTING_ADVANCED(JavaPath, JPATHKEY, QString, "java") + DEFINE_SETTING(JvmArgs, QString, "") + + // Custom Commands + DEFINE_SETTING(PreLaunchCommand, QString, "") + DEFINE_SETTING(PostExitCommand, QString, "") + +protected: + virtual QVariant getValue(const QString& name, QVariant defVal = QVariant()) const = 0; + virtual void setValue(const QString& name, QVariant val) = 0; +}; class AppSettings : public SettingsBase { + Q_OBJECT public: - AppSettings(QString fileName); + explicit AppSettings(QObject *parent = 0); + +protected: + virtual QVariant getValue(const QString &name, QVariant defVal = QVariant()) const; + virtual void setValue(const QString& name, QVariant val); + + QSettings config; }; +#undef DEFINE_SETTING_ADVANCED +#undef DEFINE_SETTING + +extern AppSettings* settings; + #endif // APPSETTINGS_H diff --git a/data/settingsbase.cpp b/data/settingsbase.cpp deleted file mode 100644 index 66195603..00000000 --- a/data/settingsbase.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "settingsbase.h" - -SettingsBase::SettingsBase(QString fileName) : - QSettings(fileName, QSettings::IniFormat) -{ - -} diff --git a/data/settingsbase.h b/data/settingsbase.h deleted file mode 100644 index 71f0e30d..00000000 --- a/data/settingsbase.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSBASE_H -#define SETTINGSBASE_H - -#include - -#include "settingsmacros.h" - -class SettingsBase : public QSettings -{ -public: - SettingsBase(QString fileName); - - -}; - -#include "settingsmacrosundef.h" - -#endif // SETTINGSBASE_H diff --git a/data/stdinstance.cpp b/data/stdinstance.cpp index 1324b510..4618f5ca 100644 --- a/data/stdinstance.cpp +++ b/data/stdinstance.cpp @@ -15,8 +15,8 @@ #include "stdinstance.h" -StdInstance::StdInstance(QString rootDir) : - InstanceBase(rootDir) +StdInstance::StdInstance(QString rootDir, QObject* parent) : + InstanceBase(rootDir, parent) { } diff --git a/data/stdinstance.h b/data/stdinstance.h index 59b1c8ab..79b87601 100644 --- a/data/stdinstance.h +++ b/data/stdinstance.h @@ -22,7 +22,7 @@ class StdInstance : public InstanceBase { public: - explicit StdInstance(QString rootDir); + explicit StdInstance(QString rootDir, QObject *parent = 0); }; #endif // STDINSTANCE_H diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 46569340..ab4d18ee 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -16,13 +16,19 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" +#include "data/appsettings.h" + #include +#include SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::SettingsDialog) { ui->setupUi(this); + + loadSettings(settings); + updateCheckboxStuff(); } SettingsDialog::~SettingsDialog() @@ -32,10 +38,10 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::updateCheckboxStuff() { - ui->minMemSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || - ui->maximizedCheckBox->isChecked())); - ui->maxMemSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || - ui->maximizedCheckBox->isChecked())); + ui->windowWidthSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || + ui->maximizedCheckBox->isChecked())); + ui->windowHeightSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || + ui->maximizedCheckBox->isChecked())); ui->maximizedCheckBox->setEnabled(!ui->compatModeCheckBox->isChecked()); } @@ -75,3 +81,101 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked) Q_UNUSED(checked); updateCheckboxStuff(); } + +void SettingsDialog::on_buttonBox_accepted() +{ + applySettings(settings); +} + +void SettingsDialog::applySettings(SettingsBase *s) +{ + // Special cases + + // Warn about dev builds. + if (!ui->devBuildsCheckBox->isChecked()) + { + s->setUseDevBuilds(false); + } + else if (!s->getUseDevBuilds()) + { + int response = QMessageBox::question(this, "Development builds", + "Development builds contain experimental features " + "and may be unstable. Are you sure you want to enable them?"); + if (response == QMessageBox::Yes) + { + s->setUseDevBuilds(true); + } + } + + + // Updates + s->setAutoUpdate(ui->autoUpdateCheckBox->isChecked()); + + // Folders + // TODO: Offer to move instances to new instance folder. + s->setInstanceDir(ui->instDirTextBox->text()); + s->setCentralModsDir(ui->modsDirTextBox->text()); + s->setLWJGLDir(ui->lwjglDirTextBox->text()); + + // Console + s->setShowConsole(ui->showConsoleCheck->isChecked()); + s->setAutoCloseConsole(ui->autoCloseConsoleCheck->isChecked()); + + // Window Size + s->setLaunchCompatMode(ui->compatModeCheckBox->isChecked()); + s->setLaunchMaximized(ui->maximizedCheckBox->isChecked()); + s->setMinecraftWinWidth(ui->windowWidthSpinBox->value()); + s->setMinecraftWinHeight(ui->windowHeightSpinBox->value()); + + // Auto Login + s->setAutoLogin(ui->autoLoginCheckBox->isChecked()); + + // Memory + s->setMinMemAlloc(ui->minMemSpinBox->value()); + s->setMaxMemAlloc(ui->maxMemSpinBox->value()); + + // Java Settings + s->setJavaPath(ui->javaPathTextBox->text()); + s->setJvmArgs(ui->jvmArgsTextBox->text()); + + // Custom Commands + s->setPreLaunchCommand(ui->preLaunchCmdTextBox->text()); + s->setPostExitCommand(ui->postExitCmdTextBox->text()); +} + +void SettingsDialog::loadSettings(SettingsBase *s) +{ + // Updates + ui->autoUpdateCheckBox->setChecked(s->getAutoUpdate()); + ui->devBuildsCheckBox->setChecked(s->getUseDevBuilds()); + + // Folders + ui->instDirTextBox->setText(s->getInstanceDir()); + ui->modsDirTextBox->setText(s->getCentralModsDir()); + ui->lwjglDirTextBox->setText(s->getLWJGLDir()); + + // Console + ui->showConsoleCheck->setChecked(s->getShowConsole()); + ui->autoCloseConsoleCheck->setChecked(s->getAutoCloseConsole()); + + // Window Size + ui->compatModeCheckBox->setChecked(s->getLaunchCompatMode()); + ui->maximizedCheckBox->setChecked(s->getLaunchMaximized()); + ui->windowWidthSpinBox->setValue(s->getMinecraftWinWidth()); + ui->windowHeightSpinBox->setValue(s->getMinecraftWinHeight()); + + // Auto Login + ui->autoLoginCheckBox->setChecked(s->getAutoLogin()); + + // Memory + ui->minMemSpinBox->setValue(s->getMinMemAlloc()); + ui->maxMemSpinBox->setValue(s->getMaxMemAlloc()); + + // Java Settings + ui->javaPathTextBox->setText(s->getJavaPath()); + ui->jvmArgsTextBox->setText(s->getJvmArgs()); + + // Custom Commands + ui->preLaunchCmdTextBox->setText(s->getPreLaunchCommand()); + ui->postExitCmdTextBox->setText(s->getPostExitCommand()); +} diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h index 3e9d9e0f..e223237f 100644 --- a/gui/settingsdialog.h +++ b/gui/settingsdialog.h @@ -18,6 +18,8 @@ #include +class SettingsBase; + namespace Ui { class SettingsDialog; } @@ -32,6 +34,9 @@ public: void updateCheckboxStuff(); + void applySettings(SettingsBase* s); + void loadSettings(SettingsBase* s); + private slots: void on_instDirBrowseBtn_clicked(); @@ -43,6 +48,8 @@ private slots: void on_maximizedCheckBox_clicked(bool checked); + void on_buttonBox_accepted(); + private: Ui::SettingsDialog *ui; }; diff --git a/gui/settingsdialog.ui b/gui/settingsdialog.ui index 315686ca..d30f56bb 100644 --- a/gui/settingsdialog.ui +++ b/gui/settingsdialog.ui @@ -158,88 +158,6 @@ - - - Console - - - - - - Console Settings - - - - - - Show console while the game is running? - - - - - - - Automatically close console when the game quits? - - - - - - - - - - Instance Console Colors - - - - - - System message color: - - - - - - - - - - Output message color: - - - - - - - - - - Error message color: - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - Minecraft @@ -315,10 +233,33 @@ + + + + Console Settings + + + + + + Show console while the game is running? + + + + + + + Automatically close console when the game quits? + + + + + + - Login automatically when an instance launches? + Login automatically when an instance icon is double clicked? diff --git a/main.cpp b/main.cpp index 0d429c8d..019a8853 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,4 @@ + /* Copyright 2013 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +17,16 @@ #include "gui/mainwindow.h" #include +#include "data/appsettings.h" + int main(int argc, char *argv[]) { QApplication app(argc, argv); + app.setOrganizationName("Forkk"); + app.setApplicationName("MultiMC 5"); + + settings = new AppSettings(&app); MainWindow mainWin; mainWin.show(); diff --git a/util/apputils.h b/util/apputils.h new file mode 100644 index 00000000..a64adc50 --- /dev/null +++ b/util/apputils.h @@ -0,0 +1,21 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef APPUTILS_H +#define APPUTILS_H + +#define STR_VAL(val) # val + +#endif // APPUTILS_H diff --git a/util/osutils.h b/util/osutils.h new file mode 100644 index 00000000..263f1f6d --- /dev/null +++ b/util/osutils.h @@ -0,0 +1,27 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OSUTILS_H +#define OSUTILS_H + +#if defined _WIN32 | defined _WIN64 +#define WINDOWS 1 +#elif __APPLE__ & __MACH__ +#define OSX 1 +#elif __linux__ +#define LINUX 1 +#endif + +#endif // OSUTILS_H diff --git a/util/settingsmacros.h b/util/settingsmacros.h deleted file mode 100644 index 94e52155..00000000 --- a/util/settingsmacros.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSMACROS_H -#define SETTINGSMACROS_H - -#define STR_VAL(val) # val - -#define DEFINE_SETTING(funcName, name, defVal, typeName, toFunc) \ - virtual typeName Get ## funcName() const { return value(name). ## toFunc(); } \ - virtual void Set ## funcName(typeName value) { setValue(name, value); } \ - virtual void Reset ## funcName() { - -#define DEFINE_SETTING_STR(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, QString, toString) - -#define DEFINE_SETTING_BOOL(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, bool, toBool) - -#define DEFINE_SETTING_INT(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, int, toInt) - -#endif // SETTINGSMACROS_H diff --git a/util/settingsmacrosundef.h b/util/settingsmacrosundef.h deleted file mode 100644 index 85b13bac..00000000 --- a/util/settingsmacrosundef.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSMACROSUNDEF_H -#define SETTINGSMACROSUNDEF_H - -#undef DEFINE_SETTING -#undef DEFINE_SETTING_STR -#undef DEFINE_SETTING_BOOL -#undef DEFINE_SETTING_INT - -#undef STR_VAL - -#endif // SETTINGSMACROSUNDEF_H -- cgit From 3a0367a79c53c59e670ee50927247885fe4807cb Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 28 Jan 2013 18:01:20 -0600 Subject: Resized main window and added version info. --- CMakeLists.txt | 14 ++++++++------ data/version.cpp | 38 ++++++++++++++++++++++++++++++++++++++ data/version.h | 38 ++++++++++++++++++++++++++++++++++++++ gui/mainwindow.cpp | 6 +++++- gui/mainwindow.ui | 4 ++-- 5 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 data/version.cpp create mode 100644 data/version.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 66e18484..1859c71b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.9) -project(multimc5) +project(MultiMC5) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -105,6 +105,7 @@ data/inifile.cpp data/instancebase.cpp data/instancemodel.cpp data/stdinstance.cpp +data/version.cpp gui/mainwindow.cpp gui/modeditwindow.cpp @@ -126,6 +127,7 @@ data/inifile.h data/instancebase.h data/instancemodel.h data/stdinstance.h +data/version.h util/apputils.h util/pathutils.h @@ -152,8 +154,8 @@ SET_SOURCE_FILES_PROPERTIES(resources/MultiMCLauncher.jar GENERATED) QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS}) QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc) -add_executable(multimc5 ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC}) -qt5_use_modules(multimc5 Widgets) -target_link_libraries(multimc5 quazip patchlib) -add_dependencies(multimc5 MultiMCLauncher) -install(TARGETS multimc5 RUNTIME DESTINATION bin) +add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC}) +qt5_use_modules(MultiMC Widgets) +target_link_libraries(MultiMC quazip patchlib) +add_dependencies(MultiMC MultiMCLauncher) +install(TARGETS MultiMC RUNTIME DESTINATION bin) diff --git a/data/version.cpp b/data/version.cpp new file mode 100644 index 00000000..905402fd --- /dev/null +++ b/data/version.cpp @@ -0,0 +1,38 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "version.h" + +#include "config.h" + +Version Version::current = Version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD); + +Version::Version(int major, int minor, int revision, int build, QObject *parent) : + QObject(parent) +{ + this->major = major; + this->minor = minor; + this->revision = revision; + this->build = build; +} + +QString Version::toString() const +{ + return QString("%1.%2.%3.%4").arg( + QString::number(major), + QString::number(minor), + QString::number(revision), + QString::number(build)); +} diff --git a/data/version.h b/data/version.h new file mode 100644 index 00000000..37c0fd68 --- /dev/null +++ b/data/version.h @@ -0,0 +1,38 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef VERSION_H +#define VERSION_H + +#include + +class Version : public QObject +{ + Q_OBJECT +public: + explicit Version(int major = 0, int minor = 0, int revision = 0, + int build = 0, QObject *parent = 0); + + QString toString() const; + + int major; + int minor; + int revision; + int build; + + static Version current; +}; + +#endif // VERSION_H diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 87a1dcc0..eedaddb8 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -19,13 +19,17 @@ #include #include -#include "../gui/settingsdialog.h" +#include "gui/settingsdialog.h" +#include "data/version.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); + + setWindowTitle(QString("MultiMC %1").arg(Version::current.toString())); + instList.initialLoad("instances"); ui->instanceView->setModel(&instList); } diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui index ccc7e777..6640657a 100644 --- a/gui/mainwindow.ui +++ b/gui/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 739 - 657 + 854 + 480 -- cgit From 7ac25bf2dae0c4435732265d26924140893914ff Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 29 Jan 2013 00:26:24 -0600 Subject: Implemented the view folder buttons on the main window. --- CMakeLists.txt | 2 ++ gui/mainwindow.cpp | 6 ++++-- util/osutils.cpp | 25 +++++++++++++++++++++++++ util/osutils.h | 5 +++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 util/osutils.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1859c71b..218d7f13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,7 @@ gui/modeditwindow.cpp gui/settingsdialog.cpp util/pathutils.cpp +util/osutils.cpp java/javautils.cpp java/annotations.cpp @@ -131,6 +132,7 @@ data/version.h util/apputils.h util/pathutils.h +util/osutils.h multimc_pragma.h diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index eedaddb8..e2a3abfb 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -19,7 +19,9 @@ #include #include +#include "util/osutils.h" #include "gui/settingsdialog.h" +#include "data/appsettings.h" #include "data/version.h" MainWindow::MainWindow(QWidget *parent) : @@ -46,7 +48,7 @@ void MainWindow::on_actionAddInstance_triggered() void MainWindow::on_actionViewInstanceFolder_triggered() { - + openInDefaultProgram(settings->getInstanceDir()); } void MainWindow::on_actionRefresh_triggered() @@ -56,7 +58,7 @@ void MainWindow::on_actionRefresh_triggered() void MainWindow::on_actionViewCentralModsFolder_triggered() { - + openInDefaultProgram(settings->getCentralModsDir()); } void MainWindow::on_actionCheckUpdate_triggered() diff --git a/util/osutils.cpp b/util/osutils.cpp new file mode 100644 index 00000000..6b095518 --- /dev/null +++ b/util/osutils.cpp @@ -0,0 +1,25 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "osutils.h" + +#include +#include +#include + +void openInDefaultProgram(QString filename) +{ + QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath()); +} diff --git a/util/osutils.h b/util/osutils.h index 263f1f6d..f779ea2d 100644 --- a/util/osutils.h +++ b/util/osutils.h @@ -16,6 +16,8 @@ #ifndef OSUTILS_H #define OSUTILS_H +#include + #if defined _WIN32 | defined _WIN64 #define WINDOWS 1 #elif __APPLE__ & __MACH__ @@ -24,4 +26,7 @@ #define LINUX 1 #endif +// Opens the given file in the default application. +void openInDefaultProgram(QString filename); + #endif // OSUTILS_H -- cgit From dcc21b7e649f79fa0cac75507ba9a314735744d9 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 29 Jan 2013 13:01:04 -0600 Subject: Changed group list loading to use Qt JSON instead of boost. --- data/instancemodel.cpp | 132 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 93 insertions(+), 39 deletions(-) diff --git a/data/instancemodel.cpp b/data/instancemodel.cpp index 239be5c5..4fbcebc2 100644 --- a/data/instancemodel.cpp +++ b/data/instancemodel.cpp @@ -16,15 +16,18 @@ #include "instancemodel.h" #include + #include +#include #include -#include "stdinstance.h" - -#include "../util/pathutils.h" +#include -#include -#include +#include +#include +#include +#include "data/stdinstance.h" +#include "util/pathutils.h" #define GROUP_FILE_FORMAT_VERSION 1 @@ -65,47 +68,98 @@ void InstanceModel::initialLoad(QString dir) // temporary map from instance ID to group name QMap groupMap; - using namespace boost::property_tree; - ptree pt; - - try + if (QFileInfo(groupFile).exists()) { - read_json(groupFile.toStdString(), pt); - - if (pt.get_optional("formatVersion") != GROUP_FILE_FORMAT_VERSION) + QFile groupFile(groupFile); + + if (!groupFile.open(QIODevice::ReadOnly)) { - // TODO: Discard old formats. + // An error occurred. Ignore it. + qDebug("Failed to read instance group file."); + goto groupParseFail; } - - BOOST_FOREACH(const ptree::value_type& vp, pt.get_child("groups")) + + QTextStream in(&groupFile); + QString jsonStr = in.readAll(); + groupFile.close(); + + QJsonParseError error; + QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonStr.toUtf8(), &error); + + if (error.error != QJsonParseError::NoError) { - ptree gPt = vp.second; - QString groupName = QString::fromUtf8(vp.first.c_str()); - - InstanceGroup *group = new InstanceGroup(groupName, this); - groups.push_back(group); - - if (gPt.get_child_optional("hidden")) - group->setHidden(gPt.get("hidden")); - - QVector groupInstances; - BOOST_FOREACH(const ptree::value_type& v, gPt.get_child("instances")) + qWarning(QString("Failed to parse instance group file: %1 at offset %2"). + arg(error.errorString(), QString::number(error.offset)).toUtf8()); + goto groupParseFail; + } + + if (!jsonDoc.isObject()) + { + qWarning("Invalid group file. Root entry should be an object."); + goto groupParseFail; + } + + QJsonObject rootObj = jsonDoc.object(); + + // Make sure the format version matches. + if (rootObj.value("formatVersion").toVariant().toInt() == GROUP_FILE_FORMAT_VERSION) + { + // Get the group list. + if (!rootObj.value("groups").isObject()) { - QString key = QString::fromUtf8(v.second.data().c_str()); - groupMap[key] = groupName; + qWarning("Invalid group list JSON: 'groups' should be an object."); + goto groupParseFail; + } + + // Iterate through the list. + QJsonObject groupList = rootObj.value("groups").toObject(); + + for (QJsonObject::iterator iter = groupList.begin(); + iter != groupList.end(); iter++) + { + QString groupName = iter.key(); + + // If not an object, complain and skip to the next one. + if (!iter.value().isObject()) + { + qWarning(QString("Group '%1' in the group list should " + "be an object.").arg(groupName).toUtf8()); + continue; + } + + QJsonObject groupObj = iter.value().toObject(); + + // Create the group object. + InstanceGroup *group = new InstanceGroup(groupName, this); + groups.push_back(group); + + // If 'hidden' isn't a bool value, just assume it's false. + if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool()) + { + group->setHidden(groupObj.value("hidden").toBool()); + } + + if (!groupObj.value("instances").isArray()) + { + qWarning(QString("Group '%1' in the group list is invalid. " + "It should contain an array " + "called 'instances'.").arg(groupName).toUtf8()); + continue; + } + + // Iterate through the list of instances in the group. + QJsonArray instancesArray = groupObj.value("instances").toArray(); + + for (QJsonArray::iterator iter2 = instancesArray.begin(); + iter2 != instancesArray.end(); iter2++) + { + groupMap[(*iter2).toString()] = groupName; + } } } } - catch (json_parser_error e) - { - qDebug("Failed to read group list. JSON parser error."); -// wxLogError(_(), -// e.line(), wxStr(e.message()).c_str()); - } - catch (ptree_error e) - { - qDebug("Failed to read group list. Unknown ptree error."); - } + +groupParseFail: qDebug("Loading instances"); QDir instDir(dir); @@ -400,4 +454,4 @@ QVariant InstanceGroup::data ( int role ) const default: return QVariant(); } -} \ No newline at end of file +} -- cgit From 90764f97d94a52517d735ed96d26bb52a2d75de1 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 29 Jan 2013 23:52:37 -0600 Subject: Add instance toolbar. --- data/appsettings.h | 7 +++ gui/mainwindow.cpp | 18 +++++++ gui/mainwindow.h | 4 ++ gui/mainwindow.ui | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 178 insertions(+), 2 deletions(-) diff --git a/data/appsettings.h b/data/appsettings.h index eff22b11..a9068bfd 100644 --- a/data/appsettings.h +++ b/data/appsettings.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "util/apputils.h" #include "util/osutils.h" @@ -60,6 +61,10 @@ public: DEFINE_SETTING(ShowConsole, bool, true) DEFINE_SETTING(AutoCloseConsole, bool, true) + // Toolbar settings + DEFINE_SETTING(InstanceToolbarVisible, bool, true) + DEFINE_SETTING(InstanceToolbarPosition, QPoint, QPoint()) + // Console Colors DEFINE_SETTING(SysMessageColor, QColor, QColor(Qt::blue)) DEFINE_SETTING(StdOutColor, QColor, QColor(Qt::black)) @@ -97,6 +102,8 @@ class AppSettings : public SettingsBase public: explicit AppSettings(QObject *parent = 0); + QSettings& getConfig() { return config; } + protected: virtual QVariant getValue(const QString &name, QVariant defVal = QVariant()) const; virtual void setValue(const QString& name, QVariant val); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index e2a3abfb..e257f5ae 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -32,6 +32,9 @@ MainWindow::MainWindow(QWidget *parent) : setWindowTitle(QString("MultiMC %1").arg(Version::current.toString())); + restoreGeometry(settings->getConfig().value("MainWindowGeometry", saveGeometry()).toByteArray()); + restoreState(settings->getConfig().value("MainWindowState", saveState()).toByteArray()); + instList.initialLoad("instances"); ui->instanceView->setModel(&instList); } @@ -86,3 +89,18 @@ void MainWindow::on_actionAbout_triggered() { } + +void MainWindow::on_mainToolBar_visibilityChanged(bool) +{ + // Don't allow hiding the main toolbar. + // This is the only way I could find to prevent it... :/ + ui->mainToolBar->setVisible(true); +} + +void MainWindow::closeEvent(QCloseEvent *event) +{ + // Save the window state and geometry. + settings->getConfig().setValue("MainWindowGeometry", saveGeometry()); + settings->getConfig().setValue("MainWindowState", saveState()); + QMainWindow::closeEvent(event); +} diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 77245531..91efd497 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -33,6 +33,8 @@ public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + void closeEvent(QCloseEvent *event); + private slots: void on_actionAbout_triggered(); @@ -52,6 +54,8 @@ private slots: void on_actionNews_triggered(); + void on_mainToolBar_visibilityChanged(bool); + private: Ui::MainWindow *ui; diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui index 6640657a..3e832276 100644 --- a/gui/mainwindow.ui +++ b/gui/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 854 - 480 + 600 + 400 @@ -39,6 +39,9 @@ +