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.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