Merge pull request #10125 from cjmayo/desktopfilename

Finish renaming desktop filename to org.freecad.FreeCAD

package/fedora/freecad.spec

@@ -315,7 +315,7 @@ done
 
 %check
 desktop-file-validate \
-    %{buildroot}%{_datadir}/applications/org.freecadweb.FreeCAD.desktop
+    %{buildroot}%{_datadir}/applications/org.freecad.FreeCAD.desktop
 %{?fedora:appstream-util validate-relax --nonet \
     %{buildroot}%{_metainfodir}/*.appdata.xml}
 

src/Gui/CMakeLists.txt

@@ -1314,11 +1314,11 @@ else(WIN32)
     #    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-icon-16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME org.freecad.FreeCAD.png)
+    INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME org.freecad.FreeCAD.png)
+    INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME org.freecad.FreeCAD.png)
+    INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME org.freecad.FreeCAD.png)
+    INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME org.freecad.FreeCAD.svg)
     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)

src/Tools/freecad-thumbnailer

@@ -7,9 +7,9 @@ Installation:
   and must have execution rights
     "$ sudo chmod +x /usr/bin/freecad-thumbnailer"
 
-- If a FreeCAD project file doesn't include a thumbnail the file freecad.png is used.
+- If a FreeCAD project file doesn't include a thumbnail the file org.freecad.FreeCAD.png is used.
   Thus, the file src/Gui/Icons/freecad-icon-48.png must be installed.
-    "$ sudo cp freecad-icon-48.png /usr/share/icons/hicolor/48x48/apps/freecad.png"
+    "$ sudo cp freecad-icon-48.png /usr/share/icons/hicolor/48x48/apps/org.freecad.FreeCAD.png"
 
 - The application/x-extension-fcstd MIME type should be registered
     Check that a corresponding /usr/share/mime/packages/freecad.xml file exists
@@ -54,7 +54,7 @@ try:
         image = zfile.read(image)
     else:
         # apps should have at least 48x48 icons
-        freecad = open("/usr/share/icons/hicolor/48x48/apps/freecad.png", "rb")
+        freecad = open("/usr/share/icons/hicolor/48x48/apps/org.freecad.FreeCAD.png", "rb")
         image = freecad.read()
 
     # Write icon to output_file

src/XDGData/CMakeLists.txt

@@ -16,26 +16,21 @@ if(NOT DEFINED APPDATA_RELEASE_DATE)
 endif()
 
 configure_file(
-    org.freecadweb.FreeCAD.appdata.xml.in
-    ${CMAKE_BINARY_DIR}/org.freecadweb.FreeCAD.appdata.xml
+    org.freecad.FreeCAD.appdata.xml.in
+    ${CMAKE_BINARY_DIR}/org.freecad.FreeCAD.appdata.xml
 )
 install(
-    FILES ${CMAKE_BINARY_DIR}/org.freecadweb.FreeCAD.appdata.xml
+    FILES ${CMAKE_BINARY_DIR}/org.freecad.FreeCAD.appdata.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
 )
 
 install(
-    FILES org.freecadweb.FreeCAD.desktop
+    FILES org.freecad.FreeCAD.desktop
     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
+    FILES org.freecad.FreeCAD.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
 )
 

src/XDGData/org.freecad.FreeCAD.appdata.xml.in

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.freecadweb.FreeCAD</id>
+  <id>org.freecad.FreeCAD</id>
   <project_license>LGPL-2.1</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <developer_name>The FreeCAD Team</developer_name>
-  <launchable type="desktop-id">org.freecadweb.FreeCAD.desktop</launchable>
+  <launchable type="desktop-id">org.freecad.FreeCAD.desktop</launchable>
   <name>FreeCAD</name>
   <summary>An open source parametric 3D CAD modeler</summary>
   <description>

src/XDGData/org.freecad.FreeCAD.desktop

@@ -17,7 +17,8 @@ GenericName[ru]=Система автоматизированного проек
 Exec=FreeCAD - --single-instance %F
 Terminal=false
 Type=Application
-Icon=org.freecadweb.FreeCAD
+Icon=org.freecad.FreeCAD
 Categories=Graphics;Science;Education;Engineering;
 StartupNotify=true
+StartupWMClass=FreeCAD
 MimeType=application/x-extension-fcstd;model/obj;model/iges;image/vnd.dwg;image/vnd.dxf;model/vnd.collada+xml;application/iges;model/iges;model/step;model/step+zip;model/stl;application/vnd.shp;model/vrml;