summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-09-17 11:54:30 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-17 11:54:30 -0300
commit94b1b7d4f9ebfed6d1f21646c5709d9f38642af4 (patch)
treee17d8e2978476b3b25a0c25a4e90a45b4ab5b709 /src
parentc3b2345dcc715f02fdfe4ffc04446236e17105a8 (diff)
parent0feb84c61b1f8efe9196af915e7500e97fa6b314 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/6087_remove-AKM-menu' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py5
-rw-r--r--src/leap/bitmask/gui/ui/mainwindow.ui9
2 files changed, 9 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 4e11c979..916e7c1f 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -224,8 +224,9 @@ class MainWindow(QtGui.QMainWindow):
self.ui.action_create_new_account.triggered.connect(
self._on_provider_changed)
- self.ui.action_advanced_key_management.triggered.connect(
- self._show_AKM)
+ # Action item hidden since we don't provide stable mail yet.
+ # self.ui.action_advanced_key_management.triggered.connect(
+ # self._show_AKM)
if IS_MAC:
self.ui.menuFile.menuAction().setText(self.tr("File"))
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>