From d5512a60b1fbc65b3b3265ae3fc50199b2bc7352 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 28 Jan 2016 13:57:37 +0200 Subject: [PATCH] plasma: use launcher applet for menu Signed-off-by: Ivailo Monev --- plasma/shells/plasma-desktop/CMakeLists.txt | 10 +--------- .../data/{plasma-desktoprc.cmake => plasma-desktoprc} | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) rename plasma/shells/plasma-desktop/data/{plasma-desktoprc.cmake => plasma-desktoprc} (98%) diff --git a/plasma/shells/plasma-desktop/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt index 6e857101..e489f089 100644 --- a/plasma/shells/plasma-desktop/CMakeLists.txt +++ b/plasma/shells/plasma-desktop/CMakeLists.txt @@ -1,11 +1,3 @@ -set(PLASMA_MENU_APPLET "org.kde.homerun-kicker") -# set(PLASMA_MENU_APPLET "launcher") - -configure_file( - data/plasma-desktoprc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/plasma-desktoprc -) - include_directories(${CMAKE_SOURCE_DIR}/libs ${CMAKE_SOURCE_DIR}/libs/plasmagenericshell ${CMAKE_SOURCE_DIR}/plasma/desktop/shell/scripting @@ -62,6 +54,6 @@ install(FILES data/plasma-themes.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES data/plasma-desktop.notifyrc DESTINATION ${DATA_INSTALL_DIR}/plasma-desktop) install(FILES data/plasma-desktop-js.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-desktoprc + FILES data/plasma-desktoprc DESTINATION ${CONFIG_INSTALL_DIR} ) diff --git a/plasma/shells/plasma-desktop/data/plasma-desktoprc.cmake b/plasma/shells/plasma-desktop/data/plasma-desktoprc similarity index 98% rename from plasma/shells/plasma-desktop/data/plasma-desktoprc.cmake rename to plasma/shells/plasma-desktop/data/plasma-desktoprc index 2da97f99..1b4f3ee7 100644 --- a/plasma/shells/plasma-desktop/data/plasma-desktoprc.cmake +++ b/plasma/shells/plasma-desktop/data/plasma-desktoprc @@ -15,7 +15,7 @@ RightButton;NoModifier=contextmenu [Containments][1][Applets][23] geometry=4,3,32,32 immutability=1 -plugin=@PLASMA_MENU_APPLET@ +plugin=launcher zvalue=0 [Containments][1][Applets][23][LayoutInformation] -- 2.11.0