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) --- 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 +- 12 files changed, 69 insertions(+), 70 deletions(-) (limited to 'src') 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.png true @@ -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.png false @@ -209,7 +209,7 @@ 0 - 26 + 25 18 @@ -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.png true @@ -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