used 22x22 pixel icons instead of 24x24 pixel icons (since ubuntu needs 22 anyway)

18 files changed, 34 insertions, 51 deletions

diff --git a/data/images/black/22/off.png b/data/images/black/22/off.png
new file mode 100644
index 00000000..65afeef2
--- /dev/null
+++ b/data/images/black/22/off.png
diff --git a/data/images/black/22/on.png b/data/images/black/22/on.png
new file mode 100644
index 00000000..229140a3
--- /dev/null
+++ b/data/images/black/22/on.png
diff --git a/data/images/black/22/question.png b/data/images/black/22/question.png
new file mode 100644
index 00000000..bb259fac
--- /dev/null
+++ b/data/images/black/22/question.png
diff --git a/data/images/black/22/wait.png b/data/images/black/22/wait.png
new file mode 100644
index 00000000..c267363b
--- /dev/null
+++ b/data/images/black/22/wait.png
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
deleted file mode 100644
index 72d41d18..00000000
--- a/data/images/black/24/off.png
+++ /dev/null
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
deleted file mode 100644
index e75d7d9a..00000000
--- a/data/images/black/24/on.png
+++ /dev/null
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
deleted file mode 100644
index efa11b12..00000000
--- a/data/images/black/24/question.png
+++ /dev/null
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
deleted file mode 100644
index 7eb78f77..00000000
--- a/data/images/black/24/wait.png
+++ /dev/null
diff --git a/data/images/white/22/off.png b/data/images/white/22/off.png
new file mode 100644
index 00000000..bd4bb0ee
--- /dev/null
+++ b/data/images/white/22/off.png
diff --git a/data/images/white/22/on.png b/data/images/white/22/on.png
new file mode 100644
index 00000000..3a3d5b55
--- /dev/null
+++ b/data/images/white/22/on.png
diff --git a/data/images/white/22/question.png b/data/images/white/22/question.png
new file mode 100644
index 00000000..bd2a6292
--- /dev/null
+++ b/data/images/white/22/question.png
diff --git a/data/images/white/22/wait.png b/data/images/white/22/wait.png
new file mode 100644
index 00000000..e0fb53df
--- /dev/null
+++ b/data/images/white/22/wait.png
diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png
deleted file mode 100644
index 5ded2a42..00000000
--- a/data/images/white/24/off.png
+++ /dev/null
diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png
deleted file mode 100644
index 48fbd5f7..00000000
--- a/data/images/white/24/on.png
+++ /dev/null
diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png
deleted file mode 100644
index e2188150..00000000
--- a/data/images/white/24/question.png
+++ /dev/null
diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png
deleted file mode 100644
index cbe7d598..00000000
--- a/data/images/white/24/wait.png
+++ /dev/null
diff --git a/data/resources/icons.qrc b/data/resources/icons.qrc
index 1cc574e2..7fda6197 100644
--- a/data/resources/icons.qrc
+++ b/data/resources/icons.qrc
@@ -1,11 +1,38 @@
 <RCC>
   <qresource prefix="/">
-    <file>../images/mail-locked.png</file>
-    <file>../images/mail-unlocked.png</file>
-    <file>../images/light/16/down-arrow.png</file>
-    <file>../images/light/16/up-arrow.png</file>
-    <file>../images/light/64/network-eip-acquiring.png</file>
-    <file>../images/light/64/network-eip-down.png</file>
-    <file>../images/light/64/network-eip-up.png</file>
+
+    <!-- used as window icon -->
+    <file>../images/mask-icon.png</file>
+
+    <!-- round status icons -->
+    <file>../images/black/off.svg</file>
+    <file>../images/black/on.svg</file>
+    <file>../images/black/question.svg</file>
+    <file>../images/black/wait.svg</file>
+    <file>../images/black/22/off.png</file>
+    <file>../images/black/22/on.png</file>
+    <file>../images/black/22/question.png</file>
+    <file>../images/black/22/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/22/off.png</file>
+    <file>../images/white/22/on.png</file>
+    <file>../images/white/22/question.png</file>
+    <file>../images/white/22/wait.png</file>
+
+    <!-- used by login -->
+    <file>../images/black/32/user.png</file>
+
+    <!-- used by eip status -->
+    <file>../images/black/32/earth.png</file>
+    <file>../images/black/32/arrow-down.png</file>
+    <file>../images/black/32/arrow-up.png</file>
+
+    <!-- used by email status -->
+    <file>../images/black/32/email.png</file>
+
   </qresource>
 </RCC>
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
deleted file mode 100644
index c400bb71..00000000
--- a/data/resources/mainwindow.qrc
+++ /dev/null
@@ -1,44 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>../images/black/32/arrow-down.png</file>
-    <file>../images/black/32/arrow-up.png</file>
-    <file>../images/black/32/cloud.png</file>
-    <file>../images/black/32/contract.png</file>
-    <file>../images/black/32/earth-square.png</file>
-    <file>../images/black/32/earth.png</file>
-    <file>../images/black/32/email-square.png</file>
-    <file>../images/black/32/email.png</file>
-    <file>../images/black/32/expand.png</file>
-    <file>../images/black/32/gear.png</file>
-    <file>../images/black/32/off.png</file>
-
-    <file>../images/black/off.svg</file>
-    <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>
-    <file>../images/leap-gray-big.png</file>
-    <file>../images/leap-color-big.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>
-  </qresource>
-</RCC>