Further move around.

diff --git a/mainwindow.ui b/mainwindow.ui
index 6c070e84c6def1a76c8cbcff068f98634d1b4c17..a84289e55f646a1ed8eda579a4effca59e7ba171 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -144,42 +144,42 @@
         </item>
         <item>
          <layout class="QGridLayout" name="player_grid">
-          <item row="2" column="6" colspan="2">
-           <widget class="QPushButton" name="player_7">
+          <item row="3" column="0" colspan="2">
+           <widget class="QPushButton" name="player_3">
             <property name="text">
-             <string>Player 7 (&amp;f)</string>
+             <string>Player 3 (&amp;e)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" colspan="2">
-           <widget class="QPushButton" name="player_2">
+          <item row="4" column="2" colspan="2">
+           <widget class="QPushButton" name="player_6">
             <property name="text">
-             <string>Player 2 (&amp;w)</string>
+             <string>Player 6 (&amp;e)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="5" colspan="2">
-           <widget class="QPushButton" name="player_3">
+          <item row="5" column="1" colspan="2">
+           <widget class="QPushButton" name="player_7">
             <property name="text">
-             <string>Player 3 (&amp;e)</string>
+             <string>Player 7 (&amp;f)</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
+          <item row="3" column="2" colspan="2">
            <widget class="QPushButton" name="player_4">
             <property name="text">
              <string>Player 4 (&amp;a)</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="4" colspan="2">
-           <widget class="QPushButton" name="player_6">
+          <item row="4" column="0" colspan="2">
+           <widget class="QPushButton" name="player_5">
             <property name="text">
-             <string>Player 6 (&amp;d)</string>
+             <string>Player 5 (&amp;s)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="2">
+          <item row="2" column="0" colspan="2">
            <widget class="QPushButton" name="player_1">
             <property name="text">
              <string>Player 1 (&amp;q)</string>
@@ -187,9 +187,9 @@
            </widget>
           </item>
           <item row="2" column="2" colspan="2">
-           <widget class="QPushButton" name="player_5">
+           <widget class="QPushButton" name="player_2">
             <property name="text">
-             <string>Player 5 (&amp;s)</string>
+             <string>Player 2 (&amp;w)</string>
             </property>
            </widget>
           </item>
@@ -207,14 +207,21 @@
         </item>
         <item>
          <layout class="QGridLayout" name="offense_grid">
-          <item row="1" column="0">
-           <widget class="QPushButton" name="pushButton_4">
+          <item row="4" column="0">
+           <widget class="QPushButton" name="pushButton_7">
             <property name="text">
-             <string>Drop (&amp;x)</string>
+             <string>Pull (&amp;p)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QPushButton" name="pushButton">
+            <property name="text">
+             <string>Catch/take (&amp;c)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
+          <item row="4" column="1">
            <widget class="QPushButton" name="pushButton_8">
             <property name="text">
              <string>Pull landed (&amp;p)</string>
@@ -228,38 +235,31 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="pushButton_5">
-            <property name="text">
-             <string>Goal (&amp;g)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
+          <item row="2" column="0">
            <widget class="QPushButton" name="pushButton_3">
             <property name="text">
              <string>Soft plus (&amp;+)</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
+          <item row="2" column="1">
            <widget class="QPushButton" name="pushButton_6">
             <property name="text">
              <string>Soft minus (&amp;-)</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="pushButton">
+          <item row="1" column="0">
+           <widget class="QPushButton" name="pushButton_4">
             <property name="text">
-             <string>Catch/take (&amp;c)</string>
+             <string>Drop (&amp;x)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="pushButton_7">
+          <item row="1" column="1">
+           <widget class="QPushButton" name="pushButton_5">
             <property name="text">
-             <string>Pull (&amp;p)</string>
+             <string>Goal (&amp;g)</string>
             </property>
            </widget>
           </item>
@@ -284,17 +284,17 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="pushButton_10">
+          <item row="2" column="0">
+           <widget class="QPushButton" name="pushButton_13">
             <property name="text">
-             <string>Their t.away (&amp;t)</string>
+             <string>Soft plus (&amp;+)</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QPushButton" name="pushButton_13">
+          <item row="0" column="1">
+           <widget class="QPushButton" name="pushButton_10">
             <property name="text">
-             <string>Soft plus (&amp;+)</string>
+             <string>Their t.away (&amp;t)</string>
             </property>
            </widget>
           </item>
@@ -305,6 +305,13 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="pushButton_14">
+            <property name="text">
+             <string>Soft minus (&amp;-)</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1">
            <widget class="QPushButton" name="pushButton_12">
             <property name="text">
@@ -312,27 +319,20 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QPushButton" name="pushButton_14">
+          <item row="3" column="0">
+           <widget class="QPushButton" name="pushButton_16">
             <property name="text">
-             <string>Soft minus (&amp;-)</string>
+             <string>Pull (&amp;p)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
+          <item row="3" column="1">
            <widget class="QPushButton" name="pushButton_15">
             <property name="text">
              <string>Our foul (&amp;o)</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="pushButton_16">
-            <property name="text">
-             <string>Pull (&amp;p)</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
         <item>
@@ -347,13 +347,6 @@
         </item>
         <item>
          <layout class="QGridLayout" name="misc_grid">
-          <item row="0" column="2">
-           <widget class="QPushButton" name="pushButton_19">
-            <property name="text">
-             <string>Stoppage (&amp;v)</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QPushButton" name="pushButton_17">
             <property name="text">
@@ -361,20 +354,27 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="1" column="0">
            <widget class="QPushButton" name="pushButton_18">
             <property name="text">
              <string>Unknown (&amp;?)</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
+          <item row="1" column="1">
            <widget class="QPushButton" name="pushButton_20">
             <property name="text">
              <string>Delete (⌫)</string>
             </property>
            </widget>
           </item>
+          <item row="0" column="1">
+           <widget class="QPushButton" name="pushButton_19">
+            <property name="text">
+             <string>Stoppage (&amp;v)</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>