Merge pull request #971 from FashionFreedom/issue-970-add-flag-icons-…

…to-label-language-dropdown feat: add flag icons to label language dropdown
FashionFreedom · Jun 12, 2023 · a9c007d · a9c007d
2 parents 2be514e + 4de494a
commit a9c007d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/src/app/seamly2d/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/seamly2d/dialogs/configpages/preferencesconfigurationpage.cpp
@@ -341,7 +341,9 @@ void PreferencesConfigurationPage::SetLabelComboBox(const QStringList &list)
     for (int i = 0; i < list.size(); ++i)
     {
         QLocale loc = QLocale(list.at(i));
-        ui->labelCombo->addItem(loc.nativeLanguageName(), list.at(i));
+        QString country = QLocale::countryToString(loc.country());
+        QIcon ico(QString("%1/%2.png").arg(":/flags").arg(country));
+        ui->labelCombo->addItem(ico, loc.nativeLanguageName(), list.at(i));
     }
 }
 

diff --git a/src/libs/vmisc/share/resources/flags.qrc b/src/libs/vmisc/share/resources/flags.qrc
@@ -21,5 +21,8 @@
         <file>flags/Poland.png</file>
         <file>flags/Romania.png</file>
         <file>flags/China.png</file>
+        <file>flags/Serbia.png</file>
+        <file>flags/Bosnia And Herzegowina.png</file>
+        <file>flags/Croatia.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/vmisc/share/resources/flags/Bosnia And Herzegowina.png b/src/libs/vmisc/share/resources/flags/Bosnia And Herzegowina.png
diff --git a/src/libs/vmisc/share/resources/flags/Croatia.png b/src/libs/vmisc/share/resources/flags/Croatia.png
diff --git a/src/libs/vmisc/share/resources/flags/Serbia.png b/src/libs/vmisc/share/resources/flags/Serbia.png