From 360aee82bea2992c8fde22079c72509bf420f45e Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Fri, 5 Dec 2014 14:52:24 +0200
Subject: [PATCH] Keep all flags icons in the separate resource file.

--HG--
branch : develop
---
 src/app/app.pro                                   |   3 ++-
 .../dialogs/app/configpages/configurationpage.cpp |   4 ++--
 src/app/main.cpp                                  |   1 +
 src/app/share/resources/flags.qrc                 |  14 ++++++++++++++
 .../resources/{icon => }/flags/CzechRepublic.png  | Bin
 .../share/resources/{icon => }/flags/France.png   | Bin
 .../share/resources/{icon => }/flags/Germany.png  | Bin
 .../resources/{icon => }/flags/Indonesia.png      | Bin
 .../share/resources/{icon => }/flags/Israel.png   | Bin
 .../share/resources/{icon => }/flags/Italy.png    | Bin
 .../resources/{icon => }/flags/Netherlands.png    | Bin
 .../share/resources/{icon => }/flags/Russia.png   | Bin
 .../share/resources/{icon => }/flags/Ukraine.png  | Bin
 .../resources/{icon => }/flags/UnitedStates.png   | Bin
 src/app/share/resources/icon.qrc                  |  10 ----------
 15 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 src/app/share/resources/flags.qrc
 rename src/app/share/resources/{icon => }/flags/CzechRepublic.png (100%)
 rename src/app/share/resources/{icon => }/flags/France.png (100%)
 rename src/app/share/resources/{icon => }/flags/Germany.png (100%)
 rename src/app/share/resources/{icon => }/flags/Indonesia.png (100%)
 rename src/app/share/resources/{icon => }/flags/Israel.png (100%)
 rename src/app/share/resources/{icon => }/flags/Italy.png (100%)
 rename src/app/share/resources/{icon => }/flags/Netherlands.png (100%)
 rename src/app/share/resources/{icon => }/flags/Russia.png (100%)
 rename src/app/share/resources/{icon => }/flags/Ukraine.png (100%)
 rename src/app/share/resources/{icon => }/flags/UnitedStates.png (100%)

diff --git a/src/app/app.pro b/src/app/app.pro
index 0551f4256..68ef40daa 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -52,7 +52,8 @@ RESOURCES += \
     share/resources/cursor.qrc \ # Tools cursor icons.
     share/resources/theme.qrc \ # Windows theme icons.
     share/resources/schema.qrc \ # Schemas for validation xml files.
-    share/resources/measurements.qrc # For measurements files that we save as resource.
+    share/resources/measurements.qrc \ # For measurements files that we save as resource.
+    share/resources/flags.qrc
 
 # Compilation will fail without this files after we added them to this section.
 OTHER_FILES += \
diff --git a/src/app/dialogs/app/configpages/configurationpage.cpp b/src/app/dialogs/app/configpages/configurationpage.cpp
index 1d6d0f624..06e39023a 100644
--- a/src/app/dialogs/app/configpages/configurationpage.cpp
+++ b/src/app/dialogs/app/configpages/configurationpage.cpp
@@ -161,13 +161,13 @@ QGroupBox *ConfigurationPage::LangGroup()
 
         QLocale loc = QLocale(locale);
         QString lang = loc.nativeLanguageName();
-        QIcon ico(QString("%1/%2.png").arg("://icon/flags").arg(QLocale::countryToString(loc.country())));
+        QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(loc.country())));
 
         langCombo->addItem(ico, lang, locale);
     }
 
     // English language is internal and doens't have own *.qm file.
-    QIcon ico(QString("%1/%2.png").arg("://icon/flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
+    QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
     QString lang = QLocale("en_US").nativeLanguageName();
     langCombo->addItem(ico, lang, "en_US");
 
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 8e72651aa..cc660d8f6 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(icon);
     Q_INIT_RESOURCE(schema);
     Q_INIT_RESOURCE(theme);
+    Q_INIT_RESOURCE(flags);
 
     QT_REQUIRE_VERSION(argc, argv, "5.2.1");
 
diff --git a/src/app/share/resources/flags.qrc b/src/app/share/resources/flags.qrc
new file mode 100644
index 000000000..5a33e6161
--- /dev/null
+++ b/src/app/share/resources/flags.qrc
@@ -0,0 +1,14 @@
+<RCC>
+    <qresource prefix="/">
+        <file>flags/CzechRepublic.png</file>
+        <file>flags/France.png</file>
+        <file>flags/Germany.png</file>
+        <file>flags/Indonesia.png</file>
+        <file>flags/Israel.png</file>
+        <file>flags/Italy.png</file>
+        <file>flags/Netherlands.png</file>
+        <file>flags/Russia.png</file>
+        <file>flags/Ukraine.png</file>
+        <file>flags/UnitedStates.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/share/resources/icon/flags/CzechRepublic.png b/src/app/share/resources/flags/CzechRepublic.png
similarity index 100%
rename from src/app/share/resources/icon/flags/CzechRepublic.png
rename to src/app/share/resources/flags/CzechRepublic.png
diff --git a/src/app/share/resources/icon/flags/France.png b/src/app/share/resources/flags/France.png
similarity index 100%
rename from src/app/share/resources/icon/flags/France.png
rename to src/app/share/resources/flags/France.png
diff --git a/src/app/share/resources/icon/flags/Germany.png b/src/app/share/resources/flags/Germany.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Germany.png
rename to src/app/share/resources/flags/Germany.png
diff --git a/src/app/share/resources/icon/flags/Indonesia.png b/src/app/share/resources/flags/Indonesia.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Indonesia.png
rename to src/app/share/resources/flags/Indonesia.png
diff --git a/src/app/share/resources/icon/flags/Israel.png b/src/app/share/resources/flags/Israel.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Israel.png
rename to src/app/share/resources/flags/Israel.png
diff --git a/src/app/share/resources/icon/flags/Italy.png b/src/app/share/resources/flags/Italy.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Italy.png
rename to src/app/share/resources/flags/Italy.png
diff --git a/src/app/share/resources/icon/flags/Netherlands.png b/src/app/share/resources/flags/Netherlands.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Netherlands.png
rename to src/app/share/resources/flags/Netherlands.png
diff --git a/src/app/share/resources/icon/flags/Russia.png b/src/app/share/resources/flags/Russia.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Russia.png
rename to src/app/share/resources/flags/Russia.png
diff --git a/src/app/share/resources/icon/flags/Ukraine.png b/src/app/share/resources/flags/Ukraine.png
similarity index 100%
rename from src/app/share/resources/icon/flags/Ukraine.png
rename to src/app/share/resources/flags/Ukraine.png
diff --git a/src/app/share/resources/icon/flags/UnitedStates.png b/src/app/share/resources/flags/UnitedStates.png
similarity index 100%
rename from src/app/share/resources/icon/flags/UnitedStates.png
rename to src/app/share/resources/flags/UnitedStates.png
diff --git a/src/app/share/resources/icon.qrc b/src/app/share/resources/icon.qrc
index 29d73c217..073e985a0 100644
--- a/src/app/share/resources/icon.qrc
+++ b/src/app/share/resources/icon.qrc
@@ -34,17 +34,8 @@
         <file>icon/32x32/arc_cut.png</file>
         <file>icon/config.png</file>
         <file>icon/pattern_config.png</file>
-        <file>icon/flags/CzechRepublic.png</file>
-        <file>icon/flags/Germany.png</file>
-        <file>icon/flags/UnitedStates.png</file>
-        <file>icon/flags/France.png</file>
-        <file>icon/flags/Israel.png</file>
-        <file>icon/flags/Russia.png</file>
-        <file>icon/flags/Ukraine.png</file>
         <file>icon/Graduation.png</file>
         <file>icon/individual.png</file>
-        <file>icon/flags/Netherlands.png</file>
-        <file>icon/flags/Italy.png</file>
         <file>icon/community_config.png</file>
         <file>icon/32x32/arrowLeft.png</file>
         <file>icon/32x32/arrowRight.png</file>
@@ -61,6 +52,5 @@
         <file>icon/32x32/line_intersect_axis.png</file>
         <file>icon/32x32/arc_intersect_axis.png</file>
         <file>icon/32x32/curve_intersect_axis.png</file>
-        <file>icon/flags/Indonesia.png</file>
     </qresource>
 </RCC>