brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle 'switch-input-source' keybinding move

Browse Source 
Moving this to gsettings-desktop-schemas instead so that
gnome-control-center doesn't have to grow a dependency on gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=690427
This commit is contained in:
Rui Matos 2012-12-18 15:04:14 +00:00
parent f71f767a3c
commit 07511cb21a
4 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/50-gnome-shell-typing.xml.in
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<KeyListEntries schema="org.gnome.shell.keybindings"
group="system"
_name="Typing"
wm_name="GNOME Shell"
package="gnome-shell">
<KeyListEntry name="switch-input-source"
_description="Switch to next source"/>
<KeyListEntry name="switch-input-source-backward"
_description="Switch to previous source"/>
</KeyListEntries>

1
data/Makefile.am
View File

@ -54,7 +54,6 @@ keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
keys_in_files = \ keys_in_files = \
50-gnome-shell-screenshot.xml.in \ 50-gnome-shell-screenshot.xml.in \
50-gnome-shell-system.xml.in \ 50-gnome-shell-system.xml.in \
50-gnome-shell-typing.xml.in \
$(NULL) $(NULL)
keys_DATA = $(keys_in_files:.xml.in=.xml) keys_DATA = $(keys_in_files:.xml.in=.xml)

10
data/org.gnome.shell.gschema.xml.in.in
View File

@ -135,16 +135,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
Keybinding to start/stop the builtin screen recorder. Keybinding to start/stop the builtin screen recorder.
</_description> </_description>
</key> </key>
<key name="switch-input-source" type="as">
<default>["&lt;Super&gt;space"]</default>
<_summary>Switch input source</_summary>
<_description>Binding to select the next input source</_description>
</key>
<key name="switch-input-source-backward" type="as">
<default>[]</default>
<_summary>Switch input source backward</_summary>
<_description>Binding to select the previous input source</_description>
</key>
</schema> </schema>
<schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/" <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"

4
js/ui/status/keyboard.js
View File

@ -330,13 +330,13 @@ const InputSourceIndicator = new Lang.Class({
this._mruSources = []; this._mruSources = [];
this._keybindingAction = this._keybindingAction =
Main.wm.addKeybinding('switch-input-source', Main.wm.addKeybinding('switch-input-source',
new Gio.Settings({ schema: "org.gnome.shell.keybindings" }), new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
Meta.KeyBindingFlags.REVERSES, Meta.KeyBindingFlags.REVERSES,
Main.KeybindingMode.ALL, Main.KeybindingMode.ALL,
Lang.bind(this, this._switchInputSource)); Lang.bind(this, this._switchInputSource));
this._keybindingActionBackward = this._keybindingActionBackward =
Main.wm.addKeybinding('switch-input-source-backward', Main.wm.addKeybinding('switch-input-source-backward',
new Gio.Settings({ schema: "org.gnome.shell.keybindings" }), new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
Meta.KeyBindingFlags.REVERSES | Meta.KeyBindingFlags.REVERSES |
Meta.KeyBindingFlags.REVERSED, Meta.KeyBindingFlags.REVERSED,
Main.KeybindingMode.ALL, Main.KeybindingMode.ALL,