From d884f849d60db44f05a6a6b22f4ffcf520900389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 25 Aug 2013 01:32:42 +0200
Subject: All kinds of incremental improvements

Redone the instance action toolbar:
* Removed all the dead actions
* Change icon and Rename are now morphed into a header
* Added button for opening the config folder
Implemented support for loose files and folders as legacy jar mods
Added texture pack support
---
 gui/mainwindow.ui | 68 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

(limited to 'gui/mainwindow.ui')

diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 893062a5..60e0f70b 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -45,6 +45,12 @@
    <property name="allowedAreas">
     <set>Qt::TopToolBarArea</set>
    </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -74,6 +80,15 @@
    <property name="allowedAreas">
     <set>Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
    </property>
+   <property name="iconSize">
+    <size>
+     <width>80</width>
+     <height>80</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
    <property name="floatable">
     <bool>false</bool>
    </property>
@@ -83,22 +98,19 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="actionChangeInstIcon"/>
+   <addaction name="actionRenameInstance"/>
+   <addaction name="separator"/>
    <addaction name="actionLaunchInstance"/>
    <addaction name="separator"/>
-   <addaction name="actionRenameInstance"/>
-   <addaction name="actionChangeInstGroup"/>
-   <addaction name="actionChangeInstIcon"/>
-   <addaction name="actionChangeInstMCVersion"/>
-   <addaction name="actionChangeInstLWJGLVersion"/>
    <addaction name="actionEditInstNotes"/>
-   <addaction name="separator"/>
-   <addaction name="actionEditInstMods"/>
-   <addaction name="actionManageInstSaves"/>
-   <addaction name="actionRebuildInstJar"/>
+   <addaction name="actionChangeInstGroup"/>
    <addaction name="separator"/>
    <addaction name="actionInstanceSettings"/>
-   <addaction name="actionMakeDesktopShortcut"/>
+   <addaction name="actionChangeInstLWJGLVersion"/>
+   <addaction name="actionEditInstMods"/>
    <addaction name="actionViewSelectedInstFolder"/>
+   <addaction name="actionConfig_Folder"/>
    <addaction name="separator"/>
    <addaction name="actionDeleteInstance"/>
   </widget>
@@ -256,7 +268,7 @@
   </action>
   <action name="actionRenameInstance">
    <property name="text">
-    <string>Rename</string>
+    <string>Instance Name</string>
    </property>
    <property name="toolTip">
     <string>Rename the selected instance.</string>
@@ -280,6 +292,10 @@
    <property name="enabled">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../multimc.qrc">
+     <normaloff>:/icons/instances/infinity</normaloff>:/icons/instances/infinity</iconset>
+   </property>
    <property name="text">
     <string>Change Icon</string>
    </property>
@@ -291,9 +307,6 @@
    </property>
   </action>
   <action name="actionEditInstNotes">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
    <property name="text">
     <string>Edit Notes</string>
    </property>
@@ -385,26 +398,9 @@
     <string>Change the version of LWJGL for the selected instance to use.</string>
    </property>
   </action>
-  <action name="actionRebuildInstJar">
-   <property name="checkable">
-    <bool>false</bool>
-   </property>
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Rebuild Jar</string>
-   </property>
-   <property name="toolTip">
-    <string>Reinstall the mods for the selected instance.</string>
-   </property>
-   <property name="statusTip">
-    <string>Reinstall the mods for the selected instance.</string>
-   </property>
-  </action>
   <action name="actionViewSelectedInstFolder">
    <property name="text">
-    <string>View Folder</string>
+    <string>Instance Folder</string>
    </property>
    <property name="toolTip">
     <string>Open the selected instance's root folder in a file browser.</string>
@@ -424,6 +420,14 @@
     <string>Delete the selected instance.</string>
    </property>
   </action>
+  <action name="actionConfig_Folder">
+   <property name="text">
+    <string>Config Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>Open the instance's config folder</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-- 
cgit v1.2.3