Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RDNN keybindings gsettings schema #2032

Merged
merged 1 commit into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon-gtk3/WindowMenu.vala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

public class Gala.Daemon.WindowMenu : Gtk.Menu {
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("org.pantheon.desktop.gala.keybindings");
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
private static GLib.Settings keybind_settings = new GLib.Settings ("org.gnome.desktop.wm.keybindings");

public signal void perform_action (Gala.ActionType type);
Expand Down
2 changes: 1 addition & 1 deletion daemon/WindowMenu.vala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

public class Gala.Daemon.WindowMenu : Gtk.Popover {
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("org.pantheon.desktop.gala.keybindings");
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
private static GLib.Settings keybind_settings = new GLib.Settings ("org.gnome.desktop.wm.keybindings");

public signal void perform_action (Gala.ActionType type) {
Expand Down
2 changes: 1 addition & 1 deletion data/gala.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</key>
</schema>

<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings">
<schema path="/io/elementary/desktop/wm/keybindings/" id="io.elementary.desktop.wm.keybindings">
<key type="as" name="switch-to-workspace-first">
<default><![CDATA[['<Super>Home']]]></default>
<summary>Shortcut to move to first workspace</summary>
Expand Down
2 changes: 1 addition & 1 deletion plugins/pip/Main.vala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
public override void initialize (Gala.WindowManager wm) {
this.wm = wm;
var display = wm.get_display ();
var settings = new GLib.Settings (Config.SCHEMA + ".keybindings");
var settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");

display.add_keybinding ("pip", settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) on_initiate);
}
Expand Down
2 changes: 1 addition & 1 deletion src/WindowManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ namespace Gala {
FilterManager.init (this);

/*keybindings*/
var keybinding_settings = new GLib.Settings (Config.SCHEMA + ".keybindings");
var keybinding_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");

display.add_keybinding ("switch-to-workspace-first", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_to_workspace_end);
display.add_keybinding ("switch-to-workspace-last", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_to_workspace_end);
Expand Down
2 changes: 1 addition & 1 deletion src/Zoom.vala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class Gala.Zoom : Object {
Object (wm: wm);

unowned var display = wm.get_display ();
var schema = new GLib.Settings (Config.SCHEMA + ".keybindings");
var schema = new GLib.Settings ("io.elementary.desktop.wm.keybindings");

display.add_keybinding ("zoom-in", schema, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) zoom_in);
display.add_keybinding ("zoom-out", schema, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) zoom_out);
Expand Down
Loading