add flat icon theme

sonichy · Mar 15, 2019 · 5a0fee9 · 5a0fee9
1 parent da71027
commit 5a0fee9
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 3 deletions.
diff --git a/icon/Flat/01d.png b/icon/Flat/01d.png
diff --git a/icon/Flat/01n.png b/icon/Flat/01n.png
diff --git a/icon/Flat/02d.png b/icon/Flat/02d.png
diff --git a/icon/Flat/02n.png b/icon/Flat/02n.png
diff --git a/icon/Flat/03d.png b/icon/Flat/03d.png
diff --git a/icon/Flat/03n.png b/icon/Flat/03n.png
diff --git a/icon/Flat/04d.png b/icon/Flat/04d.png
diff --git a/icon/Flat/04n.png b/icon/Flat/04n.png
diff --git a/icon/Flat/09d.png b/icon/Flat/09d.png
diff --git a/icon/Flat/09n.png b/icon/Flat/09n.png
diff --git a/icon/Flat/10d.png b/icon/Flat/10d.png
diff --git a/icon/Flat/10n.png b/icon/Flat/10n.png
diff --git a/icon/Flat/11d.png b/icon/Flat/11d.png
diff --git a/icon/Flat/11n.png b/icon/Flat/11n.png
diff --git a/icon/Flat/13d.png b/icon/Flat/13d.png
diff --git a/icon/Flat/13n.png b/icon/Flat/13n.png
diff --git a/icon/Flat/50d.png b/icon/Flat/50d.png
diff --git a/icon/Flat/50n.png b/icon/Flat/50n.png
diff --git a/icon/Flat/na.png b/icon/Flat/na.png
diff --git a/icon/custom.png b/icon/custom.png
diff --git a/res.qrc b/res.qrc
@@ -38,5 +38,25 @@
         <file>icon/Default/03d.png</file>
         <file>icon/Default/09d.png</file>
         <file>icon/Default/02n.png</file>
+        <file>icon/Flat/04n.png</file>
+        <file>icon/Flat/na.png</file>
+        <file>icon/Flat/09d.png</file>
+        <file>icon/Flat/03n.png</file>
+        <file>icon/Flat/50d.png</file>
+        <file>icon/Flat/04d.png</file>
+        <file>icon/Flat/03d.png</file>
+        <file>icon/Flat/11d.png</file>
+        <file>icon/Flat/01n.png</file>
+        <file>icon/Flat/09n.png</file>
+        <file>icon/Flat/50n.png</file>
+        <file>icon/Flat/02n.png</file>
+        <file>icon/Flat/10n.png</file>
+        <file>icon/Flat/13n.png</file>
+        <file>icon/Flat/11n.png</file>
+        <file>icon/Flat/13d.png</file>
+        <file>icon/Flat/02d.png</file>
+        <file>icon/Flat/10d.png</file>
+        <file>icon/Flat/01d.png</file>
+        <file>icon/custom.png</file>
     </qresource>
 </RCC>
diff --git a/weatherplugin.cpp b/weatherplugin.cpp
@@ -165,7 +165,7 @@ void WeatherPlugin::invokedMenuItem(const QString &itemKey, const QString &menuI
 
 void WeatherPlugin::MBAbout()
 {
-    QMessageBox aboutMB(QMessageBox::NoIcon, "HTYWeather 5.5", "About\n\nDeepin Linux Dock Weather Plugin.\nAuthor: 黄颖\nE-mail: [email protected]\nSource: https://github.com/sonichy/WEATHER_DDE_DOCK\nAPI: https://openweathermap.org/forecast5");
+    QMessageBox aboutMB(QMessageBox::NoIcon, "HTYWeather 5.6", "About\n\nDeepin Linux Dock Weather Plugin.\nAuthor: 黄颖\nE-mail: [email protected]\nSource: https://github.com/sonichy/WEATHER_DDE_DOCK\nAPI: https://openweathermap.org/forecast5");
     aboutMB.setIconPixmap(QPixmap(":/icon/Default/01d.png"));
     aboutMB.exec();
 }
@@ -256,15 +256,16 @@ void WeatherPlugin::set()
     QComboBox *comboBox_iconTheme = new QComboBox;
     comboBox_iconTheme->addItem(QIcon(":icon/Default/01d.png"), "Default");
     comboBox_iconTheme->addItem(QIcon(":icon/Simple/01d.png"), "Simple");
+    comboBox_iconTheme->addItem(QIcon(":icon/Flat/01d.png"), "Flat");
     QString iconTheme = m_settings.value("IconTheme","").toString();
     if(iconTheme == "" || !iconTheme.startsWith("/")){
-        comboBox_iconTheme->addItem("Custom");
+        comboBox_iconTheme->addItem(QIcon(":icon/custom.png"),"Custom");
     }else{
         comboBox_iconTheme->addItem(QIcon(iconTheme + "/01d.png"), iconTheme);
     }
     comboBox_iconTheme->setCurrentText(iconTheme);
     connect(comboBox_iconTheme, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated), [=](int index){
-        if(index == 2){
+        if(index == 3){
             QString siconTheme = QFileDialog::getExistingDirectory(dialog, "Icon Theme", iconTheme);
             if(siconTheme != ""){
                 QString icon_path = siconTheme + "/01d.png";