xdg: install icons from XDGData dir

FreeCAD · Jan 4, 2021 · 6d8aec2 · 6d8aec2
1 parent 6805a31
commit 6d8aec2
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 282 deletions.
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -1387,22 +1387,6 @@ else(WIN32)
     INSTALL(TARGETS FreeCADGui
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
-    #INSTALL(FILES Icons/freecad.xpm
-    #    Icons/freecad-icon-16.png
-    #    Icons/freecad-icon-32.png
-    #    Icons/freecad-icon-48.png
-    #    Icons/freecad-icon-64.png
-    #    Icons/freecad.svg
-    #    Icons/freecad-doc.png
-    #    DESTINATION ${CMAKE_INSTALL_DATADIR}
-    #)
-    INSTALL(FILES Icons/freecad-icon-16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME freecad.png)
-    INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME freecad.png)
-    INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME freecad.png)
-    INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME freecad.png)
-    INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
-    INSTALL(FILES Icons/freecad.xpm DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
-    INSTALL(FILES Icons/freecad-doc.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes RENAME application-x-extension-fcstd.svg)
 endif(WIN32)
 
 set(FreeCADGui_Scripts

diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
@@ -633,10 +633,10 @@ QIcon FileIconProvider::icon(const QFileInfo & info) const
 {
     if (info.suffix().toLower() == QLatin1String("fcstd")) {
         // return QApplication::windowIcon();
-        return QIcon(QString::fromLatin1(":/icons/freecad-doc.png"));
+        return QIcon(QString::fromLatin1(":/icons/freecad-doc-64.png"));
     }
     else if (info.suffix().toLower().startsWith(QLatin1String("fcstd"))) {
-        QIcon icon(QString::fromLatin1(":/icons/freecad-doc.png"));
+        QIcon icon(QString::fromLatin1(":/icons/freecad-doc-64.png"));
         QIcon darkIcon;
         int w = QApplication::style()->pixelMetric(QStyle::PM_ListViewIconSize);
         darkIcon.addPixmap(icon.pixmap(w, w, QIcon::Disabled, QIcon::Off), QIcon::Normal, QIcon::Off);

diff --git a/src/Gui/Icons/freecad-doc.png → src/Gui/Icons/freecad-doc-64.png b/src/Gui/Icons/freecad-doc.png → src/Gui/Icons/freecad-doc-64.png
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
@@ -9,7 +9,7 @@
         <file>list-remove.svg</file>
         <file>list-add.svg</file>
         <file>freecad.svg</file>
-        <file>freecad-doc.png</file>
+        <file>freecad-doc-64.png</file>
         <file>bulb.svg</file>
         <file>TextDocument.svg</file>
         <file>button_down.svg</file>

diff --git a/src/XDGData/CMakeLists.txt b/src/XDGData/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(APPDATA_RELEASE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}")
+
 if(NOT DEFINED APPDATA_RELEASE_DATE)
     if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
         execute_process(COMMAND git log -1 --pretty=%cd --date=short
@@ -28,11 +30,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
 )
 
-install(
-    FILES org.freecadweb.FreeCAD.svg
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
-)
-
 install(
     FILES org.freecadweb.FreeCAD.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
@@ -42,3 +39,51 @@ install(
     FILES FreeCAD.thumbnailer
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/thumbnailers
 )
+
+install(
+    FILES ../Gui/Icons/freecad-icon-16.png
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps
+    RENAME org.freecadweb.FreeCAD.png
+)
+
+install(
+    FILES ../Gui/Icons/freecad-icon-32.png
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps
+    RENAME org.freecadweb.FreeCAD.png
+)
+
+install(
+    FILES ../Gui/Icons/freecad-icon-48.png
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps
+    RENAME org.freecadweb.FreeCAD.png
+)
+
+install(
+    FILES ../Gui/Icons/freecad-icon-64.png
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
+    RENAME org.freecadweb.FreeCAD.png
+)
+
+install(
+    FILES ../Gui/Icons/freecad.svg
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
+    RENAME org.freecadweb.FreeCAD.svg
+)
+
+install(
+    FILES ../Gui/Icons/freecad.xpm
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps
+    RENAME org.freecadweb.FreeCAD.xpm
+)
+
+install(
+    FILES ../Gui/Icons/freecad-doc.svg
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes
+    RENAME org.freecadweb.FreeCAD-mimetype.svg
+)
+
+install(
+    FILES ../Gui/Icons/freecad-doc-64.png
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/mimetypes
+    RENAME org.freecadweb.FreeCAD-mimetype.png
+)
diff --git a/src/XDGData/org.freecadweb.FreeCAD.appdata.xml.in b/src/XDGData/org.freecadweb.FreeCAD.appdata.xml.in
@@ -58,6 +58,6 @@
   <update_contact>yorik_AT_uncreated.net</update_contact>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@PACKAGE_VERSION@" date="@APPDATA_RELEASE_DATE@"/>
+    <release version="@APPDATA_RELEASE_VERSION@" date="@APPDATA_RELEASE_DATE@"/>
   </releases>
 </component>
diff --git a/src/XDGData/org.freecadweb.FreeCAD.svg b/src/XDGData/org.freecadweb.FreeCAD.svg
diff --git a/src/XDGData/org.freecadweb.FreeCAD.xml b/src/XDGData/org.freecadweb.FreeCAD.xml
@@ -4,6 +4,6 @@
     <!-- <sub-class-of type="application/zip"/> -->
     <comment>FreeCAD document files</comment>
     <glob pattern="*.fcstd"/>
-    <icon name="org.freecadweb.FreeCAD"/>
+    <generic-icon name="org.freecadweb.FreeCAD-mimetype"/>
   </mime-type>
 </mime-info>