From 6771ba8958d385509f7cc55acab13fe14873e0c2 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
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 @@
<string>Advanced Key Management</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_4">
@@ -184,7 +184,7 @@
</layout>
</widget>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/earth.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/earth.png</pixmap>
</property>
</widget>
</item>
@@ -103,15 +103,15 @@
<widget class="QLabel" name="lblVPNStatusIcon">
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -162,7 +162,7 @@
<string>0.0 KB/s</string>
</property>
<property name="icon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/black/32/arrow-down.png</normaloff>:/images/black/32/arrow-down.png</iconset>
</property>
<property name="flat">
@@ -213,7 +213,7 @@
<string>0.0 KB/s</string>
</property>
<property name="icon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/black/32/arrow-up.png</normaloff>:/images/black/32/arrow-up.png</iconset>
</property>
<property name="flat">
@@ -265,7 +265,6 @@
</layout>
</widget>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
<include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
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 @@
<string>Encrypted Internet Preferences</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@@ -96,7 +96,7 @@
<tabstop>pbSaveGateway</tabstop>
</tabstops>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string>Logs</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -180,7 +180,7 @@
</tabstops>
<resources>
<include location="../../../../../data/resources/loggerwindow.qrc"/>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/user.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/user.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
@@ -209,7 +209,7 @@
<number>0</number>
</property>
<property name="rightMargin">
- <number>26</number>
+ <number>25</number>
</property>
<property name="bottomMargin">
<number>18</number>
@@ -299,7 +299,7 @@
<tabstop>chkRemember</tabstop>
</tabstops>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -104,14 +104,14 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/email.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/email.png</pixmap>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string>Bitmask</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<property name="inputMethodHints">
@@ -399,7 +399,7 @@
</action>
</widget>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
<include location="../../../../../data/resources/locale.qrc"/>
</resources>
<connections/>
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 @@
<string>Preferences</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -174,7 +174,7 @@
</layout>
</widget>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
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 @@
<string>Bitmask Provider Setup</string>
</property>
<property name="windowIcon">
- <iconset resource="../../../../../data/resources/mainwindow.qrc">
+ <iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
<property name="modal">
@@ -177,14 +177,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -194,7 +194,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -208,14 +208,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -225,7 +225,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -239,14 +239,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -256,7 +256,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -580,14 +580,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -597,7 +597,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -611,14 +611,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -628,7 +628,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -663,14 +663,14 @@
</property>
<property name="minimumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
- <height>24</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<property name="scaledContents">
@@ -680,7 +680,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+ <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
</property>
</widget>
</item>
@@ -883,7 +883,7 @@
<tabstop>rdoLogin</tabstop>
</tabstops>
<resources>
- <include location="../../../../../data/resources/mainwindow.qrc"/>
+ <include location="../../../../../data/resources/icons.qrc"/>
<include location="../../../../../data/resources/locale.qrc"/>
</resources>
<connections>
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