From 6bd103b322c11a3d5041b4c66abb745b96aaa5ce Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 30 Jan 2024 22:26:30 +0100 Subject: Fix flatpak Update with the state of the manifest on github and install icons at the correct location --- src/CMakeLists.txt | 19 +- src/icons/128-apps-org.kde.dolphin.png | Bin 0 -> 4538 bytes src/icons/128-system-file-manager.png | Bin 4538 -> 0 bytes src/icons/16-apps-org.kde.dolphin.png | Bin 0 -> 490 bytes src/icons/16-system-file-manager.png | Bin 490 -> 0 bytes src/icons/22-apps-org.kde.dolphin.png | Bin 0 -> 609 bytes src/icons/22-system-file-manager.png | Bin 609 -> 0 bytes src/icons/32-apps-org.kde.dolphin.png | Bin 0 -> 820 bytes src/icons/32-system-file-manager.png | Bin 820 -> 0 bytes src/icons/48-apps-org.kde.dolphin.png | Bin 0 -> 1375 bytes src/icons/48-system-file-manager.png | Bin 1375 -> 0 bytes src/icons/64-apps-org.kde.dolphin.png | Bin 0 -> 1776 bytes src/icons/64-system-file-manager.png | Bin 1776 -> 0 bytes src/icons/org.kde.dolphin.svg | 433 +++++++++++++++++++++++++++++++++ src/icons/system-file-manager.svg | 433 --------------------------------- src/org.kde.dolphin.desktop | 2 +- 16 files changed, 450 insertions(+), 437 deletions(-) create mode 100644 src/icons/128-apps-org.kde.dolphin.png delete mode 100644 src/icons/128-system-file-manager.png create mode 100644 src/icons/16-apps-org.kde.dolphin.png delete mode 100644 src/icons/16-system-file-manager.png create mode 100644 src/icons/22-apps-org.kde.dolphin.png delete mode 100644 src/icons/22-system-file-manager.png create mode 100644 src/icons/32-apps-org.kde.dolphin.png delete mode 100644 src/icons/32-system-file-manager.png create mode 100644 src/icons/48-apps-org.kde.dolphin.png delete mode 100644 src/icons/48-system-file-manager.png create mode 100644 src/icons/64-apps-org.kde.dolphin.png delete mode 100644 src/icons/64-system-file-manager.png create mode 100644 src/icons/org.kde.dolphin.svg delete mode 100644 src/icons/system-file-manager.svg (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 533b5d221..18494fc8d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -464,9 +464,22 @@ if(FLATPAK) target_compile_definitions(dolphin PRIVATE FLATPAK) endif() -# Sets the icon on Windows and OSX -file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png") -ecm_add_app_icon(dolphin ICONS ${ICONS_SRCS}) +# Install the icons on macOS and Windows +ecm_add_app_icon(dolphin + ICONS + icons/128-apps-org.kde.dolphin.png + icons/16-apps-org.kde.dolphin.png + icons/22-apps-org.kde.dolphin.png + icons/32-apps-org.kde.dolphin.png + icons/48-apps-org.kde.dolphin.png + icons/64-apps-org.kde.dolphin.png + DESTINATION + ${KDE_INSTALL_ICONDIR} + THEME + hicolor +) + +install(FILES icons/org.kde.dolphin.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps) target_link_libraries(dolphin PRIVATE diff --git a/src/icons/128-apps-org.kde.dolphin.png b/src/icons/128-apps-org.kde.dolphin.png new file mode 100644 index 000000000..559247792 Binary files /dev/null and b/src/icons/128-apps-org.kde.dolphin.png differ diff --git a/src/icons/128-system-file-manager.png b/src/icons/128-system-file-manager.png deleted file mode 100644 index 559247792..000000000 Binary files a/src/icons/128-system-file-manager.png and /dev/null differ diff --git a/src/icons/16-apps-org.kde.dolphin.png b/src/icons/16-apps-org.kde.dolphin.png new file mode 100644 index 000000000..ecc1536f3 Binary files /dev/null and b/src/icons/16-apps-org.kde.dolphin.png differ diff --git a/src/icons/16-system-file-manager.png b/src/icons/16-system-file-manager.png deleted file mode 100644 index ecc1536f3..000000000 Binary files a/src/icons/16-system-file-manager.png and /dev/null differ diff --git a/src/icons/22-apps-org.kde.dolphin.png b/src/icons/22-apps-org.kde.dolphin.png new file mode 100644 index 000000000..d6364ff7d Binary files /dev/null and b/src/icons/22-apps-org.kde.dolphin.png differ diff --git a/src/icons/22-system-file-manager.png b/src/icons/22-system-file-manager.png deleted file mode 100644 index d6364ff7d..000000000 Binary files a/src/icons/22-system-file-manager.png and /dev/null differ diff --git a/src/icons/32-apps-org.kde.dolphin.png b/src/icons/32-apps-org.kde.dolphin.png new file mode 100644 index 000000000..04a847bbc Binary files /dev/null and b/src/icons/32-apps-org.kde.dolphin.png differ diff --git a/src/icons/32-system-file-manager.png b/src/icons/32-system-file-manager.png deleted file mode 100644 index 04a847bbc..000000000 Binary files a/src/icons/32-system-file-manager.png and /dev/null differ diff --git a/src/icons/48-apps-org.kde.dolphin.png b/src/icons/48-apps-org.kde.dolphin.png new file mode 100644 index 000000000..597b678c9 Binary files /dev/null and b/src/icons/48-apps-org.kde.dolphin.png differ diff --git a/src/icons/48-system-file-manager.png b/src/icons/48-system-file-manager.png deleted file mode 100644 index 597b678c9..000000000 Binary files a/src/icons/48-system-file-manager.png and /dev/null differ diff --git a/src/icons/64-apps-org.kde.dolphin.png b/src/icons/64-apps-org.kde.dolphin.png new file mode 100644 index 000000000..e3239aaeb Binary files /dev/null and b/src/icons/64-apps-org.kde.dolphin.png differ diff --git a/src/icons/64-system-file-manager.png b/src/icons/64-system-file-manager.png deleted file mode 100644 index e3239aaeb..000000000 Binary files a/src/icons/64-system-file-manager.png and /dev/null differ diff --git a/src/icons/org.kde.dolphin.svg b/src/icons/org.kde.dolphin.svg new file mode 100644 index 000000000..974ca5590 --- /dev/null +++ b/src/icons/org.kde.dolphin.svg @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/icons/system-file-manager.svg b/src/icons/system-file-manager.svg deleted file mode 100644 index 974ca5590..000000000 --- a/src/icons/system-file-manager.svg +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 674977ace..4e3e4de2a 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -59,7 +59,7 @@ Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin 文件管理器 Name[zh_TW]=Dolphin Exec=dolphin %u -Icon=system-file-manager +Icon=org.kde.dolphin Type=Application X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; -- cgit v1.3