We only need one set of soft plus/minus buttons.

[pkanalytics] / mainwindow.ui

diff --git a/mainwindow.ui b/mainwindow.ui
index 207d0c54042892dbdc9887edd125a38ebff718af..845966050d541f772b3eb9bcb2d28563219cea33 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -105,16 +105,6 @@
         </item>
         <item>
          <layout class="QGridLayout" name="offense_grid">
-          <item row="4" column="0">
-           <widget class="QPushButton" name="pull_or_was_d">
-            <property name="text">
-             <string>Pull (&amp;p)</string>
-            </property>
-            <property name="shortcut">
-             <string>P</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QPushButton" name="catch_">
             <property name="text">
@@ -125,16 +115,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QPushButton" name="offensive_formation">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>Formation (&amp;o)</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="QPushButton" name="throwaway">
             <property name="text">
@@ -145,43 +125,43 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="offensive_soft_plus">
+          <item row="1" column="0">
+           <widget class="QPushButton" name="drop">
             <property name="text">
-             <string>Soft plus (&amp;+)</string>
+             <string>Drop (&amp;x)</string>
             </property>
             <property name="shortcut">
-             <string>+</string>
+             <string>X</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="offensive_soft_minus">
+          <item row="1" column="1">
+           <widget class="QPushButton" name="goal">
             <property name="text">
-             <string>Soft minus (&amp;-)</string>
+             <string>Goal (&amp;g)</string>
             </property>
             <property name="shortcut">
-             <string>-</string>
+             <string>G</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="drop">
-            <property name="text">
-             <string>Drop (&amp;x)</string>
+          <item row="3" column="1">
+           <widget class="QPushButton" name="offensive_formation">
+            <property name="enabled">
+             <bool>true</bool>
             </property>
-            <property name="shortcut">
-             <string>X</string>
+            <property name="text">
+             <string>Formation (&amp;o)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="goal">
+          <item row="3" column="0">
+           <widget class="QPushButton" name="pull_or_was_d">
             <property name="text">
-             <string>Goal (&amp;g)</string>
+             <string>Pull (&amp;p)</string>
             </property>
             <property name="shortcut">
-             <string>G</string>
+             <string>P</string>
             </property>
            </widget>
           </item>
@@ -209,16 +189,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="defensive_soft_plus">
-            <property name="text">
-             <string>Soft plus (&amp;+)</string>
-            </property>
-            <property name="shortcut">
-             <string>+</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="QPushButton" name="their_throwaway">
             <property name="text">
@@ -239,16 +209,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="defensive_soft_minus">
-            <property name="text">
-             <string>Soft minus (&amp;-)</string>
-            </property>
-            <property name="shortcut">
-             <string>-</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <widget class="QPushButton" name="their_goal">
             <property name="text">
@@ -259,7 +219,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="2" column="0">
            <widget class="QPushButton" name="their_pull">
             <property name="text">
              <string>Their pull (&amp;p)</string>
@@ -269,7 +229,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="2" column="1">
            <widget class="QPushButton" name="defensive_formation">
             <property name="enabled">
              <bool>true</bool>
@@ -296,7 +256,17 @@
         </item>
         <item>
          <layout class="QGridLayout" name="misc_grid">
-          <item row="0" column="0">
+          <item row="1" column="1">
+           <widget class="QPushButton" name="stoppage">
+            <property name="text">
+             <string>Stoppage (&amp;v)</string>
+            </property>
+            <property name="shortcut">
+             <string>V</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
            <widget class="QPushButton" name="substitution">
             <property name="text">
              <string>Substitution (&amp;b)</string>
@@ -306,7 +276,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item row="2" column="0">
            <widget class="QPushButton" name="unknown">
             <property name="text">
              <string>Unknown (&amp;?)</string>
@@ -316,7 +286,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="1">
            <widget class="QPushButton" name="delete_">
             <property name="text">
              <string>Delete (⌫)</string>
@@ -326,13 +296,23 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="0">
+           <widget class="QPushButton" name="soft_plus">
+            <property name="text">
+             <string>Soft plus (&amp;+)</string>
+            </property>
+            <property name="shortcut">
+             <string>+</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
-           <widget class="QPushButton" name="stoppage">
+           <widget class="QPushButton" name="soft_minus">
             <property name="text">
-             <string>Stoppage (&amp;v)</string>
+             <string>Soft minus (&amp;-)</string>
             </property>
             <property name="shortcut">
-             <string>V</string>
+             <string>-</string>
             </property>
            </widget>
           </item>