From 0feb84c61b1f8efe9196af915e7500e97fa6b314 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 16 Sep 2014 18:17:59 -0300
Subject: Hide AKM menu and disable the qt connection.

Hide the Advaneced Key Management menu from the ui file and comment out
the connection between the triggered action and the method that shows
the AKM window.

Closes #6087.
---
 src/leap/bitmask/gui/ui/mainwindow.ui | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 92c13d15..f7570ee6 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -75,7 +75,7 @@
          <x>0</x>
          <y>0</y>
          <width>524</width>
-         <height>540</height>
+         <height>549</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
@@ -306,7 +306,7 @@
      <x>0</x>
      <y>0</y>
      <width>524</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -378,11 +378,14 @@
   </action>
   <action name="action_advanced_key_management">
    <property name="enabled">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="text">
     <string>Advanced Key Management</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
  </widget>
  <resources>
-- 
cgit v1.2.3


From c7304e54e40cd9151e6d00a8441aaf48b68c9bcc Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 3 Sep 2014 15:50:08 -0700
Subject: single pref win: move eip preferences to new combined preference
 window.

---
 src/leap/bitmask/gui/ui/mainwindow.ui | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index f7570ee6..2e8aea8c 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -317,7 +317,6 @@
     <addaction name="action_advanced_key_management"/>
     <addaction name="separator"/>
     <addaction name="action_preferences"/>
-    <addaction name="action_eip_preferences"/>
     <addaction name="separator"/>
     <addaction name="action_quit"/>
    </widget>
@@ -338,12 +337,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Account Preferences...</string>
-   </property>
-  </action>
-  <action name="action_eip_preferences">
-   <property name="text">
-    <string>Internet Preferences...</string>
+    <string>Preferences...</string>
    </property>
   </action>
   <action name="action_quit">
-- 
cgit v1.2.3


From 92fc4c1d9d60a213a4be21db459efc3bfc3e205f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 18 Sep 2014 15:17:46 -0700
Subject: single pref win: added shortcut to preferences

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

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

diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 2e8aea8c..b1d68c4a 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -337,7 +337,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Preferences...</string>
+    <string>Pr&amp;eferences...</string>
    </property>
   </action>
   <action name="action_quit">
-- 
cgit v1.2.3