From 7da43cfdc92c7e29d326abe39160a11a9b7a1069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Thu, 25 Apr 2013 02:13:02 +0200 Subject: [PATCH] Use new service type and cmake macro for wallpapers --- src/shell/qmlpackages/wallpapers/CMakeLists.txt | 4 ++-- src/shell/qmlpackages/wallpapers/autumn/CMakeLists.txt | 4 ---- src/shell/qmlpackages/wallpapers/autumn/metadata.desktop | 1 + src/shell/qmlpackages/wallpapers/color/CMakeLists.txt | 4 ---- src/shell/qmlpackages/wallpapers/color/metadata.desktop | 5 +++-- 5 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 src/shell/qmlpackages/wallpapers/autumn/CMakeLists.txt delete mode 100644 src/shell/qmlpackages/wallpapers/color/CMakeLists.txt diff --git a/src/shell/qmlpackages/wallpapers/CMakeLists.txt b/src/shell/qmlpackages/wallpapers/CMakeLists.txt index 37f36f0bc..40ed59791 100644 --- a/src/shell/qmlpackages/wallpapers/CMakeLists.txt +++ b/src/shell/qmlpackages/wallpapers/CMakeLists.txt @@ -1,3 +1,3 @@ -add_subdirectory(autumn) -add_subdirectory(color) +installPackage(color org.kde.color plasma/wallpapers wallpaper) +installPackage(autumn org.kde.autumn plasma/wallpapers wallpaper) diff --git a/src/shell/qmlpackages/wallpapers/autumn/CMakeLists.txt b/src/shell/qmlpackages/wallpapers/autumn/CMakeLists.txt deleted file mode 100644 index 961260b8d..000000000 --- a/src/shell/qmlpackages/wallpapers/autumn/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.autumn PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE) - - diff --git a/src/shell/qmlpackages/wallpapers/autumn/metadata.desktop b/src/shell/qmlpackages/wallpapers/autumn/metadata.desktop index 06a65f620..c9bd5f50a 100644 --- a/src/shell/qmlpackages/wallpapers/autumn/metadata.desktop +++ b/src/shell/qmlpackages/wallpapers/autumn/metadata.desktop @@ -17,6 +17,7 @@ Name[x-test]=xxAutumnxx Type=Service Icon=java +X-KDE-ServiceType=Plasma/Wallpaper X-KDE-ParentApp= X-KDE-PluginInfo-Author=Sebastian Kügler X-KDE-PluginInfo-Category= diff --git a/src/shell/qmlpackages/wallpapers/color/CMakeLists.txt b/src/shell/qmlpackages/wallpapers/color/CMakeLists.txt deleted file mode 100644 index 4a716a70b..000000000 --- a/src/shell/qmlpackages/wallpapers/color/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.image PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE) - - diff --git a/src/shell/qmlpackages/wallpapers/color/metadata.desktop b/src/shell/qmlpackages/wallpapers/color/metadata.desktop index 75037af54..0fdf4c630 100644 --- a/src/shell/qmlpackages/wallpapers/color/metadata.desktop +++ b/src/shell/qmlpackages/wallpapers/color/metadata.desktop @@ -1,7 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Keywords= -Name=Color wallpaper +Icon=preferences-desktop-color +Name=Plain Color Name[cs]=Barva na pozadí Name[nl]=Kleur van achtergrondafbeelding Name[pt]=Papel de parede por cores @@ -11,7 +12,7 @@ Name[uk]=Кольорове тло стільниці Name[x-test]=xxColor wallpaperxx Type=Service -X-KDE-ServiceTypes=Plasma/Shell +X-KDE-ServiceTypes=Plasma/Wallpaper X-KDE-ParentApp= X-KDE-PluginInfo-Author=Marco Martin X-KDE-PluginInfo-Category=