X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.ui;h=14608d3c9da48c8a032fb8abec00214cf1e07aa4;hb=HEAD;hp=0c9226571fa3542b4a7297d0f596ed77ec2b1978;hpb=67da94217a271b0b76d42c75d1a78ee5ba942825;p=pkanalytics

diff --git a/mainwindow.ui b/mainwindow.ui
index 0c92265..14608d3 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1251</width>
+    <width>1278</width>
     <height>754</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
     <item row="0" column="0">
      <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">
+       <layout class="QVBoxLayout" name="buttons" stretch="0,0,0,0,0,0,0,1,0">
         <item>
          <layout class="QGridLayout" name="player_grid">
           <item row="3" column="0" colspan="2">
@@ -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,13 +239,13 @@
             </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>
             </property>
             <property name="text">
-             <string>Formation (&amp;o)</string>
+             <string>Formation (&amp;p)</string>
             </property>
             <property name="shortcut">
              <string>O</string>
@@ -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>
@@ -348,10 +338,38 @@
           </property>
          </widget>
         </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0">
+          <item>
+           <widget class="QPushButton" name="get_current_players">
+            <property name="text">
+             <string>Current</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="clear_player_list">
+            <property name="text">
+             <string>Clear</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="selected_gender_ratio">
+            <property name="text">
+             <string>0/0 F, 0/0 M</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
        </layout>
       </item>
       <item row="0" column="0">
-       <widget class="QVideoWidget" name="video" native="true">
+       <widget class="VideoWidget" name="video">
         <property name="minimumSize">
          <size>
           <width>320</width>
@@ -364,6 +382,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>
@@ -517,17 +540,59 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1251</width>
+     <width>1278</width>
      <height>23</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="action_export_json"/>
+    <addaction name="action_exit"/>
+   </widget>
+   <widget class="QMenu" name="menuMatch">
+    <property name="title">
+     <string>Match</string>
+    </property>
+    <addaction name="action_gender_rule_a"/>
+    <addaction name="action_gender_pull_rule"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menuMatch"/>
   </widget>
+  <action name="action_export_json">
+   <property name="text">
+    <string>Export &amp;JSON</string>
+   </property>
+  </action>
+  <action name="action_exit">
+   <property name="text">
+    <string>E&amp;xit</string>
+   </property>
+  </action>
+  <action name="action_gender_rule_a">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Gender rule &amp;A</string>
+   </property>
+  </action>
+  <action name="action_gender_pull_rule">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Gender &amp;pull rule</string>
+   </property>
+  </action>
  </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>