X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.ui;h=04a8f910f9d56c9222c866c849fc8aa98cd3c6a5;hb=72afdc62f4ea865bdf7a3f316ec96bcb932c9d0a;hp=20bf733149c063ad0a29d9ac6bd248d20fb2a4cf;hpb=3e43cd4777ddb314779f6c2be51028e14bd54e6d;p=pkanalytics

diff --git a/mainwindow.ui b/mainwindow.ui
index 20bf733..04a8f91 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -105,83 +105,73 @@
         </item>
         <item>
          <layout class="QGridLayout" name="offense_grid">
-          <item row="4" column="0">
-           <widget class="QPushButton" name="pull">
+          <item row="1" column="2" colspan="2">
+           <widget class="QPushButton" name="goal">
             <property name="text">
-             <string>Pull (&amp;p)</string>
+             <string>Goal (&amp;g)</string>
             </property>
             <property name="shortcut">
-             <string>P</string>
+             <string>G</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="catch_">
+          <item row="0" column="2" colspan="2">
+           <widget class="QPushButton" name="throwaway">
             <property name="text">
-             <string>Catch/take (&amp;c)</string>
+             <string>Throwaway (&amp;t)</string>
             </property>
             <property name="shortcut">
-             <string>C</string>
-            </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>
+             <string>T</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="throwaway">
+          <item row="1" column="0" colspan="2">
+           <widget class="QPushButton" name="drop">
             <property name="text">
-             <string>Throwaway (&amp;t)</string>
+             <string>Drop (&amp;x)</string>
             </property>
             <property name="shortcut">
-             <string>T</string>
+             <string>X</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="offensive_soft_plus">
+          <item row="0" column="0" colspan="2">
+           <widget class="QPushButton" name="catch_">
             <property name="text">
-             <string>Soft plus (&amp;+)</string>
+             <string>Catch/take (&amp;c)</string>
             </property>
             <property name="shortcut">
-             <string>+</string>
+             <string>C</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="offensive_soft_minus">
+          <item row="4" column="1" colspan="2">
+           <widget class="QPushButton" name="stallout">
             <property name="text">
-             <string>Soft minus (&amp;-)</string>
+             <string>Stallout (&amp;u)</string>
             </property>
             <property name="shortcut">
-             <string>-</string>
+             <string>U</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="drop">
+          <item row="3" column="0" colspan="2">
+           <widget class="QPushButton" name="pull_or_was_d">
             <property name="text">
-             <string>Drop (&amp;x)</string>
+             <string>Pull (&amp;p)</string>
             </property>
             <property name="shortcut">
-             <string>X</string>
+             <string>P</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="goal">
-            <property name="text">
-             <string>Goal (&amp;g)</string>
+          <item row="3" column="2" colspan="2">
+           <widget class="QPushButton" name="offensive_formation">
+            <property name="enabled">
+             <bool>true</bool>
             </property>
-            <property name="shortcut">
-             <string>G</string>
+            <property name="text">
+             <string>Formation (&amp;o)</string>
             </property>
            </widget>
           </item>
@@ -209,16 +199,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 +219,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 +229,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 +239,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 +266,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 +286,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 +296,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 +306,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>
@@ -351,7 +341,7 @@
        </layout>
       </item>
       <item row="0" column="0">
-       <widget class="VideoWidget" name="video" native="true">
+       <widget class="VideoWidget" name="video">
         <property name="minimumSize">
          <size>
           <width>320</width>
@@ -364,6 +354,11 @@
        <layout class="QHBoxLayout" name="nav_buttons" stretch="1,0,0,0,0,0,0,0,2">
         <item>
          <widget class="QLabel" name="timestamp">
+          <property name="font">
+           <font>
+            <family>Noto Sans</family>
+           </font>
+          </property>
           <property name="text">
            <string>0:00:00.000</string>
           </property>