Compiz

Merge lp:~timo-jyrinki/compiz/metacity-key-migrations into lp:compiz/0.9.8

  1. metacity-key-migrations
  2. Merge into 0.9.8
Proposed by Timo Jyrinki
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3309
Merged at revision: 3313
Proposed branch: lp:~timo-jyrinki/compiz/metacity-key-migrations
Merge into: lp:compiz/0.9.8
Diff against target: 135 lines (+120/-0)
2 files modified
postinst/convert-files/compiz-profile-Default.convert (+60/-0)
postinst/convert-files/compiz-profile-active-Default.convert (+60/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/compiz/metacity-key-migrations
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Daniel van Vugt Approve
Review via email: mp+119970@code.launchpad.net

Commit message

Additional keys from metacity to convert to GSettings. Sources from /usr/share/gnome-control-center/keybindings/50-compiz-* (except for show hud which is in unity), targets from lp:~didrocks/compiz/g-c-c-integration.

Description of the change

Additional keys from metacity to convert to GSettings. Sources from /usr/share/gnome-control-center/keybindings/50-compiz-* (except for show hud which is in unity), targets from lp:~didrocks/compiz/g-c-c-integration.

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

It doesn't seem to break anything at least :)

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/46/console reported an error when processing this lp:~timo-jyrinki/compiz/metacity-key-migrations branch.
Not merging it.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Jenkins died. Keep retying to Approve...

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/49/console reported an error when processing this lp:~timo-jyrinki/compiz/metacity-key-migrations branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/50/console reported an error when processing this lp:~timo-jyrinki/compiz/metacity-key-migrations branch.
Not merging it.

Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'postinst/convert-files/compiz-profile-Default.convert'
2--- postinst/convert-files/compiz-profile-Default.convert 2012-07-20 16:28:04 +0000
3+++ postinst/convert-files/compiz-profile-Default.convert 2012-08-16 15:38:19 +0000
4@@ -108,3 +108,63 @@
5 top-left-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_left_corner_action
6 top-right-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_right_corner_action
7
8+
9+[org.compiz.integrated]
10+exec = /apps/metacity/global_keybindings/run_command_terminal
11+run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
12+run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
13+panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
14+panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
15+
16+
17+[org.gnome.desktop.wm.keybindings]
18+move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
19+move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2
20+move-to-workspace-3 = /apps/metacity/window_keybindings/move_to_workspace_3
21+move-to-workspace-4 = /apps/metacity/window_keybindings/move_to_workspace_4
22+move-to-workspace-5 = /apps/metacity/window_keybindings/move_to_workspace_5
23+move-to-workspace-6 = /apps/metacity/window_keybindings/move_to_workspace_6
24+move-to-workspace-7 = /apps/metacity/window_keybindings/move_to_workspace_7
25+move-to-workspace-8 = /apps/metacity/window_keybindings/move_to_workspace_8
26+move-to-workspace-9 = /apps/metacity/window_keybindings/move_to_workspace_9
27+move-to-workspace-10 = /apps/metacity/window_keybindings/move_to_workspace_10
28+move-to-workspace-11 = /apps/metacity/window_keybindings/move_to_workspace_11
29+move-to-workspace-12 = /apps/metacity/window_keybindings/move_to_workspace_12
30+move-to-workspace-left = /apps/metacity/window_keybindings/move_to_workspace_left
31+move-to-workspace-right = /apps/metacity/window_keybindings/move_to_workspace_right
32+move-to-workspace-up = /apps/metacity/window_keybindings/move_to_workspace_up
33+move-to-workspace-down = /apps/metacity/window_keybindings/move_to_workspace_down
34+switch-windows = /apps/metacity/global_keybindings/switch_windows
35+switch-group = /apps/metacity/global_keybindings/switch_group
36+show-desktop = /apps/metacity/global_keybindings/show_desktop
37+switch-to-workspace-1 = /apps/metacity/global_keybindings/switch_to_workspace_1
38+switch-to-workspace-2 = /apps/metacity/global_keybindings/switch_to_workspace_2
39+switch-to-workspace-3 = /apps/metacity/global_keybindings/switch_to_workspace_3
40+switch-to-workspace-4 = /apps/metacity/global_keybindings/switch_to_workspace_4
41+switch-to-workspace-5 = /apps/metacity/global_keybindings/switch_to_workspace_5
42+switch-to-workspace-6 = /apps/metacity/global_keybindings/switch_to_workspace_6
43+switch-to-workspace-7 = /apps/metacity/global_keybindings/switch_to_workspace_7
44+switch-to-workspace-8 = /apps/metacity/global_keybindings/switch_to_workspace_8
45+switch-to-workspace-9 = /apps/metacity/global_keybindings/switch_to_workspace_9
46+switch-to-workspace-10 = /apps/metacity/global_keybindings/switch_to_workspace_10
47+switch-to-workspace-11 = /apps/metacity/global_keybindings/switch_to_workspace_11
48+switch-to-workspace-12 = /apps/metacity/global_keybindings/switch_to_workspace_12
49+switch-to-workspace-left = /apps/metacity/global_keybindings/switch_to_workspace_left
50+switch-to-workspace-right = /apps/metacity/global_keybindings/switch_to_workspace_right
51+switch-to-workspace-up = /apps/metacity/global_keybindings/switch_to_workspace_up
52+switch-to-workspace-down = /apps/metacity/global_keybindings/switch_to_workspace_down
53+activate-window-menu = /apps/metacity/window_keybindings/activate_window_menu
54+toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen
55+toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized
56+maximize = /apps/metacity/window_keybindings/maximize
57+unmaximize = /apps/metacity/window_keybindings/unmaximize
58+toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded
59+close = /apps/metacity/window_keybindings/close
60+minimize = /apps/metacity/window_keybindings/minimize
61+begin-move = /apps/metacity/window_keybindings/begin_move
62+begin-resize = /apps/metacity/window_keybindings/begin_resize
63+raise = /apps/metacity/window_keybindings/raise
64+lower = /apps/metacity/window_keybindings/lower
65+maximize-vertically = /apps/metacity/window_keybindings/maximize_vertically
66+maximize-horizontally = /apps/metacity/window_keybindings/maximize_horizontally
67+
68
69=== modified file 'postinst/convert-files/compiz-profile-active-Default.convert'
70--- postinst/convert-files/compiz-profile-active-Default.convert 2012-07-20 16:28:04 +0000
71+++ postinst/convert-files/compiz-profile-active-Default.convert 2012-08-16 15:38:19 +0000
72@@ -108,3 +108,63 @@
73 top-left-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_left_corner_action
74 top-right-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_right_corner_action
75
76+
77+[org.compiz.integrated]
78+exec = /apps/metacity/global_keybindings/run_command_terminal
79+run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
80+run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
81+panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
82+panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
83+
84+
85+[org.gnome.desktop.wm.keybindings]
86+move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
87+move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2
88+move-to-workspace-3 = /apps/metacity/window_keybindings/move_to_workspace_3
89+move-to-workspace-4 = /apps/metacity/window_keybindings/move_to_workspace_4
90+move-to-workspace-5 = /apps/metacity/window_keybindings/move_to_workspace_5
91+move-to-workspace-6 = /apps/metacity/window_keybindings/move_to_workspace_6
92+move-to-workspace-7 = /apps/metacity/window_keybindings/move_to_workspace_7
93+move-to-workspace-8 = /apps/metacity/window_keybindings/move_to_workspace_8
94+move-to-workspace-9 = /apps/metacity/window_keybindings/move_to_workspace_9
95+move-to-workspace-10 = /apps/metacity/window_keybindings/move_to_workspace_10
96+move-to-workspace-11 = /apps/metacity/window_keybindings/move_to_workspace_11
97+move-to-workspace-12 = /apps/metacity/window_keybindings/move_to_workspace_12
98+move-to-workspace-left = /apps/metacity/window_keybindings/move_to_workspace_left
99+move-to-workspace-right = /apps/metacity/window_keybindings/move_to_workspace_right
100+move-to-workspace-up = /apps/metacity/window_keybindings/move_to_workspace_up
101+move-to-workspace-down = /apps/metacity/window_keybindings/move_to_workspace_down
102+switch-windows = /apps/metacity/global_keybindings/switch_windows
103+switch-group = /apps/metacity/global_keybindings/switch_group
104+show-desktop = /apps/metacity/global_keybindings/show_desktop
105+switch-to-workspace-1 = /apps/metacity/global_keybindings/switch_to_workspace_1
106+switch-to-workspace-2 = /apps/metacity/global_keybindings/switch_to_workspace_2
107+switch-to-workspace-3 = /apps/metacity/global_keybindings/switch_to_workspace_3
108+switch-to-workspace-4 = /apps/metacity/global_keybindings/switch_to_workspace_4
109+switch-to-workspace-5 = /apps/metacity/global_keybindings/switch_to_workspace_5
110+switch-to-workspace-6 = /apps/metacity/global_keybindings/switch_to_workspace_6
111+switch-to-workspace-7 = /apps/metacity/global_keybindings/switch_to_workspace_7
112+switch-to-workspace-8 = /apps/metacity/global_keybindings/switch_to_workspace_8
113+switch-to-workspace-9 = /apps/metacity/global_keybindings/switch_to_workspace_9
114+switch-to-workspace-10 = /apps/metacity/global_keybindings/switch_to_workspace_10
115+switch-to-workspace-11 = /apps/metacity/global_keybindings/switch_to_workspace_11
116+switch-to-workspace-12 = /apps/metacity/global_keybindings/switch_to_workspace_12
117+switch-to-workspace-left = /apps/metacity/global_keybindings/switch_to_workspace_left
118+switch-to-workspace-right = /apps/metacity/global_keybindings/switch_to_workspace_right
119+switch-to-workspace-up = /apps/metacity/global_keybindings/switch_to_workspace_up
120+switch-to-workspace-down = /apps/metacity/global_keybindings/switch_to_workspace_down
121+activate-window-menu = /apps/metacity/window_keybindings/activate_window_menu
122+toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen
123+toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized
124+maximize = /apps/metacity/window_keybindings/maximize
125+unmaximize = /apps/metacity/window_keybindings/unmaximize
126+toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded
127+close = /apps/metacity/window_keybindings/close
128+minimize = /apps/metacity/window_keybindings/minimize
129+begin-move = /apps/metacity/window_keybindings/begin_move
130+begin-resize = /apps/metacity/window_keybindings/begin_resize
131+raise = /apps/metacity/window_keybindings/raise
132+lower = /apps/metacity/window_keybindings/lower
133+maximize-vertically = /apps/metacity/window_keybindings/maximize_vertically
134+maximize-horizontally = /apps/metacity/window_keybindings/maximize_horizontally
135+

Subscribers

People subscribed via source and target branches