first new version of the connect window; needs some polish though.

1 files changed, 96 insertions, 53 deletions

diff --git a/gui/client/connect.ui b/gui/client/connect.ui
index 8adfd2b..b5c8340 100644
--- a/gui/client/connect.ui
+++ b/gui/client/connect.ui
@@ -22,7 +22,7 @@
   <property name="windowTitle">
    <string>Connect to PVS session</string>
   </property>
-  <layout class="QHBoxLayout" name="mainLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="acceptDrops">
@@ -32,29 +32,29 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="page0">
-      <layout class="QVBoxLayout" name="sl_p0_vl">
-       <property name="spacing">
-        <number>0</number>
-       </property>
+      <layout class="QFormLayout" name="formLayout_2">
        <property name="margin">
         <number>0</number>
        </property>
-       <item>
-        <widget class="QLabel" name="lblSessionName">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Automatically selected session</string>
+          <string>Auto-Connect is available.</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLineEdit" name="lineEditName">
-         <property name="readOnly">
-          <bool>true</bool>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Room: </string>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="sw_p0_spacer">
+       <item row="2" column="1">
+        <widget class="QComboBox" name="comboBox_rooms"/>
+       </item>
+       <item row="1" column="0">
+        <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -66,34 +66,64 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <widget class="QLabel" name="lblStatus">
-         <property name="text">
-          <string>Ready to connect; please enter session name.</string>
+       <item row="4" column="0">
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-        </widget>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Advanced Options</string>
-         </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Specify Session Name</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="lineEdit_2"/>
-          </item>
-         </layout>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Manually connect with session name</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <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 row="4" column="0">
+        <spacer name="verticalSpacer_2">
+         <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 row="3" column="0" colspan="2">
+        <widget class="QLineEdit" name="lineEditName"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Session Name</string>
+         </property>
         </widget>
        </item>
       </layout>
@@ -133,50 +163,63 @@
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="buttons">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
       <number>6</number>
      </property>
      <item>
-      <widget class="QPushButton" name="btn_connection">
+      <widget class="QPushButton" name="btn_hide">
        <property name="text">
-        <string>Connect</string>
+        <string>Cancel</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
        </property>
        <property name="default">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="btn_advanced">
+      <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="QLabel" name="lblStatus">
        <property name="text">
-        <string>Advanced...</string>
+        <string/>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="btns_spacer">
+      <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>20</width>
-         <height>40</height>
+         <width>40</width>
+         <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="btn_hide">
+      <widget class="QPushButton" name="btn_connection">
        <property name="text">
-        <string>Cancel</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
+        <string>Connect</string>
        </property>
        <property name="default">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>