temporarily switch back to using png icons

15 files changed, 31 insertions, 23 deletions

diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
new file mode 100644
index 00000000..72d41d18
--- /dev/null
+++ b/data/images/black/24/off.png
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
new file mode 100644
index 00000000..e75d7d9a
--- /dev/null
+++ b/data/images/black/24/on.png
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
new file mode 100644
index 00000000..efa11b12
--- /dev/null
+++ b/data/images/black/24/question.png
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
new file mode 100644
index 00000000..7eb78f77
--- /dev/null
+++ b/data/images/black/24/wait.png
diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png
new file mode 100644
index 00000000..5ded2a42
--- /dev/null
+++ b/data/images/white/24/off.png
diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png
new file mode 100644
index 00000000..48fbd5f7
--- /dev/null
+++ b/data/images/white/24/on.png
diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png
new file mode 100644
index 00000000..e2188150
--- /dev/null
+++ b/data/images/white/24/question.png
diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png
new file mode 100644
index 00000000..cbe7d598
--- /dev/null
+++ b/data/images/white/24/wait.png
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index ea5900f7..c400bb71 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -16,11 +16,19 @@
     <file>../images/black/on.svg</file>
     <file>../images/black/question.svg</file>
     <file>../images/black/wait.svg</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/white/off.svg</file>
     <file>../images/white/on.svg</file>
     <file>../images/white/question.svg</file>
     <file>../images/white/wait.svg</file>
+    <file>../images/white/24/off.png</file>
+    <file>../images/white/24/on.png</file>
+    <file>../images/white/24/question.png</file>
+    <file>../images/white/24/wait.png</file>
 
     <file>../images/mask-launcher.png</file>
     <file>../images/mask-icon.png</file>
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 05e28f92..836f984a 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/wait.svg",
-            ":/images/black/on.svg",
-            ":/images/black/off.svg")
+            ":/images/black/24/wait.png",
+            ":/images/black/24/on.png",
+            ":/images/black/24/off.png")
 
         if IS_LINUX:
             EIP_ICONS_TRAY = (
-                ":/images/white/wait.svg",
-                ":/images/white/on.svg",
-                ":/images/white/off.svg")
+                ":/images/white/24/wait.png",
+                ":/images/white/24/on.png",
+                ":/images/white/24/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 4ec93d88..831c6788 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/wait.svg",
-            ":/images/black/on.svg",
-            ":/images/black/off.svg")
+            ":/images/black/24/wait.png",
+            ":/images/black/24/on.png",
+            ":/images/black/24/off.png")
 
         if IS_LINUX:
             EIP_ICONS_TRAY = (
-                ":/images/white/wait.svg",
-                ":/images/white/on.svg",
-                ":/images/white/off.svg")
+                ":/images/white/24/wait.png",
+                ":/images/white/24/on.png",
+                ":/images/white/24/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/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index e97add61..adbd8964 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -111,7 +111,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/off.svg</pixmap>
+        <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui
index 6103c77b..64b8ba8c 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/off.svg</pixmap>
+        <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index f67e9dd5..5473310b 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -194,7 +194,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -225,7 +225,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -256,7 +256,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -597,7 +597,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -628,7 +628,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -680,7 +680,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/question.svg</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
          </property>
         </widget>
        </item>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 44f91365..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/black/question.svg")
-        self.ERROR_ICON = QtGui.QPixmap(":/images/black/off.svg")
-        self.OK_ICON = QtGui.QPixmap(":/images/black/on.svg")
+        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()