From 31f99ab4d60b621fdfd9bc72c3012d3bd8dcdf07 Mon Sep 17 00:00:00 2001
From: Mehmet Aksoy <mehmet.aksoy@audivo.com>
Date: Thu, 14 Nov 2024 11:32:05 +0100
Subject: [PATCH] V1.1 release - Missing Icon added, UI size fixed

---
 CMakeLists.txt |   1 +
 img/icon.ico   | Bin 0 -> 9662 bytes
 mainwindow.cpp |   4 +
 mainwindow.ui  | 215 +++++++++++++++++++++++++++++++++++++------------
 resources.qrc  |   5 ++
 5 files changed, 174 insertions(+), 51 deletions(-)
 create mode 100644 img/icon.ico
 create mode 100644 resources.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b5be4d..84ebc03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         ${PROJECT_SOURCES}
         serialportworker.cpp
         serialportworker.h
+        resources.qrc
     )
 # Define target properties for Android with Qt 6 as:
 #    set_property(TARGET PTZControl APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
diff --git a/img/icon.ico b/img/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..17d843e3440593e9cf741d4710c9eca4caa0f42b
GIT binary patch
literal 9662
zcmeHN?NgLh6o2{$`q<|_)Jz|pX_|b)0tA$I1x&O-%!a06YNlqaCaoFugMp%@HKnPT
zHbrBZMN>`|p=bunzVIp_;v&mC>{77Hva$R+=j=WYyYv9-t_<6>mpR<~+~?kNfA^eo
z&pG!2MR|yRR;*Cy_oGV1<BIZ#q9{)gQI}Fk#QjnpQ<R#AedOy<l==<NAVyIpgXB2W
zr$i|&VlSr5WVF0gNVFp=$(XTzUVAr?+*@BMLNphatJsE)9%A^HUUM<|FTIQxS|KL?
zg`~6e?_%;_dKoXY!v977?*2a5PJaUH`=vyOaJTFr95=2lB$}XiGae6mPJSeFnMcow
z58=Gsu8r}Gj$q(I1*}I){9_L3)TM%fv8W|f`A^(xMnnE4)FrHhA#oLI*FGt{R6dK<
z-bokCIjN|lxpfJvVBVYx`?cS+X&(D1tREak?YgIk|7ux-*9jzEn=vpJwS<hntrd+0
zd6a9clYEIW*v@{cvRSnDPENw|T$V4_A|Bj!)LadkH&%NS4cl|HHTWLFIgDZb8lu&*
z_l9kZzeSrDP54Cz#|{f#xkJ%D?;PBRvD)A9r_n%Ehw&y0rY9z%5<i2o*Hputn<hFi
zB&|i~zPI7-wP|?gHlj)XjLmK9A<TQg*x6RiIcXTJx-u8G_8e{a8QAErKf|1t?$bds
z>0tj}*_Q@7pb?GuUDhsi?Afj9z_KM1_UplCUEM+?_<K%$j2W*N>|4BUH`vGXvt9|s
z{{+q(s{9smHzXS}kPfUzO5hnD3LGNsaPhNknzB-0*_sWOPs__MNbDIi{6YR<9GIC2
zTI+uCJ3HFYzWY_b4&u=Gd@h*x+!8i^^}b2_keIOXSs2q3#dmZcKZ2>jfuN;y@y}xu
z>cqiIU&EA<<Ua>-6pu^c85vezOC2_T!fVb=N5i(w6iYXvJ~e*!I{>}wJzp+*n07g3
z%}Lum(o@E4{L0I~@Q;<4BAfVo%pq93Q*KNR4N4!!0{hh}v=r@-7*<blthuNF<IRnc
z<0qMOE->`{MR*)`41Dtyns(-c*HGgQKfCVULEjhW#J-H_|NhQlOiP53_TB#GYl6vf
z^M=f4yB8vT){`vM?}6-7d(WQ2^f=k4zl0@!75@*HgbUk-^=K)r74Y4S#@MT?U^{a{
z&IzAE6^B;S7|wOtUN06toDbH;KkdsIIB%FsNo&xwYdiRCsO3T6XI_03=V98k!FLw;
zY!J4-b7#<h;Y+m9IczO{5yrFxZ4caL9kmwk61!#|e>IrN5A2k0PW;_TkJwK{oc|Cu
zu^+$udF_53{Jo!@#<bJPufeu$**YhGyB>P}ElhNNJt+D2eqIh!rq5TfeX#C_zPl)K
zLGXu=f9k+nv@2}<lw%G5R4M$~r*$59$LA;fe$|wn0#{e3w!Sa_Pt$UH)?Z-$uMND<
zM!5J*S;-QwMy_0z9GCAS5(ilJ<R@;w`<D1Z6%NPd?&D?XDmj3z_x7XvSQ(scx762R
z*J0uJ%h*8vfbTJCuBiHp#)2)BuT)Du5jL<8Cx(o_wHcQDZ1Hc5If&v{O6+Ca9edxv
z$S;@Sb-6-B5ZSO$@lOp8iZ8U4pOkwe-yJogz5()+qZBVE?^(&&=;v^eA=RH9Dt`Uh
z%ikNrzq~q#$v-ClNF?yzx1Yk<dxt-+YWX=m^Bq?&kByc-{`+(wUcI)O7er&Nhd0(2
WaF5in$(VfRmyh~?K(TsxB=8S@-nNDS

literal 0
HcmV?d00001

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0d76d95..fc37d99 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -12,6 +12,10 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     this->setFocusPolicy(Qt::StrongFocus);
 
+    // SetIcon
+    QIcon icon(":/img/icon.ico");
+    this->setWindowIcon(icon);
+
     connect(ui->connectButton, &QPushButton::clicked, this, &MainWindow::on_connectButton_clicked);
     connect(ui->stopButton, &QPushButton::clicked, this, &MainWindow::on_stopButton_clicked);
     
diff --git a/mainwindow.ui b/mainwindow.ui
index 6881316..a0d5897 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,9 +7,21 @@
     <x>0</x>
     <y>0</y>
     <width>622</width>
-    <height>402</height>
+    <height>401</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>622</width>
+    <height>401</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>622</width>
+    <height>401</height>
+   </size>
+  </property>
   <property name="font">
    <font>
     <family>Bahnschrift Light</family>
@@ -19,8 +31,18 @@
   <property name="windowTitle">
    <string>PTZ Control</string>
   </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>icon.ico</normaloff>icon.ico</iconset>
+  </property>
+  <property name="iconSize">
+   <size>
+    <width>48</width>
+    <height>48</height>
+   </size>
+  </property>
   <property name="toolButtonStyle">
-   <enum>Qt::ToolButtonStyle::ToolButtonFollowStyle</enum>
+   <enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
   </property>
   <property name="tabShape">
    <enum>QTabWidget::TabShape::Rounded</enum>
@@ -53,8 +75,17 @@
         <property name="enabled">
          <bool>false</bool>
         </property>
+        <property name="statusTip">
+         <string>This button is used to stop movement (It will send the PELCO-D Stop message)</string>
+        </property>
+        <property name="whatsThis">
+         <string>This button is used to stop movement (It will send the PELCO-D Stop message)</string>
+        </property>
         <property name="text">
-         <string>O</string>
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset theme="media-record"/>
         </property>
        </widget>
       </item>
@@ -64,7 +95,10 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>🢧</string>
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset theme="QIcon::ThemeIcon::GoNext"/>
         </property>
        </widget>
       </item>
@@ -74,7 +108,10 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>↓</string>
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset theme="QIcon::ThemeIcon::GoDown"/>
         </property>
        </widget>
       </item>
@@ -84,7 +121,10 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>↑</string>
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset theme="QIcon::ThemeIcon::GoUp"/>
         </property>
        </widget>
       </item>
@@ -94,7 +134,10 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>🢤</string>
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset theme="QIcon::ThemeIcon::GoPrevious"/>
         </property>
        </widget>
       </item>
@@ -109,6 +152,9 @@
        <height>20</height>
       </rect>
      </property>
+     <property name="statusTip">
+      <string>This option enables the Keyboard control to control PT via keyboard instead of buttons</string>
+     </property>
      <property name="text">
       <string>Keyboard Control</string>
      </property>
@@ -135,30 +181,17 @@
        <height>171</height>
       </rect>
      </property>
+     <property name="statusTip">
+      <string>The Logs will be displayed here when the connection has been established.</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Shape::NoFrame</enum>
+     </property>
+     <property name="acceptRichText">
+      <bool>false</bool>
+     </property>
     </widget>
    </widget>
-   <widget class="QPushButton" name="stopButton">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>370</x>
-      <y>320</y>
-      <width>241</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>Bahnschrift</family>
-      <pointsize>10</pointsize>
-     </font>
-    </property>
-    <property name="text">
-     <string>STOP</string>
-    </property>
-   </widget>
    <widget class="QGroupBox" name="groupBox_5">
     <property name="geometry">
      <rect>
@@ -305,6 +338,9 @@
         <property name="enabled">
          <bool>false</bool>
         </property>
+        <property name="frame">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -312,6 +348,9 @@
         <property name="enabled">
          <bool>false</bool>
         </property>
+        <property name="frame">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -325,30 +364,14 @@
        <height>20</height>
       </rect>
      </property>
+     <property name="statusTip">
+      <string>This option enables the PRESET Functionality to set-reset limits.</string>
+     </property>
      <property name="text">
-      <string>Enable PRESET functionality</string>
+      <string>PRESET functionality</string>
      </property>
     </widget>
    </widget>
-   <widget class="QPushButton" name="connectButton">
-    <property name="geometry">
-     <rect>
-      <x>130</x>
-      <y>320</y>
-      <width>231</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>Bahnschrift</family>
-      <pointsize>10</pointsize>
-     </font>
-    </property>
-    <property name="text">
-     <string>START</string>
-    </property>
-   </widget>
    <widget class="QGroupBox" name="groupBox_3">
     <property name="geometry">
      <rect>
@@ -367,7 +390,7 @@
        <x>10</x>
        <y>12</y>
        <width>221</width>
-       <height>81</height>
+       <height>83</height>
       </rect>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
@@ -401,14 +424,92 @@
       </item>
       <item row="0" column="1">
        <widget class="QPushButton" name="stopAllButton">
+        <property name="statusTip">
+         <string>This button is used to stop movement (It will send the PELCO-D Stop message)</string>
+        </property>
+        <property name="whatsThis">
+         <string>This button is used to stop movement (It will send the PELCO-D Stop message)</string>
+        </property>
         <property name="text">
-         <string>Stop All movement</string>
+         <string>Stop Movement</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </widget>
+   <widget class="QWidget" name="horizontalLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>380</x>
+      <y>320</y>
+      <width>221</width>
+      <height>41</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="connectButton">
+       <property name="font">
+        <font>
+         <family>Bahnschrift</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="toolTip">
+        <string>Please click if you want to connect the remote PT device with selected Port-Baudrate Configuration</string>
+       </property>
+       <property name="statusTip">
+        <string>Please click if you want to connect the remote PT device with selected Port-Baudrate Configuration</string>
+       </property>
+       <property name="whatsThis">
+        <string>Please click if you want to connect the remote PT device with selected Port-Baudrate Configuration</string>
+       </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string>START</string>
+       </property>
+       <property name="icon">
+        <iconset theme="QIcon::ThemeIcon::DocumentSend"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stopButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="font">
+        <font>
+         <family>Bahnschrift</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="toolTip">
+        <string>Please click if you want to disconnect the remote PT device.</string>
+       </property>
+       <property name="statusTip">
+        <string>Please click if you want to disconnect the remote PT device.</string>
+       </property>
+       <property name="text">
+        <string>STOP</string>
+       </property>
+       <property name="icon">
+        <iconset theme="QIcon::ThemeIcon::ApplicationExit"/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
@@ -424,6 +525,8 @@
      <string>File</string>
     </property>
     <addaction name="separator"/>
+    <addaction name="actionNew"/>
+    <addaction name="actionOpen"/>
     <addaction name="actionSave"/>
     <addaction name="actionSave_Config_As"/>
     <addaction name="actionExit"/>
@@ -508,6 +611,16 @@
     <string>PTZ Control Help</string>
    </property>
   </action>
+  <action name="actionNew">
+   <property name="text">
+    <string>New</string>
+   </property>
+  </action>
+  <action name="actionOpen">
+   <property name="text">
+    <string>Open..</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
diff --git a/resources.qrc b/resources.qrc
new file mode 100644
index 0000000..8fabea0
--- /dev/null
+++ b/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>img/icon.ico</file>
+    </qresource>
+</RCC>
\ No newline at end of file