From db9e6c728118c93413d11262993548dbeb51e28b Mon Sep 17 00:00:00 2001
From: kali
Date: Fri, 8 Aug 2014 11:33:30 -0500
Subject: remove outdated comment
eip machine was already moved into conductor
---
src/leap/bitmask/gui/mainwindow.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 389ff172..02488af1 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -285,14 +285,8 @@ class MainWindow(QtGui.QMainWindow):
self.logout.connect(self._mail_conductor.stop_mail_services)
- # Eip machine is a public attribute where the state machine for
- # the eip connection will be available to the different components.
- # Remember that this will not live in the +1600LOC mainwindow for
- # all the eternity, so at some point we will be moving this to
- # the EIPConductor or some other clever component that we will
- # instantiate from here.
-
- # start event machines
+ # start event machines from within the eip and mail conductors
+
# TODO should encapsulate all actions into one object
self._eip_conductor.start_eip_machine(
action=self._action_eip_startstop)
--
cgit v1.2.3
From 8433b869c86fe6cc153ce410a1946d97d509b85f Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 12:59:41 -0700
Subject: Clean up help dialog text.
---
src/leap/bitmask/gui/mainwindow.py | 48 +++++++++++++++++++++++++-------------
1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 02488af1..3f74feb5 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1073,22 +1073,38 @@ class MainWindow(QtGui.QMainWindow):
# TODO: don't hardcode!
smtp_port = 2013
- url = ("bitmask addon")
-
- msg = self.tr(
- "Instructions to use mail: "
- "If you use Thunderbird you can use the Bitmask extension helper. "
- "Search for 'Bitmask' in the add-on manager or download it "
- "from: {0}.
"
- "You can configure Bitmask manually with these options: "
- ""
- " Incoming -> IMAP, port: {1} "
- " Outgoing -> SMTP, port: {2} "
- " Username -> your bitmask username. "
- " Password -> does not matter, use any text. "
- " Just don't leave it empty and don't use your account's password."
- "").format(url, IMAP_PORT, smtp_port)
+ help_url = "
".format(
+ self.tr("bitmask.net/help"))
+
+ lang = QtCore.QLocale.system().name().replace('_','-')
+ thunderbird_extension_url = \
+ "https://addons.mozilla.org/{0}/" \
+ "thunderbird/addon/bitmask/".format(lang)
+
+ email_quick_reference = self.tr("Email quick reference")
+ thunderbird_text = self.tr("For Thunderbird, you can use the "
+ "Bitmask extension. Search for \"Bitmask\" in the add-on "
+ "manager or download it from "
+ "addons.mozilla.org.".format(thunderbird_extension_url))
+ manual_text = self.tr("Alternately, you can manually configure "
+ "your mail client to use Bitmask Email with these options:")
+ manual_imap = self.tr("IMAP: localhost, port {0}".format(IMAP_PORT))
+ manual_smtp = self.tr("SMTP: localhost, port {0}".format(smtp_port))
+ manual_username = self.tr("Username: your full email address")
+ manual_password = self.tr("Password: any non-empty text")
+
+ msg = help_url + self.tr(
+ "
{0}
"
+ "
{1}
"
+ "
{2}"
+ "
"
+ "
{3}
"
+ "
{4}
"
+ "
{5}
"
+ "
{6}
"
+ "
").format(email_quick_reference, thunderbird_text,
+ manual_text, manual_imap, manual_smtp,
+ manual_username, manual_password)
QtGui.QMessageBox.about(self, self.tr("Bitmask Help"), msg)
def _needs_update(self):
--
cgit v1.2.3
From a54a4bcd1aac5d42953f5f7f152080a391cbf643 Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 13:06:37 -0700
Subject: remove "Hide Main Window" -- much better UX, less buggy, and makes it
possible raise window when it is obscured. To hide, just close window.
---
src/leap/bitmask/gui/mainwindow.py | 79 +++++++++++++-------------------------
1 file changed, 26 insertions(+), 53 deletions(-)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 3f74feb5..c11cff9f 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -237,8 +237,8 @@ class MainWindow(QtGui.QMainWindow):
self._action_eip_startstop = QtGui.QAction("", self)
self._eip_status.set_action_eip_startstop(self._action_eip_startstop)
- self._action_visible = QtGui.QAction(self.tr("Hide Main Window"), self)
- self._action_visible.triggered.connect(self._toggle_visible)
+ self._action_visible = QtGui.QAction(self.tr("Show Main Window"), self)
+ self._action_visible.triggered.connect(self._ensure_visible)
# disable buttons for now, may come back later.
# self.ui.btnPreferences.clicked.connect(self._show_preferences)
@@ -957,8 +957,6 @@ class MainWindow(QtGui.QMainWindow):
Display the context menu from the tray icon
"""
- self._update_hideshow_menu()
-
context_menu = self._systray.contextMenu()
if not IS_MAC:
# for some reason, context_menu.show()
@@ -967,50 +965,38 @@ class MainWindow(QtGui.QMainWindow):
# this works however.
context_menu.exec_(self._systray.geometry().center())
- def _update_hideshow_menu(self):
- """
- Update the Hide/Show main window menu text based on the
- visibility of the window.
+ @QtCore.Slot()
+ def _ensure_visible(self):
"""
- get_action = lambda visible: (
- self.tr("Show Main Window"),
- self.tr("Hide Main Window"))[int(visible)]
+ TRIGGERS:
+ self._action_visible.triggered
- # set labels
- visible = self.isVisible() and self.isActiveWindow()
- self._action_visible.setText(get_action(visible))
+ Ensure that the window is visible and raised.
+ """
+ QtGui.QApplication.setQuitOnLastWindowClosed(True)
+ self.show()
+ if IS_LINUX:
+ # On ubuntu, activateWindow doesn't work reliably, so
+ # we do the following as a workaround. See
+ # https://bugreports.qt-project.org/browse/QTBUG-24932
+ # for more details
+ QtGui.QX11Info.setAppUserTime(0)
+ self.activateWindow()
+ self.raise_()
@QtCore.Slot()
- def _toggle_visible(self):
+ def _ensure_invisible(self):
"""
TRIGGERS:
self._action_visible.triggered
- Toggle the window visibility
+ Ensure that the window is hidden.
"""
- visible = self.isVisible() and self.isActiveWindow()
-
- if not visible:
- QtGui.QApplication.setQuitOnLastWindowClosed(True)
- self.show()
- if IS_LINUX:
- # On ubuntu, activateWindow doesn't work reliably, so
- # we do the following as a workaround. See
- # https://bugreports.qt-project.org/browse/QTBUG-24932
- # for more details
- QtGui.QX11Info.setAppUserTime(0)
- self.activateWindow()
- self.raise_()
- else:
- # We set this in order to avoid dialogs shutting down the
- # app on close, as they will be the only visible window.
- # e.g.: PreferencesWindow, LoggerWindow
- QtGui.QApplication.setQuitOnLastWindowClosed(False)
- self.hide()
-
- # Wait a bit until the window visibility has changed so
- # the menu is set with the correct value.
- QtDelayedCall(500, self._update_hideshow_menu)
+ # We set this in order to avoid dialogs shutting down the
+ # app on close, as they will be the only visible window.
+ # e.g.: PreferencesWindow, LoggerWindow
+ QtGui.QApplication.setQuitOnLastWindowClosed(False)
+ self.hide()
def _center_window(self):
"""
@@ -1130,19 +1116,6 @@ class MainWindow(QtGui.QMainWindow):
"Error: API version incompatible.")
QtGui.QMessageBox.warning(self, self.tr("Incompatible Provider"), msg)
- def changeEvent(self, e):
- """
- Reimplementation of changeEvent method to minimize to tray
- """
- if not IS_MAC and \
- QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
- e.type() == QtCore.QEvent.WindowStateChange and \
- self.isMinimized():
- self._toggle_visible()
- e.accept()
- return
- QtGui.QMainWindow.changeEvent(self, e)
-
def closeEvent(self, e):
"""
Reimplementation of closeEvent to close to tray
@@ -1155,7 +1128,7 @@ class MainWindow(QtGui.QMainWindow):
if QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
not self._really_quit:
- self._toggle_visible()
+ self._ensure_invisible()
e.ignore()
return
--
cgit v1.2.3
From 047b4bce66532f43456eff7f2f1d847e2b746a6d Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 13:44:59 -0700
Subject: properly align login and logout buttons
---
src/leap/bitmask/gui/ui/login.ui | 60 +++++++++++++++++++------------
src/leap/bitmask/gui/ui/logout.ui | 74 +++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+), 22 deletions(-)
create mode 100644 src/leap/bitmask/gui/ui/logout.ui
diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index 216eca9e..cd20108e 100644
--- a/src/leap/bitmask/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
@@ -33,7 +33,7 @@
0
- -1
+ 6
@@ -79,8 +79,14 @@
-
+
+
+
+ 0
+ 0
+
+ Log In
@@ -198,26 +204,17 @@
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
+ 0
+
+ 26
+
- 12
+ 18
-
+
@@ -231,22 +228,41 @@
-
+
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 24
+ 24
+
+
+
+
+ Logout
-
-
+
+ Qt::Horizontal
+
+ QSizePolicy::Fixed
+
- 40
- 20
+ 24
+ 24
diff --git a/src/leap/bitmask/gui/ui/logout.ui b/src/leap/bitmask/gui/ui/logout.ui
new file mode 100644
index 00000000..3faa93b6
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/logout.ui
@@ -0,0 +1,74 @@
+
+
+ Form
+
+
+
+ 0
+ 0
+ 434
+ 202
+
+
+
+ Form
+
+
+
+
+
+
+ 15
+ 75
+ true
+
+
+
+ ...
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+
+ Logout
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3
From 9b8251efe382f944e14a320e60e26a372a87d66b Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 14:14:17 -0700
Subject: added non-functional decorative footer
---
src/leap/bitmask/gui/ui/mainwindow.ui | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 1eeb636f..5bd21484 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -7,7 +7,7 @@
00524
- 640
+ 600
@@ -216,6 +216,28 @@
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ background-color: rgba(0,0,0,20); border-top: 1px solid rgba(0,0,0,30);
+
+
+
+ 0
+ 16
+
+
+
+
--
cgit v1.2.3
From dddd670e8d9fde0772547453696c26c3d08fe5a1 Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 15:07:24 -0700
Subject: simplify wizard instructions
---
src/leap/bitmask/gui/ui/wizard.ui | 32 ++++++++++++++++----------------
src/leap/bitmask/gui/wizard.py | 15 ++++-----------
2 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 8c52897d..e895dc5a 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -23,7 +23,7 @@
- Bitmask first run
+ Bitmask Provider Setup
@@ -40,10 +40,10 @@
- Welcome
+ Welcome to Bitmask
- This is the Bitmask first run wizard
+ 0
@@ -59,7 +59,7 @@
- <html><head/><body><p>Now we will guide you through some configuration that is needed before you can connect for the first time.</p><p>If you ever need to modify these options again, you can find the wizard in the <span style=" font-style:italic;">'Bitmask -> Create new account...'</span> menu from the main window.</p><p>Do you want to <span style=" font-weight:600;">sign up</span> for a new account, or <span style=" font-weight:600;">log in</span> with an already existing username?</p></body></html>
+ Qt::RichText
@@ -109,10 +109,10 @@
- Provider selection
+ Choose a provider
- Please enter the domain of the provider you want to use for your connection
+ 1
@@ -156,7 +156,7 @@
- Getting provider information
+ Getting provider information.
@@ -350,10 +350,10 @@
- Provider Information
+ About this provider
- Description of services offered by this provider
+ 2
@@ -495,7 +495,7 @@
Provider setup
- Gathering configuration options for this provider
+ 3
@@ -517,7 +517,7 @@
- We are downloading some bits that we need to establish a secure connection with the provider for the first time.
+ Bitmask is attempting to establish a secure connection with this provider for the first time.true
@@ -590,21 +590,21 @@
- Getting info from the Certificate Authority
+ Fetching provider credentials.
- Do we trust this Certificate Authority?
+ Do we trust these credentials?
- Establishing a trust relationship with this provider
+ Connecting to provider.
@@ -666,7 +666,7 @@
Register new user
- Register a new user with provider
+ 4
@@ -791,7 +791,7 @@
Service selection
- Please select the services you would like to have
+ 5
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index be5bde52..e0b4b620 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -679,7 +679,7 @@ class Wizard(QtGui.QWizard):
the user to enable or disable.
"""
self.ui.grpServices.setTitle(
- self.tr("Services by {0}").format(self._provider_details['name']))
+ self.tr("Services by {0}").format(self._provider_details['domain']))
services = get_supported(self._provider_details['services'])
@@ -723,18 +723,11 @@ class Wizard(QtGui.QWizard):
if pageId == self.SETUP_PROVIDER_PAGE:
if not self._provider_setup_ok:
self._reset_provider_setup()
- sub_title = self.tr("Gathering configuration options for {0}")
- sub_title = sub_title.format(self._provider_details['name'])
- self.page(pageId).setSubTitle(sub_title)
self.ui.lblDownloadCaCert.setPixmap(self.QUESTION_ICON)
self._provider_setup_defer = self._backend.\
provider_bootstrap(provider=self._domain)
if pageId == self.PRESENT_PROVIDER_PAGE:
- sub_title = self.tr("Description of services offered by {0}")
- sub_title = sub_title.format(self._provider_details['name'])
- self.page(pageId).setSubTitle(sub_title)
-
details = self._provider_details
name = "{0}".format(details['name'])
domain = "https://{0}".format(details['domain'])
@@ -746,9 +739,9 @@ class Wizard(QtGui.QWizard):
self.ui.lblProviderPolicy.setText(details['enrollment_policy'])
if pageId == self.REGISTER_USER_PAGE:
- sub_title = self.tr("Register a new user with {0}")
- sub_title = sub_title.format(self._provider_details['name'])
- self.page(pageId).setSubTitle(sub_title)
+ title = self.tr("Register a new user with {0}")
+ title = title.format(self._provider_details['domain'])
+ self.page(pageId).setTitle(title)
self.ui.chkRemember.setVisible(False)
if pageId == self.SERVICES_PAGE:
--
cgit v1.2.3
From 7e48a36a681e89def5826f00e322c3c37b5dfe98 Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 15:08:28 -0700
Subject: clean up icons in mainwindow.qrc
---
changes/minor-ui-adjustments | 1 +
data/images/Arrow-Down-32.png | Bin 1458 -> 0 bytes
data/images/Arrow-Up-32.png | Bin 1400 -> 0 bytes
data/images/Blue-Arrow-Right-32.png | Bin 1432 -> 0 bytes
data/images/Dialog-accept.png | Bin 1316 -> 0 bytes
data/images/Dialog-error.png | Bin 1380 -> 0 bytes
data/images/Emblem-question.png | Bin 1260 -> 0 bytes
data/images/black/24/off.png | Bin 0 -> 663 bytes
data/images/black/24/on.png | Bin 0 -> 547 bytes
data/images/black/24/question.png | Bin 0 -> 638 bytes
data/images/black/24/wait.png | Bin 0 -> 660 bytes
data/images/black/32/question.png | Bin 0 -> 797 bytes
data/resources/mainwindow.qrc | 11 +++++------
src/leap/bitmask/gui/wizard.py | 6 +++---
14 files changed, 9 insertions(+), 9 deletions(-)
create mode 100644 changes/minor-ui-adjustments
delete mode 100644 data/images/Arrow-Down-32.png
delete mode 100644 data/images/Arrow-Up-32.png
delete mode 100644 data/images/Blue-Arrow-Right-32.png
delete mode 100644 data/images/Dialog-accept.png
delete mode 100644 data/images/Dialog-error.png
delete mode 100644 data/images/Emblem-question.png
create mode 100644 data/images/black/24/off.png
create mode 100644 data/images/black/24/on.png
create mode 100644 data/images/black/24/question.png
create mode 100644 data/images/black/24/wait.png
create mode 100644 data/images/black/32/question.png
diff --git a/changes/minor-ui-adjustments b/changes/minor-ui-adjustments
new file mode 100644
index 00000000..33e27964
--- /dev/null
+++ b/changes/minor-ui-adjustments
@@ -0,0 +1 @@
+- minor adjustments to the layout of UI elements (#5514, #5515, #5510).
diff --git a/data/images/Arrow-Down-32.png b/data/images/Arrow-Down-32.png
deleted file mode 100644
index c5c607a1..00000000
Binary files a/data/images/Arrow-Down-32.png and /dev/null differ
diff --git a/data/images/Arrow-Up-32.png b/data/images/Arrow-Up-32.png
deleted file mode 100644
index 85370ac5..00000000
Binary files a/data/images/Arrow-Up-32.png and /dev/null differ
diff --git a/data/images/Blue-Arrow-Right-32.png b/data/images/Blue-Arrow-Right-32.png
deleted file mode 100644
index 66e50b0d..00000000
Binary files a/data/images/Blue-Arrow-Right-32.png and /dev/null differ
diff --git a/data/images/Dialog-accept.png b/data/images/Dialog-accept.png
deleted file mode 100644
index 5a8a0bdb..00000000
Binary files a/data/images/Dialog-accept.png and /dev/null differ
diff --git a/data/images/Dialog-error.png b/data/images/Dialog-error.png
deleted file mode 100644
index 51da2f5b..00000000
Binary files a/data/images/Dialog-error.png and /dev/null differ
diff --git a/data/images/Emblem-question.png b/data/images/Emblem-question.png
deleted file mode 100644
index b2163e5b..00000000
Binary files a/data/images/Emblem-question.png and /dev/null differ
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
new file mode 100644
index 00000000..9786ea0e
Binary files /dev/null and b/data/images/black/24/off.png differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
new file mode 100644
index 00000000..70e7ff11
Binary files /dev/null and b/data/images/black/24/on.png differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
new file mode 100644
index 00000000..3f3f2fd9
Binary files /dev/null and b/data/images/black/24/question.png differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
new file mode 100644
index 00000000..37e8f99b
Binary files /dev/null and b/data/images/black/24/wait.png differ
diff --git a/data/images/black/32/question.png b/data/images/black/32/question.png
new file mode 100644
index 00000000..f1aeadd2
Binary files /dev/null and b/data/images/black/32/question.png differ
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 0a917d5a..612f0223 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -15,24 +15,23 @@
../images/black/32/gear.png../images/black/32/off.png../images/black/32/on.png
+ ../images/black/32/question.png../images/black/32/refresh.png../images/black/32/user.png../images/black/32/wait.png
+ ../images/black/24/off.png
+ ../images/black/24/on.png
+ ../images/black/24/question.png
+ ../images/black/24/wait.png../images/mask-launcher.png../images/mask-icon.png../images/leap-gray-big.png
- ../images/Blue-Arrow-Right-32.png../images/leap-color-big.png
- ../images/Arrow-Down-32.png
- ../images/Arrow-Up-32.png../images/conn_connecting.png../images/conn_connected.png../images/conn_error.png../images/conn_connecting-light.png../images/conn_connected-light.png../images/conn_error-light.png
- ../images/Dialog-accept.png
- ../images/Dialog-error.png
- ../images/Emblem-question.png
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index e0b4b620..175d744c 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -70,9 +70,9 @@ class Wizard(QtGui.QWizard):
self.setPixmap(QtGui.QWizard.LogoPixmap,
QtGui.QPixmap(":/images/mask-icon.png"))
- self.QUESTION_ICON = QtGui.QPixmap(":/images/Emblem-question.png")
- self.ERROR_ICON = QtGui.QPixmap(":/images/Dialog-error.png")
- self.OK_ICON = QtGui.QPixmap(":/images/Dialog-accept.png")
+ self.QUESTION_ICON = QtGui.QPixmap(":/images/black/24/question.png")
+ self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png")
+ self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png")
self._selected_services = set()
self._shown_services = set()
--
cgit v1.2.3
From 9dc94c0eb18a625e3a4a9e0126349ad7c21567c5 Mon Sep 17 00:00:00 2001
From: elijah
Date: Sun, 10 Aug 2014 16:24:56 -0700
Subject: svg icons! well, how about that?
---
data/images/black/24/off.png | Bin 663 -> 0 bytes
data/images/black/24/on.png | Bin 547 -> 0 bytes
data/images/black/24/question.png | Bin 638 -> 0 bytes
data/images/black/24/wait.png | Bin 660 -> 0 bytes
data/images/black/32/off.png | Bin 695 -> 0 bytes
data/images/black/32/on.png | Bin 667 -> 0 bytes
data/images/black/32/question.png | Bin 797 -> 0 bytes
data/images/black/32/wait.png | Bin 836 -> 0 bytes
data/images/black/off.svg | 88 ++++++++++++++++++++++++++++++++
data/images/black/on.svg | 78 +++++++++++++++++++++++++++++
data/images/black/question.svg | 82 ++++++++++++++++++++++++++++++
data/images/black/wait.svg | 75 +++++++++++++++++++++++++++
data/images/white/32/off.png | Bin 703 -> 0 bytes
data/images/white/32/on.png | Bin 677 -> 0 bytes
data/images/white/32/wait.png | Bin 855 -> 0 bytes
data/images/white/off.svg | 89 +++++++++++++++++++++++++++++++++
data/images/white/on.svg | 78 +++++++++++++++++++++++++++++
data/images/white/question.svg | 82 ++++++++++++++++++++++++++++++
data/images/white/wait.svg | 76 ++++++++++++++++++++++++++++
data/resources/mainwindow.qrc | 23 ++++-----
src/leap/bitmask/gui/eip_status.py | 12 ++---
src/leap/bitmask/gui/mail_status.py | 12 ++---
src/leap/bitmask/gui/ui/eip_status.ui | 2 +-
src/leap/bitmask/gui/ui/mail_status.ui | 2 +-
src/leap/bitmask/gui/ui/wizard.ui | 66 +++++++++++++++++++++---
src/leap/bitmask/gui/wizard.py | 6 +--
26 files changed, 736 insertions(+), 35 deletions(-)
delete mode 100644 data/images/black/24/off.png
delete mode 100644 data/images/black/24/on.png
delete mode 100644 data/images/black/24/question.png
delete mode 100644 data/images/black/24/wait.png
delete mode 100644 data/images/black/32/off.png
delete mode 100644 data/images/black/32/on.png
delete mode 100644 data/images/black/32/question.png
delete mode 100644 data/images/black/32/wait.png
create mode 100644 data/images/black/off.svg
create mode 100644 data/images/black/on.svg
create mode 100644 data/images/black/question.svg
create mode 100644 data/images/black/wait.svg
delete mode 100644 data/images/white/32/off.png
delete mode 100644 data/images/white/32/on.png
delete mode 100644 data/images/white/32/wait.png
create mode 100644 data/images/white/off.svg
create mode 100644 data/images/white/on.svg
create mode 100644 data/images/white/question.svg
create mode 100644 data/images/white/wait.svg
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
deleted file mode 100644
index 9786ea0e..00000000
Binary files a/data/images/black/24/off.png and /dev/null differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
deleted file mode 100644
index 70e7ff11..00000000
Binary files a/data/images/black/24/on.png and /dev/null differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
deleted file mode 100644
index 3f3f2fd9..00000000
Binary files a/data/images/black/24/question.png and /dev/null differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
deleted file mode 100644
index 37e8f99b..00000000
Binary files a/data/images/black/24/wait.png and /dev/null differ
diff --git a/data/images/black/32/off.png b/data/images/black/32/off.png
deleted file mode 100644
index 6ddde746..00000000
Binary files a/data/images/black/32/off.png and /dev/null differ
diff --git a/data/images/black/32/on.png b/data/images/black/32/on.png
deleted file mode 100644
index bbd28bad..00000000
Binary files a/data/images/black/32/on.png and /dev/null differ
diff --git a/data/images/black/32/question.png b/data/images/black/32/question.png
deleted file mode 100644
index f1aeadd2..00000000
Binary files a/data/images/black/32/question.png and /dev/null differ
diff --git a/data/images/black/32/wait.png b/data/images/black/32/wait.png
deleted file mode 100644
index a01ce923..00000000
Binary files a/data/images/black/32/wait.png and /dev/null differ
diff --git a/data/images/black/off.svg b/data/images/black/off.svg
new file mode 100644
index 00000000..35c49a56
--- /dev/null
+++ b/data/images/black/off.svg
@@ -0,0 +1,88 @@
+
+
+
+
diff --git a/data/images/black/on.svg b/data/images/black/on.svg
new file mode 100644
index 00000000..36938e0a
--- /dev/null
+++ b/data/images/black/on.svg
@@ -0,0 +1,78 @@
+
+
+
+
diff --git a/data/images/black/question.svg b/data/images/black/question.svg
new file mode 100644
index 00000000..60038638
--- /dev/null
+++ b/data/images/black/question.svg
@@ -0,0 +1,82 @@
+
+
+
+
diff --git a/data/images/black/wait.svg b/data/images/black/wait.svg
new file mode 100644
index 00000000..2ae0113a
--- /dev/null
+++ b/data/images/black/wait.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/data/images/white/32/off.png b/data/images/white/32/off.png
deleted file mode 100644
index 22621594..00000000
Binary files a/data/images/white/32/off.png and /dev/null differ
diff --git a/data/images/white/32/on.png b/data/images/white/32/on.png
deleted file mode 100644
index 8946f763..00000000
Binary files a/data/images/white/32/on.png and /dev/null differ
diff --git a/data/images/white/32/wait.png b/data/images/white/32/wait.png
deleted file mode 100644
index 8562d636..00000000
Binary files a/data/images/white/32/wait.png and /dev/null differ
diff --git a/data/images/white/off.svg b/data/images/white/off.svg
new file mode 100644
index 00000000..9c7cacfe
--- /dev/null
+++ b/data/images/white/off.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/data/images/white/on.svg b/data/images/white/on.svg
new file mode 100644
index 00000000..4d4bc5b8
--- /dev/null
+++ b/data/images/white/on.svg
@@ -0,0 +1,78 @@
+
+
+
+
diff --git a/data/images/white/question.svg b/data/images/white/question.svg
new file mode 100644
index 00000000..dd4aa200
--- /dev/null
+++ b/data/images/white/question.svg
@@ -0,0 +1,82 @@
+
+
+
+
diff --git a/data/images/white/wait.svg b/data/images/white/wait.svg
new file mode 100644
index 00000000..8963b0cf
--- /dev/null
+++ b/data/images/white/wait.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 612f0223..ea5900f7 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -1,8 +1,5 @@
- ../images/white/32/off.png
- ../images/white/32/on.png
- ../images/white/32/wait.png../images/black/32/arrow-down.png../images/black/32/arrow-up.png../images/black/32/cloud.png
@@ -14,15 +11,17 @@
../images/black/32/expand.png../images/black/32/gear.png../images/black/32/off.png
- ../images/black/32/on.png
- ../images/black/32/question.png
- ../images/black/32/refresh.png
- ../images/black/32/user.png
- ../images/black/32/wait.png
- ../images/black/24/off.png
- ../images/black/24/on.png
- ../images/black/24/question.png
- ../images/black/24/wait.png
+
+ ../images/black/off.svg
+ ../images/black/on.svg
+ ../images/black/question.svg
+ ../images/black/wait.svg
+
+ ../images/white/off.svg
+ ../images/white/on.svg
+ ../images/white/question.svg
+ ../images/white/wait.svg
+
../images/mask-launcher.png../images/mask-icon.png../images/leap-gray-big.png
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 1e764a8c..05e28f92 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -214,15 +214,15 @@ class EIPStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/32/wait.png",
- ":/images/black/32/on.png",
- ":/images/black/32/off.png")
+ ":/images/black/wait.svg",
+ ":/images/black/on.svg",
+ ":/images/black/off.svg")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/32/wait.png",
- ":/images/white/32/on.png",
- ":/images/white/32/off.png")
+ ":/images/white/wait.svg",
+ ":/images/white/on.svg",
+ ":/images/white/off.svg")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index bb755b5c..4ec93d88 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -134,15 +134,15 @@ class MailStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/32/wait.png",
- ":/images/black/32/on.png",
- ":/images/black/32/off.png")
+ ":/images/black/wait.svg",
+ ":/images/black/on.svg",
+ ":/images/black/off.svg")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/32/wait.png",
- ":/images/white/32/on.png",
- ":/images/white/32/off.png")
+ ":/images/white/wait.svg",
+ ":/images/white/on.svg",
+ ":/images/white/off.svg")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index e0996620..e97add61 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -111,7 +111,7 @@
- :/images/black/32/off.png
+ :/images/black/off.svgtrue
diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui
index 22976f39..6103c77b 100644
--- a/src/leap/bitmask/gui/ui/mail_status.ui
+++ b/src/leap/bitmask/gui/ui/mail_status.ui
@@ -60,7 +60,7 @@
- :/images/black/32/off.png
+ :/images/black/off.svgtrue
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index e895dc5a..f67e9dd5 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -181,11 +181,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
@@ -203,11 +212,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
@@ -225,11 +243,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
@@ -557,11 +584,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
@@ -579,11 +615,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
@@ -622,11 +667,20 @@
24
+
+
+ 24
+ 24
+
+
+
+ true
+
- :/images/Emblem-question.png
+ :/images/black/question.svg
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 175d744c..44f91365 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -70,9 +70,9 @@ class Wizard(QtGui.QWizard):
self.setPixmap(QtGui.QWizard.LogoPixmap,
QtGui.QPixmap(":/images/mask-icon.png"))
- self.QUESTION_ICON = QtGui.QPixmap(":/images/black/24/question.png")
- self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png")
- self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png")
+ self.QUESTION_ICON = QtGui.QPixmap(":/images/black/question.svg")
+ self.ERROR_ICON = QtGui.QPixmap(":/images/black/off.svg")
+ self.OK_ICON = QtGui.QPixmap(":/images/black/on.svg")
self._selected_services = set()
self._shown_services = set()
--
cgit v1.2.3
From ff4f8e1b1b0cbe48e8d94fed5128acc60be9bf1a Mon Sep 17 00:00:00 2001
From: Ruben Pollan
Date: Sat, 9 Aug 2014 15:39:37 -0500
Subject: Wait until EIP is up to autologin. Closes #5939.
---
changes/bug_5939_wait-for-eip-to-autologin | 1 +
src/leap/bitmask/gui/mainwindow.py | 51 ++++++++++++++++++++++++++++--
2 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 changes/bug_5939_wait-for-eip-to-autologin
diff --git a/changes/bug_5939_wait-for-eip-to-autologin b/changes/bug_5939_wait-for-eip-to-autologin
new file mode 100644
index 00000000..5dec8331
--- /dev/null
+++ b/changes/bug_5939_wait-for-eip-to-autologin
@@ -0,0 +1 @@
+- Wait until EIP is up to autologin. Closes #5939
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 389ff172..990ea643 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1165,12 +1165,14 @@ class MainWindow(QtGui.QMainWindow):
skip_first_run = self._settings.get_skip_first_run()
return not (has_provider_on_disk and skip_first_run)
+ @QtCore.Slot()
def _download_provider_config(self):
"""
Start the bootstrapping sequence. It will download the
provider configuration if it's not present, otherwise will
emit the corresponding signals inmediately
"""
+ self._disconnect_scheduled_login()
domain = self._login_widget.get_selected_provider()
self._backend.provider_setup(provider=domain)
@@ -1204,6 +1206,40 @@ class MainWindow(QtGui.QMainWindow):
self.tr("Unable to login: Problem with provider"))
self._login_widget.set_enabled(True)
+ def _schedule_login(self):
+ """
+ Schedule the login sequence to go after the EIP started.
+
+ The login sequence is connected to all finishing status of EIP
+ (connected, disconnected, aborted or died) to continue with the login
+ after EIP.
+ """
+ logger.debug('Login scheduled when eip_connected is triggered')
+ eip_sigs = self._eip_conductor.qtsigs
+ eip_sigs.connected_signal.connect(self._download_provider_config)
+ eip_sigs.disconnected_signal.connect(self._download_provider_config)
+ eip_sigs.connection_aborted_signal.connect(self._download_provider_config)
+ eip_sigs.connection_died_signal.connect(self._download_provider_config)
+
+ def _disconnect_scheduled_login(self):
+ """
+ Disconnect scheduled login signals if exists
+ """
+ try:
+ eip_sigs = self._eip_conductor.qtsigs
+ eip_sigs.connected_signal.disconnect(
+ self._download_provider_config)
+ eip_sigs.disconnected_signal.disconnect(
+ self._download_provider_config)
+ eip_sigs.connection_aborted_signal.disconnect(
+ self._download_provider_config)
+ eip_sigs.connection_died_signal.disconnect(
+ self._download_provider_config)
+ except Exception:
+ # signal not connected
+ pass
+
+
@QtCore.Slot()
def _login(self):
"""
@@ -1229,7 +1265,10 @@ class MainWindow(QtGui.QMainWindow):
else:
self.ui.action_create_new_account.setEnabled(False)
if self._login_widget.start_login():
- self._download_provider_config()
+ if self._trying_to_start_eip:
+ self._schedule_login()
+ else:
+ self._download_provider_config()
@QtCore.Slot(unicode)
def _authentication_error(self, msg):
@@ -1258,8 +1297,13 @@ class MainWindow(QtGui.QMainWindow):
Stop the login sequence.
"""
logger.debug("Cancelling log in.")
+ self._disconnect_scheduled_login()
+
self._cancel_ongoing_defers()
+ # Needed in case of EIP starting and login deferer never set
+ self._set_login_cancelled()
+
def _cancel_ongoing_defers(self):
"""
Cancel the running defers to avoid app blocking.
@@ -1673,8 +1717,9 @@ class MainWindow(QtGui.QMainWindow):
"""
passed = data[PASSED_KEY]
if not passed:
- self._login_widget.set_status(
- self.tr("Unable to connect: Problem with provider"))
+ self._eip_status.set_eip_status(
+ self.tr("Unable to connect: Problem with provider"),
+ error=True)
logger.error(data[ERROR_KEY])
self._already_started_eip = False
self._eip_status.aborted()
--
cgit v1.2.3
From c52ca1aa1e9637d3e7d18f30b7c476ab1b1fe13a Mon Sep 17 00:00:00 2001
From: elijah
Date: Mon, 11 Aug 2014 13:08:43 -0700
Subject: temporarily switch back to using png icons
---
data/images/black/24/off.png | Bin 0 -> 606 bytes
data/images/black/24/on.png | Bin 0 -> 583 bytes
data/images/black/24/question.png | Bin 0 -> 587 bytes
data/images/black/24/wait.png | Bin 0 -> 641 bytes
data/images/white/24/off.png | Bin 0 -> 628 bytes
data/images/white/24/on.png | Bin 0 -> 579 bytes
data/images/white/24/question.png | Bin 0 -> 590 bytes
data/images/white/24/wait.png | Bin 0 -> 647 bytes
data/resources/mainwindow.qrc | 8 ++++++++
src/leap/bitmask/gui/eip_status.py | 12 ++++++------
src/leap/bitmask/gui/mail_status.py | 12 ++++++------
src/leap/bitmask/gui/ui/eip_status.ui | 2 +-
src/leap/bitmask/gui/ui/mail_status.ui | 2 +-
src/leap/bitmask/gui/ui/wizard.ui | 12 ++++++------
src/leap/bitmask/gui/wizard.py | 6 +++---
15 files changed, 31 insertions(+), 23 deletions(-)
create mode 100644 data/images/black/24/off.png
create mode 100644 data/images/black/24/on.png
create mode 100644 data/images/black/24/question.png
create mode 100644 data/images/black/24/wait.png
create mode 100644 data/images/white/24/off.png
create mode 100644 data/images/white/24/on.png
create mode 100644 data/images/white/24/question.png
create mode 100644 data/images/white/24/wait.png
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
new file mode 100644
index 00000000..72d41d18
Binary files /dev/null and b/data/images/black/24/off.png differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
new file mode 100644
index 00000000..e75d7d9a
Binary files /dev/null and b/data/images/black/24/on.png differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
new file mode 100644
index 00000000..efa11b12
Binary files /dev/null and b/data/images/black/24/question.png differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
new file mode 100644
index 00000000..7eb78f77
Binary files /dev/null and b/data/images/black/24/wait.png differ
diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png
new file mode 100644
index 00000000..5ded2a42
Binary files /dev/null and b/data/images/white/24/off.png differ
diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png
new file mode 100644
index 00000000..48fbd5f7
Binary files /dev/null and b/data/images/white/24/on.png differ
diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png
new file mode 100644
index 00000000..e2188150
Binary files /dev/null and b/data/images/white/24/question.png differ
diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png
new file mode 100644
index 00000000..cbe7d598
Binary files /dev/null and b/data/images/white/24/wait.png differ
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index ea5900f7..c400bb71 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -16,11 +16,19 @@
../images/black/on.svg../images/black/question.svg../images/black/wait.svg
+ ../images/black/24/off.png
+ ../images/black/24/on.png
+ ../images/black/24/question.png
+ ../images/black/24/wait.png../images/white/off.svg../images/white/on.svg../images/white/question.svg../images/white/wait.svg
+ ../images/white/24/off.png
+ ../images/white/24/on.png
+ ../images/white/24/question.png
+ ../images/white/24/wait.png../images/mask-launcher.png../images/mask-icon.png
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 05e28f92..836f984a 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -214,15 +214,15 @@ class EIPStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/wait.svg",
- ":/images/black/on.svg",
- ":/images/black/off.svg")
+ ":/images/black/24/wait.png",
+ ":/images/black/24/on.png",
+ ":/images/black/24/off.png")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/wait.svg",
- ":/images/white/on.svg",
- ":/images/white/off.svg")
+ ":/images/white/24/wait.png",
+ ":/images/white/24/on.png",
+ ":/images/white/24/off.png")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index 4ec93d88..831c6788 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -134,15 +134,15 @@ class MailStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/wait.svg",
- ":/images/black/on.svg",
- ":/images/black/off.svg")
+ ":/images/black/24/wait.png",
+ ":/images/black/24/on.png",
+ ":/images/black/24/off.png")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/wait.svg",
- ":/images/white/on.svg",
- ":/images/white/off.svg")
+ ":/images/white/24/wait.png",
+ ":/images/white/24/on.png",
+ ":/images/white/24/off.png")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index e97add61..adbd8964 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -111,7 +111,7 @@
- :/images/black/off.svg
+ :/images/black/24/off.pngtrue
diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui
index 6103c77b..64b8ba8c 100644
--- a/src/leap/bitmask/gui/ui/mail_status.ui
+++ b/src/leap/bitmask/gui/ui/mail_status.ui
@@ -60,7 +60,7 @@
- :/images/black/off.svg
+ :/images/black/24/off.pngtrue
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index f67e9dd5..5473310b 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -194,7 +194,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
@@ -225,7 +225,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
@@ -256,7 +256,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
@@ -597,7 +597,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
@@ -628,7 +628,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
@@ -680,7 +680,7 @@
- :/images/black/question.svg
+ :/images/black/24/question.png
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 44f91365..175d744c 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -70,9 +70,9 @@ class Wizard(QtGui.QWizard):
self.setPixmap(QtGui.QWizard.LogoPixmap,
QtGui.QPixmap(":/images/mask-icon.png"))
- self.QUESTION_ICON = QtGui.QPixmap(":/images/black/question.svg")
- self.ERROR_ICON = QtGui.QPixmap(":/images/black/off.svg")
- self.OK_ICON = QtGui.QPixmap(":/images/black/on.svg")
+ self.QUESTION_ICON = QtGui.QPixmap(":/images/black/24/question.png")
+ self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png")
+ self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png")
self._selected_services = set()
self._shown_services = set()
--
cgit v1.2.3
From 6aa7612ceb05269dfc3aaa02a961ddaef67908df Mon Sep 17 00:00:00 2001
From: elijah
Date: Mon, 11 Aug 2014 15:33:53 -0700
Subject: removed unused icons
---
data/images/black/32/cloud.png | Bin 468 -> 0 bytes
data/images/black/32/contract.png | Bin 417 -> 0 bytes
data/images/black/32/earth-square.png | Bin 1068 -> 0 bytes
data/images/black/32/email-square.png | Bin 787 -> 0 bytes
data/images/black/32/expand.png | Bin 451 -> 0 bytes
data/images/black/32/gear.png | Bin 644 -> 0 bytes
data/images/black/32/refresh.png | Bin 624 -> 0 bytes
data/images/conn_connected-light.png | Bin 426 -> 0 bytes
data/images/conn_connected.png | Bin 426 -> 0 bytes
data/images/conn_connecting-light.png | Bin 791 -> 0 bytes
data/images/conn_connecting.png | Bin 712 -> 0 bytes
data/images/conn_error-light.png | Bin 1457 -> 0 bytes
data/images/conn_error.png | Bin 1429 -> 0 bytes
data/images/favicon.ico | Bin 1150 -> 0 bytes
data/images/leap-client.icns | Bin 27456 -> 0 bytes
data/images/leap-client.tiff | Bin 3598 -> 0 bytes
data/images/leap-color-big.png | Bin 30322 -> 0 bytes
data/images/leap-gray-big.png | Bin 17246 -> 0 bytes
data/images/light/16/accept.png | Bin 285 -> 0 bytes
data/images/light/16/down-arrow.png | Bin 356 -> 0 bytes
data/images/light/16/error.png | Bin 355 -> 0 bytes
data/images/light/16/refresh.png | Bin 472 -> 0 bytes
data/images/light/16/up-arrow.png | Bin 357 -> 0 bytes
data/images/light/64/network-eip-acquiring.png | Bin 791 -> 0 bytes
data/images/light/64/network-eip-down.png | Bin 1429 -> 0 bytes
data/images/light/64/network-eip-up.png | Bin 426 -> 0 bytes
data/images/mail-locked.png | Bin 2326 -> 0 bytes
data/images/mail-unlocked.png | Bin 2791 -> 0 bytes
data/images/mask-launcher.png | Bin 37759 -> 0 bytes
data/images/mask-small.png | Bin 18172 -> 0 bytes
data/images/white/32/arrow-down.png | Bin 486 -> 0 bytes
data/images/white/32/arrow-up.png | Bin 463 -> 0 bytes
data/images/white/32/cloud.png | Bin 504 -> 0 bytes
data/images/white/32/contract.png | Bin 417 -> 0 bytes
data/images/white/32/earth-square.png | Bin 1068 -> 0 bytes
data/images/white/32/earth.png | Bin 896 -> 0 bytes
data/images/white/32/email-square.png | Bin 787 -> 0 bytes
data/images/white/32/email.png | Bin 622 -> 0 bytes
data/images/white/32/expand.png | Bin 451 -> 0 bytes
data/images/white/32/gear.png | Bin 656 -> 0 bytes
data/images/white/32/refresh.png | Bin 654 -> 0 bytes
data/images/white/32/user.png | Bin 556 -> 0 bytes
42 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 data/images/black/32/cloud.png
delete mode 100644 data/images/black/32/contract.png
delete mode 100644 data/images/black/32/earth-square.png
delete mode 100644 data/images/black/32/email-square.png
delete mode 100644 data/images/black/32/expand.png
delete mode 100644 data/images/black/32/gear.png
delete mode 100644 data/images/black/32/refresh.png
delete mode 100644 data/images/conn_connected-light.png
delete mode 100644 data/images/conn_connected.png
delete mode 100644 data/images/conn_connecting-light.png
delete mode 100644 data/images/conn_connecting.png
delete mode 100644 data/images/conn_error-light.png
delete mode 100644 data/images/conn_error.png
delete mode 100644 data/images/favicon.ico
delete mode 100644 data/images/leap-client.icns
delete mode 100644 data/images/leap-client.tiff
delete mode 100644 data/images/leap-color-big.png
delete mode 100644 data/images/leap-gray-big.png
delete mode 100644 data/images/light/16/accept.png
delete mode 100644 data/images/light/16/down-arrow.png
delete mode 100644 data/images/light/16/error.png
delete mode 100644 data/images/light/16/refresh.png
delete mode 100644 data/images/light/16/up-arrow.png
delete mode 100644 data/images/light/64/network-eip-acquiring.png
delete mode 100644 data/images/light/64/network-eip-down.png
delete mode 100644 data/images/light/64/network-eip-up.png
delete mode 100644 data/images/mail-locked.png
delete mode 100644 data/images/mail-unlocked.png
delete mode 100644 data/images/mask-launcher.png
delete mode 100644 data/images/mask-small.png
delete mode 100644 data/images/white/32/arrow-down.png
delete mode 100644 data/images/white/32/arrow-up.png
delete mode 100644 data/images/white/32/cloud.png
delete mode 100644 data/images/white/32/contract.png
delete mode 100644 data/images/white/32/earth-square.png
delete mode 100644 data/images/white/32/earth.png
delete mode 100644 data/images/white/32/email-square.png
delete mode 100644 data/images/white/32/email.png
delete mode 100644 data/images/white/32/expand.png
delete mode 100644 data/images/white/32/gear.png
delete mode 100644 data/images/white/32/refresh.png
delete mode 100644 data/images/white/32/user.png
diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png
deleted file mode 100644
index 10cbd62d..00000000
Binary files a/data/images/black/32/cloud.png and /dev/null differ
diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png
deleted file mode 100644
index 9f0ee605..00000000
Binary files a/data/images/black/32/contract.png and /dev/null differ
diff --git a/data/images/black/32/earth-square.png b/data/images/black/32/earth-square.png
deleted file mode 100644
index da7bf2cf..00000000
Binary files a/data/images/black/32/earth-square.png and /dev/null differ
diff --git a/data/images/black/32/email-square.png b/data/images/black/32/email-square.png
deleted file mode 100644
index 499d7a8f..00000000
Binary files a/data/images/black/32/email-square.png and /dev/null differ
diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png
deleted file mode 100644
index c581503d..00000000
Binary files a/data/images/black/32/expand.png and /dev/null differ
diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png
deleted file mode 100644
index 93c8742d..00000000
Binary files a/data/images/black/32/gear.png and /dev/null differ
diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png
deleted file mode 100644
index ad67f563..00000000
Binary files a/data/images/black/32/refresh.png and /dev/null differ
diff --git a/data/images/conn_connected-light.png b/data/images/conn_connected-light.png
deleted file mode 100644
index a0db2a22..00000000
Binary files a/data/images/conn_connected-light.png and /dev/null differ
diff --git a/data/images/conn_connected.png b/data/images/conn_connected.png
deleted file mode 100644
index a5d20497..00000000
Binary files a/data/images/conn_connected.png and /dev/null differ
diff --git a/data/images/conn_connecting-light.png b/data/images/conn_connecting-light.png
deleted file mode 100644
index 83e3ea75..00000000
Binary files a/data/images/conn_connecting-light.png and /dev/null differ
diff --git a/data/images/conn_connecting.png b/data/images/conn_connecting.png
deleted file mode 100644
index 31b6e617..00000000
Binary files a/data/images/conn_connecting.png and /dev/null differ
diff --git a/data/images/conn_error-light.png b/data/images/conn_error-light.png
deleted file mode 100644
index 8cee20fe..00000000
Binary files a/data/images/conn_error-light.png and /dev/null differ
diff --git a/data/images/conn_error.png b/data/images/conn_error.png
deleted file mode 100644
index 85669af6..00000000
Binary files a/data/images/conn_error.png and /dev/null differ
diff --git a/data/images/favicon.ico b/data/images/favicon.ico
deleted file mode 100644
index 7f41dd1d..00000000
Binary files a/data/images/favicon.ico and /dev/null differ
diff --git a/data/images/leap-client.icns b/data/images/leap-client.icns
deleted file mode 100644
index d5d52cdc..00000000
Binary files a/data/images/leap-client.icns and /dev/null differ
diff --git a/data/images/leap-client.tiff b/data/images/leap-client.tiff
deleted file mode 100644
index 71c95b0d..00000000
Binary files a/data/images/leap-client.tiff and /dev/null differ
diff --git a/data/images/leap-color-big.png b/data/images/leap-color-big.png
deleted file mode 100644
index eafacdcd..00000000
Binary files a/data/images/leap-color-big.png and /dev/null differ
diff --git a/data/images/leap-gray-big.png b/data/images/leap-gray-big.png
deleted file mode 100644
index 1529a74f..00000000
Binary files a/data/images/leap-gray-big.png and /dev/null differ
diff --git a/data/images/light/16/accept.png b/data/images/light/16/accept.png
deleted file mode 100644
index 917a68c4..00000000
Binary files a/data/images/light/16/accept.png and /dev/null differ
diff --git a/data/images/light/16/down-arrow.png b/data/images/light/16/down-arrow.png
deleted file mode 100644
index 9beb5de3..00000000
Binary files a/data/images/light/16/down-arrow.png and /dev/null differ
diff --git a/data/images/light/16/error.png b/data/images/light/16/error.png
deleted file mode 100644
index edc20985..00000000
Binary files a/data/images/light/16/error.png and /dev/null differ
diff --git a/data/images/light/16/refresh.png b/data/images/light/16/refresh.png
deleted file mode 100644
index a948a071..00000000
Binary files a/data/images/light/16/refresh.png and /dev/null differ
diff --git a/data/images/light/16/up-arrow.png b/data/images/light/16/up-arrow.png
deleted file mode 100644
index 4e0ec404..00000000
Binary files a/data/images/light/16/up-arrow.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-acquiring.png b/data/images/light/64/network-eip-acquiring.png
deleted file mode 100644
index 83e3ea75..00000000
Binary files a/data/images/light/64/network-eip-acquiring.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-down.png b/data/images/light/64/network-eip-down.png
deleted file mode 100644
index 85669af6..00000000
Binary files a/data/images/light/64/network-eip-down.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-up.png b/data/images/light/64/network-eip-up.png
deleted file mode 100644
index a0db2a22..00000000
Binary files a/data/images/light/64/network-eip-up.png and /dev/null differ
diff --git a/data/images/mail-locked.png b/data/images/mail-locked.png
deleted file mode 100644
index 2108ca1c..00000000
Binary files a/data/images/mail-locked.png and /dev/null differ
diff --git a/data/images/mail-unlocked.png b/data/images/mail-unlocked.png
deleted file mode 100644
index fc3c11b0..00000000
Binary files a/data/images/mail-unlocked.png and /dev/null differ
diff --git a/data/images/mask-launcher.png b/data/images/mask-launcher.png
deleted file mode 100644
index cb27f8d3..00000000
Binary files a/data/images/mask-launcher.png and /dev/null differ
diff --git a/data/images/mask-small.png b/data/images/mask-small.png
deleted file mode 100644
index 5f5f1b41..00000000
Binary files a/data/images/mask-small.png and /dev/null differ
diff --git a/data/images/white/32/arrow-down.png b/data/images/white/32/arrow-down.png
deleted file mode 100644
index 02ccc540..00000000
Binary files a/data/images/white/32/arrow-down.png and /dev/null differ
diff --git a/data/images/white/32/arrow-up.png b/data/images/white/32/arrow-up.png
deleted file mode 100644
index fbe1f816..00000000
Binary files a/data/images/white/32/arrow-up.png and /dev/null differ
diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png
deleted file mode 100644
index 39d589ef..00000000
Binary files a/data/images/white/32/cloud.png and /dev/null differ
diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png
deleted file mode 100644
index 262ff3c0..00000000
Binary files a/data/images/white/32/contract.png and /dev/null differ
diff --git a/data/images/white/32/earth-square.png b/data/images/white/32/earth-square.png
deleted file mode 100644
index da7bf2cf..00000000
Binary files a/data/images/white/32/earth-square.png and /dev/null differ
diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png
deleted file mode 100644
index efca7ccb..00000000
Binary files a/data/images/white/32/earth.png and /dev/null differ
diff --git a/data/images/white/32/email-square.png b/data/images/white/32/email-square.png
deleted file mode 100644
index 499d7a8f..00000000
Binary files a/data/images/white/32/email-square.png and /dev/null differ
diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png
deleted file mode 100644
index abb36035..00000000
Binary files a/data/images/white/32/email.png and /dev/null differ
diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png
deleted file mode 100644
index 0ec28dcc..00000000
Binary files a/data/images/white/32/expand.png and /dev/null differ
diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png
deleted file mode 100644
index 83f8d5ff..00000000
Binary files a/data/images/white/32/gear.png and /dev/null differ
diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png
deleted file mode 100644
index 36a89da9..00000000
Binary files a/data/images/white/32/refresh.png and /dev/null differ
diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png
deleted file mode 100644
index ff8edd00..00000000
Binary files a/data/images/white/32/user.png and /dev/null differ
--
cgit v1.2.3
From 6771ba8958d385509f7cc55acab13fe14873e0c2 Mon Sep 17 00:00:00 2001
From: elijah
Date: Mon, 11 Aug 2014 15:35:33 -0700
Subject: used 22x22 pixel icons instead of 24x24 pixel icons (since ubuntu
needs 22 anyway)
---
Makefile | 2 +-
data/images/black/22/off.png | Bin 0 -> 542 bytes
data/images/black/22/on.png | Bin 0 -> 519 bytes
data/images/black/22/question.png | Bin 0 -> 562 bytes
data/images/black/22/wait.png | Bin 0 -> 596 bytes
data/images/black/24/off.png | Bin 606 -> 0 bytes
data/images/black/24/on.png | Bin 583 -> 0 bytes
data/images/black/24/question.png | Bin 587 -> 0 bytes
data/images/black/24/wait.png | Bin 641 -> 0 bytes
data/images/white/22/off.png | Bin 0 -> 587 bytes
data/images/white/22/on.png | Bin 0 -> 533 bytes
data/images/white/22/question.png | Bin 0 -> 558 bytes
data/images/white/22/wait.png | Bin 0 -> 588 bytes
data/images/white/24/off.png | Bin 628 -> 0 bytes
data/images/white/24/on.png | Bin 579 -> 0 bytes
data/images/white/24/question.png | Bin 590 -> 0 bytes
data/images/white/24/wait.png | Bin 647 -> 0 bytes
data/resources/icons.qrc | 41 ++++++++++---
data/resources/mainwindow.qrc | 44 --------------
src/leap/bitmask/gui/eip_status.py | 12 ++--
src/leap/bitmask/gui/mail_status.py | 12 ++--
src/leap/bitmask/gui/ui/advanced_key_management.ui | 4 +-
src/leap/bitmask/gui/ui/eip_status.ui | 13 ++---
src/leap/bitmask/gui/ui/eippreferences.ui | 4 +-
src/leap/bitmask/gui/ui/loggerwindow.ui | 4 +-
src/leap/bitmask/gui/ui/login.ui | 6 +-
src/leap/bitmask/gui/ui/mail_status.ui | 6 +-
src/leap/bitmask/gui/ui/mainwindow.ui | 4 +-
src/leap/bitmask/gui/ui/preferences.ui | 4 +-
src/leap/bitmask/gui/ui/wizard.ui | 64 ++++++++++-----------
src/leap/bitmask/gui/wizard.py | 6 +-
31 files changed, 104 insertions(+), 122 deletions(-)
create mode 100644 data/images/black/22/off.png
create mode 100644 data/images/black/22/on.png
create mode 100644 data/images/black/22/question.png
create mode 100644 data/images/black/22/wait.png
delete mode 100644 data/images/black/24/off.png
delete mode 100644 data/images/black/24/on.png
delete mode 100644 data/images/black/24/question.png
delete mode 100644 data/images/black/24/wait.png
create mode 100644 data/images/white/22/off.png
create mode 100644 data/images/white/22/on.png
create mode 100644 data/images/white/22/question.png
create mode 100644 data/images/white/22/wait.png
delete mode 100644 data/images/white/24/off.png
delete mode 100644 data/images/white/24/on.png
delete mode 100644 data/images/white/24/question.png
delete mode 100644 data/images/white/24/wait.png
delete mode 100644 data/resources/mainwindow.qrc
diff --git a/Makefile b/Makefile
index 73437449..0008cb39 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ PROJFILE = data/bitmask.pro
#UI files to compile
UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui
#Qt resource files to compile
-RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc eipstatus.qrc
+RESOURCES = icons.qrc flags.qrc locale.qrc loggerwindow.qrc
#pyuic4 and pyrcc4 binaries
PYUIC = pyside-uic
diff --git a/data/images/black/22/off.png b/data/images/black/22/off.png
new file mode 100644
index 00000000..65afeef2
Binary files /dev/null and b/data/images/black/22/off.png differ
diff --git a/data/images/black/22/on.png b/data/images/black/22/on.png
new file mode 100644
index 00000000..229140a3
Binary files /dev/null and b/data/images/black/22/on.png differ
diff --git a/data/images/black/22/question.png b/data/images/black/22/question.png
new file mode 100644
index 00000000..bb259fac
Binary files /dev/null and b/data/images/black/22/question.png differ
diff --git a/data/images/black/22/wait.png b/data/images/black/22/wait.png
new file mode 100644
index 00000000..c267363b
Binary files /dev/null and b/data/images/black/22/wait.png differ
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
deleted file mode 100644
index 72d41d18..00000000
Binary files a/data/images/black/24/off.png and /dev/null differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
deleted file mode 100644
index e75d7d9a..00000000
Binary files a/data/images/black/24/on.png and /dev/null differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
deleted file mode 100644
index efa11b12..00000000
Binary files a/data/images/black/24/question.png and /dev/null differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
deleted file mode 100644
index 7eb78f77..00000000
Binary files a/data/images/black/24/wait.png and /dev/null differ
diff --git a/data/images/white/22/off.png b/data/images/white/22/off.png
new file mode 100644
index 00000000..bd4bb0ee
Binary files /dev/null and b/data/images/white/22/off.png differ
diff --git a/data/images/white/22/on.png b/data/images/white/22/on.png
new file mode 100644
index 00000000..3a3d5b55
Binary files /dev/null and b/data/images/white/22/on.png differ
diff --git a/data/images/white/22/question.png b/data/images/white/22/question.png
new file mode 100644
index 00000000..bd2a6292
Binary files /dev/null and b/data/images/white/22/question.png differ
diff --git a/data/images/white/22/wait.png b/data/images/white/22/wait.png
new file mode 100644
index 00000000..e0fb53df
Binary files /dev/null and b/data/images/white/22/wait.png differ
diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png
deleted file mode 100644
index 5ded2a42..00000000
Binary files a/data/images/white/24/off.png and /dev/null differ
diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png
deleted file mode 100644
index 48fbd5f7..00000000
Binary files a/data/images/white/24/on.png and /dev/null differ
diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png
deleted file mode 100644
index e2188150..00000000
Binary files a/data/images/white/24/question.png and /dev/null differ
diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png
deleted file mode 100644
index cbe7d598..00000000
Binary files a/data/images/white/24/wait.png and /dev/null differ
diff --git a/data/resources/icons.qrc b/data/resources/icons.qrc
index 1cc574e2..7fda6197 100644
--- a/data/resources/icons.qrc
+++ b/data/resources/icons.qrc
@@ -1,11 +1,38 @@
- ../images/mail-locked.png
- ../images/mail-unlocked.png
- ../images/light/16/down-arrow.png
- ../images/light/16/up-arrow.png
- ../images/light/64/network-eip-acquiring.png
- ../images/light/64/network-eip-down.png
- ../images/light/64/network-eip-up.png
+
+
+ ../images/mask-icon.png
+
+
+ ../images/black/off.svg
+ ../images/black/on.svg
+ ../images/black/question.svg
+ ../images/black/wait.svg
+ ../images/black/22/off.png
+ ../images/black/22/on.png
+ ../images/black/22/question.png
+ ../images/black/22/wait.png
+
+ ../images/white/off.svg
+ ../images/white/on.svg
+ ../images/white/question.svg
+ ../images/white/wait.svg
+ ../images/white/22/off.png
+ ../images/white/22/on.png
+ ../images/white/22/question.png
+ ../images/white/22/wait.png
+
+
+ ../images/black/32/user.png
+
+
+ ../images/black/32/earth.png
+ ../images/black/32/arrow-down.png
+ ../images/black/32/arrow-up.png
+
+
+ ../images/black/32/email.png
+
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
deleted file mode 100644
index c400bb71..00000000
--- a/data/resources/mainwindow.qrc
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
- ../images/black/32/arrow-down.png
- ../images/black/32/arrow-up.png
- ../images/black/32/cloud.png
- ../images/black/32/contract.png
- ../images/black/32/earth-square.png
- ../images/black/32/earth.png
- ../images/black/32/email-square.png
- ../images/black/32/email.png
- ../images/black/32/expand.png
- ../images/black/32/gear.png
- ../images/black/32/off.png
-
- ../images/black/off.svg
- ../images/black/on.svg
- ../images/black/question.svg
- ../images/black/wait.svg
- ../images/black/24/off.png
- ../images/black/24/on.png
- ../images/black/24/question.png
- ../images/black/24/wait.png
-
- ../images/white/off.svg
- ../images/white/on.svg
- ../images/white/question.svg
- ../images/white/wait.svg
- ../images/white/24/off.png
- ../images/white/24/on.png
- ../images/white/24/question.png
- ../images/white/24/wait.png
-
- ../images/mask-launcher.png
- ../images/mask-icon.png
- ../images/leap-gray-big.png
- ../images/leap-color-big.png
- ../images/conn_connecting.png
- ../images/conn_connected.png
- ../images/conn_error.png
- ../images/conn_connecting-light.png
- ../images/conn_connected-light.png
- ../images/conn_error-light.png
-
-
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 836f984a..1b0e5b92 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -214,15 +214,15 @@ class EIPStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/24/wait.png",
- ":/images/black/24/on.png",
- ":/images/black/24/off.png")
+ ":/images/black/22/wait.png",
+ ":/images/black/22/on.png",
+ ":/images/black/22/off.png")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/24/wait.png",
- ":/images/white/24/on.png",
- ":/images/white/24/off.png")
+ ":/images/white/22/wait.png",
+ ":/images/white/22/on.png",
+ ":/images/white/22/off.png")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index 831c6788..d523f449 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -134,15 +134,15 @@ class MailStatusWidget(QtGui.QWidget):
WIN : light icons
"""
EIP_ICONS = EIP_ICONS_TRAY = (
- ":/images/black/24/wait.png",
- ":/images/black/24/on.png",
- ":/images/black/24/off.png")
+ ":/images/black/22/wait.png",
+ ":/images/black/22/on.png",
+ ":/images/black/22/off.png")
if IS_LINUX:
EIP_ICONS_TRAY = (
- ":/images/white/24/wait.png",
- ":/images/white/24/on.png",
- ":/images/white/24/off.png")
+ ":/images/white/22/wait.png",
+ ":/images/white/22/on.png",
+ ":/images/white/22/off.png")
self.CONNECTING_ICON = QtGui.QPixmap(EIP_ICONS[0])
self.CONNECTED_ICON = QtGui.QPixmap(EIP_ICONS[1])
diff --git a/src/leap/bitmask/gui/ui/advanced_key_management.ui b/src/leap/bitmask/gui/ui/advanced_key_management.ui
index 3b567347..72f70d24 100644
--- a/src/leap/bitmask/gui/ui/advanced_key_management.ui
+++ b/src/leap/bitmask/gui/ui/advanced_key_management.ui
@@ -14,7 +14,7 @@
Advanced Key Management
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -184,7 +184,7 @@
-
+
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index adbd8964..4aaa682a 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -60,7 +60,7 @@
- :/images/black/32/earth.png
+ :/images/black/32/earth.png
@@ -103,15 +103,15 @@
- 24
- 24
+ 22
+ 22
- :/images/black/24/off.png
+ :/images/black/22/off.pngtrue
@@ -162,7 +162,7 @@
0.0 KB/s
-
+ :/images/black/32/arrow-down.png:/images/black/32/arrow-down.png
@@ -213,7 +213,7 @@
0.0 KB/s
-
+ :/images/black/32/arrow-up.png:/images/black/32/arrow-up.png
@@ -265,7 +265,6 @@
-
diff --git a/src/leap/bitmask/gui/ui/eippreferences.ui b/src/leap/bitmask/gui/ui/eippreferences.ui
index a3050683..1a5fcd24 100644
--- a/src/leap/bitmask/gui/ui/eippreferences.ui
+++ b/src/leap/bitmask/gui/ui/eippreferences.ui
@@ -14,7 +14,7 @@
Encrypted Internet Preferences
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -96,7 +96,7 @@
pbSaveGateway
-
+
diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index b19ed91a..fd8644c9 100644
--- a/src/leap/bitmask/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
@@ -14,7 +14,7 @@
Logs
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -180,7 +180,7 @@
-
+
diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index cd20108e..26decc6d 100644
--- a/src/leap/bitmask/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
@@ -170,7 +170,7 @@
- :/images/black/32/user.png
+ :/images/black/32/user.pngfalse
@@ -209,7 +209,7 @@
0
- 26
+ 2518
@@ -299,7 +299,7 @@
chkRemember
-
+
diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui
index 64b8ba8c..6fd63aec 100644
--- a/src/leap/bitmask/gui/ui/mail_status.ui
+++ b/src/leap/bitmask/gui/ui/mail_status.ui
@@ -60,7 +60,7 @@
- :/images/black/24/off.png
+ :/images/black/22/off.pngtrue
@@ -104,14 +104,14 @@
- :/images/black/32/email.png
+ :/images/black/32/email.png
-
+
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 5bd21484..5dc48f29 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -32,7 +32,7 @@
Bitmask
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -399,7 +399,7 @@
-
+
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index e187c016..cd4d3a77 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -14,7 +14,7 @@
Preferences
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -174,7 +174,7 @@
-
+
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 5473310b..0e28ecbf 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -26,7 +26,7 @@
Bitmask Provider Setup
-
+ :/images/mask-icon.png:/images/mask-icon.png
@@ -177,14 +177,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -194,7 +194,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -208,14 +208,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -225,7 +225,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -239,14 +239,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -256,7 +256,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -580,14 +580,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -597,7 +597,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -611,14 +611,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -628,7 +628,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -663,14 +663,14 @@
- 24
- 24
+ 22
+ 22
- 24
- 24
+ 22
+ 22
@@ -680,7 +680,7 @@
- :/images/black/24/question.png
+ :/images/black/22/question.png
@@ -883,7 +883,7 @@
rdoLogin
-
+
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 175d744c..0223c053 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -70,9 +70,9 @@ class Wizard(QtGui.QWizard):
self.setPixmap(QtGui.QWizard.LogoPixmap,
QtGui.QPixmap(":/images/mask-icon.png"))
- self.QUESTION_ICON = QtGui.QPixmap(":/images/black/24/question.png")
- self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png")
- self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png")
+ self.QUESTION_ICON = QtGui.QPixmap(":/images/black/22/question.png")
+ self.ERROR_ICON = QtGui.QPixmap(":/images/black/22/off.png")
+ self.OK_ICON = QtGui.QPixmap(":/images/black/22/on.png")
self._selected_services = set()
self._shown_services = set()
--
cgit v1.2.3
From 4e3de46b0398f363c65a74197ebd858f6d577b81 Mon Sep 17 00:00:00 2001
From: elijah
Date: Mon, 11 Aug 2014 15:36:25 -0700
Subject: added more country flags
---
data/images/countries/ar.png | Bin 0 -> 506 bytes
data/images/countries/at.png | Bin 0 -> 403 bytes
data/images/countries/au.png | Bin 0 -> 673 bytes
data/images/countries/bd.png | Bin 0 -> 504 bytes
data/images/countries/be.png | Bin 0 -> 449 bytes
data/images/countries/br.png | Bin 0 -> 593 bytes
data/images/countries/ca.png | Bin 0 -> 628 bytes
data/images/countries/cat.png | Bin 0 -> 398 bytes
data/images/countries/ch.png | Bin 0 -> 367 bytes
data/images/countries/cl.png | Bin 0 -> 450 bytes
data/images/countries/cn.png | Bin 0 -> 472 bytes
data/images/countries/co.png | Bin 0 -> 483 bytes
data/images/countries/cy.png | Bin 0 -> 428 bytes
data/images/countries/cz.png | Bin 0 -> 476 bytes
data/images/countries/de.png | Bin 0 -> 545 bytes
data/images/countries/dk.png | Bin 0 -> 495 bytes
data/images/countries/ec.png | Bin 0 -> 500 bytes
data/images/countries/ee.png | Bin 0 -> 429 bytes
data/images/countries/es.png | Bin 0 -> 469 bytes
data/images/countries/fi.png | Bin 0 -> 489 bytes
data/images/countries/fr.png | Bin 0 -> 545 bytes
data/images/countries/gb.png | Bin 0 -> 599 bytes
data/images/countries/gr.png | Bin 0 -> 487 bytes
data/images/countries/hk.png | Bin 0 -> 527 bytes
data/images/countries/hu.png | Bin 0 -> 432 bytes
data/images/countries/id.png | Bin 0 -> 430 bytes
data/images/countries/ie.png | Bin 0 -> 481 bytes
data/images/countries/il.png | Bin 0 -> 431 bytes
data/images/countries/in.png | Bin 0 -> 503 bytes
data/images/countries/iq.png | Bin 0 -> 515 bytes
data/images/countries/ir.png | Bin 0 -> 512 bytes
data/images/countries/is.png | Bin 0 -> 532 bytes
data/images/countries/it.png | Bin 0 -> 420 bytes
data/images/countries/jp.png | Bin 0 -> 420 bytes
data/images/countries/kh.png | Bin 0 -> 549 bytes
data/images/countries/kr.png | Bin 0 -> 592 bytes
data/images/countries/lb.png | Bin 0 -> 517 bytes
data/images/countries/ly.png | Bin 0 -> 419 bytes
data/images/countries/mx.png | Bin 0 -> 574 bytes
data/images/countries/my.png | Bin 0 -> 571 bytes
data/images/countries/ng.png | Bin 0 -> 482 bytes
data/images/countries/no.png | Bin 0 -> 512 bytes
data/images/countries/nz.png | Bin 0 -> 639 bytes
data/images/countries/pe.png | Bin 0 -> 397 bytes
data/images/countries/pk.png | Bin 0 -> 569 bytes
data/images/countries/pl.png | Bin 0 -> 374 bytes
data/images/countries/ps.png | Bin 0 -> 472 bytes
data/images/countries/py.png | Bin 0 -> 473 bytes
data/images/countries/ru.png | Bin 0 -> 420 bytes
data/images/countries/se.png | Bin 0 -> 542 bytes
data/images/countries/sg.png | Bin 0 -> 468 bytes
data/images/countries/tn.png | Bin 0 -> 495 bytes
data/images/countries/ua.png | Bin 0 -> 446 bytes
data/images/countries/ve.png | Bin 0 -> 528 bytes
data/images/countries/vn.png | Bin 0 -> 474 bytes
data/images/countries/za.png | Bin 0 -> 642 bytes
data/resources/eipstatus.qrc | 7 -----
data/resources/flags.qrc | 63 ++++++++++++++++++++++++++++++++++++++++++
58 files changed, 63 insertions(+), 7 deletions(-)
create mode 100755 data/images/countries/ar.png
create mode 100755 data/images/countries/at.png
create mode 100755 data/images/countries/au.png
create mode 100755 data/images/countries/bd.png
create mode 100755 data/images/countries/be.png
create mode 100755 data/images/countries/br.png
create mode 100755 data/images/countries/ca.png
create mode 100644 data/images/countries/cat.png
create mode 100755 data/images/countries/ch.png
create mode 100755 data/images/countries/cl.png
create mode 100755 data/images/countries/cn.png
create mode 100755 data/images/countries/co.png
create mode 100755 data/images/countries/cy.png
create mode 100755 data/images/countries/cz.png
create mode 100755 data/images/countries/de.png
create mode 100755 data/images/countries/dk.png
create mode 100755 data/images/countries/ec.png
create mode 100755 data/images/countries/ee.png
create mode 100755 data/images/countries/es.png
create mode 100755 data/images/countries/fi.png
create mode 100755 data/images/countries/fr.png
create mode 100644 data/images/countries/gb.png
create mode 100755 data/images/countries/gr.png
create mode 100755 data/images/countries/hk.png
create mode 100755 data/images/countries/hu.png
create mode 100755 data/images/countries/id.png
create mode 100755 data/images/countries/ie.png
create mode 100755 data/images/countries/il.png
create mode 100755 data/images/countries/in.png
create mode 100755 data/images/countries/iq.png
create mode 100755 data/images/countries/ir.png
create mode 100755 data/images/countries/is.png
create mode 100755 data/images/countries/it.png
create mode 100755 data/images/countries/jp.png
create mode 100755 data/images/countries/kh.png
create mode 100755 data/images/countries/kr.png
create mode 100755 data/images/countries/lb.png
create mode 100755 data/images/countries/ly.png
create mode 100755 data/images/countries/mx.png
create mode 100755 data/images/countries/my.png
create mode 100755 data/images/countries/ng.png
create mode 100755 data/images/countries/no.png
create mode 100755 data/images/countries/nz.png
create mode 100755 data/images/countries/pe.png
create mode 100755 data/images/countries/pk.png
create mode 100755 data/images/countries/pl.png
create mode 100755 data/images/countries/ps.png
create mode 100755 data/images/countries/py.png
create mode 100755 data/images/countries/ru.png
create mode 100755 data/images/countries/se.png
create mode 100755 data/images/countries/sg.png
create mode 100755 data/images/countries/tn.png
create mode 100755 data/images/countries/ua.png
create mode 100755 data/images/countries/ve.png
create mode 100755 data/images/countries/vn.png
create mode 100755 data/images/countries/za.png
delete mode 100644 data/resources/eipstatus.qrc
create mode 100644 data/resources/flags.qrc
diff --git a/data/images/countries/ar.png b/data/images/countries/ar.png
new file mode 100755
index 00000000..e5ef8f1f
Binary files /dev/null and b/data/images/countries/ar.png differ
diff --git a/data/images/countries/at.png b/data/images/countries/at.png
new file mode 100755
index 00000000..0f15f34f
Binary files /dev/null and b/data/images/countries/at.png differ
diff --git a/data/images/countries/au.png b/data/images/countries/au.png
new file mode 100755
index 00000000..a01389a7
Binary files /dev/null and b/data/images/countries/au.png differ
diff --git a/data/images/countries/bd.png b/data/images/countries/bd.png
new file mode 100755
index 00000000..076a8bf8
Binary files /dev/null and b/data/images/countries/bd.png differ
diff --git a/data/images/countries/be.png b/data/images/countries/be.png
new file mode 100755
index 00000000..d86ebc80
Binary files /dev/null and b/data/images/countries/be.png differ
diff --git a/data/images/countries/br.png b/data/images/countries/br.png
new file mode 100755
index 00000000..9b1a5538
Binary files /dev/null and b/data/images/countries/br.png differ
diff --git a/data/images/countries/ca.png b/data/images/countries/ca.png
new file mode 100755
index 00000000..1f204193
Binary files /dev/null and b/data/images/countries/ca.png differ
diff --git a/data/images/countries/cat.png b/data/images/countries/cat.png
new file mode 100644
index 00000000..5041e308
Binary files /dev/null and b/data/images/countries/cat.png differ
diff --git a/data/images/countries/ch.png b/data/images/countries/ch.png
new file mode 100755
index 00000000..242ec01a
Binary files /dev/null and b/data/images/countries/ch.png differ
diff --git a/data/images/countries/cl.png b/data/images/countries/cl.png
new file mode 100755
index 00000000..29c6d61b
Binary files /dev/null and b/data/images/countries/cl.png differ
diff --git a/data/images/countries/cn.png b/data/images/countries/cn.png
new file mode 100755
index 00000000..89144146
Binary files /dev/null and b/data/images/countries/cn.png differ
diff --git a/data/images/countries/co.png b/data/images/countries/co.png
new file mode 100755
index 00000000..a118ff4a
Binary files /dev/null and b/data/images/countries/co.png differ
diff --git a/data/images/countries/cy.png b/data/images/countries/cy.png
new file mode 100755
index 00000000..5b1ad6c0
Binary files /dev/null and b/data/images/countries/cy.png differ
diff --git a/data/images/countries/cz.png b/data/images/countries/cz.png
new file mode 100755
index 00000000..c8403dd2
Binary files /dev/null and b/data/images/countries/cz.png differ
diff --git a/data/images/countries/de.png b/data/images/countries/de.png
new file mode 100755
index 00000000..ac4a9773
Binary files /dev/null and b/data/images/countries/de.png differ
diff --git a/data/images/countries/dk.png b/data/images/countries/dk.png
new file mode 100755
index 00000000..e2993d3c
Binary files /dev/null and b/data/images/countries/dk.png differ
diff --git a/data/images/countries/ec.png b/data/images/countries/ec.png
new file mode 100755
index 00000000..0caa0b1e
Binary files /dev/null and b/data/images/countries/ec.png differ
diff --git a/data/images/countries/ee.png b/data/images/countries/ee.png
new file mode 100755
index 00000000..0c82efb7
Binary files /dev/null and b/data/images/countries/ee.png differ
diff --git a/data/images/countries/es.png b/data/images/countries/es.png
new file mode 100755
index 00000000..c2de2d71
Binary files /dev/null and b/data/images/countries/es.png differ
diff --git a/data/images/countries/fi.png b/data/images/countries/fi.png
new file mode 100755
index 00000000..14ec091b
Binary files /dev/null and b/data/images/countries/fi.png differ
diff --git a/data/images/countries/fr.png b/data/images/countries/fr.png
new file mode 100755
index 00000000..8332c4ec
Binary files /dev/null and b/data/images/countries/fr.png differ
diff --git a/data/images/countries/gb.png b/data/images/countries/gb.png
new file mode 100644
index 00000000..ff701e19
Binary files /dev/null and b/data/images/countries/gb.png differ
diff --git a/data/images/countries/gr.png b/data/images/countries/gr.png
new file mode 100755
index 00000000..8651ade7
Binary files /dev/null and b/data/images/countries/gr.png differ
diff --git a/data/images/countries/hk.png b/data/images/countries/hk.png
new file mode 100755
index 00000000..d5c380ca
Binary files /dev/null and b/data/images/countries/hk.png differ
diff --git a/data/images/countries/hu.png b/data/images/countries/hu.png
new file mode 100755
index 00000000..7baafe44
Binary files /dev/null and b/data/images/countries/hu.png differ
diff --git a/data/images/countries/id.png b/data/images/countries/id.png
new file mode 100755
index 00000000..c6bc0faf
Binary files /dev/null and b/data/images/countries/id.png differ
diff --git a/data/images/countries/ie.png b/data/images/countries/ie.png
new file mode 100755
index 00000000..26baa31e
Binary files /dev/null and b/data/images/countries/ie.png differ
diff --git a/data/images/countries/il.png b/data/images/countries/il.png
new file mode 100755
index 00000000..2ca772d0
Binary files /dev/null and b/data/images/countries/il.png differ
diff --git a/data/images/countries/in.png b/data/images/countries/in.png
new file mode 100755
index 00000000..e4d7e81a
Binary files /dev/null and b/data/images/countries/in.png differ
diff --git a/data/images/countries/iq.png b/data/images/countries/iq.png
new file mode 100755
index 00000000..878a3514
Binary files /dev/null and b/data/images/countries/iq.png differ
diff --git a/data/images/countries/ir.png b/data/images/countries/ir.png
new file mode 100755
index 00000000..c5fd136a
Binary files /dev/null and b/data/images/countries/ir.png differ
diff --git a/data/images/countries/is.png b/data/images/countries/is.png
new file mode 100755
index 00000000..b8f6d0f0
Binary files /dev/null and b/data/images/countries/is.png differ
diff --git a/data/images/countries/it.png b/data/images/countries/it.png
new file mode 100755
index 00000000..89692f74
Binary files /dev/null and b/data/images/countries/it.png differ
diff --git a/data/images/countries/jp.png b/data/images/countries/jp.png
new file mode 100755
index 00000000..325fbad3
Binary files /dev/null and b/data/images/countries/jp.png differ
diff --git a/data/images/countries/kh.png b/data/images/countries/kh.png
new file mode 100755
index 00000000..30f6bb1b
Binary files /dev/null and b/data/images/countries/kh.png differ
diff --git a/data/images/countries/kr.png b/data/images/countries/kr.png
new file mode 100755
index 00000000..9c0a78eb
Binary files /dev/null and b/data/images/countries/kr.png differ
diff --git a/data/images/countries/lb.png b/data/images/countries/lb.png
new file mode 100755
index 00000000..d0d452bf
Binary files /dev/null and b/data/images/countries/lb.png differ
diff --git a/data/images/countries/ly.png b/data/images/countries/ly.png
new file mode 100755
index 00000000..b163a9f8
Binary files /dev/null and b/data/images/countries/ly.png differ
diff --git a/data/images/countries/mx.png b/data/images/countries/mx.png
new file mode 100755
index 00000000..5bc58ab3
Binary files /dev/null and b/data/images/countries/mx.png differ
diff --git a/data/images/countries/my.png b/data/images/countries/my.png
new file mode 100755
index 00000000..9034cbab
Binary files /dev/null and b/data/images/countries/my.png differ
diff --git a/data/images/countries/ng.png b/data/images/countries/ng.png
new file mode 100755
index 00000000..3eea2e02
Binary files /dev/null and b/data/images/countries/ng.png differ
diff --git a/data/images/countries/no.png b/data/images/countries/no.png
new file mode 100755
index 00000000..160b6b5b
Binary files /dev/null and b/data/images/countries/no.png differ
diff --git a/data/images/countries/nz.png b/data/images/countries/nz.png
new file mode 100755
index 00000000..10d6306d
Binary files /dev/null and b/data/images/countries/nz.png differ
diff --git a/data/images/countries/pe.png b/data/images/countries/pe.png
new file mode 100755
index 00000000..62a04977
Binary files /dev/null and b/data/images/countries/pe.png differ
diff --git a/data/images/countries/pk.png b/data/images/countries/pk.png
new file mode 100755
index 00000000..e9df70ca
Binary files /dev/null and b/data/images/countries/pk.png differ
diff --git a/data/images/countries/pl.png b/data/images/countries/pl.png
new file mode 100755
index 00000000..d413d010
Binary files /dev/null and b/data/images/countries/pl.png differ
diff --git a/data/images/countries/ps.png b/data/images/countries/ps.png
new file mode 100755
index 00000000..f5f54776
Binary files /dev/null and b/data/images/countries/ps.png differ
diff --git a/data/images/countries/py.png b/data/images/countries/py.png
new file mode 100755
index 00000000..cb8723c0
Binary files /dev/null and b/data/images/countries/py.png differ
diff --git a/data/images/countries/ru.png b/data/images/countries/ru.png
new file mode 100755
index 00000000..47da4214
Binary files /dev/null and b/data/images/countries/ru.png differ
diff --git a/data/images/countries/se.png b/data/images/countries/se.png
new file mode 100755
index 00000000..1994653d
Binary files /dev/null and b/data/images/countries/se.png differ
diff --git a/data/images/countries/sg.png b/data/images/countries/sg.png
new file mode 100755
index 00000000..dd34d612
Binary files /dev/null and b/data/images/countries/sg.png differ
diff --git a/data/images/countries/tn.png b/data/images/countries/tn.png
new file mode 100755
index 00000000..183cdd3d
Binary files /dev/null and b/data/images/countries/tn.png differ
diff --git a/data/images/countries/ua.png b/data/images/countries/ua.png
new file mode 100755
index 00000000..09563a21
Binary files /dev/null and b/data/images/countries/ua.png differ
diff --git a/data/images/countries/ve.png b/data/images/countries/ve.png
new file mode 100755
index 00000000..00c90f9a
Binary files /dev/null and b/data/images/countries/ve.png differ
diff --git a/data/images/countries/vn.png b/data/images/countries/vn.png
new file mode 100755
index 00000000..ec7cd48a
Binary files /dev/null and b/data/images/countries/vn.png differ
diff --git a/data/images/countries/za.png b/data/images/countries/za.png
new file mode 100755
index 00000000..57c58e21
Binary files /dev/null and b/data/images/countries/za.png differ
diff --git a/data/resources/eipstatus.qrc b/data/resources/eipstatus.qrc
deleted file mode 100644
index 5d0f2924..00000000
--- a/data/resources/eipstatus.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- ../images/countries/nl.png
- ../images/countries/tr.png
- ../images/countries/us.png
-
-
diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc
new file mode 100644
index 00000000..8bdc9c4c
--- /dev/null
+++ b/data/resources/flags.qrc
@@ -0,0 +1,63 @@
+
+
+ ../images/countries/ar.png
+ ../images/countries/at.png
+ ../images/countries/au.png
+ ../images/countries/bd.png
+ ../images/countries/be.png
+ ../images/countries/br.png
+ ../images/countries/ca.png
+ ../images/countries/cat.png
+ ../images/countries/ch.png
+ ../images/countries/cl.png
+ ../images/countries/cn.png
+ ../images/countries/co.png
+ ../images/countries/cy.png
+ ../images/countries/cz.png
+ ../images/countries/de.png
+ ../images/countries/dk.png
+ ../images/countries/ec.png
+ ../images/countries/ee.png
+ ../images/countries/es.png
+ ../images/countries/fi.png
+ ../images/countries/fr.png
+ ../images/countries/gb.png
+ ../images/countries/gr.png
+ ../images/countries/hk.png
+ ../images/countries/hu.png
+ ../images/countries/id.png
+ ../images/countries/ie.png
+ ../images/countries/il.png
+ ../images/countries/in.png
+ ../images/countries/iq.png
+ ../images/countries/ir.png
+ ../images/countries/is.png
+ ../images/countries/it.png
+ ../images/countries/jp.png
+ ../images/countries/kh.png
+ ../images/countries/kr.png
+ ../images/countries/lb.png
+ ../images/countries/ly.png
+ ../images/countries/mx.png
+ ../images/countries/my.png
+ ../images/countries/ng.png
+ ../images/countries/nl.png
+ ../images/countries/no.png
+ ../images/countries/nz.png
+ ../images/countries/pe.png
+ ../images/countries/pk.png
+ ../images/countries/pl.png
+ ../images/countries/ps.png
+ ../images/countries/py.png
+ ../images/countries/ru.png
+ ../images/countries/se.png
+ ../images/countries/sg.png
+ ../images/countries/tn.png
+ ../images/countries/tr.png
+ ../images/countries/ua.png
+ ../images/countries/us.png
+ ../images/countries/ve.png
+ ../images/countries/vn.png
+ ../images/countries/za.png
+
+
\ No newline at end of file
--
cgit v1.2.3
From 3274c7c52f5afb1481197686c0d2961a605aae8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?=
Date: Mon, 11 Aug 2014 20:19:53 -0300
Subject: We do not have eipstatus.qrc anymore
---
src/leap/bitmask/gui/eip_status.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 1b0e5b92..abd6e2c9 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -793,6 +793,3 @@ class EIPStatusWidget(QtGui.QWidget):
"""
self.set_eip_status("", error=error)
self.set_eip_status_icon("error")
-
-import eipstatus_rc
-assert(eipstatus_rc)
--
cgit v1.2.3
From 516c732fc603a8d26d30110f4fbab1e991006010 Mon Sep 17 00:00:00 2001
From: elijah
Date: Tue, 12 Aug 2014 14:31:33 -0700
Subject: fix missing country flags
---
src/leap/bitmask/gui/ui/eip_status.ui | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index 4aaa682a..0fb861bc 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -266,6 +266,7 @@
+
--
cgit v1.2.3