summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-12 14:57:17 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-12 14:57:17 -0300
commit4a04005babda280d1366e6be464777b23688311a (patch)
treefcd2f50b23b6b2f113395b83ca3aaf2f32bc98c9
parent25f09f2fb9031a3f7cdf1d960f47fd52fe08a064 (diff)
parent5761e301c939418b9f13481e75feca41842e5fb3 (diff)
Merge remote-tracking branch 'ivan/bug/3425_replace-wizard-images' into develop
-rw-r--r--changes/bug-3425_replace-wizard-images1
-rw-r--r--src/leap/gui/ui/wizard.ui2
-rw-r--r--src/leap/gui/wizard.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changes/bug-3425_replace-wizard-images b/changes/bug-3425_replace-wizard-images
new file mode 100644
index 00000000..cf5cbd9d
--- /dev/null
+++ b/changes/bug-3425_replace-wizard-images
@@ -0,0 +1 @@
+ o Replace wizard images with the rainbow mask. Closes #3425.
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/gui/ui/wizard.ui
index a8f66bbc..5e0108dc 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/gui/ui/wizard.ui
@@ -771,7 +771,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/leap-color-big.png</pixmap>
+ <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap>
</property>
</widget>
</item>
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 2b48fc81..1710b09b 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -75,7 +75,7 @@ class Wizard(QtGui.QWizard):
self.ui.setupUi(self)
self.setPixmap(QtGui.QWizard.LogoPixmap,
- QtGui.QPixmap(":/images/leap-color-small.png"))
+ QtGui.QPixmap(":/images/mask-icon.png"))
self.QUESTION_ICON = QtGui.QPixmap(":/images/Emblem-question.png")
self.ERROR_ICON = QtGui.QPixmap(":/images/Dialog-error.png")