* Layout switching
- Improved layout change logic (indicator is now always updated when the actual switch occurs). This fixes layout switching triggered by the X11 shortcut not being synchronized with layout switching from the tray icon click and the TDE shortcut.
- Kxkb will ignore XkbStateNotify events not related to XkbGroupState which caused strange behaviour with the system tray context menu.
- Reapply Xkb settings when a keyboard device changes state
- Do not run setxkbmap without arguments
- Catch and process changes to Xkb layouts and options
- Always check for Xkb opcode in X11 events, this fixes invalid group issue (Michele Calgaro)
* Tray indicator
- Do not reload all Kxkb settings every time we are requested to get a pixmap!
- Tray indicator pixmap manager improvements
- Fix Quit tray icon menu item
* Configuration
- Optimize settings reloading
- Do not reload settings every time getKxkbOptions() is called; if settings actually need to be re-read, it must be done maunally before calling this function
- Use pointer to global KxkbConfig instance instead of keeping own copy
- Fixed optimized loading of initial settings using KxkbConfig::LOAD_INIT_OPTIONS (I had sort of broken it in the past)
- Removed unused KxkbConfig::LOAD_ACTIVE_OPTIONS
- `newInstance()` now delegates calling setLayout() to readSettings()
- Merged `initTray()` into `readSettings()` - no reason to exist as separate function
* Refactoring
- Merged KxkbLabelController into KxkbSystemTray
- Rename LayoutIcon to LayoutIconManager for clarity
- Minor code cleanup in LayoutIconManager
- Remove use of singleton pattern for LayoutIconManager
- Make XKBExtension a singleton.
- Add mutex to XKBExtension to prevent it from processing configuration changes likely caused by KXkb
- `XKBExtension::getServerOptions()` now also returns layout and variant information in a XkbOptions struct
- New `KxkbConfig::setFromXkbOptions()` member can update current configuration from a XkbOptions struct
- No need to use `tdeApp` pointer in KXKBApp (KUniqueApplication) class
- Consistent code style and more appropriate function names and return types
- Commented option sections for clarity
- Removed superfluous debug messages
- Add proper copyright header to extension.*
* Settings GUI
- Make "Transparent background" checkbox available for theme colors in the GUI
- Add customization options "Stretch flag", "Dim flag", "Show indicator bevel"
- Disable KMilo checkbox when layout notifications disabled
- Fix reading settings for TDE layout hotkeys
This resolves #547.
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1) Add conflicts check for hotkey checkboxes
Due to the ability to set multiple keyboard layout switching hotkeys,
it is important to inform the user of conflicting options that are
not handled properly by the X.org server when set at the same time
(e.g. Win+Space and Alt+Space).
This change adds a warning that informs the user about the problem and
the conflicting options. This warning is shown only when setting
multiple hotkeys via the Xkb options tab, which is for the advanced
user. Most users will ever need only one hotkey, and the combobox on
the first tab should be more than enough.
2) Add "none" item to layout switching options
3) Replace Reset old options checkbox with radio buttons
As per discussion, this makes the function of the option more
apparent. WhatIs hints have been added for additional clarity.
4) Update hotkey combobox per server options
5) Avoid duplication of options by querying Xkb for already set options.
This was a problem in Append Mode in which `setxkbmap` strings would
get too long due to setting already set options. This code checks for
already set options and omits them from the new `setxkbmap` call.
This does not apply to Overwrite Mode.
6) Overwrite previous grp: options when using the combobox
See previous commit message about the addition of hotkeys combobox.
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
1) New layout switching approach
The new approach is based on the "grp" options group of Xkb
and so enables us to use predefined X11 layout (group) switching
hotkeys like "Caps Lock" or "Shift+Alt" (you can see the full list
in the Options tab). The added bonus to this is that we conform
to the Xkb setting.
The code lets Xkb handle the keyboard layout switching hotkey(s)
and is similar to the one that is used in kkbswitch, monitoring
for an Xkb group (layout) change event.
This solution required me to remove some hacky and obsolete code
which was there to support really old pre-XFree-4.2 era systems
and included the "include groups" hack.
This means that the "Enable latin layout" checkbox is now gone
and setxkbmap is only called when the keyboard layouts and/or
options are modified, and not for every layout change.
2) Common layout switching hotkeys combobox
A combobox was added to the first page of the Keyboard Layouts
KCM module. It provides to the users a quick way to set a layout
switching key combination. It also controls the "grp" group in
the Xkb tab.
A special note about this combobox is that, even if Append Mode
was selected in the Xkb Options tab, this hotkey will overwrite
previous hotkey options. This means that all grp: options will
be forced removed before applying the option from the combobox
(in contrast to specifying options via the Xkb Options tab,
which, in Append Mode, will not get overwritten until next login).
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Slávek Banko
Mavridis Philippe
Michele Calgaro
Timothy Pearson
tpearson
toma