summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-08-10 15:08:28 -0700
committerelijah <elijah@riseup.net>2014-08-10 21:48:40 -0700
commit7e48a36a681e89def5826f00e322c3c37b5dfe98 (patch)
treeb0ddbd98c5fd11dcc80b5013cbcb3809ed08268d
parentdddd670e8d9fde0772547453696c26c3d08fe5a1 (diff)
clean up icons in mainwindow.qrc
-rw-r--r--changes/minor-ui-adjustments1
-rw-r--r--data/images/Arrow-Down-32.pngbin1458 -> 0 bytes
-rw-r--r--data/images/Arrow-Up-32.pngbin1400 -> 0 bytes
-rw-r--r--data/images/Blue-Arrow-Right-32.pngbin1432 -> 0 bytes
-rw-r--r--data/images/Dialog-accept.pngbin1316 -> 0 bytes
-rw-r--r--data/images/Dialog-error.pngbin1380 -> 0 bytes
-rw-r--r--data/images/Emblem-question.pngbin1260 -> 0 bytes
-rw-r--r--data/images/black/24/off.pngbin0 -> 663 bytes
-rw-r--r--data/images/black/24/on.pngbin0 -> 547 bytes
-rw-r--r--data/images/black/24/question.pngbin0 -> 638 bytes
-rw-r--r--data/images/black/24/wait.pngbin0 -> 660 bytes
-rw-r--r--data/images/black/32/question.pngbin0 -> 797 bytes
-rw-r--r--data/resources/mainwindow.qrc11
-rw-r--r--src/leap/bitmask/gui/wizard.py6
14 files changed, 9 insertions, 9 deletions
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
--- a/data/images/Arrow-Down-32.png
+++ /dev/null
Binary files differ
diff --git a/data/images/Arrow-Up-32.png b/data/images/Arrow-Up-32.png
deleted file mode 100644
index 85370ac5..00000000
--- a/data/images/Arrow-Up-32.png
+++ /dev/null
Binary files 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
--- a/data/images/Blue-Arrow-Right-32.png
+++ /dev/null
Binary files differ
diff --git a/data/images/Dialog-accept.png b/data/images/Dialog-accept.png
deleted file mode 100644
index 5a8a0bdb..00000000
--- a/data/images/Dialog-accept.png
+++ /dev/null
Binary files differ
diff --git a/data/images/Dialog-error.png b/data/images/Dialog-error.png
deleted file mode 100644
index 51da2f5b..00000000
--- a/data/images/Dialog-error.png
+++ /dev/null
Binary files differ
diff --git a/data/images/Emblem-question.png b/data/images/Emblem-question.png
deleted file mode 100644
index b2163e5b..00000000
--- a/data/images/Emblem-question.png
+++ /dev/null
Binary files differ
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
new file mode 100644
index 00000000..9786ea0e
--- /dev/null
+++ b/data/images/black/24/off.png
Binary files differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
new file mode 100644
index 00000000..70e7ff11
--- /dev/null
+++ b/data/images/black/24/on.png
Binary files differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
new file mode 100644
index 00000000..3f3f2fd9
--- /dev/null
+++ b/data/images/black/24/question.png
Binary files differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
new file mode 100644
index 00000000..37e8f99b
--- /dev/null
+++ b/data/images/black/24/wait.png
Binary files differ
diff --git a/data/images/black/32/question.png b/data/images/black/32/question.png
new file mode 100644
index 00000000..f1aeadd2
--- /dev/null
+++ b/data/images/black/32/question.png
Binary files 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 @@
<file>../images/black/32/gear.png</file>
<file>../images/black/32/off.png</file>
<file>../images/black/32/on.png</file>
+ <file>../images/black/32/question.png</file>
<file>../images/black/32/refresh.png</file>
<file>../images/black/32/user.png</file>
<file>../images/black/32/wait.png</file>
+ <file>../images/black/24/off.png</file>
+ <file>../images/black/24/on.png</file>
+ <file>../images/black/24/question.png</file>
+ <file>../images/black/24/wait.png</file>
<file>../images/mask-launcher.png</file>
<file>../images/mask-icon.png</file>
<file>../images/leap-gray-big.png</file>
- <file>../images/Blue-Arrow-Right-32.png</file>
<file>../images/leap-color-big.png</file>
- <file>../images/Arrow-Down-32.png</file>
- <file>../images/Arrow-Up-32.png</file>
<file>../images/conn_connecting.png</file>
<file>../images/conn_connected.png</file>
<file>../images/conn_error.png</file>
<file>../images/conn_connecting-light.png</file>
<file>../images/conn_connected-light.png</file>
<file>../images/conn_error-light.png</file>
- <file>../images/Dialog-accept.png</file>
- <file>../images/Dialog-error.png</file>
- <file>../images/Emblem-question.png</file>
</qresource>
</RCC>
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()