diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-16 18:17:59 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-16 18:17:59 -0300 |
| commit | 0feb84c61b1f8efe9196af915e7500e97fa6b314 (patch) | |
| tree | e17d8e2978476b3b25a0c25a4e90a45b4ab5b709 | |
| parent | c3b2345dcc715f02fdfe4ffc04446236e17105a8 (diff) | |
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.
| -rw-r--r-- | changes/feature-6087_remove-AKM-menu | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 5 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/changes/feature-6087_remove-AKM-menu b/changes/feature-6087_remove-AKM-menu new file mode 100644 index 00000000..9326ca47 --- /dev/null +++ b/changes/feature-6087_remove-AKM-menu @@ -0,0 +1,2 @@ +- Remove the Advanced Key Management since we don't support stable mail yet. + Closes #6087. 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> |