From 7e48a36a681e89def5826f00e322c3c37b5dfe98 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 10 Aug 2014 15:08:28 -0700 Subject: clean up icons in mainwindow.qrc --- changes/minor-ui-adjustments | 1 + data/images/Arrow-Down-32.png | Bin 1458 -> 0 bytes data/images/Arrow-Up-32.png | Bin 1400 -> 0 bytes data/images/Blue-Arrow-Right-32.png | Bin 1432 -> 0 bytes data/images/Dialog-accept.png | Bin 1316 -> 0 bytes data/images/Dialog-error.png | Bin 1380 -> 0 bytes data/images/Emblem-question.png | Bin 1260 -> 0 bytes data/images/black/24/off.png | Bin 0 -> 663 bytes data/images/black/24/on.png | Bin 0 -> 547 bytes data/images/black/24/question.png | Bin 0 -> 638 bytes data/images/black/24/wait.png | Bin 0 -> 660 bytes data/images/black/32/question.png | Bin 0 -> 797 bytes data/resources/mainwindow.qrc | 11 +++++------ src/leap/bitmask/gui/wizard.py | 6 +++--- 14 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 changes/minor-ui-adjustments delete mode 100644 data/images/Arrow-Down-32.png delete mode 100644 data/images/Arrow-Up-32.png delete mode 100644 data/images/Blue-Arrow-Right-32.png delete mode 100644 data/images/Dialog-accept.png delete mode 100644 data/images/Dialog-error.png delete mode 100644 data/images/Emblem-question.png create mode 100644 data/images/black/24/off.png create mode 100644 data/images/black/24/on.png create mode 100644 data/images/black/24/question.png create mode 100644 data/images/black/24/wait.png create mode 100644 data/images/black/32/question.png 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 Binary files a/data/images/Arrow-Down-32.png and /dev/null differ diff --git a/data/images/Arrow-Up-32.png b/data/images/Arrow-Up-32.png deleted file mode 100644 index 85370ac5..00000000 Binary files a/data/images/Arrow-Up-32.png and /dev/null 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 Binary files a/data/images/Blue-Arrow-Right-32.png and /dev/null differ diff --git a/data/images/Dialog-accept.png b/data/images/Dialog-accept.png deleted file mode 100644 index 5a8a0bdb..00000000 Binary files a/data/images/Dialog-accept.png and /dev/null differ diff --git a/data/images/Dialog-error.png b/data/images/Dialog-error.png deleted file mode 100644 index 51da2f5b..00000000 Binary files a/data/images/Dialog-error.png and /dev/null differ diff --git a/data/images/Emblem-question.png b/data/images/Emblem-question.png deleted file mode 100644 index b2163e5b..00000000 Binary files a/data/images/Emblem-question.png and /dev/null differ diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png new file mode 100644 index 00000000..9786ea0e Binary files /dev/null and b/data/images/black/24/off.png differ diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png new file mode 100644 index 00000000..70e7ff11 Binary files /dev/null and b/data/images/black/24/on.png differ diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png new file mode 100644 index 00000000..3f3f2fd9 Binary files /dev/null and b/data/images/black/24/question.png differ diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png new file mode 100644 index 00000000..37e8f99b Binary files /dev/null and b/data/images/black/24/wait.png differ diff --git a/data/images/black/32/question.png b/data/images/black/32/question.png new file mode 100644 index 00000000..f1aeadd2 Binary files /dev/null and b/data/images/black/32/question.png 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 @@ ../images/black/32/gear.png ../images/black/32/off.png ../images/black/32/on.png + ../images/black/32/question.png ../images/black/32/refresh.png ../images/black/32/user.png ../images/black/32/wait.png + ../images/black/24/off.png + ../images/black/24/on.png + ../images/black/24/question.png + ../images/black/24/wait.png ../images/mask-launcher.png ../images/mask-icon.png ../images/leap-gray-big.png - ../images/Blue-Arrow-Right-32.png ../images/leap-color-big.png - ../images/Arrow-Down-32.png - ../images/Arrow-Up-32.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 - ../images/Dialog-accept.png - ../images/Dialog-error.png - ../images/Emblem-question.png 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() -- cgit v1.2.3