From 6aa7612ceb05269dfc3aaa02a961ddaef67908df Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 11 Aug 2014 15:33:53 -0700
Subject: removed unused icons

---
 data/images/black/32/cloud.png                 | Bin 468 -> 0 bytes
 data/images/black/32/contract.png              | Bin 417 -> 0 bytes
 data/images/black/32/earth-square.png          | Bin 1068 -> 0 bytes
 data/images/black/32/email-square.png          | Bin 787 -> 0 bytes
 data/images/black/32/expand.png                | Bin 451 -> 0 bytes
 data/images/black/32/gear.png                  | Bin 644 -> 0 bytes
 data/images/black/32/refresh.png               | Bin 624 -> 0 bytes
 data/images/conn_connected-light.png           | Bin 426 -> 0 bytes
 data/images/conn_connected.png                 | Bin 426 -> 0 bytes
 data/images/conn_connecting-light.png          | Bin 791 -> 0 bytes
 data/images/conn_connecting.png                | Bin 712 -> 0 bytes
 data/images/conn_error-light.png               | Bin 1457 -> 0 bytes
 data/images/conn_error.png                     | Bin 1429 -> 0 bytes
 data/images/favicon.ico                        | Bin 1150 -> 0 bytes
 data/images/leap-client.icns                   | Bin 27456 -> 0 bytes
 data/images/leap-client.tiff                   | Bin 3598 -> 0 bytes
 data/images/leap-color-big.png                 | Bin 30322 -> 0 bytes
 data/images/leap-gray-big.png                  | Bin 17246 -> 0 bytes
 data/images/light/16/accept.png                | Bin 285 -> 0 bytes
 data/images/light/16/down-arrow.png            | Bin 356 -> 0 bytes
 data/images/light/16/error.png                 | Bin 355 -> 0 bytes
 data/images/light/16/refresh.png               | Bin 472 -> 0 bytes
 data/images/light/16/up-arrow.png              | Bin 357 -> 0 bytes
 data/images/light/64/network-eip-acquiring.png | Bin 791 -> 0 bytes
 data/images/light/64/network-eip-down.png      | Bin 1429 -> 0 bytes
 data/images/light/64/network-eip-up.png        | Bin 426 -> 0 bytes
 data/images/mail-locked.png                    | Bin 2326 -> 0 bytes
 data/images/mail-unlocked.png                  | Bin 2791 -> 0 bytes
 data/images/mask-launcher.png                  | Bin 37759 -> 0 bytes
 data/images/mask-small.png                     | Bin 18172 -> 0 bytes
 data/images/white/32/arrow-down.png            | Bin 486 -> 0 bytes
 data/images/white/32/arrow-up.png              | Bin 463 -> 0 bytes
 data/images/white/32/cloud.png                 | Bin 504 -> 0 bytes
 data/images/white/32/contract.png              | Bin 417 -> 0 bytes
 data/images/white/32/earth-square.png          | Bin 1068 -> 0 bytes
 data/images/white/32/earth.png                 | Bin 896 -> 0 bytes
 data/images/white/32/email-square.png          | Bin 787 -> 0 bytes
 data/images/white/32/email.png                 | Bin 622 -> 0 bytes
 data/images/white/32/expand.png                | Bin 451 -> 0 bytes
 data/images/white/32/gear.png                  | Bin 656 -> 0 bytes
 data/images/white/32/refresh.png               | Bin 654 -> 0 bytes
 data/images/white/32/user.png                  | Bin 556 -> 0 bytes
 42 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 data/images/black/32/cloud.png
 delete mode 100644 data/images/black/32/contract.png
 delete mode 100644 data/images/black/32/earth-square.png
 delete mode 100644 data/images/black/32/email-square.png
 delete mode 100644 data/images/black/32/expand.png
 delete mode 100644 data/images/black/32/gear.png
 delete mode 100644 data/images/black/32/refresh.png
 delete mode 100644 data/images/conn_connected-light.png
 delete mode 100644 data/images/conn_connected.png
 delete mode 100644 data/images/conn_connecting-light.png
 delete mode 100644 data/images/conn_connecting.png
 delete mode 100644 data/images/conn_error-light.png
 delete mode 100644 data/images/conn_error.png
 delete mode 100644 data/images/favicon.ico
 delete mode 100644 data/images/leap-client.icns
 delete mode 100644 data/images/leap-client.tiff
 delete mode 100644 data/images/leap-color-big.png
 delete mode 100644 data/images/leap-gray-big.png
 delete mode 100644 data/images/light/16/accept.png
 delete mode 100644 data/images/light/16/down-arrow.png
 delete mode 100644 data/images/light/16/error.png
 delete mode 100644 data/images/light/16/refresh.png
 delete mode 100644 data/images/light/16/up-arrow.png
 delete mode 100644 data/images/light/64/network-eip-acquiring.png
 delete mode 100644 data/images/light/64/network-eip-down.png
 delete mode 100644 data/images/light/64/network-eip-up.png
 delete mode 100644 data/images/mail-locked.png
 delete mode 100644 data/images/mail-unlocked.png
 delete mode 100644 data/images/mask-launcher.png
 delete mode 100644 data/images/mask-small.png
 delete mode 100644 data/images/white/32/arrow-down.png
 delete mode 100644 data/images/white/32/arrow-up.png
 delete mode 100644 data/images/white/32/cloud.png
 delete mode 100644 data/images/white/32/contract.png
 delete mode 100644 data/images/white/32/earth-square.png
 delete mode 100644 data/images/white/32/earth.png
 delete mode 100644 data/images/white/32/email-square.png
 delete mode 100644 data/images/white/32/email.png
 delete mode 100644 data/images/white/32/expand.png
 delete mode 100644 data/images/white/32/gear.png
 delete mode 100644 data/images/white/32/refresh.png
 delete mode 100644 data/images/white/32/user.png

diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png
deleted file mode 100644
index 10cbd62d..00000000
Binary files a/data/images/black/32/cloud.png and /dev/null differ
diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png
deleted file mode 100644
index 9f0ee605..00000000
Binary files a/data/images/black/32/contract.png and /dev/null differ
diff --git a/data/images/black/32/earth-square.png b/data/images/black/32/earth-square.png
deleted file mode 100644
index da7bf2cf..00000000
Binary files a/data/images/black/32/earth-square.png and /dev/null differ
diff --git a/data/images/black/32/email-square.png b/data/images/black/32/email-square.png
deleted file mode 100644
index 499d7a8f..00000000
Binary files a/data/images/black/32/email-square.png and /dev/null differ
diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png
deleted file mode 100644
index c581503d..00000000
Binary files a/data/images/black/32/expand.png and /dev/null differ
diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png
deleted file mode 100644
index 93c8742d..00000000
Binary files a/data/images/black/32/gear.png and /dev/null differ
diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png
deleted file mode 100644
index ad67f563..00000000
Binary files a/data/images/black/32/refresh.png and /dev/null differ
diff --git a/data/images/conn_connected-light.png b/data/images/conn_connected-light.png
deleted file mode 100644
index a0db2a22..00000000
Binary files a/data/images/conn_connected-light.png and /dev/null differ
diff --git a/data/images/conn_connected.png b/data/images/conn_connected.png
deleted file mode 100644
index a5d20497..00000000
Binary files a/data/images/conn_connected.png and /dev/null differ
diff --git a/data/images/conn_connecting-light.png b/data/images/conn_connecting-light.png
deleted file mode 100644
index 83e3ea75..00000000
Binary files a/data/images/conn_connecting-light.png and /dev/null differ
diff --git a/data/images/conn_connecting.png b/data/images/conn_connecting.png
deleted file mode 100644
index 31b6e617..00000000
Binary files a/data/images/conn_connecting.png and /dev/null differ
diff --git a/data/images/conn_error-light.png b/data/images/conn_error-light.png
deleted file mode 100644
index 8cee20fe..00000000
Binary files a/data/images/conn_error-light.png and /dev/null differ
diff --git a/data/images/conn_error.png b/data/images/conn_error.png
deleted file mode 100644
index 85669af6..00000000
Binary files a/data/images/conn_error.png and /dev/null differ
diff --git a/data/images/favicon.ico b/data/images/favicon.ico
deleted file mode 100644
index 7f41dd1d..00000000
Binary files a/data/images/favicon.ico and /dev/null differ
diff --git a/data/images/leap-client.icns b/data/images/leap-client.icns
deleted file mode 100644
index d5d52cdc..00000000
Binary files a/data/images/leap-client.icns and /dev/null differ
diff --git a/data/images/leap-client.tiff b/data/images/leap-client.tiff
deleted file mode 100644
index 71c95b0d..00000000
Binary files a/data/images/leap-client.tiff and /dev/null differ
diff --git a/data/images/leap-color-big.png b/data/images/leap-color-big.png
deleted file mode 100644
index eafacdcd..00000000
Binary files a/data/images/leap-color-big.png and /dev/null differ
diff --git a/data/images/leap-gray-big.png b/data/images/leap-gray-big.png
deleted file mode 100644
index 1529a74f..00000000
Binary files a/data/images/leap-gray-big.png and /dev/null differ
diff --git a/data/images/light/16/accept.png b/data/images/light/16/accept.png
deleted file mode 100644
index 917a68c4..00000000
Binary files a/data/images/light/16/accept.png and /dev/null differ
diff --git a/data/images/light/16/down-arrow.png b/data/images/light/16/down-arrow.png
deleted file mode 100644
index 9beb5de3..00000000
Binary files a/data/images/light/16/down-arrow.png and /dev/null differ
diff --git a/data/images/light/16/error.png b/data/images/light/16/error.png
deleted file mode 100644
index edc20985..00000000
Binary files a/data/images/light/16/error.png and /dev/null differ
diff --git a/data/images/light/16/refresh.png b/data/images/light/16/refresh.png
deleted file mode 100644
index a948a071..00000000
Binary files a/data/images/light/16/refresh.png and /dev/null differ
diff --git a/data/images/light/16/up-arrow.png b/data/images/light/16/up-arrow.png
deleted file mode 100644
index 4e0ec404..00000000
Binary files a/data/images/light/16/up-arrow.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-acquiring.png b/data/images/light/64/network-eip-acquiring.png
deleted file mode 100644
index 83e3ea75..00000000
Binary files a/data/images/light/64/network-eip-acquiring.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-down.png b/data/images/light/64/network-eip-down.png
deleted file mode 100644
index 85669af6..00000000
Binary files a/data/images/light/64/network-eip-down.png and /dev/null differ
diff --git a/data/images/light/64/network-eip-up.png b/data/images/light/64/network-eip-up.png
deleted file mode 100644
index a0db2a22..00000000
Binary files a/data/images/light/64/network-eip-up.png and /dev/null differ
diff --git a/data/images/mail-locked.png b/data/images/mail-locked.png
deleted file mode 100644
index 2108ca1c..00000000
Binary files a/data/images/mail-locked.png and /dev/null differ
diff --git a/data/images/mail-unlocked.png b/data/images/mail-unlocked.png
deleted file mode 100644
index fc3c11b0..00000000
Binary files a/data/images/mail-unlocked.png and /dev/null differ
diff --git a/data/images/mask-launcher.png b/data/images/mask-launcher.png
deleted file mode 100644
index cb27f8d3..00000000
Binary files a/data/images/mask-launcher.png and /dev/null differ
diff --git a/data/images/mask-small.png b/data/images/mask-small.png
deleted file mode 100644
index 5f5f1b41..00000000
Binary files a/data/images/mask-small.png and /dev/null differ
diff --git a/data/images/white/32/arrow-down.png b/data/images/white/32/arrow-down.png
deleted file mode 100644
index 02ccc540..00000000
Binary files a/data/images/white/32/arrow-down.png and /dev/null differ
diff --git a/data/images/white/32/arrow-up.png b/data/images/white/32/arrow-up.png
deleted file mode 100644
index fbe1f816..00000000
Binary files a/data/images/white/32/arrow-up.png and /dev/null differ
diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png
deleted file mode 100644
index 39d589ef..00000000
Binary files a/data/images/white/32/cloud.png and /dev/null differ
diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png
deleted file mode 100644
index 262ff3c0..00000000
Binary files a/data/images/white/32/contract.png and /dev/null differ
diff --git a/data/images/white/32/earth-square.png b/data/images/white/32/earth-square.png
deleted file mode 100644
index da7bf2cf..00000000
Binary files a/data/images/white/32/earth-square.png and /dev/null differ
diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png
deleted file mode 100644
index efca7ccb..00000000
Binary files a/data/images/white/32/earth.png and /dev/null differ
diff --git a/data/images/white/32/email-square.png b/data/images/white/32/email-square.png
deleted file mode 100644
index 499d7a8f..00000000
Binary files a/data/images/white/32/email-square.png and /dev/null differ
diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png
deleted file mode 100644
index abb36035..00000000
Binary files a/data/images/white/32/email.png and /dev/null differ
diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png
deleted file mode 100644
index 0ec28dcc..00000000
Binary files a/data/images/white/32/expand.png and /dev/null differ
diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png
deleted file mode 100644
index 83f8d5ff..00000000
Binary files a/data/images/white/32/gear.png and /dev/null differ
diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png
deleted file mode 100644
index 36a89da9..00000000
Binary files a/data/images/white/32/refresh.png and /dev/null differ
diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png
deleted file mode 100644
index ff8edd00..00000000
Binary files a/data/images/white/32/user.png and /dev/null differ
-- 
cgit v1.2.3


From 6771ba8958d385509f7cc55acab13fe14873e0c2 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 11 Aug 2014 15:35:33 -0700
Subject: used 22x22 pixel icons instead of 24x24 pixel icons (since ubuntu
 needs 22 anyway)

---
 Makefile                                           |   2 +-
 data/images/black/22/off.png                       | Bin 0 -> 542 bytes
 data/images/black/22/on.png                        | Bin 0 -> 519 bytes
 data/images/black/22/question.png                  | Bin 0 -> 562 bytes
 data/images/black/22/wait.png                      | Bin 0 -> 596 bytes
 data/images/black/24/off.png                       | Bin 606 -> 0 bytes
 data/images/black/24/on.png                        | Bin 583 -> 0 bytes
 data/images/black/24/question.png                  | Bin 587 -> 0 bytes
 data/images/black/24/wait.png                      | Bin 641 -> 0 bytes
 data/images/white/22/off.png                       | Bin 0 -> 587 bytes
 data/images/white/22/on.png                        | Bin 0 -> 533 bytes
 data/images/white/22/question.png                  | Bin 0 -> 558 bytes
 data/images/white/22/wait.png                      | Bin 0 -> 588 bytes
 data/images/white/24/off.png                       | Bin 628 -> 0 bytes
 data/images/white/24/on.png                        | Bin 579 -> 0 bytes
 data/images/white/24/question.png                  | Bin 590 -> 0 bytes
 data/images/white/24/wait.png                      | Bin 647 -> 0 bytes
 data/resources/icons.qrc                           |  41 ++++++++++---
 data/resources/mainwindow.qrc                      |  44 --------------
 src/leap/bitmask/gui/eip_status.py                 |  12 ++--
 src/leap/bitmask/gui/mail_status.py                |  12 ++--
 src/leap/bitmask/gui/ui/advanced_key_management.ui |   4 +-
 src/leap/bitmask/gui/ui/eip_status.ui              |  13 ++---
 src/leap/bitmask/gui/ui/eippreferences.ui          |   4 +-
 src/leap/bitmask/gui/ui/loggerwindow.ui            |   4 +-
 src/leap/bitmask/gui/ui/login.ui                   |   6 +-
 src/leap/bitmask/gui/ui/mail_status.ui             |   6 +-
 src/leap/bitmask/gui/ui/mainwindow.ui              |   4 +-
 src/leap/bitmask/gui/ui/preferences.ui             |   4 +-
 src/leap/bitmask/gui/ui/wizard.ui                  |  64 ++++++++++-----------
 src/leap/bitmask/gui/wizard.py                     |   6 +-
 31 files changed, 104 insertions(+), 122 deletions(-)
 create mode 100644 data/images/black/22/off.png
 create mode 100644 data/images/black/22/on.png
 create mode 100644 data/images/black/22/question.png
 create mode 100644 data/images/black/22/wait.png
 delete mode 100644 data/images/black/24/off.png
 delete mode 100644 data/images/black/24/on.png
 delete mode 100644 data/images/black/24/question.png
 delete mode 100644 data/images/black/24/wait.png
 create mode 100644 data/images/white/22/off.png
 create mode 100644 data/images/white/22/on.png
 create mode 100644 data/images/white/22/question.png
 create mode 100644 data/images/white/22/wait.png
 delete mode 100644 data/images/white/24/off.png
 delete mode 100644 data/images/white/24/on.png
 delete mode 100644 data/images/white/24/question.png
 delete mode 100644 data/images/white/24/wait.png
 delete mode 100644 data/resources/mainwindow.qrc

diff --git a/Makefile b/Makefile
index 73437449..0008cb39 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ PROJFILE = data/bitmask.pro
 #UI files to compile
 UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui
 #Qt resource files to compile
-RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc eipstatus.qrc
+RESOURCES = icons.qrc flags.qrc locale.qrc loggerwindow.qrc
 
 #pyuic4 and pyrcc4 binaries
 PYUIC = pyside-uic
diff --git a/data/images/black/22/off.png b/data/images/black/22/off.png
new file mode 100644
index 00000000..65afeef2
Binary files /dev/null and b/data/images/black/22/off.png differ
diff --git a/data/images/black/22/on.png b/data/images/black/22/on.png
new file mode 100644
index 00000000..229140a3
Binary files /dev/null and b/data/images/black/22/on.png differ
diff --git a/data/images/black/22/question.png b/data/images/black/22/question.png
new file mode 100644
index 00000000..bb259fac
Binary files /dev/null and b/data/images/black/22/question.png differ
diff --git a/data/images/black/22/wait.png b/data/images/black/22/wait.png
new file mode 100644
index 00000000..c267363b
Binary files /dev/null and b/data/images/black/22/wait.png differ
diff --git a/data/images/black/24/off.png b/data/images/black/24/off.png
deleted file mode 100644
index 72d41d18..00000000
Binary files a/data/images/black/24/off.png and /dev/null differ
diff --git a/data/images/black/24/on.png b/data/images/black/24/on.png
deleted file mode 100644
index e75d7d9a..00000000
Binary files a/data/images/black/24/on.png and /dev/null differ
diff --git a/data/images/black/24/question.png b/data/images/black/24/question.png
deleted file mode 100644
index efa11b12..00000000
Binary files a/data/images/black/24/question.png and /dev/null differ
diff --git a/data/images/black/24/wait.png b/data/images/black/24/wait.png
deleted file mode 100644
index 7eb78f77..00000000
Binary files a/data/images/black/24/wait.png and /dev/null differ
diff --git a/data/images/white/22/off.png b/data/images/white/22/off.png
new file mode 100644
index 00000000..bd4bb0ee
Binary files /dev/null and b/data/images/white/22/off.png differ
diff --git a/data/images/white/22/on.png b/data/images/white/22/on.png
new file mode 100644
index 00000000..3a3d5b55
Binary files /dev/null and b/data/images/white/22/on.png differ
diff --git a/data/images/white/22/question.png b/data/images/white/22/question.png
new file mode 100644
index 00000000..bd2a6292
Binary files /dev/null and b/data/images/white/22/question.png differ
diff --git a/data/images/white/22/wait.png b/data/images/white/22/wait.png
new file mode 100644
index 00000000..e0fb53df
Binary files /dev/null and b/data/images/white/22/wait.png differ
diff --git a/data/images/white/24/off.png b/data/images/white/24/off.png
deleted file mode 100644
index 5ded2a42..00000000
Binary files a/data/images/white/24/off.png and /dev/null differ
diff --git a/data/images/white/24/on.png b/data/images/white/24/on.png
deleted file mode 100644
index 48fbd5f7..00000000
Binary files a/data/images/white/24/on.png and /dev/null differ
diff --git a/data/images/white/24/question.png b/data/images/white/24/question.png
deleted file mode 100644
index e2188150..00000000
Binary files a/data/images/white/24/question.png and /dev/null differ
diff --git a/data/images/white/24/wait.png b/data/images/white/24/wait.png
deleted file mode 100644
index cbe7d598..00000000
Binary files a/data/images/white/24/wait.png and /dev/null differ
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>
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 836f984a..1b0e5b92 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/24/wait.png",
-            ":/images/black/24/on.png",
-            ":/images/black/24/off.png")
+            ":/images/black/22/wait.png",
+            ":/images/black/22/on.png",
+            ":/images/black/22/off.png")
 
         if IS_LINUX:
             EIP_ICONS_TRAY = (
-                ":/images/white/24/wait.png",
-                ":/images/white/24/on.png",
-                ":/images/white/24/off.png")
+                ":/images/white/22/wait.png",
+                ":/images/white/22/on.png",
+                ":/images/white/22/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 831c6788..d523f449 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/24/wait.png",
-            ":/images/black/24/on.png",
-            ":/images/black/24/off.png")
+            ":/images/black/22/wait.png",
+            ":/images/black/22/on.png",
+            ":/images/black/22/off.png")
 
         if IS_LINUX:
             EIP_ICONS_TRAY = (
-                ":/images/white/24/wait.png",
-                ":/images/white/24/on.png",
-                ":/images/white/24/off.png")
+                ":/images/white/22/wait.png",
+                ":/images/white/22/on.png",
+                ":/images/white/22/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/advanced_key_management.ui b/src/leap/bitmask/gui/ui/advanced_key_management.ui
index 3b567347..72f70d24 100644
--- a/src/leap/bitmask/gui/ui/advanced_key_management.ui
+++ b/src/leap/bitmask/gui/ui/advanced_key_management.ui
@@ -14,7 +14,7 @@
    <string>Advanced Key Management</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
@@ -184,7 +184,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index adbd8964..4aaa682a 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -60,7 +60,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/earth.png</pixmap>
+        <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/earth.png</pixmap>
        </property>
       </widget>
      </item>
@@ -103,15 +103,15 @@
       <widget class="QLabel" name="lblVPNStatusIcon">
        <property name="maximumSize">
         <size>
-         <width>24</width>
-         <height>24</height>
+         <width>22</width>
+         <height>22</height>
         </size>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/off.png</pixmap>
+        <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -162,7 +162,7 @@
              <string>0.0 KB/s</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../../../data/resources/mainwindow.qrc">
+             <iconset resource="../../../../../data/resources/icons.qrc">
               <normaloff>:/images/black/32/arrow-down.png</normaloff>:/images/black/32/arrow-down.png</iconset>
             </property>
             <property name="flat">
@@ -213,7 +213,7 @@
              <string>0.0 KB/s</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../../../data/resources/mainwindow.qrc">
+             <iconset resource="../../../../../data/resources/icons.qrc">
               <normaloff>:/images/black/32/arrow-up.png</normaloff>:/images/black/32/arrow-up.png</iconset>
             </property>
             <property name="flat">
@@ -265,7 +265,6 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
   <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
diff --git a/src/leap/bitmask/gui/ui/eippreferences.ui b/src/leap/bitmask/gui/ui/eippreferences.ui
index a3050683..1a5fcd24 100644
--- a/src/leap/bitmask/gui/ui/eippreferences.ui
+++ b/src/leap/bitmask/gui/ui/eippreferences.ui
@@ -14,7 +14,7 @@
    <string>Encrypted Internet Preferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -96,7 +96,7 @@
   <tabstop>pbSaveGateway</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index b19ed91a..fd8644c9 100644
--- a/src/leap/bitmask/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
@@ -14,7 +14,7 @@
    <string>Logs</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -180,7 +180,7 @@
  </tabstops>
  <resources>
   <include location="../../../../../data/resources/loggerwindow.qrc"/>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index cd20108e..26decc6d 100644
--- a/src/leap/bitmask/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
@@ -170,7 +170,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/user.png</pixmap>
+      <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/user.png</pixmap>
      </property>
      <property name="scaledContents">
       <bool>false</bool>
@@ -209,7 +209,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>26</number>
+       <number>25</number>
       </property>
       <property name="bottomMargin">
        <number>18</number>
@@ -299,7 +299,7 @@
   <tabstop>chkRemember</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/mail_status.ui b/src/leap/bitmask/gui/ui/mail_status.ui
index 64b8ba8c..6fd63aec 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/24/off.png</pixmap>
+        <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -104,14 +104,14 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/email.png</pixmap>
+      <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/email.png</pixmap>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 5bd21484..5dc48f29 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -32,7 +32,7 @@
    <string>Bitmask</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <property name="inputMethodHints">
@@ -399,7 +399,7 @@
   </action>
  </widget>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
   <include location="../../../../../data/resources/locale.qrc"/>
  </resources>
  <connections/>
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index e187c016..cd4d3a77 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -14,7 +14,7 @@
    <string>Preferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
@@ -174,7 +174,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 5473310b..0e28ecbf 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -26,7 +26,7 @@
    <string>Bitmask Provider Setup</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <property name="modal">
@@ -177,14 +177,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -194,7 +194,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -208,14 +208,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -225,7 +225,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -239,14 +239,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -256,7 +256,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -580,14 +580,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -597,7 +597,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -611,14 +611,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -628,7 +628,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -663,14 +663,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="scaledContents">
@@ -680,7 +680,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/24/question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -883,7 +883,7 @@
   <tabstop>rdoLogin</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/icons.qrc"/>
   <include location="../../../../../data/resources/locale.qrc"/>
  </resources>
  <connections>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 175d744c..0223c053 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/24/question.png")
-        self.ERROR_ICON = QtGui.QPixmap(":/images/black/24/off.png")
-        self.OK_ICON = QtGui.QPixmap(":/images/black/24/on.png")
+        self.QUESTION_ICON = QtGui.QPixmap(":/images/black/22/question.png")
+        self.ERROR_ICON = QtGui.QPixmap(":/images/black/22/off.png")
+        self.OK_ICON = QtGui.QPixmap(":/images/black/22/on.png")
 
         self._selected_services = set()
         self._shown_services = set()
-- 
cgit v1.2.3


From 4e3de46b0398f363c65a74197ebd858f6d577b81 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 11 Aug 2014 15:36:25 -0700
Subject: added more country flags

---
 data/images/countries/ar.png  | Bin 0 -> 506 bytes
 data/images/countries/at.png  | Bin 0 -> 403 bytes
 data/images/countries/au.png  | Bin 0 -> 673 bytes
 data/images/countries/bd.png  | Bin 0 -> 504 bytes
 data/images/countries/be.png  | Bin 0 -> 449 bytes
 data/images/countries/br.png  | Bin 0 -> 593 bytes
 data/images/countries/ca.png  | Bin 0 -> 628 bytes
 data/images/countries/cat.png | Bin 0 -> 398 bytes
 data/images/countries/ch.png  | Bin 0 -> 367 bytes
 data/images/countries/cl.png  | Bin 0 -> 450 bytes
 data/images/countries/cn.png  | Bin 0 -> 472 bytes
 data/images/countries/co.png  | Bin 0 -> 483 bytes
 data/images/countries/cy.png  | Bin 0 -> 428 bytes
 data/images/countries/cz.png  | Bin 0 -> 476 bytes
 data/images/countries/de.png  | Bin 0 -> 545 bytes
 data/images/countries/dk.png  | Bin 0 -> 495 bytes
 data/images/countries/ec.png  | Bin 0 -> 500 bytes
 data/images/countries/ee.png  | Bin 0 -> 429 bytes
 data/images/countries/es.png  | Bin 0 -> 469 bytes
 data/images/countries/fi.png  | Bin 0 -> 489 bytes
 data/images/countries/fr.png  | Bin 0 -> 545 bytes
 data/images/countries/gb.png  | Bin 0 -> 599 bytes
 data/images/countries/gr.png  | Bin 0 -> 487 bytes
 data/images/countries/hk.png  | Bin 0 -> 527 bytes
 data/images/countries/hu.png  | Bin 0 -> 432 bytes
 data/images/countries/id.png  | Bin 0 -> 430 bytes
 data/images/countries/ie.png  | Bin 0 -> 481 bytes
 data/images/countries/il.png  | Bin 0 -> 431 bytes
 data/images/countries/in.png  | Bin 0 -> 503 bytes
 data/images/countries/iq.png  | Bin 0 -> 515 bytes
 data/images/countries/ir.png  | Bin 0 -> 512 bytes
 data/images/countries/is.png  | Bin 0 -> 532 bytes
 data/images/countries/it.png  | Bin 0 -> 420 bytes
 data/images/countries/jp.png  | Bin 0 -> 420 bytes
 data/images/countries/kh.png  | Bin 0 -> 549 bytes
 data/images/countries/kr.png  | Bin 0 -> 592 bytes
 data/images/countries/lb.png  | Bin 0 -> 517 bytes
 data/images/countries/ly.png  | Bin 0 -> 419 bytes
 data/images/countries/mx.png  | Bin 0 -> 574 bytes
 data/images/countries/my.png  | Bin 0 -> 571 bytes
 data/images/countries/ng.png  | Bin 0 -> 482 bytes
 data/images/countries/no.png  | Bin 0 -> 512 bytes
 data/images/countries/nz.png  | Bin 0 -> 639 bytes
 data/images/countries/pe.png  | Bin 0 -> 397 bytes
 data/images/countries/pk.png  | Bin 0 -> 569 bytes
 data/images/countries/pl.png  | Bin 0 -> 374 bytes
 data/images/countries/ps.png  | Bin 0 -> 472 bytes
 data/images/countries/py.png  | Bin 0 -> 473 bytes
 data/images/countries/ru.png  | Bin 0 -> 420 bytes
 data/images/countries/se.png  | Bin 0 -> 542 bytes
 data/images/countries/sg.png  | Bin 0 -> 468 bytes
 data/images/countries/tn.png  | Bin 0 -> 495 bytes
 data/images/countries/ua.png  | Bin 0 -> 446 bytes
 data/images/countries/ve.png  | Bin 0 -> 528 bytes
 data/images/countries/vn.png  | Bin 0 -> 474 bytes
 data/images/countries/za.png  | Bin 0 -> 642 bytes
 data/resources/eipstatus.qrc  |   7 -----
 data/resources/flags.qrc      |  63 ++++++++++++++++++++++++++++++++++++++++++
 58 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100755 data/images/countries/ar.png
 create mode 100755 data/images/countries/at.png
 create mode 100755 data/images/countries/au.png
 create mode 100755 data/images/countries/bd.png
 create mode 100755 data/images/countries/be.png
 create mode 100755 data/images/countries/br.png
 create mode 100755 data/images/countries/ca.png
 create mode 100644 data/images/countries/cat.png
 create mode 100755 data/images/countries/ch.png
 create mode 100755 data/images/countries/cl.png
 create mode 100755 data/images/countries/cn.png
 create mode 100755 data/images/countries/co.png
 create mode 100755 data/images/countries/cy.png
 create mode 100755 data/images/countries/cz.png
 create mode 100755 data/images/countries/de.png
 create mode 100755 data/images/countries/dk.png
 create mode 100755 data/images/countries/ec.png
 create mode 100755 data/images/countries/ee.png
 create mode 100755 data/images/countries/es.png
 create mode 100755 data/images/countries/fi.png
 create mode 100755 data/images/countries/fr.png
 create mode 100644 data/images/countries/gb.png
 create mode 100755 data/images/countries/gr.png
 create mode 100755 data/images/countries/hk.png
 create mode 100755 data/images/countries/hu.png
 create mode 100755 data/images/countries/id.png
 create mode 100755 data/images/countries/ie.png
 create mode 100755 data/images/countries/il.png
 create mode 100755 data/images/countries/in.png
 create mode 100755 data/images/countries/iq.png
 create mode 100755 data/images/countries/ir.png
 create mode 100755 data/images/countries/is.png
 create mode 100755 data/images/countries/it.png
 create mode 100755 data/images/countries/jp.png
 create mode 100755 data/images/countries/kh.png
 create mode 100755 data/images/countries/kr.png
 create mode 100755 data/images/countries/lb.png
 create mode 100755 data/images/countries/ly.png
 create mode 100755 data/images/countries/mx.png
 create mode 100755 data/images/countries/my.png
 create mode 100755 data/images/countries/ng.png
 create mode 100755 data/images/countries/no.png
 create mode 100755 data/images/countries/nz.png
 create mode 100755 data/images/countries/pe.png
 create mode 100755 data/images/countries/pk.png
 create mode 100755 data/images/countries/pl.png
 create mode 100755 data/images/countries/ps.png
 create mode 100755 data/images/countries/py.png
 create mode 100755 data/images/countries/ru.png
 create mode 100755 data/images/countries/se.png
 create mode 100755 data/images/countries/sg.png
 create mode 100755 data/images/countries/tn.png
 create mode 100755 data/images/countries/ua.png
 create mode 100755 data/images/countries/ve.png
 create mode 100755 data/images/countries/vn.png
 create mode 100755 data/images/countries/za.png
 delete mode 100644 data/resources/eipstatus.qrc
 create mode 100644 data/resources/flags.qrc

diff --git a/data/images/countries/ar.png b/data/images/countries/ar.png
new file mode 100755
index 00000000..e5ef8f1f
Binary files /dev/null and b/data/images/countries/ar.png differ
diff --git a/data/images/countries/at.png b/data/images/countries/at.png
new file mode 100755
index 00000000..0f15f34f
Binary files /dev/null and b/data/images/countries/at.png differ
diff --git a/data/images/countries/au.png b/data/images/countries/au.png
new file mode 100755
index 00000000..a01389a7
Binary files /dev/null and b/data/images/countries/au.png differ
diff --git a/data/images/countries/bd.png b/data/images/countries/bd.png
new file mode 100755
index 00000000..076a8bf8
Binary files /dev/null and b/data/images/countries/bd.png differ
diff --git a/data/images/countries/be.png b/data/images/countries/be.png
new file mode 100755
index 00000000..d86ebc80
Binary files /dev/null and b/data/images/countries/be.png differ
diff --git a/data/images/countries/br.png b/data/images/countries/br.png
new file mode 100755
index 00000000..9b1a5538
Binary files /dev/null and b/data/images/countries/br.png differ
diff --git a/data/images/countries/ca.png b/data/images/countries/ca.png
new file mode 100755
index 00000000..1f204193
Binary files /dev/null and b/data/images/countries/ca.png differ
diff --git a/data/images/countries/cat.png b/data/images/countries/cat.png
new file mode 100644
index 00000000..5041e308
Binary files /dev/null and b/data/images/countries/cat.png differ
diff --git a/data/images/countries/ch.png b/data/images/countries/ch.png
new file mode 100755
index 00000000..242ec01a
Binary files /dev/null and b/data/images/countries/ch.png differ
diff --git a/data/images/countries/cl.png b/data/images/countries/cl.png
new file mode 100755
index 00000000..29c6d61b
Binary files /dev/null and b/data/images/countries/cl.png differ
diff --git a/data/images/countries/cn.png b/data/images/countries/cn.png
new file mode 100755
index 00000000..89144146
Binary files /dev/null and b/data/images/countries/cn.png differ
diff --git a/data/images/countries/co.png b/data/images/countries/co.png
new file mode 100755
index 00000000..a118ff4a
Binary files /dev/null and b/data/images/countries/co.png differ
diff --git a/data/images/countries/cy.png b/data/images/countries/cy.png
new file mode 100755
index 00000000..5b1ad6c0
Binary files /dev/null and b/data/images/countries/cy.png differ
diff --git a/data/images/countries/cz.png b/data/images/countries/cz.png
new file mode 100755
index 00000000..c8403dd2
Binary files /dev/null and b/data/images/countries/cz.png differ
diff --git a/data/images/countries/de.png b/data/images/countries/de.png
new file mode 100755
index 00000000..ac4a9773
Binary files /dev/null and b/data/images/countries/de.png differ
diff --git a/data/images/countries/dk.png b/data/images/countries/dk.png
new file mode 100755
index 00000000..e2993d3c
Binary files /dev/null and b/data/images/countries/dk.png differ
diff --git a/data/images/countries/ec.png b/data/images/countries/ec.png
new file mode 100755
index 00000000..0caa0b1e
Binary files /dev/null and b/data/images/countries/ec.png differ
diff --git a/data/images/countries/ee.png b/data/images/countries/ee.png
new file mode 100755
index 00000000..0c82efb7
Binary files /dev/null and b/data/images/countries/ee.png differ
diff --git a/data/images/countries/es.png b/data/images/countries/es.png
new file mode 100755
index 00000000..c2de2d71
Binary files /dev/null and b/data/images/countries/es.png differ
diff --git a/data/images/countries/fi.png b/data/images/countries/fi.png
new file mode 100755
index 00000000..14ec091b
Binary files /dev/null and b/data/images/countries/fi.png differ
diff --git a/data/images/countries/fr.png b/data/images/countries/fr.png
new file mode 100755
index 00000000..8332c4ec
Binary files /dev/null and b/data/images/countries/fr.png differ
diff --git a/data/images/countries/gb.png b/data/images/countries/gb.png
new file mode 100644
index 00000000..ff701e19
Binary files /dev/null and b/data/images/countries/gb.png differ
diff --git a/data/images/countries/gr.png b/data/images/countries/gr.png
new file mode 100755
index 00000000..8651ade7
Binary files /dev/null and b/data/images/countries/gr.png differ
diff --git a/data/images/countries/hk.png b/data/images/countries/hk.png
new file mode 100755
index 00000000..d5c380ca
Binary files /dev/null and b/data/images/countries/hk.png differ
diff --git a/data/images/countries/hu.png b/data/images/countries/hu.png
new file mode 100755
index 00000000..7baafe44
Binary files /dev/null and b/data/images/countries/hu.png differ
diff --git a/data/images/countries/id.png b/data/images/countries/id.png
new file mode 100755
index 00000000..c6bc0faf
Binary files /dev/null and b/data/images/countries/id.png differ
diff --git a/data/images/countries/ie.png b/data/images/countries/ie.png
new file mode 100755
index 00000000..26baa31e
Binary files /dev/null and b/data/images/countries/ie.png differ
diff --git a/data/images/countries/il.png b/data/images/countries/il.png
new file mode 100755
index 00000000..2ca772d0
Binary files /dev/null and b/data/images/countries/il.png differ
diff --git a/data/images/countries/in.png b/data/images/countries/in.png
new file mode 100755
index 00000000..e4d7e81a
Binary files /dev/null and b/data/images/countries/in.png differ
diff --git a/data/images/countries/iq.png b/data/images/countries/iq.png
new file mode 100755
index 00000000..878a3514
Binary files /dev/null and b/data/images/countries/iq.png differ
diff --git a/data/images/countries/ir.png b/data/images/countries/ir.png
new file mode 100755
index 00000000..c5fd136a
Binary files /dev/null and b/data/images/countries/ir.png differ
diff --git a/data/images/countries/is.png b/data/images/countries/is.png
new file mode 100755
index 00000000..b8f6d0f0
Binary files /dev/null and b/data/images/countries/is.png differ
diff --git a/data/images/countries/it.png b/data/images/countries/it.png
new file mode 100755
index 00000000..89692f74
Binary files /dev/null and b/data/images/countries/it.png differ
diff --git a/data/images/countries/jp.png b/data/images/countries/jp.png
new file mode 100755
index 00000000..325fbad3
Binary files /dev/null and b/data/images/countries/jp.png differ
diff --git a/data/images/countries/kh.png b/data/images/countries/kh.png
new file mode 100755
index 00000000..30f6bb1b
Binary files /dev/null and b/data/images/countries/kh.png differ
diff --git a/data/images/countries/kr.png b/data/images/countries/kr.png
new file mode 100755
index 00000000..9c0a78eb
Binary files /dev/null and b/data/images/countries/kr.png differ
diff --git a/data/images/countries/lb.png b/data/images/countries/lb.png
new file mode 100755
index 00000000..d0d452bf
Binary files /dev/null and b/data/images/countries/lb.png differ
diff --git a/data/images/countries/ly.png b/data/images/countries/ly.png
new file mode 100755
index 00000000..b163a9f8
Binary files /dev/null and b/data/images/countries/ly.png differ
diff --git a/data/images/countries/mx.png b/data/images/countries/mx.png
new file mode 100755
index 00000000..5bc58ab3
Binary files /dev/null and b/data/images/countries/mx.png differ
diff --git a/data/images/countries/my.png b/data/images/countries/my.png
new file mode 100755
index 00000000..9034cbab
Binary files /dev/null and b/data/images/countries/my.png differ
diff --git a/data/images/countries/ng.png b/data/images/countries/ng.png
new file mode 100755
index 00000000..3eea2e02
Binary files /dev/null and b/data/images/countries/ng.png differ
diff --git a/data/images/countries/no.png b/data/images/countries/no.png
new file mode 100755
index 00000000..160b6b5b
Binary files /dev/null and b/data/images/countries/no.png differ
diff --git a/data/images/countries/nz.png b/data/images/countries/nz.png
new file mode 100755
index 00000000..10d6306d
Binary files /dev/null and b/data/images/countries/nz.png differ
diff --git a/data/images/countries/pe.png b/data/images/countries/pe.png
new file mode 100755
index 00000000..62a04977
Binary files /dev/null and b/data/images/countries/pe.png differ
diff --git a/data/images/countries/pk.png b/data/images/countries/pk.png
new file mode 100755
index 00000000..e9df70ca
Binary files /dev/null and b/data/images/countries/pk.png differ
diff --git a/data/images/countries/pl.png b/data/images/countries/pl.png
new file mode 100755
index 00000000..d413d010
Binary files /dev/null and b/data/images/countries/pl.png differ
diff --git a/data/images/countries/ps.png b/data/images/countries/ps.png
new file mode 100755
index 00000000..f5f54776
Binary files /dev/null and b/data/images/countries/ps.png differ
diff --git a/data/images/countries/py.png b/data/images/countries/py.png
new file mode 100755
index 00000000..cb8723c0
Binary files /dev/null and b/data/images/countries/py.png differ
diff --git a/data/images/countries/ru.png b/data/images/countries/ru.png
new file mode 100755
index 00000000..47da4214
Binary files /dev/null and b/data/images/countries/ru.png differ
diff --git a/data/images/countries/se.png b/data/images/countries/se.png
new file mode 100755
index 00000000..1994653d
Binary files /dev/null and b/data/images/countries/se.png differ
diff --git a/data/images/countries/sg.png b/data/images/countries/sg.png
new file mode 100755
index 00000000..dd34d612
Binary files /dev/null and b/data/images/countries/sg.png differ
diff --git a/data/images/countries/tn.png b/data/images/countries/tn.png
new file mode 100755
index 00000000..183cdd3d
Binary files /dev/null and b/data/images/countries/tn.png differ
diff --git a/data/images/countries/ua.png b/data/images/countries/ua.png
new file mode 100755
index 00000000..09563a21
Binary files /dev/null and b/data/images/countries/ua.png differ
diff --git a/data/images/countries/ve.png b/data/images/countries/ve.png
new file mode 100755
index 00000000..00c90f9a
Binary files /dev/null and b/data/images/countries/ve.png differ
diff --git a/data/images/countries/vn.png b/data/images/countries/vn.png
new file mode 100755
index 00000000..ec7cd48a
Binary files /dev/null and b/data/images/countries/vn.png differ
diff --git a/data/images/countries/za.png b/data/images/countries/za.png
new file mode 100755
index 00000000..57c58e21
Binary files /dev/null and b/data/images/countries/za.png differ
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
-- 
cgit v1.2.3