Merge branch 'release-0.6.1'0.6.1

4 files changed, 97 insertions, 52 deletions

diff --git a/data/resources/eipstatus.qrc b/data/resources/eipstatus.qrc
deleted file mode 100644
index 5d0f2924..00000000
--- a/data/resources/eipstatus.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>../images/countries/nl.png</file>
-    <file>../images/countries/tr.png</file>
-    <file>../images/countries/us.png</file>
-  </qresource>
-</RCC>
diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc
new file mode 100644
index 00000000..8bdc9c4c
--- /dev/null
+++ b/data/resources/flags.qrc
@@ -0,0 +1,63 @@
+<RCC>
+  <qresource prefix="/">
+    <file>../images/countries/ar.png</file>
+    <file>../images/countries/at.png</file>
+    <file>../images/countries/au.png</file>
+    <file>../images/countries/bd.png</file>
+    <file>../images/countries/be.png</file>
+    <file>../images/countries/br.png</file>
+    <file>../images/countries/ca.png</file>
+    <file>../images/countries/cat.png</file>
+    <file>../images/countries/ch.png</file>
+    <file>../images/countries/cl.png</file>
+    <file>../images/countries/cn.png</file>
+    <file>../images/countries/co.png</file>
+    <file>../images/countries/cy.png</file>
+    <file>../images/countries/cz.png</file>
+    <file>../images/countries/de.png</file>
+    <file>../images/countries/dk.png</file>
+    <file>../images/countries/ec.png</file>
+    <file>../images/countries/ee.png</file>
+    <file>../images/countries/es.png</file>
+    <file>../images/countries/fi.png</file>
+    <file>../images/countries/fr.png</file>
+    <file>../images/countries/gb.png</file>
+    <file>../images/countries/gr.png</file>
+    <file>../images/countries/hk.png</file>
+    <file>../images/countries/hu.png</file>
+    <file>../images/countries/id.png</file>
+    <file>../images/countries/ie.png</file>
+    <file>../images/countries/il.png</file>
+    <file>../images/countries/in.png</file>
+    <file>../images/countries/iq.png</file>
+    <file>../images/countries/ir.png</file>
+    <file>../images/countries/is.png</file>
+    <file>../images/countries/it.png</file>
+    <file>../images/countries/jp.png</file>
+    <file>../images/countries/kh.png</file>
+    <file>../images/countries/kr.png</file>
+    <file>../images/countries/lb.png</file>
+    <file>../images/countries/ly.png</file>
+    <file>../images/countries/mx.png</file>
+    <file>../images/countries/my.png</file>
+    <file>../images/countries/ng.png</file>
+    <file>../images/countries/nl.png</file>
+    <file>../images/countries/no.png</file>
+    <file>../images/countries/nz.png</file>
+    <file>../images/countries/pe.png</file>
+    <file>../images/countries/pk.png</file>
+    <file>../images/countries/pl.png</file>
+    <file>../images/countries/ps.png</file>
+    <file>../images/countries/py.png</file>
+    <file>../images/countries/ru.png</file>
+    <file>../images/countries/se.png</file>
+    <file>../images/countries/sg.png</file>
+    <file>../images/countries/tn.png</file>
+    <file>../images/countries/tr.png</file>
+    <file>../images/countries/ua.png</file>
+    <file>../images/countries/us.png</file>
+    <file>../images/countries/ve.png</file>
+    <file>../images/countries/vn.png</file>
+    <file>../images/countries/za.png</file>
+  </qresource>
+</RCC>
\ No newline at end of file
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 0a917d5a..00000000
--- a/data/resources/mainwindow.qrc
+++ /dev/null
@@ -1,38 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>../images/white/32/off.png</file>
-    <file>../images/white/32/on.png</file>
-    <file>../images/white/32/wait.png</file>
-    <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/32/on.png</file>
-    <file>../images/black/32/refresh.png</file>
-    <file>../images/black/32/user.png</file>
-    <file>../images/black/32/wait.png</file>
-    <file>../images/mask-launcher.png</file>
-    <file>../images/mask-icon.png</file>
-    <file>../images/leap-gray-big.png</file>
-    <file>../images/Blue-Arrow-Right-32.png</file>
-    <file>../images/leap-color-big.png</file>
-    <file>../images/Arrow-Down-32.png</file>
-    <file>../images/Arrow-Up-32.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>
-    <file>../images/Dialog-accept.png</file>
-    <file>../images/Dialog-error.png</file>
-    <file>../images/Emblem-question.png</file>
-  </qresource>
-</RCC>