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? --- 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 ++-- 6 files changed, 77 insertions(+), 23 deletions(-) (limited to 'src/leap/bitmask') 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.svg true 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.svg true 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