summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-04-12 14:05:29 -0300
committerTomas Touceda <chiiph@leap.se>2013-04-12 14:05:29 -0300
commit4e4268af42e6d0bbf38e6027ca36d1b9f1bdda68 (patch)
tree030be534db4a35ee990588abdb3160857df695d0 /src/leap/gui
parentd84e2a7b30b23f20ed832c447f1bcfa325f9510d (diff)
Fix UI which was missbehaving
- Remove the <b> wrapping on checkboxes, since they don't understand HTML - Change the display of provider since providers with big names like dev.bitmask.net make the UI look bad.
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/ui/wizard.ui173
-rw-r--r--src/leap/gui/wizard.py2
2 files changed, 42 insertions, 133 deletions
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/gui/ui/wizard.ui
index ed7fe37c..87d04194 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/gui/ui/wizard.ui
@@ -284,125 +284,27 @@
<string notr="true">2</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <spacer name="verticalSpacer_5">
- <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="0" column="1">
- <spacer name="verticalSpacer_13">
- <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="0" column="2">
- <spacer name="verticalSpacer_17">
- <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="0" column="3">
- <spacer name="verticalSpacer_18">
- <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="0" column="4">
- <spacer name="verticalSpacer_19">
- <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="0" column="5">
- <spacer name="verticalSpacer_20">
- <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="1" column="0">
+ <item row="1" column="0" colspan="2">
<widget class="QLabel" name="lblProviderName">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="lblProviderURL">
- <property name="text">
- <string>URL</string>
- </property>
- </widget>
- </item>
- <item row="1" column="6">
- <spacer name="horizontalSpacer_3">
- <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 row="2" column="0">
- <spacer name="horizontalSpacer_7">
+ <item row="6" column="1">
+ <spacer name="verticalSpacer_15">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>20</width>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
- <item row="2" column="1" colspan="6">
+ <item row="3" column="1" colspan="2">
<widget class="QLabel" name="lblProviderDesc">
<property name="minimumSize">
<size>
@@ -424,21 +326,24 @@
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QLabel" name="lblServ">
<property name="text">
<string>&lt;b&gt;Services offered:&lt;/b&gt;</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="4" column="1">
<widget class="QLabel" name="lblServicesOffered">
<property name="text">
<string>services</string>
</property>
</widget>
</item>
- <item row="3" column="6">
+ <item row="4" column="2">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -451,22 +356,25 @@
</property>
</spacer>
</item>
- <item row="4" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>&lt;b&gt;Enrollment policy:&lt;/b&gt;</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="5" column="1">
<widget class="QLabel" name="lblProviderPolicy">
<property name="text">
<string>policy</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <spacer name="verticalSpacer_14">
+ <item row="0" column="1">
+ <spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -478,31 +386,32 @@
</property>
</spacer>
</item>
- <item row="5" column="1">
- <spacer name="verticalSpacer_15">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>&lt;b&gt;URL:&lt;/b&gt;</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- </spacer>
+ </widget>
</item>
- <item row="5" column="6">
- <spacer name="verticalSpacer_16">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="2" column="1" colspan="2">
+ <widget class="QLabel" name="lblProviderURL">
+ <property name="text">
+ <string>URL</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>&lt;b&gt;Description:&lt;/b&gt;</string>
</property>
- </spacer>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+ </property>
+ </widget>
</item>
</layout>
</widget>
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 7759b98d..4da4c815 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -80,7 +80,7 @@ class Wizard(QtGui.QWizard):
if self._is_need_eip_password_warning():
EIP_LABEL += " " + self.tr(
- "(<b>will need admin password to start</b>)")
+ "(will need admin password to start)")
self.SERVICE_DISPLAY = [
EIP_LABEL