From 580501d53c3117b2b83c5861f31f82ab4107505e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 13 Nov 2015 04:38:56 +0200 Subject: [PATCH] plasma: use simple menu applet if libdbusmenu-qt not found the problem with kicker is that it does not display menu items if libdbusmenu-qt is not found, the homerun applet probably should not be installed in such case but that is to be evaluated later. Signed-off-by: Ivailo Monev --- plasma/desktop/shell/CMakeLists.txt | 16 +++++++++++++++- .../data/{plasma-desktoprc => plasma-desktoprc.cmake} | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) rename plasma/desktop/shell/data/{plasma-desktoprc => plasma-desktoprc.cmake} (98%) diff --git a/plasma/desktop/shell/CMakeLists.txt b/plasma/desktop/shell/CMakeLists.txt index 6b5b0785..e70b675f 100644 --- a/plasma/desktop/shell/CMakeLists.txt +++ b/plasma/desktop/shell/CMakeLists.txt @@ -1,3 +1,14 @@ +if(DBUSMENUQT_FOUND) + set(PLASMA_MENU_APPLET "org.kde.homerun-kicker") +else() + set(PLASMA_MENU_APPLET "launcher") +endif() + +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 @@ -53,4 +64,7 @@ install(FILES data/plasma-shell-desktop.kcfg DESTINATION ${KCFG_INSTALL_DIR}) 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 data/plasma-desktoprc DESTINATION ${CONFIG_INSTALL_DIR}) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-desktoprc + DESTINATION ${CONFIG_INSTALL_DIR} +) diff --git a/plasma/desktop/shell/data/plasma-desktoprc b/plasma/desktop/shell/data/plasma-desktoprc.cmake similarity index 98% rename from plasma/desktop/shell/data/plasma-desktoprc rename to plasma/desktop/shell/data/plasma-desktoprc.cmake index 886674ac..2da97f99 100644 --- a/plasma/desktop/shell/data/plasma-desktoprc +++ b/plasma/desktop/shell/data/plasma-desktoprc.cmake @@ -15,7 +15,7 @@ RightButton;NoModifier=contextmenu [Containments][1][Applets][23] geometry=4,3,32,32 immutability=1 -plugin=org.kde.homerun-kicker +plugin=@PLASMA_MENU_APPLET@ zvalue=0 [Containments][1][Applets][23][LayoutInformation] -- 2.11.0