Make soft +/- span both columns.

[pkanalytics] / mainwindow.ui

diff --git a/mainwindow.ui b/mainwindow.ui
index a0fe53fd70214ac0cd278041b8a970a3774063d4..c672fd5be66bc75c0263a29f113cda028a7dca09 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1031</width>
+    <width>1251</width>
     <height>754</height>
    </rect>
   </property>
@@ -16,7 +16,7 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0">
-     <layout class="QGridLayout" name="main_grid" rowstretch="1,0,0,0,0,0" columnstretch="1,0">
+     <layout class="QGridLayout" name="main_grid" rowstretch="1,0,0" columnstretch="1,0">
       <item row="0" column="0">
        <widget class="QVideoWidget" name="video" native="true">
         <property name="minimumSize">
@@ -214,7 +214,7 @@
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="offense_label">
+         <widget class="ClickableLabel" name="offense_label">
           <property name="text">
            <string>Offense</string>
           </property>
@@ -231,7 +231,7 @@
              <string>Pull (&amp;p)</string>
             </property>
             <property name="shortcut">
-             <string>P, Return</string>
+             <string>P</string>
             </property>
            </widget>
           </item>
@@ -246,9 +246,12 @@
            </widget>
           </item>
           <item row="4" column="1">
-           <widget class="QPushButton" name="pull_landed">
+           <widget class="QPushButton" name="unused_button">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
-             <string>Pull landed (&amp;p)</string>
+             <string/>
             </property>
            </widget>
           </item>
@@ -257,6 +260,9 @@
             <property name="text">
              <string>Throwaway (&amp;t)</string>
             </property>
+            <property name="shortcut">
+             <string>T</string>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -265,7 +271,7 @@
              <string>Soft plus (&amp;+)</string>
             </property>
             <property name="shortcut">
-             <string>-</string>
+             <string>+</string>
             </property>
            </widget>
           </item>
@@ -275,7 +281,7 @@
              <string>Soft minus (&amp;-)</string>
             </property>
             <property name="shortcut">
-             <string>+</string>
+             <string>-</string>
             </property>
            </widget>
           </item>
@@ -302,7 +308,7 @@
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="defense_label">
+         <widget class="ClickableLabel" name="defense_label">
           <property name="text">
            <string>Defense</string>
           </property>
@@ -318,13 +324,19 @@
             <property name="text">
              <string>Defense (&amp;x)</string>
             </property>
+            <property name="shortcut">
+             <string>X</string>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
-           <widget class="QPushButton" name="defense_soft_plus">
+           <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">
@@ -332,6 +344,9 @@
             <property name="text">
              <string>Their t.away (&amp;t)</string>
             </property>
+            <property name="shortcut">
+             <string>T</string>
+            </property>
            </widget>
           </item>
           <item row="0" column="0">
@@ -339,13 +354,19 @@
             <property name="text">
              <string>Interception (&amp;c)</string>
             </property>
+            <property name="shortcut">
+             <string>C</string>
+            </property>
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QPushButton" name="defense_soft_minus">
+           <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">
@@ -353,6 +374,9 @@
             <property name="text">
              <string>Their goal (&amp;g)</string>
             </property>
+            <property name="shortcut">
+             <string>G</string>
+            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -360,12 +384,21 @@
             <property name="text">
              <string>Their pull (&amp;p)</string>
             </property>
+            <property name="shortcut">
+             <string>P</string>
+            </property>
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="QPushButton" name="our_foul">
+           <widget class="QPushButton" name="unused_button2">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
-             <string>Our foul (&amp;o)</string>
+             <string/>
+            </property>
+            <property name="shortcut">
+             <string>O</string>
             </property>
            </widget>
           </item>
@@ -388,6 +421,9 @@
             <property name="text">
              <string>Substitution (&amp;b)</string>
             </property>
+            <property name="shortcut">
+             <string>B</string>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -395,6 +431,9 @@
             <property name="text">
              <string>Unknown (&amp;?)</string>
             </property>
+            <property name="shortcut">
+             <string>?</string>
+            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -412,6 +451,9 @@
             <property name="text">
              <string>Stoppage (&amp;v)</string>
             </property>
+            <property name="shortcut">
+             <string>V</string>
+            </property>
            </widget>
           </item>
          </layout>
@@ -437,7 +479,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1031</width>
+     <width>1251</width>
      <height>23</height>
     </rect>
    </property>
@@ -450,6 +492,11 @@
    <header location="global">QVideoWidget</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>clickable_label.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>