X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=mainwindow.ui;h=845966050d541f772b3eb9bcb2d28563219cea33;hb=fb839f83f5113f02fb9ef3485f27f5b220919a4c;hp=91ef5e5e0d02a53bea10491dd428afafebf26055;hpb=47bc388b460b87ed7cd8be285f26dfe99c0f3c6a;p=pkanalytics

diff --git a/mainwindow.ui b/mainwindow.ui
index 91ef5e5..8459660 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1031</width>
-    <height>713</height>
+    <width>1251</width>
+    <height>754</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,132 +16,9 @@
   <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">
-      <item row="3" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="nav_buttons" stretch="1,0,0,0,0,0,0,0,2">
-        <item>
-         <widget class="QLabel" name="timestamp">
-          <property name="text">
-           <string>0:00:00.000</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="minus10s">
-          <property name="text">
-           <string>-10s (&amp;K)</string>
-          </property>
-          <property name="shortcut">
-           <string>K</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="plus10s">
-          <property name="text">
-           <string>+10s (&amp;L)</string>
-          </property>
-          <property name="shortcut">
-           <string>L</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="minus2s">
-          <property name="text">
-           <string>-2s (&amp;←)</string>
-          </property>
-          <property name="shortcut">
-           <string>Left</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="plus2s">
-          <property name="text">
-           <string>+2s (&amp;→)</string>
-          </property>
-          <property name="shortcut">
-           <string>Right</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="minus1f">
-          <property name="text">
-           <string>-1f (&amp;,)</string>
-          </property>
-          <property name="shortcut">
-           <string>,</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="plus1f">
-          <property name="text">
-           <string>+1f (&amp;.)</string>
-          </property>
-          <property name="shortcut">
-           <string>.</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="play_pause">
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Pause (space)</string>
-          </property>
-          <property name="shortcut">
-           <string>Space</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="status">
-          <property name="text">
-           <string>0–0 | offense | 0 passes, 0 sec possession</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0">
-       <widget class="QVideoWidget" name="video" native="true">
-        <property name="minimumSize">
-         <size>
-          <width>320</width>
-          <height>240</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <layout class="QVBoxLayout" name="buttons">
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
+     <layout class="QGridLayout" name="main_grid" rowstretch="1,0,0,0" columnstretch="1,0">
+      <item row="0" column="1" rowspan="4">
+       <layout class="QVBoxLayout" name="buttons" stretch="0,0,0,0,0,0,0,1">
         <item>
          <layout class="QGridLayout" name="player_grid">
           <item row="3" column="0" colspan="2">
@@ -217,7 +94,7 @@
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="offense_label">
+         <widget class="ClickableLabel" name="offense_label">
           <property name="text">
            <string>Offense</string>
           </property>
@@ -228,16 +105,6 @@
         </item>
         <item>
          <layout class="QGridLayout" name="offense_grid">
-          <item row="4" column="0">
-           <widget class="QPushButton" name="pull">
-            <property name="text">
-             <string>Pull (&amp;p)</string>
-            </property>
-            <property name="shortcut">
-             <string>P, Return</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QPushButton" name="catch_">
             <property name="text">
@@ -248,37 +115,13 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QPushButton" name="pull_landed">
-            <property name="text">
-             <string>Pull landed (&amp;p)</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="QPushButton" name="throwaway">
             <property name="text">
              <string>Throwaway (&amp;t)</string>
             </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="offensive_soft_plus">
-            <property name="text">
-             <string>Soft plus (&amp;+)</string>
-            </property>
             <property name="shortcut">
-             <string>-</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="offensive_soft_minus">
-            <property name="text">
-             <string>Soft minus (&amp;-)</string>
-            </property>
-            <property name="shortcut">
-             <string>+</string>
+             <string>T</string>
             </property>
            </widget>
           </item>
@@ -302,10 +145,30 @@
             </property>
            </widget>
           </item>
+          <item row="3" 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="3" 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>
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="defense_label">
+         <widget class="ClickableLabel" name="defense_label">
           <property name="text">
            <string>Defense</string>
           </property>
@@ -321,12 +184,8 @@
             <property name="text">
              <string>Defense (&amp;x)</string>
             </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="defense_soft_plus">
-            <property name="text">
-             <string>Soft plus (&amp;+)</string>
+            <property name="shortcut">
+             <string>X</string>
             </property>
            </widget>
           </item>
@@ -335,6 +194,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">
@@ -342,12 +204,8 @@
             <property name="text">
              <string>Interception (&amp;c)</string>
             </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="defense_soft_minus">
-            <property name="text">
-             <string>Soft minus (&amp;-)</string>
+            <property name="shortcut">
+             <string>C</string>
             </property>
            </widget>
           </item>
@@ -356,19 +214,31 @@
             <property name="text">
              <string>Their goal (&amp;g)</string>
             </property>
+            <property name="shortcut">
+             <string>G</string>
+            </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>
             </property>
+            <property name="shortcut">
+             <string>P</string>
+            </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QPushButton" name="our_foul">
+          <item row="2" column="1">
+           <widget class="QPushButton" name="defensive_formation">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="text">
-             <string>Our foul (&amp;o)</string>
+             <string>Formation (&amp;p)</string>
+            </property>
+            <property name="shortcut">
+             <string>O</string>
             </property>
            </widget>
           </item>
@@ -386,61 +256,243 @@
         </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>
             </property>
+            <property name="shortcut">
+             <string>B</string>
+            </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>
             </property>
+            <property name="shortcut">
+             <string>?</string>
+            </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="1">
            <widget class="QPushButton" name="delete_">
             <property name="text">
              <string>Delete (⌫)</string>
             </property>
+            <property name="shortcut">
+             <string>Backspace</string>
+            </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>-</string>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
+         <widget class="QTableView" name="player_view">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::MultiSelection</enum>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
           </property>
-         </spacer>
+         </widget>
         </item>
        </layout>
       </item>
-      <item row="5" column="0" colspan="2">
-       <widget class="QTableView" name="event_view">
-        <property name="selectionMode">
-         <enum>QAbstractItemView::SingleSelection</enum>
-        </property>
-        <property name="selectionBehavior">
-         <enum>QAbstractItemView::SelectRows</enum>
+      <item row="0" column="0">
+       <widget class="VideoWidget" name="video">
+        <property name="minimumSize">
+         <size>
+          <width>320</width>
+          <height>240</height>
+         </size>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <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>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="minus10s">
+          <property name="text">
+           <string>-10s (&amp;K)</string>
+          </property>
+          <property name="shortcut">
+           <string>K</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="plus10s">
+          <property name="text">
+           <string>+10s (&amp;L)</string>
+          </property>
+          <property name="shortcut">
+           <string>L</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="minus2s">
+          <property name="text">
+           <string>-2s (&amp;←)</string>
+          </property>
+          <property name="shortcut">
+           <string>Left</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="plus2s">
+          <property name="text">
+           <string>+2s (&amp;→)</string>
+          </property>
+          <property name="shortcut">
+           <string>Right</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="minus1f">
+          <property name="text">
+           <string>-1f (&amp;,)</string>
+          </property>
+          <property name="shortcut">
+           <string>,</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="plus1f">
+          <property name="text">
+           <string>+1f (&amp;.)</string>
+          </property>
+          <property name="shortcut">
+           <string>.</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="play_pause">
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Pause (space)</string>
+          </property>
+          <property name="shortcut">
+           <string>Space</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="status">
+          <property name="text">
+           <string>0–0 | offense | 0 passes, 0 sec possession</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0">
+        <item>
+         <widget class="QTableView" name="event_view">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="offensive_formation_layout">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Offensive formation</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QListView" name="offensive_formation_view"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="defensive_formation_layout">
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Defensive formation</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QListView" name="defensive_formation_view"/>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
      </layout>
     </item>
    </layout>
@@ -450,7 +502,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1031</width>
+     <width>1251</width>
      <height>23</height>
     </rect>
    </property>
@@ -458,11 +510,16 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVideoWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">QVideoWidget</header>
+   <class>VideoWidget</class>
+   <extends>QOpenGLWidget</extends>
+   <header>video_widget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>clickable_label.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>