X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.ui;h=f3b2711cb321c084f5539e2ccbe111acb789f58c;hb=a6c5bcbb6226d28b07cde463a39192d21066b73f;hp=37d38bf5dc93fedc10c3e56b762466a02f5a36fb;hpb=571f9bb75c909503f7429d8a30c8baad46dfe19e;p=ultimatescore

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 37d38bf..f3b2711 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>720</width>
-    <height>552</height>
+    <width>891</width>
+    <height>597</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,19 +34,12 @@
         <item>
          <widget class="QLabel" name="label_11">
           <property name="text">
-           <string>CasparCG server:</string>
+           <string>WebSocket server port:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="casparcg_host_box">
-          <property name="text">
-           <string>localhost</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="casparcg_port_box">
+         <widget class="QLineEdit" name="ws_port_box">
           <property name="maximumSize">
            <size>
             <width>50</width>
@@ -59,14 +52,14 @@
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="casparcg_reconnect_btn">
+         <widget class="QPushButton" name="ws_disconnect_btn">
           <property name="text">
-           <string>Reconnect</string>
+           <string>Change port and disconnect all</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="casparcg_connected_label">
+         <widget class="QLabel" name="ws_connected_label">
           <property name="minimumSize">
            <size>
             <width>100</width>
@@ -81,6 +74,36 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="bt6000_enable">
+          <property name="text">
+           <string>Score 1 UDP</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="bt6000_2_enable">
+          <property name="text">
+           <string>Score 2 UDP</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="bt6000_3_enable">
+          <property name="text">
+           <string>Score 3 UDP</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -88,28 +111,56 @@
         <item>
          <widget class="QPushButton" name="show_scorebug_btn">
           <property name="text">
-           <string>Show scorebug</string>
+           <string>Show score</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_roster_1_btn">
+          <property name="text">
+           <string>Roster 1</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_roster_2_btn">
+          <property name="text">
+           <string>Roster 2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_roster_carousel_btn">
+          <property name="text">
+           <string>Roster 1+2</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="show_group_a_btn">
           <property name="text">
-           <string>Show group A</string>
+           <string>Group A</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="show_group_b_btn">
           <property name="text">
-           <string>Show group B</string>
+           <string>Group B</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_group_c_btn">
+          <property name="text">
+           <string>Group C</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="show_schedule_btn">
           <property name="text">
-           <string>Show schedule</string>
+           <string>Schedule</string>
           </property>
          </widget>
         </item>
@@ -133,7 +184,7 @@
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="4" column="2">
+          <item row="4" column="3">
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
              <widget class="QPushButton" name="goal_2_btn">
@@ -164,10 +215,10 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
+          <item row="3" column="3">
            <widget class="QSpinBox" name="score_2_box"/>
           </item>
-          <item row="3" column="3">
+          <item row="3" column="4">
            <widget class="QPushButton" name="set_score_btn">
             <property name="text">
              <string>Set</string>
@@ -181,14 +232,17 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="initials_1_edit">
-            <property name="text">
+          <item row="1" column="2">
+           <widget class="QComboBox" name="initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>PCL</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
+          <item row="4" column="2">
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <item>
              <widget class="QPushButton" name="goal_1_btn">
@@ -212,33 +266,36 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="1">
+          <item row="2" column="2">
            <widget class="QLineEdit" name="color_1_edit">
             <property name="text">
              <string>red</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="3" column="2">
            <widget class="QSpinBox" name="score_1_box"/>
           </item>
-          <item row="0" column="2">
+          <item row="0" column="3">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Team 2</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="0" column="2">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Team 1</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QLineEdit" name="initials_2_edit">
-            <property name="text">
+          <item row="1" column="3">
+           <widget class="QComboBox" name="initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>TFK</string>
             </property>
            </widget>
@@ -250,34 +307,102 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
+          <item row="1" column="4">
            <widget class="QPushButton" name="set_initials_btn">
             <property name="text">
              <string>Set</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
+          <item row="2" column="3">
            <widget class="QLineEdit" name="color_2_edit">
             <property name="text">
              <string>yellow</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
+          <item row="2" column="4">
            <widget class="QPushButton" name="set_color_btn">
             <property name="text">
              <string>Set</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="3">
+          <item row="4" column="4">
            <widget class="QPushButton" name="set_all_scorebug_btn">
             <property name="text">
              <string>Set all</string>
             </property>
            </widget>
           </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_17">
+            <property name="text">
+             <string>Match 2</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="2">
+           <widget class="QComboBox" name="match_2_initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string>PCL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="3">
+           <widget class="QComboBox" name="match_2_initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string>TFK</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="4">
+           <widget class="QPushButton" name="set_match_2_initials_btn">
+            <property name="text">
+             <string>Set</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>Match 3</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="2">
+           <widget class="QComboBox" name="match_3_initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string>PCL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="3">
+           <widget class="QComboBox" name="match_3_initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string>TFK</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="4">
+           <widget class="QPushButton" name="set_match_3_initials_btn">
+            <property name="text">
+             <string>Set</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -306,9 +431,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="value">
-           <number>30</number>
-          </property>
          </widget>
         </item>
         <item>
@@ -340,7 +462,60 @@
         <item>
          <widget class="QPushButton" name="set_clock_btn">
           <property name="text">
-           <string>Set</string>
+           <string>Set clock</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_14">
+          <property name="text">
+           <string>Set clock limit to:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="clock_limit_min_box">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="value">
+           <number>25</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_15">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="clock_limit_sec_box">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximum">
+           <number>59</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="set_clock_limit_btn">
+          <property name="text">
+           <string>Set limit</string>
           </property>
          </widget>
         </item>
@@ -376,6 +551,34 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QPushButton" name="show_match_2_btn">
+          <property name="text">
+           <string>Show match 2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="hide_match_2_btn">
+          <property name="text">
+           <string>Hide match 2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_match_3_btn">
+          <property name="text">
+           <string>Show match 3</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="hide_match_3_btn">
+          <property name="text">
+           <string>Hide match 3</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -450,6 +653,16 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="autoshow_autocomment">
+          <property name="text">
+           <string>Auto-show on clock limit</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -485,7 +698,7 @@
         <item>
          <widget class="QLineEdit" name="lowerthird_subheading_edit">
           <property name="text">
-           <string>Trøndisk 2017</string>
+           <string>Trøndisk 2018</string>
           </property>
          </widget>
         </item>
@@ -538,9 +751,8 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
-  <tabstop>casparcg_host_box</tabstop>
-  <tabstop>casparcg_port_box</tabstop>
-  <tabstop>casparcg_reconnect_btn</tabstop>
+  <tabstop>ws_port_box</tabstop>
+  <tabstop>ws_disconnect_btn</tabstop>
   <tabstop>initials_1_edit</tabstop>
   <tabstop>initials_2_edit</tabstop>
   <tabstop>set_initials_btn</tabstop>