From 722cf92e10cf73e79e54f463aa19b2d01bd3cf75 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 11 Dec 2013 22:58:59 -0800 Subject: move login widget to top of main window, move preference buttons to menu. --- src/leap/bitmask/gui/mainwindow.py | 11 +- src/leap/bitmask/gui/ui/mainwindow.ui | 198 ++++++++++++---------------------- 2 files changed, 76 insertions(+), 133 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 44fee6b5..1c80cce8 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -248,6 +248,8 @@ class MainWindow(QtGui.QMainWindow): self._soledad_bootstrapper.soledad_failed.connect( self._mail_status.set_soledad_failed) + self.ui.action_preferences.triggered.connect(self._show_preferences) + self.ui.action_eip_preferences.triggered.connect(self._show_eip_preferences) self.ui.action_about_leap.triggered.connect(self._about) self.ui.action_quit.triggered.connect(self.quit) self.ui.action_wizard.triggered.connect(self._launch_wizard) @@ -279,8 +281,9 @@ class MainWindow(QtGui.QMainWindow): self._action_visible = QtGui.QAction(self.tr("Hide Main Window"), self) self._action_visible.triggered.connect(self._toggle_visible) - self.ui.btnPreferences.clicked.connect(self._show_preferences) - self.ui.btnEIPPreferences.clicked.connect(self._show_eip_preferences) + # disable buttons for now, may come back later. + # self.ui.btnPreferences.clicked.connect(self._show_preferences) + # self.ui.btnEIPPreferences.clicked.connect(self._show_eip_preferences) self._enabled_services = [] @@ -467,7 +470,8 @@ class MainWindow(QtGui.QMainWindow): """ SLOT TRIGGERS: - self.ui.btnPreferences.clicked + self.ui.btnPreferences.clicked (disabled for now) + self.ui.action_preferences Displays the preferences window. """ @@ -520,6 +524,7 @@ class MainWindow(QtGui.QMainWindow): SLOT TRIGGERS: self.ui.btnEIPPreferences.clicked + self.ui.action_eip_preferences (disabled for now) Displays the EIP preferences window. """ diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 3b83788e..4dc39d03 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -85,108 +85,8 @@ 0 - - - - - 0 - - - 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 - - - 24 - - - - - - 16 - 75 - true - - - - background-color: rgba(255, 255, 255, 0); - - - Encrypted Internet - - - - - - - - 48 - 20 - - - - - - - - - - - :/images/black/32/gear.png:/images/black/32/gear.png - - - false - - - false - - - false - - - - - - - - - - 12 - - - 0 - - - 12 - - - 0 - - - - - - - - - - Qt::Horizontal - - - + + @@ -199,9 +99,7 @@ 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)); -} + background-color: rgba(0,0,0,20); border-bottom: 1px solid rgba(0,0,0,30); @@ -214,36 +112,15 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb - 16 75 true - background-color: rgba(255, 255, 255, 0); - - - Login - - - - - - - - 48 - 20 - - - - + background-color: rgba(255, 255, 255, 0); border: none; - - - - - :/images/black/32/gear.png:/images/black/32/gear.png + Please Log In @@ -257,13 +134,54 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb + - + Qt::Horizontal + + + + + + + 0 + + + 0 + + + + + 12 + + + 0 + + + 12 + + + 0 + + + + + + + + + + + Qt::Horizontal + + + + + @@ -286,6 +204,15 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb + + + + + Qt::Horizontal + + + + @@ -390,6 +317,9 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb + + + @@ -406,8 +336,16 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb + + true + + + Account Preferences... + + + - Preferences... + Internet Preferences... -- cgit v1.2.3 From 551e02141d5ffa72b76d2d1541bda2f877c8d379 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 11 Dec 2013 23:01:43 -0800 Subject: modified eip widget: change font to look better when under login widget, tightened spacing, moved upload and download icons to the buttons themselves, get rid of extra left whitespace padding on bandwidth status. --- src/leap/bitmask/gui/eip_status.py | 4 +-- src/leap/bitmask/gui/ui/eip_status.ui | 66 ++++++----------------------------- 2 files changed, 13 insertions(+), 57 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index 4b4d360f..92bb623e 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -41,8 +41,8 @@ class EIPStatusWidget(QtGui.QWidget): EIP Status widget that displays the current state of the EIP service """ DISPLAY_TRAFFIC_RATES = True - RATE_STR = "%14.2f KB/s" - TOTAL_STR = "%14.2f Kb" + RATE_STR = "%1.2f KB/s" + TOTAL_STR = "%1.2f Kb" eip_connection_connected = QtCore.Signal() diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui index d078ca0c..64821ad6 100644 --- a/src/leap/bitmask/gui/ui/eip_status.ui +++ b/src/leap/bitmask/gui/ui/eip_status.ui @@ -25,6 +25,9 @@ + + 0 + @@ -75,13 +78,6 @@ 0 - - - 14 - 75 - true - - Traffic is being routed in the clear @@ -124,12 +120,6 @@ - - - 16777215 - 32 - - 0 @@ -145,16 +135,6 @@ QLayout::SetDefaultConstraint - - - - - - - :/images/light/16/down-arrow.png - - - @@ -175,25 +155,18 @@ 16777215 - - - 11 - 75 - true - - PointingHandCursor - - text-align: left; - 0.0 KB/s true + + :/images/light/16/down-arrow.png + @@ -206,22 +179,12 @@ - 10 + 20 20 - - - - - - - :/images/light/16/up-arrow.png - - - @@ -242,25 +205,18 @@ 16777215 - - - 11 - 75 - true - - PointingHandCursor - - text-align: left; - 0.0 KB/s true + + :/images/light/16/up-arrow.png + @@ -271,7 +227,7 @@ 0 - 20 + 0 -- cgit v1.2.3 From 714c9afedfaee3c0288536cb1c3b138b20bab03c Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 11 Dec 2013 23:02:18 -0800 Subject: login widget: tighten spacing, get rid of non-standard font family. --- src/leap/bitmask/gui/ui/login.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui index e7ca1652..7e8f9daf 100644 --- a/src/leap/bitmask/gui/ui/login.ui +++ b/src/leap/bitmask/gui/ui/login.ui @@ -215,7 +215,7 @@ 0 - 24 + 0 @@ -255,7 +255,7 @@ color: rgb(132, 132, 132); -font: 75 12pt "Lucida Grande"; +font: 75 12pt; -- cgit v1.2.3 From 2a8632e60a538828e8c5b417c5b02fbdaaccc88d Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 11 Dec 2013 23:06:03 -0800 Subject: main window ui: remove unused statusbar --- src/leap/bitmask/gui/ui/mainwindow.ui | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 4dc39d03..ce05f8f3 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -334,7 +334,6 @@ - true -- cgit v1.2.3