Get kvantum icon from theme if possible

tsujan · Jul 22, 2018 · e8c4a55 · e8c4a55
1 parent 1fd4376
commit e8c4a55
Show file tree

Hide file tree

Showing 8 changed files with 1,417 additions and 1,422 deletions.
diff --git a/Kvantum/NEWS b/Kvantum/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	21 Jul 2018, V0.10.7
+	22 Jul 2018, V0.10.7
 
 See "ChangeLog" for changes.
diff --git a/Kvantum/kvantummanager/KvantumManager.cpp b/Kvantum/kvantummanager/KvantumManager.cpp
@@ -149,6 +149,12 @@ KvantumManager::KvantumManager (const QString& lang, QWidget *parent) : QMainWin
         window->setFormat (format);
     }
 
+    QIcon icn = QIcon::fromTheme ("kvantum");
+    if (icn.isNull())
+        icn = QIcon (":/Icons/kvantumpreview/data/kvantum.svg");
+    setWindowIcon (icn);
+    ui->preview->setIcon(icn);
+
     resize (sizeHint().expandedTo (QSize (600, 400)));
 }
 /*************************/

diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager.ts b/Kvantum/kvantummanager/data/translations/kvantummanager.ts
diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager_de.ts b/Kvantum/kvantummanager/data/translations/kvantummanager_de.ts
diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager_eo.ts b/Kvantum/kvantummanager/data/translations/kvantummanager_eo.ts
diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager_lt.ts b/Kvantum/kvantummanager/data/translations/kvantummanager_lt.ts
diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager_pl.ts b/Kvantum/kvantummanager/data/translations/kvantummanager_pl.ts
diff --git a/Kvantum/kvantummanager/kvantummanager.ui b/Kvantum/kvantummanager/kvantummanager.ui
@@ -11,10 +11,6 @@
   <property name="windowTitle">
    <string>Kvantum Manager</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="kvantummanager.qrc">
-    <normaloff>:/Icons/kvantumpreview/data/kvantum.svg</normaloff>:/Icons/kvantumpreview/data/kvantum.svg</iconset>
-  </property>
   <widget class="QWidget" name="widget">
    <property name="sizePolicy">
     <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -2012,10 +2008,6 @@ or update its preview.</string>
       <property name="text">
        <string>Preview</string>
       </property>
-      <property name="icon">
-       <iconset resource="kvantummanager.qrc">
-        <normaloff>:/Icons/kvantumpreview/data/kvantum.svg</normaloff>:/Icons/kvantumpreview/data/kvantum.svg</iconset>
-      </property>
      </widget>
     </item>
     <item row="2" column="2" alignment="Qt::AlignHCenter">
@@ -2075,8 +2067,5 @@ or update its preview.</string>
    <header>combobox.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="kvantummanager.qrc"/>
- </resources>
  <connections/>
 </ui>