From 9e2be552912d4d3c798323a0254e47b0e73d76e6 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 27 Jul 2005 01:33:42 +0000
Subject: [PATCH] RC2. accelerator keys

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1533 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Evergreen/staff_client/Makefile               |  2 +-
 .../main/app_shell_menus_overlay.xul          | 90 +++++++++----------
 .../evergreen/main/app_shell_overlay.xul      | 48 +++++-----
 .../chrome/locale/en-US/evergreen/auth.dtd    |  2 +-
 Evergreen/staff_client/install.rdf            |  2 +-
 5 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index 64c4a2aa4e..02ec27a939 100644
--- a/Evergreen/staff_client/Makefile
+++ b/Evergreen/staff_client/Makefile
@@ -1,6 +1,6 @@
 VERSION=0.0.9
 PACKAGE=Evergreen
-DESCRIPTION=Evergreen Staff Client Alpha RC1
+DESCRIPTION=Evergreen Alpha RC2
 BUILD=2005072619
 
 RETRIEVE_FIELDMAPPER=wget -N http://gapines.org/js/util/fieldmapper.js
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
index 1db0c2994c..2e66610d6e 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
@@ -8,16 +8,16 @@
 <!-- The File menu on the main menu -->
 <menu id="main.menu.file" label="&main.menu.file.label;" accesskey="&main.menu.file.key;" >
 	<menupopup id="main.menu.file.popup">
-		<menuitem label="&main.menu.file.new.label;" accesskey="&main.menu.file.new.key;" key="file-new-key" command="cmd_new_window"/>
-		<menuitem label="&main.menu.file.new_tab.label;" accesskey="&main.menu.file.new_tab.key;" key="file-new-tab-key" command="cmd_new_tab"/>
+		<menuitem label="&main.menu.file.new.label;" accesskey="&main.menu.file.new.key;" key="file-new-key" observes="cmd_new_window"/>
+		<menuitem label="&main.menu.file.new_tab.label;" accesskey="&main.menu.file.new_tab.key;" key="file-new-tab-key" observes="cmd_new_tab"/>
 		<menuseparator />
 	<!--
-		<menuitem label="&main.menu.file.open.label;" accesskey="&main.menu.file.open.key;" key="file-open-key" command="cmd_broken" disabled="true"/>
-		<menuitem label="&main.menu.file.save.label;" accesskey="&main.menu.file.save.key;" key="file-save-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.file.open.label;" accesskey="&main.menu.file.open.key;" key="file-open-key" observes="cmd_broken" disabled="true"/>
+		<menuitem label="&main.menu.file.save.label;" accesskey="&main.menu.file.save.key;" key="file-save-key" observes="cmd_broken"/>
 		<menuseparator />
 	-->
-		<menuitem label="&main.menu.file.close_tab.label;" accesskey="&main.menu.file.close_tab.key;" key="file-close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&main.menu.file.close.label;" accesskey="&main.menu.file.close.key;" key="file-close-key" command="cmd_close_window"/>
+		<menuitem label="&main.menu.file.close_tab.label;" accesskey="&main.menu.file.close_tab.key;" key="file-close-tab-key" observes="cmd_close_tab"/>
+		<menuitem label="&main.menu.file.close.label;" accesskey="&main.menu.file.close.key;" key="file-close-key" observes="cmd_close_window"/>
 	</menupopup>
 </menu>
 
@@ -26,20 +26,20 @@
 	<menupopup id="main.menu.edit.popup">
 		<menuitem label="stub"/>
 	<!--
-		<menuitem label="&main.menu.edit.undo.label;" accesskey="&main.menu.edit.undo.key;" key="edit-undo-key" command="cmd_broken"/>
-		<menuitem label="&main.menu.edit.redo.label;" accesskey="&main.menu.edit.redo.key;" key="edit-redo-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.undo.label;" accesskey="&main.menu.edit.undo.key;" key="edit-undo-key" observes="cmd_broken"/>
+		<menuitem label="&main.menu.edit.redo.label;" accesskey="&main.menu.edit.redo.key;" key="edit-redo-key" observes="cmd_broken"/>
 		<menuseparator />
-		<menuitem label="&main.menu.edit.cut.label;" accesskey="&main.menu.edit.cut.key;" key="edit-cut-key" command="cmd_broken"/>
-		<menuitem label="&main.menu.edit.copy.label;" accesskey="&main.menu.edit.copy.key;" key="edit-copy-key" command="cmd_broken"/>
-		<menuitem label="&main.menu.edit.paste.label;" accesskey="&main.menu.edit.paste.key;" key="edit-paste-key" command="cmd_broken"/>
-		<menuitem label="&main.menu.edit.delete.label;" accesskey="&main.menu.edit.delete.key;" key="edit-delete-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.cut.label;" accesskey="&main.menu.edit.cut.key;" key="edit-cut-key" observes="cmd_broken"/>
+		<menuitem label="&main.menu.edit.copy.label;" accesskey="&main.menu.edit.copy.key;" key="edit-copy-key" observes="cmd_broken"/>
+		<menuitem label="&main.menu.edit.paste.label;" accesskey="&main.menu.edit.paste.key;" key="edit-paste-key" observes="cmd_broken"/>
+		<menuitem label="&main.menu.edit.delete.label;" accesskey="&main.menu.edit.delete.key;" key="edit-delete-key" observes="cmd_broken"/>
 		<menuseparator />
-		<menuitem label="&main.menu.edit.buckets.label;" accesskey="&main.menu.edit.buckets.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.buckets.label;" accesskey="&main.menu.edit.buckets.key;" observes="cmd_broken"/>
 		<menuseparator />
-		<menuitem label="&main.menu.edit.select_all.label;" accesskey="&main.menu.edit.select_all.key;" key="edit-select-all-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.select_all.label;" accesskey="&main.menu.edit.select_all.key;" key="edit-select-all-key" observes="cmd_broken"/>
 		<menuseparator />
-		<menuitem label="&main.menu.edit.find.label;" accesskey="&main.menu.edit.find.key;" key="edit-find-key" command="cmd_broken"/>
-		<menuitem label="&main.menu.edit.find_again.label;" accesskey="&main.menu.edit.find_again.key;" key="edit-find-again-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.find.label;" accesskey="&main.menu.edit.find.key;" key="edit-find-key" observes="cmd_broken"/>
+		<menuitem label="&main.menu.edit.find_again.label;" accesskey="&main.menu.edit.find_again.key;" key="edit-find-again-key" observes="cmd_broken"/>
 	-->
 	</menupopup>
 </menu>
@@ -47,49 +47,49 @@
 <!-- The Circulation menu on the main menu -->
 <menu id="main.menu.circ" label="&main.menu.circ.label;" accesskey="&main.menu.circ.key;">
 	<menupopup id="main.menu.circ.popup">
-		<menuitem label="&main.menu.circ.checkout.label;" accesskey="&main.menu.circ.checkout.key;" command="cmd_circ_checkout"/>
-		<menuitem label="&main.menu.circ.checkin.label;" accesskey="&main.menu.circ.checkin.key;" command="cmd_circ_checkin"/>
-		<menuitem label="&main.menu.circ.hold_capture.label;" accesskey="&main.menu.circ.hold_capture.key;" command="cmd_circ_hold_capture"/>
+		<menuitem label="&main.menu.circ.checkout.label;" accesskey="&main.menu.circ.checkout.key;" observes="cmd_circ_checkout"/>
+		<menuitem label="&main.menu.circ.checkin.label;" accesskey="&main.menu.circ.checkin.key;" observes="cmd_circ_checkin"/>
+		<menuitem label="&main.menu.circ.hold_capture.label;" accesskey="&main.menu.circ.hold_capture.key;" observes="cmd_circ_hold_capture"/>
 	<!--
-		<menu id="special-circ-menu" label="&main.menu.circ.special.label;" accesskey="&main.menu.circ.special.key;" command="cmd_broken"/>
+		<menu id="special-circ-menu" label="&main.menu.circ.special.label;" accesskey="&main.menu.circ.special.key;" observes="cmd_broken"/>
 		<menuseparator />
-		<menuitem label="&main.menu.circ.place_hold.label;" accesskey="&main.menu.circ.place_hold.key;" key="circ-place-hold-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.place_hold.label;" accesskey="&main.menu.circ.place_hold.key;" key="circ-place-hold-key" observes="cmd_broken"/>
 	-->
 		<menuseparator />
-		<menuitem label="&main.menu.circ.copy_status.label;" accesskey="&main.menu.circ.copy_status.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.patron_status.label;" accesskey="&main.menu.circ.patron_status.key;" command="cmd_circ_display"/>
+		<menuitem label="&main.menu.circ.copy_status.label;" accesskey="&main.menu.circ.copy_status.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.patron_status.label;" accesskey="&main.menu.circ.patron_status.key;" observes="cmd_circ_checkout"/>
 		<menuseparator />
-		<menuitem label="&main.menu.circ.patron_registration.label;" accesskey="&main.menu.circ.patron_registration.key;" command="cmd_patron_register"/>
+		<menuitem label="&main.menu.circ.patron_registration.label;" accesskey="&main.menu.circ.patron_registration.key;" observes="cmd_patron_register"/>
 	</menupopup>
 </menu>
 
 <!-- The Special Circulation submenu in the Circulation menu -->
 <menu id="special-circ-menu">
 	<menupopup id="special-circ-popup">
-		<menuitem label="&main.menu.circ.mark_used.label;" accesskey="&main.menu.circ.mark_used.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.lost.label;" accesskey="&main.menu.circ.lost.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.missing.label;" accesskey="&main.menu.circ.missing.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.found.label;" accesskey="&main.menu.circ.found.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.claimed_returned.label;" accesskey="&main.menu.circ.claimed_returned.key;" command="cmd_broken"/>
-		<menuitem label="&main.menu.circ.quick_add.label;" accesskey="&main.menu.circ.quick_add.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.mark_used.label;" accesskey="&main.menu.circ.mark_used.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.lost.label;" accesskey="&main.menu.circ.lost.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.missing.label;" accesskey="&main.menu.circ.missing.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.found.label;" accesskey="&main.menu.circ.found.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.claimed_returned.label;" accesskey="&main.menu.circ.claimed_returned.key;" observes="cmd_broken"/>
+		<menuitem label="&main.menu.circ.quick_add.label;" accesskey="&main.menu.circ.quick_add.key;" observes="cmd_broken"/>
 	</menupopup>
 </menu>
 
 <!-- The Cataloging menu on the main menu -->
 <menu id="main.menu.cat" label="&main.menu.cat.label;" accesskey="&main.menu.cat.key;">
 	<menupopup id="main.menu.cat.popup">
-		<menuitem label="&main.menu.cat.bib_search.label;" accesskey="&main.menu.cat.bib_search.key;" command="cmd_cat_main"/>
+		<menuitem label="&main.menu.cat.bib_search.label;" accesskey="&main.menu.cat.bib_search.key;" observes="cmd_search_opac"/>
 		<menuseparator />
-		<menuitem disabled="true" label="&main.menu.cat.dedup.label;" accesskey="&main.menu.cat.dedup.key;" command="cmd_broken"/>
-		<menuitem label="Z39.50 Import" accesskey="Z" command="cmd_z39_50_import"/>
+		<menuitem disabled="true" label="&main.menu.cat.dedup.label;" accesskey="&main.menu.cat.dedup.key;" observes="cmd_broken"/>
+		<menuitem label="Z39.50 Import" accesskey="Z" observes="cmd_z39_50_import"/>
 	</menupopup>
 </menu>
 
 <!-- The Search menu on the main menu -->
 <menu id="main.menu.search" label="&main.menu.search.label;" accesskey="&main.menu.search.key;">
 	<menupopup id="main.menu.search.popup">
-		<menuitem label="Catalog" accesskey="C" command="cmd_search_opac" />
-		<menuitem label="Patrons" accesskey="P" command="cmd_circ_search" />
+		<menuitem label="Catalog" accesskey="C" observes="cmd_search_opac" />
+		<menuitem label="Patrons" accesskey="P" observes="cmd_patron_search" />
 	</menupopup>
 </menu>
 
@@ -124,17 +124,17 @@
 <!-- The Help menu on the main menu -->
 <menu id="main.menu.admin" label="&main.menu.admin.label;" accesskey="&main.menu.admin.key;">
 	<menupopup id="main.menu.admin.popup">
-		<menuitem label="Receipt Template Editor" accesskey="R" command="cmd_receipt_template_editor"/>
-		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
-		<menuitem label="Copy Stat-Cat Editor" accesskey="C" command="cmd_copy_stat_cat_edit"/>
-		<menuitem label="Patron Stat-Cat Editor" accesskey="P" command="cmd_patron_stat_cat_edit"/>
+		<menuitem label="Receipt Template Editor" accesskey="R" observes="cmd_receipt_template_editor"/>
+		<menuitem label="Survey Wizard" accesskey="S" observes="cmd_survey_wizard"/>
+		<menuitem label="Copy Stat-Cat Editor" accesskey="C" observes="cmd_copy_stat_cat_edit"/>
+		<menuitem label="Patron Stat-Cat Editor" accesskey="P" observes="cmd_patron_stat_cat_edit"/>
 		<menuseparator />
-		<menuitem label="Test Module" accesskey="T" command="cmd_test"/>
-		<menuitem label="XUL Test" accesskey="X" command="cmd_xuleditor"/>
-		<menuitem label="Fieldmapper" accesskey="m" command="cmd_fieldmapper"/>
-		<menuitem label="Filterable Console" accesskey="F" command="cmd_filter_console"/>
-		<menuitem label="Javscript Console" accesskey="J" command="cmd_console"/>
-		<menuitem label="Javscript Shell" accesskey="H" command="cmd_shell"/>
+		<menuitem label="Test Module" accesskey="T" observes="cmd_test"/>
+		<menuitem label="XUL Test" accesskey="X" observes="cmd_xuleditor"/>
+		<menuitem label="Fieldmapper" accesskey="m" observes="cmd_fieldmapper"/>
+		<menuitem label="Filterable Console" accesskey="F" observes="cmd_filter_console"/>
+		<menuitem label="Javscript Console" accesskey="J" observes="cmd_console"/>
+		<menuitem label="Javscript Shell" accesskey="H" observes="cmd_shell"/>
 	</menupopup>
 </menu>
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
index 746b822132..4c053a470e 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
@@ -9,40 +9,37 @@
 
 <commandset id="universal_cmds">
 
-	<command id="cmd_close_window" oncommand="
+	<command id="cmd_close_window" key="close-window-key" oncommand="
 		window.close();" />
 
-	<command id="cmd_new_window" oncommand="
+	<command id="cmd_new_window" key="new-window-key" oncommand="
 		mw.spawn_main();" />
 
-	<command id="cmd_new_tab" oncommand="
+	<command id="cmd_new_tab" key="new-tab-key" oncommand="
 		mw.new_tab(document,'main_tabbox');" />
 
-	<command id="cmd_close_tab" oncommand="
+	<command id="cmd_close_tab" key="close-tab-key" oncommand="
 		mw.close_tab(document,'main_tabbox');" />
 
-	<command id="cmd_cat_main" oncommand="
+	<command id="cmd_cat_main" key="cat-main-key" oncommand="
 		mw.spawn_opac_navigator(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_circ_checkout" oncommand="
+	<command id="cmd_circ_checkout" key="circ-checkout-key" oncommand="
 		mw.spawn_patron_barcode_entry(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_circ_search" oncommand="
+	<command id="cmd_patron_search" key="patron-search-key" oncommand="
 		mw.spawn_patron_search(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_circ_display" oncommand="
-		mw.spawn_patron_barcode_entry(document,'replace_tab','main_tabbox',{}); "/>
-
-	<command id="cmd_circ_checkin" oncommand="
+	<command id="cmd_circ_checkin" key="circ-checkin-key" oncommand="
 		mw.spawn_checkin(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_circ_hold_capture" oncommand="
+	<command id="cmd_circ_hold_capture" key="circ-hold-capture-key" oncommand="
 		mw.spawn_hold_capture(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_search_opac" oncommand="
+	<command id="cmd_search_opac" key="search-opac-key" oncommand="
 		mw.spawn_opac_navigator(document,'replace_tab','main_tabbox',{}); "/>	
 
-	<command id="cmd_patron_register" oncommand="
+	<command id="cmd_patron_register" key="patron-register-key" oncommand="
 		mw.spawn_patron_register(document,'replace_tab','main_tabbox',{}); "/>	
 
 	<command id="cmd_survey_wizard" oncommand="
@@ -75,10 +72,10 @@
 	<command id="cmd_fieldmapper" oncommand="
 		mw.spawn_fieldmapper(document,'new_tab','main_tabbox',{}); "/>
 
-	<command id="cmd_test" oncommand="
+	<command id="cmd_test" disabled="true" oncommand="
 		mw.spawn_interface(document,'new_tab','main_tabbox','chrome://evergreen/content/util/fm_view.xul','Fieldmapper',{}); "/>
 
-	<command id="cmd_broken" oncommand="
+	<command id="cmd_broken" disabled="true" oncommand="
 		alert('Not Yet Implemented'); "/>
 
 </commandset>
@@ -188,12 +185,12 @@
 
 <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
 <keyset id="AppShell_keys">
-	<key id="file-new-key" modifiers="accel" key="N" command="cmd_new_window"/>
-	<key id="file-new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
-	<key id="file-open-key" modifiers="accel" key="O" command=""/>
-	<key id="file-save-key" modifiers="accel" key="S" command=""/>
-	<key id="file-close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
-	<key id="file-close-key" modifiers="accel" key="Q" command="cmd_close_window"/>
+	<key id="new-window-key" modifiers="accel" key="N" command="cmd_new_window"/>
+	<key id="new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
+	<key id="open-key" modifiers="accel" key="O" command=""/>
+	<key id="save-key" modifiers="accel" key="S" command=""/>
+	<key id="close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
+	<key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
 	<!--
 	<key id="edit-undo-key" modifiers="accel" key="Z" command=""/>
 	<key id="edit-redo-key" modifiers="accel" key="Y" command=""/>
@@ -213,7 +210,12 @@
 	<key id="circ-place-hold-key" keycode="VK_F5" command=""/>
 	<key id="circ-patron-registration-key" keycode="VK_F12" command=""/>
 	-->
-	<key id="circ-check-out-key" keycode="VK_F1" command="cmd_circ_checkout"/>
+	<key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
+	<key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
+	<key id="search-opac-key" keycode="VK_F3" command="cmd_search_opac"/>
+	<key id="patron-search-key" keycode="VK_F4" command="cmd_patron_search"/>
+	<key id="circ-hold-capture-key" keycode="VK_F5" command="cmd_circ_hold_capture"/>
+	<key id="patron-register-key" keycode="VK_F12" command="cmd_patron_registration"/>
 </keyset>
 
 </overlay>
diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
index 50e3496c34..004164d516 100644
--- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
@@ -1,4 +1,4 @@
-<!ENTITY auth.title "Evergreen Staff Client Alpha RC1">
+<!ENTITY auth.title "Evergreen Alpha RC2">
 <!ENTITY auth.version "Evergreen 0.0.9 2005072619">
 
 <!ENTITY auth.login_header "Login">
diff --git a/Evergreen/staff_client/install.rdf b/Evergreen/staff_client/install.rdf
index e710883e05..c663c1c114 100755
--- a/Evergreen/staff_client/install.rdf
+++ b/Evergreen/staff_client/install.rdf
@@ -31,7 +31,7 @@
 	
 		<!-- Front End MetaData -->
 		<em:name>Evergreen</em:name>
-		<em:description>Evergreen Staff Client Alpha RC1</em:description>
+		<em:description>Evergreen Alpha RC2</em:description>
    	 
 		<em:homepageURL>http://open-ils.org/</em:homepageURL>
     
-- 
2.43.2