┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNate Graham <[email protected]>2019-04-03 08:56:08 -0600
committerNate Graham <[email protected]>2019-04-06 11:40:54 -0600
commitb303e3c93a9397e1f731fa71fb8b3f10784f5420 (patch)
tree6f83bd2a74157c4a0ed76c049026a9bf86a0573b /src
parentf4549a196b21b259826e80a83cf70ab35c61f5e4 (diff)
Re-implement Meta-E global launch shortcut using KGlobalAccel
Summary: FEATURE: 405302 FIXED-IN: 19.08.0 Test Plan: 1. Apply patch 2. Reboot (didn't work until I rebooted or logged out and back in again) 3. Hit {key Meta E} 4. Dolphin Launches Reviewers: #dolphin, elvisangelaccio, davidedmundson Reviewed By: #dolphin, elvisangelaccio Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D20229
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt7
-rwxr-xr-xsrc/org.kde.dolphin.desktop1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0dd57679..dea10675f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -384,6 +384,13 @@ install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install( PROGRAMS org.kde.dolphin.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+
+install( DIRECTORY DESTINATION "${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel" )
+
+install(
+ CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${KDE_INSTALL_FULL_APPDIR}/org.kde.dolphin.desktop ${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel/org.kde.dolphin.desktop)"
+)
+
install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
settings/dolphin_generalsettings.kcfg
settings/dolphin_compactmodesettings.kcfg
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index c0ac84347..b2e29e9ba 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -97,3 +97,4 @@ Terminal=false
MimeType=inode/directory;
InitialPreference=10
X-DBUS-ServiceName=org.kde.dolphin
+X-KDE-Shortcuts=Meta+E