refact ui

LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp

@@ -19,6 +19,10 @@ DialogVersionControl::DialogVersionControl(ConnectorToServer* connectorToServer,
 {
     ui->setupUi(this);    
 
+    ui->createDuplicateButton->setObjectName("createDuplicateButton");
+    ui->deleteVersionButton->setObjectName("deleteVersionButton");
+    ui->switchServerVersionButton->setObjectName("switchServerVersionButton");
+
     setMinimumSize(500, 300);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Version control"));

LibInstructorsAndTrainees/settings/dialogversioncontrol.ui

@@ -34,19 +34,25 @@
        <item>
         <layout class="QVBoxLayout" name="actualServerListLayout">
          <property name="leftMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="topMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="rightMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="bottomMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="verListTitle">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="font">
             <font>
              <family>MS Shell Dlg 2</family>
@@ -59,10 +65,26 @@
            <property name="text">
             <string>Available versions on the server:</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
           </widget>
          </item>
          <item>
-          <widget class="QListWidget" name="verListView"/>
+          <widget class="QListWidget" name="verListView">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>250</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
@@ -90,26 +112,13 @@
          <item>
           <widget class="QLabel" name="infoValue">
            <property name="text">
-            <string>Double click on the version to see information...</string>
+            <string>InfoValue</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
            </property>
           </widget>
          </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item>
           <layout class="QHBoxLayout" name="ServerInfoLayout">
            <item>
@@ -117,6 +126,9 @@
              <property name="text">
               <string>Current server version:</string>
              </property>
+             <property name="alignment">
+              <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+             </property>
             </widget>
            </item>
            <item>
@@ -124,6 +136,9 @@
              <property name="text">
               <string>none</string>
              </property>
+             <property name="alignment">
+              <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+             </property>
             </widget>
            </item>
           </layout>
@@ -133,10 +148,23 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0,0">
+      <layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0,0,0,0">
        <property name="spacing">
         <number>6</number>
        </property>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QPushButton" name="createDuplicateButton">
          <property name="sizePolicy">
@@ -197,6 +225,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </item>
     </layout>

LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui

@@ -36,7 +36,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
+          <pixmap resource="../InstructorsAndTrainees.qrc">:/resources/icons/circleGray.png</pixmap>
          </property>
         </widget>
        </item>
@@ -110,7 +110,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>