X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.ui;h=cfc8cc40c3946dfb62f3485650f92c74d6c4f7a5;hb=a863d093841773e0e17cc4965c073b443e195071;hp=291d1ab9a9dc94f22a587f684e2be77a84fc199d;hpb=d7f9db25c3831ee632d2e1ae59ab930c331e40d2;p=ultimatescore

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 291d1ab..cfc8cc4 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>805</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>
@@ -83,6 +76,73 @@
         </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>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
@@ -92,14 +152,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 +207,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>
@@ -248,9 +320,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="value">
-           <number>25</number>
-          </property>
          </widget>
         </item>
         <item>
@@ -282,7 +351,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>
@@ -339,7 +461,7 @@
         <item>
          <widget class="QLineEdit" name="comment_edit">
           <property name="text">
-           <string>Pagacap: First to 9 points</string>
+           <string/>
           </property>
          </widget>
         </item>
@@ -427,7 +549,7 @@
         <item>
          <widget class="QLineEdit" name="lowerthird_subheading_edit">
           <property name="text">
-           <string>TFK mini-tournament 2017</string>
+           <string>Trøndisk 2017</string>
           </property>
          </widget>
         </item>
@@ -451,6 +573,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>
@@ -459,9 +602,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>