Merge lp:~ubuntu-mate-dev/compiz/mate-consistent-keybindings into lp:compiz/0.9.12

Proposed by Martin Wimpress 
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3950
Merged at revision: 3952
Proposed branch: lp:~ubuntu-mate-dev/compiz/mate-consistent-keybindings
Merge into: lp:compiz/0.9.12
Diff against target: 118 lines (+23/-15)
1 file modified
debian/mate.ini (+23/-15)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/compiz/mate-consistent-keybindings
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
Ubuntu Sponsors Team Pending
Review via email: mp+258251@code.launchpad.net

Commit message

Default MATE keybindings to be consistent with other MATE WMs.

Description of the change

This merge proposal makes the key bindings for MATE broadly consistent between Marco and Compiz. Where possible, all key bindings are now aligned with the document below:

  * https://help.ubuntu.com/community/KeyboardShortcuts

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

No problems.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/mate.ini'
2--- debian/mate.ini 2015-02-27 23:11:40 +0000
3+++ debian/mate.ini 2015-05-05 13:22:44 +0000
4@@ -1,13 +1,10 @@
5 [core]
6-s0_active_plugins = core;composite;opengl;compiztoolbox;crashhandler;imgjpeg;copytex;decor;showdesktop;put;text;cube;mousepoll;grid;imgpng;move;matecompat;scale;snap;place;resize;commands;regex;shift;thumbnail;rotate;showmouse;workarounds;cubeaddon;animation;expo;ezoom;addhelper;
7+s0_active_plugins = core;crashhandler;composite;opengl;decor;addhelper;put;place;regex;imgpng;copytex;grid;snap;resize;showdesktop;mousepoll;text;compiztoolbox;matecompat;imgjpeg;commands;animation;cube;move;neg;rotate;scale;shift;thumbnail;cubeaddon;workarounds;showmouse;expo;ezoom;session;
8 s0_audible_bell = false
9 s0_do_serialize = true
10 s0_autoraise = false
11 s0_autoraise_delay = 500
12-s0_minimize_window_key = <Super>h
13-s0_maximize_window_key = <Super>Up
14-s0_unmaximize_or_minimize_window_key = <Super>Down
15-s0_window_menu_button = <Super>Button3
16+s0_show_desktop_key = <Control><Alt>d
17 s0_toggle_window_maximized_key = <Alt>F10
18 s0_toggle_window_shaded_key = Disabled
19 s0_hsize = 4
20@@ -23,6 +20,8 @@
21 s0_transparent_manual_only = true
22
23 [grid]
24+s0_put_maximize_key = Disabled
25+s0_put_restore_key = Disabled
26 s0_top_left_corner_action = 7
27 s0_top_edge_action = 8
28 s0_top_right_corner_action = 9
29@@ -31,23 +30,26 @@
30 s0_bottom_right_corner_action = 3
31 s0_outline_color = #87a7529f
32 s0_fill_color = #74fb001b
33+s0_snapback_windows = true
34
35 [move]
36-s0_initiate_button = <Super>Button1
37+s0_initiate_button = <Alt>Button1
38 s0_opacity = 96
39
40 [animation]
41+s0_open_matches = ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver);((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\.exe$));(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd);
42+s0_close_matches = ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot);((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\.exe$));(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd);
43 s0_unminimize_effects = animation:Glide 2;
44
45 [matecompat]
46-s0_main_menu_key = <Super>s
47 s0_command_screenshot = mate-screenshot
48 s0_command_window_screenshot = mate-screenshot -w
49 s0_command_terminal = mate-terminal
50 s0_run_command_terminal_key = <Control><Alt>t
51
52 [gnomecompat]
53-s0_main_menu_key = <Super>s
54+s0_main_menu_key = Disabled
55+s0_run_key = Disabled
56 s0_command_screenshot = mate-screenshot
57 s0_command_window_screenshot = mate-screenshot -w
58 s0_command_terminal = mate-terminal
59@@ -70,7 +72,7 @@
60 s0_down_window_key = <Shift><Super>Next
61
62 [resize]
63-s0_initiate_button = <Super>Button2
64+s0_initiate_button = <Alt>Button2
65 s0_border_color = #6164659f
66 s0_fill_color = #87a75240
67
68@@ -78,7 +80,6 @@
69 s0_command20 = /usr/bin/mate-system-monitor -p
70
71 [expo]
72-s0_expo_key = <Control><Alt>Up
73 s0_mipmaps = true
74 s0_selected_color = #34422eff
75 s0_reflection = true
76@@ -86,8 +87,8 @@
77 s0_ground_color2 = #4b504400
78
79 [ezoom]
80-s0_zoom_in_key = <Super>m
81-s0_zoom_out_key = <Super>n
82+s0_zoom_in_button = <Super>Button4
83+s0_zoom_out_button = <Super>Button5
84 s0_zoom_box_outline_color = #4b50449f
85 s0_zoom_box_fill_color = #2f2f2f4f
86
87@@ -141,7 +142,7 @@
88
89 [crashhandler]
90 s0_enabled = true
91-s0_directory = /tmp
92+s0_directory = /var/crash
93 s0_start_wm = true
94 s0_wm_cmd = /usr/bin/marco --replace
95
96@@ -191,7 +192,7 @@
97 s0_rotation_speed = 0.350000
98 s0_radius = 70
99 s0_num_particles = 384
100-s0_color = #ffdf3fff
101+s0_color = #87a752ff
102
103 [cubeaddon]
104 s0_reflection = false
105@@ -211,4 +212,11 @@
106 [addhelper]
107 s0_ononinit = true
108 s0_brightness = 96
109-s0_saturation = 72
110\ No newline at end of file
111+s0_saturation = 72
112+
113+[scale]
114+s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)
115+
116+[showdesktop]
117+s0_direction = 5
118+s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)

Subscribers

People subscribed via source and target branches