The attached patch updates keyboard shortcuts for OpenSolaris accoding to the Ui spec. It also fixed borken download link, merged 02-ctrl-esc-mod4-r.diff with 09-enable-sun-keys-Open-Front.dif into one patch, renamed the new patch to 02-shortcut.diff and reordered patches.
Calum, do we really want to use F15 as the shortcut of Raise or Lower Window. If do not think it's very eazy to locate the key on normal keyboard. Regards, Jedy -------------- next part -------------- Index: base-specs/metacity.spec =================================================================== --- base-specs/metacity.spec (revision 15246) +++ base-specs/metacity.spec (working copy) @@ -16,15 +16,21 @@ Distribution: Java Desktop System Vendor: Sun Microsystems, Inc. Summary: GNOME Window Manager -Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.25/metacity-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.23/metacity-%{version}.tar.bz2 Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2 %if %build_l10n Source2: l10n-configure.sh %endif #owner:erwannc date:2000-00-00 type:branding Patch1: metacity-01-default-theme.diff -#owner:gheet date:2003-07-17 type:branding -Patch2: metacity-02-ctrl-esc-mod4-r.diff +%if %option_with_sun_branding +#owner:jedy date:2008-09-05 type:branding +Patch2: metacity-02-shortcut.diff +%endif +%if %option_with_indiana_branding +#owner:jedy date:2008-09-05 type:branding +Patch2: metacity-02-shortcut-indiana.diff +%endif #owner:gman date:2003-11-20 type:branding Patch3: metacity-03-ctrl-alt-del.diff #owner:erwannc date:2004-04-30 type:branding @@ -37,14 +43,12 @@ Patch7: metacity-07-branding-hack.diff #owner:erwannc date:2006-11-02 type:feature bugster:6393724 Patch8: metacity-08-trusted-extensions.diff -#owner:erwannc date:2004-10-08 type:feature bugster:5103120 -Patch9: metacity-09-enable-Sun-keys-Open-Front.diff #owner:bewitche date:2008-05-23 type:bug bugster:6676458 bugzilla:156543 -Patch10: metacity-10-wireframe.diff +Patch9: metacity-09-wireframe.diff #owner:erwannc date:2008-006-02 type:feature bugster:0000000 -Patch11: metacity-11-remove-xopen-source-posix.diff +Patch10: metacity-10-remove-xopen-source-posix.diff #owner:jedy date:2008-08-18 type:branding -Patch12: metacity-12-font.diff +Patch11: metacity-11-font.diff URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,7 +78,12 @@ cd po-sun; make; cd .. %endif %patch1 -p1 +%if %option_with_sun_branding %patch2 -p1 +%endif +%if %option_with_indiana_branding +%patch2 -p1 +%endif %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -84,7 +93,6 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %build %ifos linux @@ -162,6 +170,12 @@ %{_mandir}/man1/* %changelog +* Fri Sep 05 2008 - jedy.wang at sun.com +- Fix broken link. +- Merge 02-ctrl-esc-mod4-r.diff with 09-enable-sun-keys-Open-Front.dif + into one patch and rename it to 02-shortcut.diff. +- New patch 02-shortcut-indiana.diff. +- Reorder patches. * Tue Sep 02 2008 - christian.kelly at sun.com - Bump to 2.25.1. - Rework patches/metacity-08-trusted-extensions.diff. -------------- next part -------------- diff -Nrup metacity-2.16.3/src/metacity.schemas.in ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in --- metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:09:51.136549000 +0200 +++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:10:15.395755000 +0200 @@ -509,7 +509,7 @@ you set <applyto>/apps/metacity/window_keybindings/minimize</applyto> <owner>metacity</owner> <type>string</type> - <default><Alt>F9</default> + <default>F17</default> <locale name="C"> <short>Minimize window</short> <long> @@ -971,7 +971,7 @@ you set <applyto>/apps/metacity/window_keybindings/raise_or_lower</applyto> <owner>metacity</owner> <type>string</type> - <!-- no default for this one --> + <default>F15</default> <locale name="C"> <short>Raise obscured window, otherwise lower</short> <long> @@ -1235,7 +1235,7 @@ you set <applyto>/apps/metacity/global_keybindings/show_desktop</applyto> <owner>metacity</owner> <type>string</type> - <default><Control><Alt>d</default> + <default><Mod4>d</default> <locale name="C"> <short>Hide all windows and focus desktop</short> <long> @@ -1648,7 +1648,7 @@ you set <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto> <owner>metacity</owner> <type>string</type> - <default><Alt>F1</default> + <default><Control>Escape</default> <locale name="C"> <short>Show the panel menu</short> <long> @@ -1671,7 +1671,7 @@ you set <applyto>/apps/metacity/global_keybindings/panel_run_dialog</applyto> <owner>metacity</owner> <type>string</type> - <default><Alt>F2</default> + <default><Mod4>r</default> <locale name="C"> <short>Show the panel run application dialog</short> <long> -------------- next part -------------- diff -ur metacity-2.23.377-orig//src/metacity.schemas.in metacity-2.23.377//src/metacity.schemas.in --- metacity-2.23.377-orig//src/metacity.schemas.in Fri Sep 5 16:41:44 2008 +++ metacity-2.23.377//src/metacity.schemas.in Fri Sep 5 16:43:04 2008 @@ -1024,7 +1024,7 @@ <applyto>/apps/metacity/window_keybindings/raise_or_lower</applyto> <owner>metacity</owner> <type>string</type> - <!-- no default for this one --> + <default>F15</default> <locale name="C"> <short>Raise obscured window, otherwise lower</short> <long> @@ -1096,7 +1096,7 @@ <applyto>/apps/metacity/window_keybindings/maximize_vertically</applyto> <owner>metacity</owner> <type>string</type> - <!-- no default for this one --> + <default><Shift><Alt>Tab</default> <locale name="C"> <short>Maximize window vertically</short> <long>
