# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1410113333 -10800
# Node ID 98fe1587dc43239b3d6fd599ca3b673fa833f710
# Parent  3c83fe3486b19a46c172882dbab6fdf252f01ee4
- interface fixes and changes: edit modes now use plain letter keybinds like gimp, fixed some edit modes missing from the menu, magic wand now follows the selection mode (in order to group selective/drawing modes together like that), etc

diff -r 3c83fe3486b1 -r 98fe1587dc43 ui/ldforge.ui
--- a/ui/ldforge.ui	Sun Sep 07 20:51:14 2014 +0300
+++ b/ui/ldforge.ui	Sun Sep 07 21:08:53 2014 +0300
@@ -47,8 +47,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>233</width>
-           <height>399</height>
+           <width>237</width>
+           <height>414</height>
           </rect>
          </property>
          <attribute name="label">
@@ -75,8 +75,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>256</width>
-           <height>121</height>
+           <width>237</width>
+           <height>414</height>
           </rect>
          </property>
          <attribute name="label">
@@ -157,8 +157,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>101</width>
-           <height>101</height>
+           <width>237</width>
+           <height>414</height>
           </rect>
          </property>
          <attribute name="label">
@@ -194,7 +194,7 @@
      <x>0</x>
      <y>0</y>
      <width>1010</width>
-     <height>27</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -286,7 +286,11 @@
     <addaction name="actionSelectByType"/>
     <addaction name="separator"/>
     <addaction name="actionModeSelect"/>
+    <addaction name="actionModeMagicWand"/>
     <addaction name="actionModeDraw"/>
+    <addaction name="actionModeRectangle"/>
+    <addaction name="actionModeCircle"/>
+    <addaction name="actionModeLinePath"/>
     <addaction name="separator"/>
     <addaction name="actionSetDrawDepth"/>
     <addaction name="separator"/>
@@ -400,9 +404,9 @@
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <widget class="QToolBar" name="toolBar">
+  <widget class="QToolBar" name="toolBarFile">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>File</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -416,9 +420,9 @@
    <addaction name="actionSave"/>
    <addaction name="actionSaveAs"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_2">
+  <widget class="QToolBar" name="toolBarNewObject">
    <property name="windowTitle">
-    <string>toolBar_2</string>
+    <string>New Object</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -435,9 +439,9 @@
    <addaction name="actionNewBFC"/>
    <addaction name="actionNewVertex"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_3">
+  <widget class="QToolBar" name="toolBarBasicTools">
    <property name="windowTitle">
-    <string>toolBar_3</string>
+    <string>Basic tools</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -452,9 +456,9 @@
    <addaction name="actionPaste"/>
    <addaction name="actionDelete"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_4">
+  <widget class="QToolBar" name="toolBarSelect">
    <property name="windowTitle">
-    <string>toolBar_4</string>
+    <string>Select</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -466,9 +470,9 @@
    <addaction name="actionSelectByColor"/>
    <addaction name="actionSelectByType"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_5">
+  <widget class="QToolBar" name="toolBarGrid">
    <property name="windowTitle">
-    <string>toolBar_5</string>
+    <string>Grid</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -480,9 +484,9 @@
    <addaction name="actionGridMedium"/>
    <addaction name="actionGridFine"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_6">
+  <widget class="QToolBar" name="toolBarDisplay">
    <property name="windowTitle">
-    <string>toolBar_6</string>
+    <string>Display options</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -496,9 +500,9 @@
    <addaction name="actionRandomColors"/>
    <addaction name="actionDrawAngles"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_7">
+  <widget class="QToolBar" name="toolBarEditTools">
    <property name="windowTitle">
-    <string>toolBar_7</string>
+    <string>Editing tools</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -520,9 +524,9 @@
    <addaction name="actionVisibilityToggle"/>
    <addaction name="actionVisibilityReveal"/>
   </widget>
-  <widget class="QToolBar" name="toolBar_8">
+  <widget class="QToolBar" name="toolBarEditModes">
    <property name="windowTitle">
-    <string>toolBar_8</string>
+    <string>Editing modes</string>
    </property>
    <attribute name="toolBarArea">
     <enum>LeftToolBarArea</enum>
@@ -531,15 +535,15 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionModeSelect"/>
+   <addaction name="actionModeMagicWand"/>
    <addaction name="actionModeDraw"/>
    <addaction name="actionModeRectangle"/>
    <addaction name="actionModeCircle"/>
-   <addaction name="actionModeMagicWand"/>
    <addaction name="actionModeLinePath"/>
   </widget>
-  <widget class="QToolBar" name="colorToolbar">
+  <widget class="QToolBar" name="toolBarColor">
    <property name="windowTitle">
-    <string>toolBar_9</string>
+    <string>Colors</string>
    </property>
    <attribute name="toolBarArea">
     <enum>RightToolBarArea</enum>
@@ -548,9 +552,9 @@
     <bool>false</bool>
    </attribute>
   </widget>
-  <widget class="QToolBar" name="toolBar_9">
+  <widget class="QToolBar" name="toolBarExternalPrograms">
    <property name="windowTitle">
-    <string>toolBar_9</string>
+    <string>External Programs</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -986,7 +990,7 @@
     <string>Select Mode</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+1</string>
+    <string>S</string>
    </property>
   </action>
   <action name="actionModeDraw">
@@ -1001,7 +1005,7 @@
     <string>Draw Mode</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+2</string>
+    <string>D</string>
    </property>
   </action>
   <action name="actionSetDrawDepth">
@@ -1021,7 +1025,7 @@
     <string>Set the color on given objects.</string>
    </property>
    <property name="shortcut">
-    <string>C</string>
+    <string>Shift+C</string>
    </property>
   </action>
   <action name="actionAutocolor">
@@ -1200,6 +1204,9 @@
    <property name="statusTip">
     <string>Flip coordinates.</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+F</string>
+   </property>
   </action>
   <action name="actionDemote">
    <property name="text">
@@ -1500,9 +1507,6 @@
    <property name="text">
     <string>Save All</string>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+Shift+S</string>
-   </property>
   </action>
   <action name="actionClose">
    <property name="text">
@@ -1562,7 +1566,7 @@
     <string>Circle Mode</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+4</string>
+    <string>C</string>
    </property>
   </action>
   <action name="actionVisibilityHide">
@@ -1682,7 +1686,7 @@
     <string>Magic wand</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+5</string>
+    <string>W</string>
    </property>
   </action>
   <action name="actionModeRectangle">
@@ -1697,7 +1701,7 @@
     <string>Rectangle Mode</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+3</string>
+    <string>R</string>
    </property>
   </action>
   <action name="actionModeLinePath">
@@ -1712,7 +1716,7 @@
     <string>Line Path Mode</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+6</string>
+    <string>P</string>
    </property>
   </action>
  </widget>