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

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 37d38bf..09c0ad9 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>
@@ -88,28 +81,49 @@
         <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_schedule_btn">
           <property name="text">
-           <string>Show schedule</string>
+           <string>Schedule</string>
           </property>
          </widget>
         </item>
@@ -306,9 +320,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="value">
-           <number>30</number>
-          </property>
          </widget>
         </item>
         <item>
@@ -340,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>
@@ -485,7 +549,7 @@
         <item>
          <widget class="QLineEdit" name="lowerthird_subheading_edit">
           <property name="text">
-           <string>Trøndisk 2017</string>
+           <string>Norwegian Ultimate Championships 2018</string>
           </property>
          </widget>
         </item>
@@ -538,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>