diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-16 16:18:59 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-16 16:18:59 -0300 |
| commit | 4c550c558dcb554b3ea1bc0246492e39e8532886 (patch) | |
| tree | 3a18999e62eb18091d002e6c1c7222846a92947b /src/leap/bitmask/gui/ui | |
| parent | 81715dc47d77934c4f67d2527a56c28f58f0345d (diff) | |
| parent | d52daa106a97562e1cc67c5a2f242f2ef9884508 (diff) | |
Merge branch 'release-0.5.1'0.5.1
Diffstat (limited to 'src/leap/bitmask/gui/ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/advanced_key_management.ui | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/login.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/advanced_key_management.ui b/src/leap/bitmask/gui/ui/advanced_key_management.ui index 1112670f..3b567347 100644 --- a/src/leap/bitmask/gui/ui/advanced_key_management.ui +++ b/src/leap/bitmask/gui/ui/advanced_key_management.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>AdvancedKeyManagement</class> - <widget class="QWidget" name="AdvancedKeyManagement"> + <widget class="QDialog" name="AdvancedKeyManagement"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui index f5725d5a..216eca9e 100644 --- a/src/leap/bitmask/gui/ui/login.ui +++ b/src/leap/bitmask/gui/ui/login.ui @@ -215,7 +215,7 @@ <number>0</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>12</number> </property> <item row="0" column="0" colspan="2"> <widget class="QLabel" name="lblUser"> |