From 7f6b344b49506462a63453bc79ae1b82536dc138 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 4 Jan 2014 16:13:28 +0100
Subject: Clean up/update translation code and made language selectable in the
 settings dialog

---
 gui/dialogs/SettingsDialog.ui | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'gui/dialogs/SettingsDialog.ui')

diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index dbc8ca88..c1008c75 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>526</width>
-    <height>628</height>
+    <height>701</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -40,6 +40,20 @@
        <string>General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1">
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Language (needs restart):</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="languageBox"/>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QGroupBox" name="sortingModeBox">
          <property name="enabled">
@@ -644,7 +658,6 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>settingsTab</tabstop>
   <tabstop>buttonBox</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
-- 
cgit v1.2.3


From e6201f9ff799a21faff15c61586f2da4e62b799f Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Thu, 9 Jan 2014 15:30:21 +0000
Subject: Add "MB" as a suffix to memory spinboxes

---
 gui/dialogs/SettingsDialog.ui | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'gui/dialogs/SettingsDialog.ui')

diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index e7671cce..5f2614ed 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -596,6 +596,9 @@
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="1" column="1">
            <widget class="QSpinBox" name="maxMemSpinBox">
+            <property name="suffix">
+             <string> MB</string>
+            </property>
             <property name="minimum">
              <number>512</number>
             </property>
@@ -626,6 +629,9 @@
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="minMemSpinBox">
+            <property name="suffix">
+             <string> MB</string>
+            </property>
             <property name="minimum">
              <number>256</number>
             </property>
@@ -649,6 +655,9 @@
           </item>
           <item row="2" column="1">
            <widget class="QSpinBox" name="permGenSpinBox">
+            <property name="suffix">
+             <string> MB</string>
+            </property>
             <property name="minimum">
              <number>64</number>
             </property>
@@ -895,7 +904,7 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="sortingModeGroup"/>
   <buttongroup name="proxyGroup"/>
+  <buttongroup name="sortingModeGroup"/>
  </buttongroups>
 </ui>
-- 
cgit v1.2.3


From 9ddf2aec31e33e8e0fa450d0084f115471401ad4 Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Fri, 10 Jan 2014 13:16:31 +0000
Subject: Add tooltips to Java memory spinboxes

---
 gui/dialogs/SettingsDialog.ui | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'gui/dialogs/SettingsDialog.ui')

diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 840e9928..b95b3c8c 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -599,6 +599,9 @@
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="1" column="1">
            <widget class="QSpinBox" name="maxMemSpinBox">
+            <property name="toolTip">
+             <string>The maximum amount of memory Minecraft is allowed to use.</string>
+            </property>
             <property name="suffix">
              <string> MB</string>
             </property>
@@ -632,6 +635,9 @@
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="minMemSpinBox">
+            <property name="toolTip">
+             <string>The amount of memory Minecraft is started with.</string>
+            </property>
             <property name="suffix">
              <string> MB</string>
             </property>
@@ -658,6 +664,9 @@
           </item>
           <item row="2" column="1">
            <widget class="QSpinBox" name="permGenSpinBox">
+            <property name="toolTip">
+             <string>The amount of memory available to store loaded Java classes.</string>
+            </property>
             <property name="suffix">
              <string> MB</string>
             </property>
@@ -907,7 +916,7 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="proxyGroup"/>
   <buttongroup name="sortingModeGroup"/>
+  <buttongroup name="proxyGroup"/>
  </buttongroups>
 </ui>
-- 
cgit v1.2.3