diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-09-16 16:18:57 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-09-16 16:18:57 +0200 |
| commit | 50a389703d127643680eb466d21741807f7c65e7 (patch) | |
| tree | caf9016aa9164b82949d02fa047857d0be701bda /shortcuts | |
| parent | 321325c40bf676a854ad3145442148482aeea65e (diff) | |
UnityScreen, CompizShortcutModeller: remove the custom keys to maximize or restore/minimize
We already have them defined in compiz core nowadays, it's better not to create even more fragmentation, but reusing what we can. Sadly I've to remove code :'( (bzr r1820.4.15)
Diffstat (limited to 'shortcuts')
| -rw-r--r-- | shortcuts/CompizShortcutModeller.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/shortcuts/CompizShortcutModeller.cpp b/shortcuts/CompizShortcutModeller.cpp index cd13d8522..b77966a70 100644 --- a/shortcuts/CompizShortcutModeller.cpp +++ b/shortcuts/CompizShortcutModeller.cpp @@ -40,7 +40,8 @@ namespace // Compiz Core Options const std::string CORE_OPTION_SHOW_DESKTOP_KEY = "show_desktop_key"; - const std::string CORE_OPTION_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY = "unmaximize_or_minimize_window_key"; + const std::string CORE_OPTION_MAXIMIZE_KEY = "maximize_window_key"; + const std::string CORE_OPTION_RESTORE_MINIMIZE_KEY = "unmaximize_or_minimize_window_key"; const std::string CORE_OPTION_CLOSE_WINDOW_KEY = "close_window_key"; const std::string CORE_OPTION_WINDOW_MENU_KEY = "window_menu_key"; @@ -302,14 +303,14 @@ void CompizModeller::AddWindowsHints(std::list<shortcut::AbstractHint::Ptr> &hin hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Maximises the current window."), shortcut::OptionType::COMPIZ_KEY, - UNITYSHELL_PLUGIN_NAME, - UNITYSHELL_OPTION_MAXIMIZE)); + CORE_PLUGIN_NAME, + CORE_OPTION_MAXIMIZE_KEY)); hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Restores or minimises the current window."), shortcut::OptionType::COMPIZ_KEY, - UNITYSHELL_PLUGIN_NAME, - UNITYSHELL_OPTION_RESTORE_MINIMIZE)); + CORE_PLUGIN_NAME, + CORE_OPTION_RESTORE_MINIMIZE_KEY)); hints.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"), _("Semi-maximise the current window."), |