From 2247aa80af0b959ae3d95ac048e397db896eb6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Tue, 8 Oct 2013 15:59:29 -0300 Subject: Improve GUI based on QA rounds --- changes/bug_improve_gui | 1 + src/leap/bitmask/gui/mainwindow.py | 9 +- src/leap/bitmask/gui/ui/eip_status.ui | 4 +- src/leap/bitmask/gui/ui/login.ui | 230 ++++++++++++++++++--------------- src/leap/bitmask/gui/ui/mail_status.ui | 73 +++++++---- src/leap/bitmask/gui/ui/mainwindow.ui | 44 ++++++- 6 files changed, 220 insertions(+), 141 deletions(-) create mode 100644 changes/bug_improve_gui diff --git a/changes/bug_improve_gui b/changes/bug_improve_gui new file mode 100644 index 00000000..8a106a10 --- /dev/null +++ b/changes/bug_improve_gui @@ -0,0 +1 @@ + o Improve GUI based on QA rounds. Fixes #4041 and #4042. \ No newline at end of file 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 diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui index 27df3f31..25831118 100644 --- a/src/leap/bitmask/gui/ui/eip_status.ui +++ b/src/leap/bitmask/gui/ui/eip_status.ui @@ -94,8 +94,8 @@ - 16 - 16 + 24 + 24 diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui index a1842608..e7ca1652 100644 --- a/src/leap/bitmask/gui/ui/login.ui +++ b/src/leap/bitmask/gui/ui/login.ui @@ -7,7 +7,7 @@ 0 0 468 - 350 + 363 @@ -32,104 +32,26 @@ 0 - - - - - 0 - 0 - - - - - 0 - 0 - + + -1 + + + + + Qt::Horizontal - - - 24 - - - - - - 15 - 75 - true - - - - ... - - - - - - - Logout - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - color: rgb(132, 132, 132); -font: 75 12pt "Lucida Grande"; - - - - - - - - - - - - - - 0 - 0 - + + QSizePolicy::Maximum - + - 16777215 - 800 + 12 + 0 - - - - - :/images/black/32/user.png - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 0 - - + - + @@ -224,21 +146,36 @@ font: 75 12pt "Lucida Grande"; - - - - Qt::Horizontal - - - QSizePolicy::Maximum + + + + + 0 + 0 + - + - 12 - 0 + 16777215 + 800 - + + + + + :/images/black/32/user.png + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 0 + + @@ -259,6 +196,91 @@ font: 75 12pt "Lucida Grande"; + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + + + 24 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Logout + + + + + + + + 15 + 75 + true + + + + ... + + + + + + + color: rgb(132, 132, 132); +font: 75 12pt "Lucida Grande"; + + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 5 + + + + diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui index 1327f9e7..22976f39 100644 --- a/src/leap/bitmask/gui/ui/mail_status.ui +++ b/src/leap/bitmask/gui/ui/mail_status.ui @@ -7,7 +7,7 @@ 0 0 400 - 72 + 79 @@ -20,9 +20,25 @@ Form + + 0 + - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + color: rgb(80, 80, 80); @@ -32,7 +48,26 @@ - + + + + + 24 + 24 + + + + + + + :/images/black/32/off.png + + + true + + + + @@ -45,38 +80,22 @@ - - + + - Qt::Horizontal + Qt::Vertical + + + QSizePolicy::Fixed - 40 - 20 + 0 + 5 - - - - - 16 - 16 - - - - - - - :/images/black/32/off.png - - - true - - - diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 920160b8..10c77057 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -86,13 +86,16 @@ 0 - + 0 0 + + QFrame{background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(160, 160, 160, 128), stop:1 rgba(255, 255, 255, 0));} + 24 @@ -109,6 +112,9 @@ true + + background-color: rgba(255, 255, 255, 0); + Encrypted Internet @@ -122,6 +128,9 @@ 20 + + + @@ -167,13 +176,21 @@ - + 0 0 + + false + + + QFrame{ +background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(160, 160, 160, 128), stop:1 rgba(255, 255, 255, 0)); +} + 24 @@ -190,6 +207,9 @@ true + + background-color: rgba(255, 255, 255, 0); + Login @@ -203,6 +223,9 @@ 20 + + + @@ -216,7 +239,11 @@ - + + + 12 + + @@ -226,7 +253,10 @@ - + + + -1 + 12 @@ -269,7 +299,7 @@ 40 - 20 + 0 @@ -290,7 +320,7 @@ - + 0 0 @@ -311,7 +341,7 @@ 40 - 20 + 0 -- cgit v1.2.3