summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-15 11:33:20 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-15 11:33:20 -0300
commitd3d8c478101006b9874bfdffd2f7027d3a598629 (patch)
tree2bbd606c2429d14116be50f1ace71162c3a066ee /src/leap/bitmask/gui/mainwindow.py
parente015e7565936ed0cc9032732ab551a3d51db5e86 (diff)
parent2247aa80af0b959ae3d95ac048e397db896eb6d7 (diff)
Merge remote-tracking branch 'chiiph/bug/ui_improvements' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index bb5c4e64..c715984e 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -298,6 +298,11 @@ class MainWindow(QtGui.QMainWindow):
self.ui.lblNewUpdates.setVisible(False)
self.ui.btnMore.setVisible(False)
+ #########################################
+ # We hide this in height temporarily too
+ self.ui.lblNewUpdates.resize(0, 0)
+ self.ui.btnMore.resize(0, 0)
+ #########################################
self.ui.btnMore.clicked.connect(self._updates_details)
# Services signals/slots connection
@@ -639,7 +644,7 @@ class MainWindow(QtGui.QMainWindow):
eip_menu = systrayMenu.addMenu(self.tr("Encrypted Internet: OFF"))
eip_menu.addAction(self._action_eip_startstop)
self._eip_status.set_eip_status_menu(eip_menu)
-
+ systrayMenu.addSeparator()
systrayMenu.addAction(self._action_mail_status)
systrayMenu.addSeparator()
systrayMenu.addAction(self.ui.action_quit)
@@ -941,6 +946,7 @@ class MainWindow(QtGui.QMainWindow):
"""
self._login_widget.logged_in()
+ self.ui.lblLoginProvider.setText(self._provider_config.get_name())
self._enabled_services = self._settings.get_enabled_services(
self._provider_config.get_domain())
@@ -1613,6 +1619,7 @@ class MainWindow(QtGui.QMainWindow):
logging out
"""
self._login_widget.done_logout()
+ self.ui.lblLoginProvider.setText(self.tr("Login"))
if ok:
self._logged_user = None