diff options
| author | Michele Calgaro <[email protected]> | 2024-09-21 23:02:21 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-09-22 18:58:25 +0900 |
| commit | 10675b72c35bd5bf49a6391a89d5a8561b30f5d0 (patch) | |
| tree | ae8673b0db27bf706afdd8f1f2825d0e117fb80e /khotkeys/shared | |
| parent | 1a8369c842b0f6a8529918827694abc151ee9c92 (diff) | |
| download | tdebase-10675b72c35bd5bf49a6391a89d5a8561b30f5d0.tar.gz tdebase-10675b72c35bd5bf49a6391a89d5a8561b30f5d0.zip | |
khotkeys: make sure the kded service is controlled only by the Service Manager in TCC.
Also make sure any changes to Input Action is immediately notified to
the kded service.
This resolves issue #537.
1. Fix kded service startup settings.
In TCC --> Regional & Accessibility --> Input Actions --> General
Settings tab, there was a checkbox to "disable the daemon". This was
either quitting or relaunching khotkeys as a standalone application,
overlapping any choice set in the TCC -> TDE Components --> Service
Manager page.
khotkeys is now launched as a kded service, therefore the aforemention
checkbox is no longer required. If a user choose to manually launch
khotkeys as a standalone application, they can disable it by simply
terminating the application (either by killing it or quitting through
DCOP).
2. Notify Input Actions changes to the kded service
If Input Actions are changed, the changes will be notified to either the
kded service or the standalone khotkeys application, depending on which
of the two is running.
3. the kcm_khotkeys_init library has been removed since it is no longer
necessary.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 8da4fdbdbc7635014f83bfa1364dfdadcb00677b)
Diffstat (limited to 'khotkeys/shared')
| -rw-r--r-- | khotkeys/shared/settings.cpp | 6 | ||||
| -rw-r--r-- | khotkeys/shared/settings.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index becacd5d1..c4068564e 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -103,8 +103,6 @@ bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportT } if( import_P != ImportNone ) return true; // don't read global settings - cfg_P.setGroup( "Main" ); // main group - daemon_disabled = cfg_P.readBoolEntry( "Disabled", false ); cfg_P.setGroup( "Gestures" ); gestures_disabled_globally = cfg_P.readBoolEntry( "Disabled", true ); gesture_mouse_button = cfg_P.readNumEntry( "MouseButton", 2 ); @@ -132,9 +130,6 @@ void Settings::write_settings() cfg.writeEntry( "AlreadyImported", already_imported ); cfg.setGroup( "Data" ); int cnt = write_actions_recursively_v2( cfg, actions, true ); - cfg.setGroup( "Main" ); - cfg.writeEntry( "Autostart", cnt != 0 && !daemon_disabled ); - cfg.writeEntry( "Disabled", daemon_disabled ); cfg.setGroup( "Gestures" ); cfg.writeEntry( "Disabled", gestures_disabled_globally ); cfg.writeEntry( "MouseButton", gesture_mouse_button ); @@ -155,7 +150,6 @@ void Settings::write_settings() // return value means the number of enabled actions written in the cfg file -// i.e. 'Autostart' for value > 0 should be on int Settings::write_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool enabled_P ) { int enabled_cnt = 0; diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h index 753d056c3..da4a291c1 100644 --- a/khotkeys/shared/settings.h +++ b/khotkeys/shared/settings.h @@ -37,7 +37,6 @@ class TDE_EXPORT Settings bool gestures_disabled_globally; int gesture_mouse_button; int gesture_timeout; - bool daemon_disabled; Windowdef_list* gestures_exclude; TDEShortcut voice_shortcut; protected: |