metacity r4064 - in trunk: . src/include src/ui

[tthurman svn gnome org]

Author: tthurman
Date: Thu Dec 25 16:53:33 2008
New Revision: 4064
URL: http://svn.gnome.org/viewvc/metacity?rev=4064&view=rev

Log:
	* src/include/all-keybindings.h: alt-F10 toggles maximisation,
          alt-F5 only restores.  Also rename "unmaximize" to "restore".
	* src/ui/frames.c: Rename "unmaximize" to "restore".
          Closes #343824.



Modified:
   trunk/ChangeLog
   trunk/src/include/all-keybindings.h
   trunk/src/ui/frames.c

Modified: trunk/src/include/all-keybindings.h
==============================================================================
--- trunk/src/include/all-keybindings.h	(original)
+++ trunk/src/include/all-keybindings.h	Thu Dec 25 16:53:33 2008
@@ -258,14 +258,14 @@
 keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW,
         NULL,
         _("Toggle fullscreen mode"))
-keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, NULL,
+keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, "<Alt>F10",
         _("Toggle maximization state"))
 keybind (toggle_above, handle_toggle_above, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle whether a window will always be visible over other windows"))
-keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, "<Alt>F10",
+keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, NULL,
         _("Maximize window"))
 keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW, "<Alt>F5",
-        _("Unmaximize window"))
+        _("Restore window"))
 keybind (toggle_shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle shaded state"))
 keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "<Alt>F9",

Modified: trunk/src/ui/frames.c
==============================================================================
--- trunk/src/ui/frames.c	(original)
+++ trunk/src/ui/frames.c	Thu Dec 25 16:53:33 2008
@@ -1086,7 +1086,7 @@
       tiptext = _("Maximize Window");
       break;
     case META_FRAME_CONTROL_UNMAXIMIZE:
-      tiptext = _("Unmaximize Window");
+      tiptext = _("Restore Window");
       break;
     case META_FRAME_CONTROL_SHADE:
       tiptext = _("Roll Up Window");