Changes the approach of Qt Gui initialization to the member pointer approach. This means multiple inheritance is avoided and the form is now a member pointer of the class. Immlicitely renamed some ui elements for clearification. Again changed unnecessary use of QDialog to QWidget.

1 files changed, 19 insertions, 11 deletions

diff --git a/gui/client/toolbar.ui b/gui/client/toolbar.ui
index 8f32658..199eef2 100644
--- a/gui/client/toolbar.ui
+++ b/gui/client/toolbar.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ToolbarClass</class>
- <widget class="QWidget" name="ToolbarClass">
+ <class>Toolbar</class>
+ <widget class="QWidget" name="Toolbar">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -66,8 +66,17 @@ QCheckBox::indicator:checked:pressed {
 }
 </string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_2">
-   <property name="margin">
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -78,12 +87,12 @@ QCheckBox::indicator:checked:pressed {
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QHBoxLayout" name="horizontalLayout2">
       <item>
        <widget class="QPushButton" name="cmdMenu">
         <property name="minimumSize">
          <size>
-          <width>68</width>
+          <width>84</width>
           <height>0</height>
          </size>
         </property>
@@ -96,7 +105,7 @@ QCheckBox::indicator:checked:pressed {
        </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer">
+       <spacer name="spacer_left">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -119,7 +128,7 @@ QCheckBox::indicator:checked:pressed {
        </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer_3">
+       <spacer name="spacer_right">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -132,7 +141,7 @@ QCheckBox::indicator:checked:pressed {
        </spacer>
       </item>
       <item>
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="icon_pvs">
         <property name="text">
          <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -143,7 +152,7 @@ p, li { white-space: pre-wrap; }
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="icon_cam">
         <property name="maximumSize">
          <size>
           <width>16</width>
@@ -168,7 +177,6 @@ p, li { white-space: pre-wrap; }
  </widget>
  <resources>
   <include location="../../pvsclient.qrc"/>
-  <include location="../../pvsclient.qrc"/>
  </resources>
  <connections/>
 </ui>