diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-15 10:32:37 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-15 10:32:37 -0300 |
| commit | e8c028f3eb6cd0681f039c456dc1ac45c98d598f (patch) | |
| tree | b7e84ebafad106726308d3c87f58ad1d900d66d7 /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 159dbe295148975bdfe9a50f871254aa9adf2328 (diff) | |
| parent | fb9bad95cc4bd2769af5f91c2f0cac1be4c3c617 (diff) | |
Merge branch 'release-0.6.1'0.6.1
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index d755115a..92c13d15 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>524</width> - <height>722</height> + <height>600</height> </rect> </property> <property name="sizePolicy"> @@ -32,7 +32,7 @@ <string>Bitmask</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <property name="inputMethodHints"> @@ -75,7 +75,7 @@ <x>0</x> <y>0</y> <width>524</width> - <height>667</height> + <height>540</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -86,7 +86,7 @@ <number>0</number> </property> <item> - <widget class="QFrame" name="frame"> + <widget class="QFrame" name="providerFrame"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -97,29 +97,16 @@ <bool>false</bool> </property> <property name="styleSheet"> - <string notr="true">background-color: rgba(0,0,0,20); border-bottom: 1px solid rgba(0,0,0,30);</string> + <string notr="true">QFrame#providerFrame {background-color: rgba(0,0,0,20); border-bottom: 1px solid rgba(0,0,0,30);}</string> </property> <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="leftMargin"> - <number>24</number> - </property> - <property name="rightMargin"> - <number>24</number> - </property> <item> - <widget class="QLabel" name="lblLoginProvider"> + <widget class="QComboBox" name="cmbProviders"> <property name="font"> <font> - <weight>75</weight> - <bold>true</bold> + <pointsize>12</pointsize> </font> </property> - <property name="styleSheet"> - <string notr="true">background-color: rgba(255, 255, 255, 0); border: none;</string> - </property> - <property name="text"> - <string>Please Log In</string> - </property> </widget> </item> </layout> @@ -186,7 +173,7 @@ <item> <layout class="QVBoxLayout" name="mailLayout"> <property name="spacing"> - <number>-1</number> + <number>6</number> </property> <property name="margin"> <number>12</number> @@ -216,6 +203,28 @@ </property> </spacer> </item> + <item> + <widget class="QFrame" name="frame"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>16</height> + </size> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="styleSheet"> + <string notr="true">background-color: rgba(0,0,0,20); border-top: 1px solid rgba(0,0,0,30);</string> + </property> + </widget> + </item> </layout> </widget> </widget> @@ -297,7 +306,7 @@ <x>0</x> <y>0</y> <width>524</width> - <height>23</height> + <height>25</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -377,7 +386,7 @@ </action> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> </resources> <connections/> |