]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Re-implement Meta-E global launch shortcut using KGlobalAccel
authorNate Graham <nate@kde.org>
Wed, 3 Apr 2019 14:56:08 +0000 (08:56 -0600)
committerNate Graham <nate@kde.org>
Sat, 6 Apr 2019 17:40:54 +0000 (11:40 -0600)
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

src/CMakeLists.txt
src/org.kde.dolphin.desktop

index e0dd576793b54b22f1192a14fe1dd68074ad487b..dea10675faf54f5bfcbea6ad69ef95739c5261d2 100644 (file)
@@ -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
index c0ac843479f308d288a347c958f7ea6c95b66b32..b2e29e9baa598017566b6312a6d05cc0e4cef248 100755 (executable)
@@ -97,3 +97,4 @@ Terminal=false
 MimeType=inode/directory;
 InitialPreference=10
 X-DBUS-ServiceName=org.kde.dolphin
+X-KDE-Shortcuts=Meta+E