X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.ui;h=44418ef7b2240d5d890a274801854ea13b76843c;hb=c7d5ff85088aeab9d979bf7c7a261df963b722eb;hp=43db93e4a277c88146e57dbe80bfebd1bb92cef5;hpb=16d15ef4620934cab3f23cc125e380b925494955;p=ultimatescore

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 43db93e..44418ef 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>720</width>
-    <height>552</height>
+    <width>805</width>
+    <height>597</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Ultimate score client</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -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,93 @@
           </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>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_13">
+        <item>
+         <widget class="QPushButton" name="show_scorebug_btn">
+          <property name="text">
+           <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>Group A</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_group_b_btn">
+          <property name="text">
+           <string>Group B</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_schedule_btn">
+          <property name="text">
+           <string>Schedule</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_carousel_btn">
+          <property name="text">
+           <string>Carousel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_nothing_btn">
+          <property name="text">
+           <string>Hide all</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -92,14 +172,20 @@
             <item>
              <widget class="QPushButton" name="goal_2_btn">
               <property name="text">
-               <string>+1 point</string>
+               <string>+1 point (F9)</string>
+              </property>
+              <property name="shortcut">
+               <string>F9</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="ungoal_2_btn">
               <property name="text">
-               <string>-1 point</string>
+               <string>-1 point (F11)</string>
+              </property>
+              <property name="shortcut">
+               <string>F11</string>
               </property>
              </widget>
             </item>
@@ -141,14 +227,20 @@
             <item>
              <widget class="QPushButton" name="goal_1_btn">
               <property name="text">
-               <string>+1 point</string>
+               <string>+1 point (F5)</string>
+              </property>
+              <property name="shortcut">
+               <string>F5</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="ungoal_1_btn">
               <property name="text">
-               <string>-1 point</string>
+               <string>-1 point (F7)</string>
+              </property>
+              <property name="shortcut">
+               <string>F7</string>
               </property>
              </widget>
             </item>
@@ -220,6 +312,34 @@
             </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="1">
+           <widget class="QLineEdit" name="match_2_initials_1_edit">
+            <property name="text">
+             <string>PCL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="2">
+           <widget class="QLineEdit" name="match_2_initials_2_edit">
+            <property name="text">
+             <string>TFK</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="3">
+           <widget class="QPushButton" name="set_match_2_initials_btn">
+            <property name="text">
+             <string>Set</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -248,9 +368,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="value">
-           <number>25</number>
-          </property>
          </widget>
         </item>
         <item>
@@ -282,7 +399,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>30</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>
@@ -318,6 +488,20 @@
           </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>
        </layout>
       </item>
       <item>
@@ -339,7 +523,7 @@
         <item>
          <widget class="QLineEdit" name="comment_edit">
           <property name="text">
-           <string>Pagacap: First to 9 points</string>
+           <string/>
           </property>
          </widget>
         </item>
@@ -392,6 +576,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>
@@ -427,7 +621,7 @@
         <item>
          <widget class="QLineEdit" name="lowerthird_subheading_edit">
           <property name="text">
-           <string>TFK mini-tournament 2017</string>
+           <string>Trøndisk 2018</string>
           </property>
          </widget>
         </item>
@@ -451,6 +645,27 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_12">
+        <item>
+         <widget class="QLabel" name="label_13">
+          <property name="text">
+           <string>Quick lower third (A&lt;num&gt;/B&lt;num&gt; = players, C&lt;num&gt; = code):</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="quick_lower_third_edit"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="show_quick_lower_third_btn">
+          <property name="text">
+           <string>Show</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </item>
    </layout>
@@ -458,6 +673,41 @@
   <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+  <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>
+  <tabstop>color_1_edit</tabstop>
+  <tabstop>color_2_edit</tabstop>
+  <tabstop>set_color_btn</tabstop>
+  <tabstop>score_1_box</tabstop>
+  <tabstop>score_2_box</tabstop>
+  <tabstop>set_score_btn</tabstop>
+  <tabstop>goal_1_btn</tabstop>
+  <tabstop>ungoal_1_btn</tabstop>
+  <tabstop>goal_2_btn</tabstop>
+  <tabstop>ungoal_2_btn</tabstop>
+  <tabstop>set_all_scorebug_btn</tabstop>
+  <tabstop>clock_min_box</tabstop>
+  <tabstop>clock_sec_box</tabstop>
+  <tabstop>set_clock_btn</tabstop>
+  <tabstop>start_and_show_clock_btn</tabstop>
+  <tabstop>stop_clock_btn</tabstop>
+  <tabstop>show_clock_btn</tabstop>
+  <tabstop>hide_clock_btn</tabstop>
+  <tabstop>comment_edit</tabstop>
+  <tabstop>set_comment_btn</tabstop>
+  <tabstop>set_and_show_comment_btn</tabstop>
+  <tabstop>hide_comment_btn</tabstop>
+  <tabstop>autocomment_edit</tabstop>
+  <tabstop>set_and_show_autocomment_btn</tabstop>
+  <tabstop>lowerthird_heading_edit</tabstop>
+  <tabstop>lowerthird_subheading_edit</tabstop>
+  <tabstop>show_lower_third_btn</tabstop>
+  <tabstop>hide_lower_third_btn</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>