Unity

Merge lp:~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores into lp:unity

  1. unity.merge-fix966099-shortcut-fails-to-minimize-just-restores
  2. Merge into trunk
Proposed by MC Return
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3102
Proposed branch: lp:~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores
Merge into: lp:unity
Diff against target: 59 lines (+5/-5)
4 files modified
shortcuts/CompizShortcutModeller.cpp (+2/-2)
shortcuts/StandaloneShortcuts.cpp (+1/-1)
tools/convert-files/compiz-profile-active-unity.convert (+1/-1)
tools/convert-files/compiz-profile-unity.convert (+1/-1)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Disapprove
Brandon Schaefer (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+145474@code.launchpad.net

Commit message

Changed all references to unmaximize_window_key to unmaximize_or_minimize_window_key.
Together with the changes to Compiz the default shortcut to "restore or minimize" the
focused window will now work correctly.

(LP: #966099)

Description of the change

Note:
This needs Compiz changes to work, see here:
lp:~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores

Already merged into lp:compiz in r3591. The new functionality is now fully usable,
but currently disabled. Reference:
http://bazaar.launchpad.net/~compiz-team/compiz/0.9.9/revision/3591

This MP modifies the quilt Compiz patching for the Ubuntu version:
https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix966099-refresh-quilt-patch.0/+merge/146203
This landed in lp:compiz here: http://bazaar.launchpad.net/~compiz-team/compiz/0.9.9/revision/3594

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Note this branch requires this compiz branch:
https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix966099-add-unmaximize-or-minimize-window-key/+merge/145464

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Actually we need to wait for the ubuntu patch to be updated so there wont be a missing shortcut.

review: Needs Fixing
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

with the new patch landed, this is ready.

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

-unmaximize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_window_key
+unmaximize-or-minimize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_or_minimize_window_key

This is wrong, the gconf key didn't change and is still unmaximize_window_key… mc-return, can you please propose a revert of the right side, about it.

Also, what's your key strategy migration so that people won't loose their keybinding change on upgrade?

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shortcuts/CompizShortcutModeller.cpp'
2--- shortcuts/CompizShortcutModeller.cpp 2013-01-23 14:57:58 +0000
3+++ shortcuts/CompizShortcutModeller.cpp 2013-01-29 19:53:42 +0000
4@@ -42,7 +42,7 @@
5 // Compiz Core Options
6 const std::string CORE_OPTION_SHOW_DESKTOP_KEY = "show_desktop_key";
7 const std::string CORE_OPTION_MAXIMIZE_WINDOW_KEY = "maximize_window_key";
8- const std::string CORE_OPTION_UNMAXIMIZE_WINDOW_KEY = "unmaximize_window_key";
9+ const std::string CORE_OPTION_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY = "unmaximize_or_minimize_window_key";
10 const std::string CORE_OPTION_CLOSE_WINDOW_KEY = "close_window_key";
11 const std::string CORE_OPTION_WINDOW_MENU_KEY = "window_menu_key";
12
13@@ -304,7 +304,7 @@
14 _("Restores or minimises the current window."),
15 shortcut::OptionType::COMPIZ_KEY,
16 CORE_PLUGIN_NAME,
17- CORE_OPTION_UNMAXIMIZE_WINDOW_KEY));
18+ CORE_OPTION_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY));
19
20 hints.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"),
21 _("Semi-maximise the current window."),
22
23=== modified file 'shortcuts/StandaloneShortcuts.cpp'
24--- shortcuts/StandaloneShortcuts.cpp 2013-01-23 15:29:43 +0000
25+++ shortcuts/StandaloneShortcuts.cpp 2013-01-29 19:53:42 +0000
26@@ -226,7 +226,7 @@
27 _("Restores or minimises the current window."),
28 shortcut::OptionType::COMPIZ_KEY,
29 "core",
30- "unmaximize_window_key")));
31+ "unmaximize_or_minimize_window_key")));
32
33 hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", _(" or Right"),
34 _("Semi-maximises the current window."),
35
36=== modified file 'tools/convert-files/compiz-profile-active-unity.convert'
37--- tools/convert-files/compiz-profile-active-unity.convert 2012-11-06 18:19:09 +0000
38+++ tools/convert-files/compiz-profile-active-unity.convert 2013-01-29 19:53:42 +0000
39@@ -70,7 +70,7 @@
40 toggle-window-maximized-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_key
41 toggle-window-maximized-vertically-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_vertically_key
42 toggle-window-shaded-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_shaded_key
43-unmaximize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_window_key
44+unmaximize-or-minimize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_or_minimize_window_key
45 window-menu-button = /apps/compiz-1/plugins/core/screen0/options/window_menu_button
46 window-menu-key = /apps/compiz-1/plugins/core/screen0/options/window_menu_key
47
48
49=== modified file 'tools/convert-files/compiz-profile-unity.convert'
50--- tools/convert-files/compiz-profile-unity.convert 2012-11-06 18:19:09 +0000
51+++ tools/convert-files/compiz-profile-unity.convert 2013-01-29 19:53:42 +0000
52@@ -70,7 +70,7 @@
53 toggle-window-maximized-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_key
54 toggle-window-maximized-vertically-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_vertically_key
55 toggle-window-shaded-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_shaded_key
56-unmaximize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_window_key
57+unmaximize-or-minimize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_or_minimize_window_key
58 window-menu-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/window_menu_button
59 window-menu-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/window_menu_key
60