From b0dc286e5381d3328f3408b97541818e47865ad5 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 22 Apr 2014 13:33:37 -0300
Subject: Use QDialog as base for AKM.

This allows the akm to be treated as a preferences dialog instead of an
extra 'main window'.
---
 src/leap/bitmask/gui/ui/advanced_key_management.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/leap/bitmask/gui/ui')

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>
-- 
cgit v1.2.3


From 0890db9160c1b77da45587273bdd7398a87d1a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 8 May 2014 16:43:11 -0300
Subject: Fix logout button margins

---
 src/leap/bitmask/gui/ui/login.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/leap/bitmask/gui/ui')

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">
-- 
cgit v1.2.3