add watermark image to wizard

8 files changed, 39 insertions, 15 deletions

diff --git a/src/leap/gui/firstrun/connect.py b/src/leap/gui/firstrun/connect.py
index ad7bb13a..209174a1 100644
--- a/src/leap/gui/firstrun/connect.py
+++ b/src/leap/gui/firstrun/connect.py
@@ -12,7 +12,7 @@ from leap.gui.progress import ValidationPage
 from leap.util.web import get_https_domain_and_port
 
 from leap.base import auth
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 
 logger = logging.getLogger(__name__)
 
@@ -31,6 +31,10 @@ class ConnectionPage(ValidationPage):
         self.setSubTitle(subtitle)
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
diff --git a/src/leap/gui/firstrun/intro.py b/src/leap/gui/firstrun/intro.py
index b519362f..8e5014e6 100644
--- a/src/leap/gui/firstrun/intro.py
+++ b/src/leap/gui/firstrun/intro.py
@@ -4,7 +4,7 @@ Intro page used in first run wizard
 
 from PyQt4 import QtGui
 
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 
 
 class IntroPage(QtGui.QWizardPage):
@@ -13,9 +13,9 @@ class IntroPage(QtGui.QWizardPage):
 
         self.setTitle(self.tr("First run wizard"))
 
-        #self.setPixmap(
-            #QtGui.QWizard.WatermarkPixmap,
-            #QtGui.QPixmap(':/images/watermark1.png'))
+        self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
 
         self.setPixmap(
             QtGui.QWizard.LogoPixmap,
diff --git a/src/leap/gui/firstrun/last.py b/src/leap/gui/firstrun/last.py
index f3e467db..6a01ba34 100644
--- a/src/leap/gui/firstrun/last.py
+++ b/src/leap/gui/firstrun/last.py
@@ -6,7 +6,7 @@ import logging
 from PyQt4 import QtGui
 
 from leap.util.coroutines import coroutine
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 
 logger = logging.getLogger(__name__)
 
@@ -19,13 +19,13 @@ class LastPage(QtGui.QWizardPage):
             "Connecting to Encrypted Internet Proxy service..."))
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
-        #self.setPixmap(
-            #QtGui.QWizard.WatermarkPixmap,
-            #QtGui.QPixmap(':/images/watermark2.png'))
-
         self.label = QtGui.QLabel()
         self.label.setWordWrap(True)
 
diff --git a/src/leap/gui/firstrun/login.py b/src/leap/gui/firstrun/login.py
index 3707d3ff..1efceaa9 100644
--- a/src/leap/gui/firstrun/login.py
+++ b/src/leap/gui/firstrun/login.py
@@ -11,7 +11,7 @@ from leap.gui.firstrun.mixins import UserFormMixIn
 from leap.gui.progress import InlineValidationPage
 from leap.gui import styles
 
-from leap.gui.constants import APP_LOGO, FULL_USERNAME_REGEX
+from leap.gui.constants import APP_LOGO, APP_WATERMARK, FULL_USERNAME_REGEX
 
 
 class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
@@ -26,6 +26,10 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
         self.current_page = "login"
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
diff --git a/src/leap/gui/firstrun/providerinfo.py b/src/leap/gui/firstrun/providerinfo.py
index cff4caca..3385e9e7 100644
--- a/src/leap/gui/firstrun/providerinfo.py
+++ b/src/leap/gui/firstrun/providerinfo.py
@@ -5,7 +5,7 @@ import logging
 
 from PyQt4 import QtGui
 
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 from leap.util.translations import translate
 
 logger = logging.getLogger(__name__)
@@ -21,6 +21,10 @@ class ProviderInfoPage(QtGui.QWizardPage):
             "Services offered by this provider"))
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
diff --git a/src/leap/gui/firstrun/providerselect.py b/src/leap/gui/firstrun/providerselect.py
index 917b16fd..36bb4510 100644
--- a/src/leap/gui/firstrun/providerselect.py
+++ b/src/leap/gui/firstrun/providerselect.py
@@ -16,7 +16,7 @@ from leap.gui import styles
 from leap.gui.utils import delay
 from leap.util.web import get_https_domain_and_port
 
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 
 logger = logging.getLogger(__name__)
 
@@ -35,6 +35,10 @@ class SelectProviderPage(InlineValidationPage):
             "to use for your connection")
         )
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
diff --git a/src/leap/gui/firstrun/providersetup.py b/src/leap/gui/firstrun/providersetup.py
index 157a5183..40a14048 100644
--- a/src/leap/gui/firstrun/providersetup.py
+++ b/src/leap/gui/firstrun/providersetup.py
@@ -11,7 +11,7 @@ from PyQt4 import QtGui
 from leap.base import exceptions as baseexceptions
 from leap.gui.progress import ValidationPage
 
-from leap.gui.constants import APP_LOGO
+from leap.gui.constants import APP_LOGO, APP_WATERMARK
 
 logger = logging.getLogger(__name__)
 
@@ -30,6 +30,10 @@ class ProviderSetupValidationPage(ValidationPage):
             self.tr("Gathering configuration options for this provider"))
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))
 
diff --git a/src/leap/gui/firstrun/register.py b/src/leap/gui/firstrun/register.py
index 15278330..2ae926d1 100644
--- a/src/leap/gui/firstrun/register.py
+++ b/src/leap/gui/firstrun/register.py
@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 from leap.base import auth
 from leap.gui import styles
-from leap.gui.constants import APP_LOGO, BARE_USERNAME_REGEX
+from leap.gui.constants import APP_LOGO, APP_WATERMARK, BARE_USERNAME_REGEX
 from leap.gui.progress import InlineValidationPage
 from leap.gui.styles import ErrorLabelStyleSheet
 
@@ -32,6 +32,10 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
         # subtitle is set in the initializePage
 
         self.setPixmap(
+            QtGui.QWizard.WatermarkPixmap,
+            QtGui.QPixmap(APP_WATERMARK))
+
+        self.setPixmap(
             QtGui.QWizard.LogoPixmap,
             QtGui.QPixmap(APP_LOGO))