Merge https://github.com/Forkk/MultiMC5

Conflicts:
	gui/mainwindow.ui

1 files changed, 221 insertions, 2 deletions

diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 5abfb37d..137f7e97 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>739</width>
-    <height>657</height>
+    <width>600</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,11 +44,17 @@
       <attribute name="headerVisible">
        <bool>false</bool>
       </attribute>
+      <property name="contextMenuPolicy">
+       <enum>Qt::CustomContextMenu</enum>
+      </property>
      </widget>
     </item>
    </layout>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
+   <property name="windowTitle">
+    <string>Main Toolbar</string>
+   </property>
    <property name="movable">
     <bool>false</bool>
    </property>
@@ -74,6 +80,38 @@
    <addaction name="actionAbout"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QToolBar" name="instanceToolBar">
+   <property name="windowTitle">
+    <string>Instance Toolbar</string>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>RightToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <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="separator"/>
+   <addaction name="actionInstanceSettings"/>
+   <addaction name="actionMakeDesktopShortcut"/>
+   <addaction name="actionViewSelectedInstFolder"/>
+   <addaction name="separator"/>
+   <addaction name="actionDeleteInstance"/>
+  </widget>
   <action name="actionAddInstance">
    <property name="icon">
     <iconset resource="../multimc.qrc">
@@ -85,6 +123,9 @@
    <property name="toolTip">
     <string>Add a new instance.</string>
    </property>
+   <property name="statusTip">
+    <string>Add a new instance.</string>
+   </property>
   </action>
   <action name="actionViewInstanceFolder">
    <property name="icon">
@@ -97,6 +138,9 @@
    <property name="toolTip">
     <string>Open the instance folder in a file browser.</string>
    </property>
+   <property name="statusTip">
+    <string>Open the instance folder in a file browser.</string>
+   </property>
   </action>
   <action name="actionRefresh">
    <property name="icon">
@@ -109,6 +153,9 @@
    <property name="toolTip">
     <string>Reload the instance list.</string>
    </property>
+   <property name="statusTip">
+    <string>Reload the instance list.</string>
+   </property>
   </action>
   <action name="actionViewCentralModsFolder">
    <property name="icon">
@@ -121,6 +168,9 @@
    <property name="toolTip">
     <string>Open the central mods folder in a file browser.</string>
    </property>
+   <property name="statusTip">
+    <string>Open the central mods folder in a file browser.</string>
+   </property>
   </action>
   <action name="actionCheckUpdate">
    <property name="icon">
@@ -133,6 +183,9 @@
    <property name="toolTip">
     <string>Check for new updates for MultiMC</string>
    </property>
+   <property name="statusTip">
+    <string>Check for new updates for MultiMC</string>
+   </property>
   </action>
   <action name="actionSettings">
    <property name="icon">
@@ -145,6 +198,9 @@
    <property name="toolTip">
     <string>Change settings.</string>
    </property>
+   <property name="statusTip">
+    <string>Change settings.</string>
+   </property>
    <property name="menuRole">
     <enum>QAction::PreferencesRole</enum>
    </property>
@@ -160,6 +216,9 @@
    <property name="toolTip">
     <string>Open the bug tracker to report a bug with MultiMC.</string>
    </property>
+   <property name="statusTip">
+    <string>Open the bug tracker to report a bug with MultiMC.</string>
+   </property>
   </action>
   <action name="actionNews">
    <property name="icon">
@@ -172,6 +231,9 @@
    <property name="toolTip">
     <string>Open the MultiMC dev blog to read news about MultiMC.</string>
    </property>
+   <property name="statusTip">
+    <string>Open the MultiMC dev blog to read news about MultiMC.</string>
+   </property>
   </action>
   <action name="actionAbout">
    <property name="icon">
@@ -184,10 +246,167 @@
    <property name="toolTip">
     <string>View information about MultiMC.</string>
    </property>
+   <property name="statusTip">
+    <string>About MultiMC</string>
+   </property>
    <property name="menuRole">
     <enum>QAction::AboutRole</enum>
    </property>
   </action>
+  <action name="actionLaunchInstance">
+   <property name="text">
+    <string>Play</string>
+   </property>
+   <property name="toolTip">
+    <string>Launch the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Launch the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionRenameInstance">
+   <property name="text">
+    <string>Rename</string>
+   </property>
+   <property name="toolTip">
+    <string>Rename the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Rename the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionChangeInstGroup">
+   <property name="text">
+    <string>Change Group</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the selected instance's group.</string>
+   </property>
+   <property name="statusTip">
+    <string>Change the selected instance's group.</string>
+   </property>
+  </action>
+  <action name="actionChangeInstIcon">
+   <property name="text">
+    <string>Change Icon</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the selected instance's icon.</string>
+   </property>
+   <property name="statusTip">
+    <string>Change the selected instance's icon.</string>
+   </property>
+  </action>
+  <action name="actionEditInstNotes">
+   <property name="text">
+    <string>Edit Notes</string>
+   </property>
+   <property name="toolTip">
+    <string>Edit the notes for the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Edit the notes for the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionInstanceSettings">
+   <property name="text">
+    <string>Settings</string>
+   </property>
+   <property name="toolTip">
+    <string>Change settings for the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Change settings for the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionMakeDesktopShortcut">
+   <property name="text">
+    <string>Make Shortcut</string>
+   </property>
+   <property name="toolTip">
+    <string>Make a shortcut on the desktop for the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Make a shortcut on the desktop for the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionManageInstSaves">
+   <property name="text">
+    <string>Manage Saves</string>
+   </property>
+   <property name="toolTip">
+    <string>Manage saves for the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Manage saves for the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionEditInstMods">
+   <property name="text">
+    <string>Edit Mods</string>
+   </property>
+   <property name="toolTip">
+    <string>Edit the mods for the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Edit the mods for the selected instance.</string>
+   </property>
+  </action>
+  <action name="actionChangeInstMCVersion">
+   <property name="text">
+    <string>Change Version</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the selected instance's Minecraft version.</string>
+   </property>
+   <property name="statusTip">
+    <string>Change the selected instance's Minecraft version.</string>
+   </property>
+  </action>
+  <action name="actionChangeInstLWJGLVersion">
+   <property name="text">
+    <string>Change LWJGL</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the version of LWJGL for the selected instance to use.</string>
+   </property>
+   <property name="statusTip">
+    <string>Change the version of LWJGL for the selected instance to use.</string>
+   </property>
+  </action>
+  <action name="actionRebuildInstJar">
+   <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>
+   </property>
+   <property name="toolTip">
+    <string>Open the selected instance's root folder in a file browser.</string>
+   </property>
+   <property name="statusTip">
+    <string>Open the selected instance's root folder in a file browser.</string>
+   </property>
+  </action>
+  <action name="actionDeleteInstance">
+   <property name="text">
+    <string>Delete</string>
+   </property>
+   <property name="toolTip">
+    <string>Delete the selected instance.</string>
+   </property>
+   <property name="statusTip">
+    <string>Delete the selected instance.</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>