diff options
author | Manuel Schneider | 2014-05-06 18:45:03 +0200 |
---|---|---|
committer | Manuel Schneider | 2014-05-06 18:45:03 +0200 |
commit | 03bb2a73d30e9d138d85dafe5b0c37296feb5e9c (patch) | |
tree | a8abe332c737bc6d7cf4fa11b614dcdeca53eaba /gui | |
parent | Clipped the green checkmark's white space. (diff) | |
download | pvs2-03bb2a73d30e9d138d85dafe5b0c37296feb5e9c.tar.gz pvs2-03bb2a73d30e9d138d85dafe5b0c37296feb5e9c.tar.xz pvs2-03bb2a73d30e9d138d85dafe5b0c37296feb5e9c.zip |
Changes the ConnectionWidows gui to a relative layout. Added a stacked widget to
change between checkmark and the rest. Changed the non expressive names of ui
elements.
Diffstat (limited to 'gui')
-rw-r--r-- | gui/client/connect.ui | 291 | ||||
-rw-r--r-- | gui/server_normal/sessionname.ui | 2 |
2 files changed, 171 insertions, 122 deletions
diff --git a/gui/client/connect.ui b/gui/client/connect.ui index a7cb621..a108fe8 100644 --- a/gui/client/connect.ui +++ b/gui/client/connect.ui @@ -2,137 +2,186 @@ <ui version="4.0"> <class>ConnectWindow</class> <widget class="QWidget" name="ConnectWindow"> + <property name="windowModality"> + <enum>Qt::WindowModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>512</width> - <height>128</height> + <height>92</height> </rect> </property> + <property name="minimumSize"> + <size> + <width>512</width> + <height>92</height> + </size> + </property> <property name="windowTitle"> <string>Connect to PVS session</string> </property> - <widget class="QGroupBox" name="grpSetname"> - <property name="geometry"> - <rect> - <x>3</x> - <y>10</y> - <width>504</width> - <height>61</height> - </rect> - </property> - <property name="title"> - <string>Session Name</string> - </property> - <widget class="QPushButton" name="cmdOK"> - <property name="geometry"> - <rect> - <x>396</x> - <y>20</y> - <width>101</width> - <height>31</height> - </rect> - </property> - <property name="text"> - <string>Connect</string> - </property> - <property name="default"> - <bool>true</bool> - </property> - </widget> - <widget class="QLineEdit" name="txtName"> - <property name="geometry"> - <rect> - <x>10</x> - <y>20</y> - <width>371</width> - <height>31</height> - </rect> - </property> - <property name="font"> - <font> - <pointsize>14</pointsize> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - </widget> - <widget class="QLabel" name="lblError"> - <property name="geometry"> - <rect> - <x>20</x> - <y>80</y> - <width>381</width> - <height>21</height> - </rect> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - <widget class="QLabel" name="lblStatus"> - <property name="geometry"> - <rect> - <x>10</x> - <y>90</y> - <width>381</width> - <height>21</height> - </rect> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - <widget class="QPushButton" name="cmdCancel"> - <property name="geometry"> - <rect> - <x>399</x> - <y>80</y> - <width>101</width> - <height>31</height> - </rect> - </property> - <property name="text"> - <string>Hide</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - <property name="default"> - <bool>false</bool> - </property> - </widget> - <widget class="QLabel" name="lblCheckmark"> - <property name="geometry"> - <rect> - <x>120</x> - <y>0</y> - <width>221</width> - <height>121</height> - </rect> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../../pvsclient.qrc">:/dark-green-check-mark.svg</pixmap> - </property> - <property name="scaledContents"> - <bool>true</bool> - </property> - </widget> + <layout class="QHBoxLayout" name="mainLayout"> + <item> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <property name="currentIndex"> + <number>1</number> + </property> + <widget class="QWidget" name="page0"> + <layout class="QVBoxLayout" name="sl_p0_vl"> + <property name="spacing"> + <number>0</number> + </property> + <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> + <widget class="QLabel" name="lblSessionName"> + <property name="text"> + <string>Session Name:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>14</pointsize> + </font> + </property> + <property name="text"> + <string notr="true"/> + </property> + </widget> + </item> + <item> + <spacer name="sw_p0_spacer"> + <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> + <widget class="QLabel" name="lblStatus"> + <property name="text"> + <string>Ready to connect; please enter session name.</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="page1"> + <layout class="QHBoxLayout" name="sw_p1_hl"> + <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> + <widget class="QLabel" name="lblCheckmark"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>94</width> + <height>72</height> + </size> + </property> + <property name="pixmap"> + <pixmap resource="../../pvsclient.qrc">:/dark-green-check-mark.svg</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="buttons"> + <property name="spacing"> + <number>6</number> + </property> + <item> + <widget class="QPushButton" name="btn_connection"> + <property name="text"> + <string>Connect</string> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="btn_hide"> + <property name="text"> + <string>Hide</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="btns_spacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> </widget> <resources> <include location="../../pvsclient.qrc"/> diff --git a/gui/server_normal/sessionname.ui b/gui/server_normal/sessionname.ui index 6171b60..e0c813e 100644 --- a/gui/server_normal/sessionname.ui +++ b/gui/server_normal/sessionname.ui @@ -61,7 +61,7 @@ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> - <widget class="QLineEdit" name="txtName"> + <widget class="QLineEdit" name="lineEditName"> <property name="geometry"> <rect> <x>10</x> |