From f66536d84b38aa0eb46e928fdaf13d7da790b2ee Mon Sep 17 00:00:00 2001
From: daniel-Jones <daniel@danieljon.es>
Date: Sun, 4 Jun 2017 16:26:56 +0930
Subject: added HTML/JS/PHP pages/scripts to allow RGB changes over a web page.
 Integrated a server into the application to allow incoming connections and
 receive commands

---
 qt/RGBController/controllerwindow.ui | 59 +++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 17 deletions(-)

(limited to 'qt/RGBController/controllerwindow.ui')

diff --git a/qt/RGBController/controllerwindow.ui b/qt/RGBController/controllerwindow.ui
index 63a91b1..0a10269 100644
--- a/qt/RGBController/controllerwindow.ui
+++ b/qt/RGBController/controllerwindow.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>364</width>
-    <height>238</height>
+    <width>433</width>
+    <height>254</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,7 @@
     <item row="7" column="1">
      <widget class="QTabWidget" name="display_tab">
       <property name="currentIndex">
-       <number>4</number>
+       <number>5</number>
       </property>
       <widget class="QWidget" name="status_tab">
        <attribute name="title">
@@ -528,21 +528,21 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="2" column="0">
          <widget class="QLabel" name="irc_server_label">
           <property name="text">
            <string>Server</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="5" column="0">
          <widget class="QLineEdit" name="irc_server_input">
           <property name="text">
            <string>irc.danieljon.es</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="5" column="1">
          <widget class="QSpinBox" name="irc_bot_spinbox">
           <property name="maximumSize">
            <size>
@@ -558,42 +558,42 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="irc_channel_label">
           <property name="text">
            <string>Channel</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="7" column="0">
          <widget class="QLineEdit" name="irc_channel_input">
           <property name="text">
            <string>#csgo</string>
           </property>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="8" column="0">
          <widget class="QLabel" name="irc_name_label">
           <property name="text">
            <string>Name</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="9" column="0">
          <widget class="QLineEdit" name="irc_name_input">
           <property name="text">
            <string>LightBot</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="2" column="1">
          <widget class="QLabel" name="irc_port_label">
           <property name="text">
            <string>Port</string>
           </property>
          </widget>
         </item>
-        <item row="8" column="0">
+        <item row="10" column="0">
          <widget class="QPushButton" name="irc_connect_button">
           <property name="text">
            <string>Connect</string>
@@ -602,15 +602,40 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="server_tab">
+       <attribute name="title">
+        <string>Server</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout_6">
+        <item row="0" column="0">
+         <layout class="QFormLayout" name="server_tab_layout">
+          <item row="0" column="0">
+           <widget class="QPushButton" name="server_start_button">
+            <property name="text">
+             <string>Start server</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
       <widget class="QWidget" name="log_tab">
        <attribute name="title">
         <string>Log</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_3">
-        <item row="2" column="0">
+        <item row="5" column="0">
          <widget class="QLineEdit" name="serial_input"/>
         </item>
-        <item row="1" column="0">
+        <item row="5" column="1">
+         <widget class="QPushButton" name="serial_send_button">
+          <property name="text">
+           <string>Send</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0" colspan="2">
          <widget class="QTextEdit" name="info_log_textarea"/>
         </item>
         <item row="0" column="0">
@@ -620,10 +645,10 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <widget class="QPushButton" name="serial_send_button">
+        <item row="0" column="1">
+         <widget class="QLabel" name="ping_count_label">
           <property name="text">
-           <string>Send</string>
+           <string>Ping</string>
           </property>
          </widget>
         </item>
-- 
cgit v1.2.3