From c767707c951bff6ff525a507be0393119e050b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 19 Jul 2014 23:16:02 +0200
Subject: Make forge work.

Using classifiers FTW.
---
 gui/dialogs/IconPickerDialog.h |  3 ---
 gui/dialogs/ProgressDialog.h   |  3 ---
 gui/dialogs/SettingsDialog.cpp |  6 +++++
 gui/dialogs/SettingsDialog.ui  | 55 ++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 59 insertions(+), 8 deletions(-)

(limited to 'gui/dialogs')

diff --git a/gui/dialogs/IconPickerDialog.h b/gui/dialogs/IconPickerDialog.h
index 70951da6..f00c2388 100644
--- a/gui/dialogs/IconPickerDialog.h
+++ b/gui/dialogs/IconPickerDialog.h
@@ -29,10 +29,7 @@ class IconPickerDialog : public QDialog
 public:
 	explicit IconPickerDialog(QWidget *parent = 0);
 	~IconPickerDialog();
-	#pragma clang diagnostic push
-	#pragma clang diagnostic ignored "-Woverloaded-virtual"
 	int exec(QString selection);
-	#pragma clang diagnostic pop
 	QString selectedIconKey;
 
 protected:
diff --git a/gui/dialogs/ProgressDialog.h b/gui/dialogs/ProgressDialog.h
index 45a6238a..3276fd7a 100644
--- a/gui/dialogs/ProgressDialog.h
+++ b/gui/dialogs/ProgressDialog.h
@@ -34,10 +34,7 @@ public:
 
 	void updateSize();
 
-	#pragma clang diagnostic push
-	#pragma clang diagnostic ignored "-Woverloaded-virtual"
 	int exec(ProgressProvider *task);
-	#pragma clang diagnostic pop
 
 	void setSkipButton(bool present, QString label = QString());
 
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 46368bc1..347cd67e 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -365,6 +365,9 @@ void SettingsDialog::applySettings(SettingsObject *s)
 	}
 	s->set("JsonEditor", jsonEditor);
 
+	// Minecraft version updates
+	s->set("AutoUpdateMinecraftVersions", ui->autoupdateMinecraft->isChecked());
+
 	// Console
 	s->set("ShowConsole", ui->showConsoleCheck->isChecked());
 	s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
@@ -470,6 +473,9 @@ void SettingsDialog::loadSettings(SettingsObject *s)
 	// Editors
 	ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
 
+	// Minecraft version updates
+	ui->autoupdateMinecraft->setChecked(s->get("AutoUpdateMinecraftVersions").toBool());
+	
 	// Console
 	ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
 	ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index d4e90302..94b81dd7 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -409,6 +409,22 @@
        <string>Minecraft</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>Minecraft Version Updates</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_14">
+          <item>
+           <widget class="QCheckBox" name="autoupdateMinecraft">
+            <property name="text">
+             <string>Automatically update to latest version revision</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="windowSizeGroupBox">
          <property name="title">
@@ -1056,11 +1072,30 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>buttonBox</tabstop>
+  <tabstop>settingsTabs</tabstop>
+  <tabstop>autoUpdateCheckBox</tabstop>
+  <tabstop>updateChannelComboBox</tabstop>
+  <tabstop>trackFtbBox</tabstop>
+  <tabstop>ftbLauncherBox</tabstop>
+  <tabstop>ftbLauncherBrowseBtn</tabstop>
+  <tabstop>ftbBox</tabstop>
+  <tabstop>ftbBrowseBtn</tabstop>
+  <tabstop>instDirTextBox</tabstop>
+  <tabstop>instDirBrowseBtn</tabstop>
+  <tabstop>modsDirTextBox</tabstop>
+  <tabstop>modsDirBrowseBtn</tabstop>
+  <tabstop>lwjglDirTextBox</tabstop>
+  <tabstop>lwjglDirBrowseBtn</tabstop>
+  <tabstop>iconsDirTextBox</tabstop>
+  <tabstop>iconsDirBrowseBtn</tabstop>
+  <tabstop>languageBox</tabstop>
+  <tabstop>resetNotificationsBtn</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
+  <tabstop>themeComboBox</tabstop>
   <tabstop>jsonEditorTextBox</tabstop>
   <tabstop>jsonEditorBrowseBtn</tabstop>
+  <tabstop>autoupdateMinecraft</tabstop>
   <tabstop>maximizedCheckBox</tabstop>
   <tabstop>windowWidthSpinBox</tabstop>
   <tabstop>windowHeightSpinBox</tabstop>
@@ -1076,7 +1111,23 @@
   <tabstop>jvmArgsTextBox</tabstop>
   <tabstop>preLaunchCmdTextBox</tabstop>
   <tabstop>postExitCmdTextBox</tabstop>
-  <tabstop>settingsTabs</tabstop>
+  <tabstop>proxyDefaultBtn</tabstop>
+  <tabstop>proxyNoneBtn</tabstop>
+  <tabstop>proxySOCKS5Btn</tabstop>
+  <tabstop>proxyHTTPBtn</tabstop>
+  <tabstop>proxyAddrEdit</tabstop>
+  <tabstop>proxyPortEdit</tabstop>
+  <tabstop>proxyUserEdit</tabstop>
+  <tabstop>proxyPassEdit</tabstop>
+  <tabstop>jprofilerPathEdit</tabstop>
+  <tabstop>jprofilerPathBtn</tabstop>
+  <tabstop>jprofilerCheckBtn</tabstop>
+  <tabstop>jvisualvmPathEdit</tabstop>
+  <tabstop>jvisualvmPathBtn</tabstop>
+  <tabstop>jvisualvmCheckBtn</tabstop>
+  <tabstop>mceditPathEdit</tabstop>
+  <tabstop>mceditPathBtn</tabstop>
+  <tabstop>mceditCheckBtn</tabstop>
  </tabstops>
  <resources>
   <include location="../../graphics.qrc"/>
-- 
cgit v1.2.3