From d71d4660b447e599b29dc47e2c7af44088965c0b Mon Sep 17 00:00:00 2001
From: pines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 6 Jul 2006 17:34:23 +0000
Subject: [PATCH] close all tabs button and new tabs have focus by default

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4913 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../xul/staff_client/chrome/content/main/menu.js  | 15 +++++++++++++++
 .../chrome/content/main/menu_frame_menus.xul      | 12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index a9297673c6..a0c4595c34 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -58,6 +58,10 @@ main.menu.prototype = {
 				['oncommand'],
 				function() { obj.close_tab(); }
 			],
+			'cmd_close_all_tabs' : [
+				['oncommand'],
+				function() { obj.close_all_tabs(); }
+			],
 
 			/* Edit Menu */
 			'cmd_edit_copy_buckets' : [
@@ -562,6 +566,16 @@ main.menu.prototype = {
 		}
 	},
 
+	'close_all_tabs' : function() {
+		var obj = this;
+		try {
+			var count = obj.controller.view.tabs.childNodes.length;
+			for (var i = 0; i < count; i++) obj.close_tab();
+		} catch(E) {
+			obj.error.standard_unexpected_error_alert('Error closing all tabs',E);
+		}
+	},
+
 	'close_tab' : function () {
 		var idx = this.controller.view.tabs.selectedIndex;
 		var tab = this.controller.view.tabs.childNodes[idx];
@@ -643,6 +657,7 @@ main.menu.prototype = {
 		tab.hidden = false;
 		if (!content_params) content_params = {};
 		if (!params) params = { 'tab_name' : 'Tab ' + (tc+1) };
+		if (!params.nofocus) params.focus = true; /* make focus the default */
 		try {
 			if (params.focus) this.controller.view.tabs.selectedIndex = tc;
 			params.index = tc;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 887d32cc8b..080b8b4a88 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -12,6 +12,7 @@
 	<command id="cmd_new_window" key="new-window-key" />
 	<command id="cmd_new_tab" key="new-tab-key" />
 	<command id="cmd_close_tab" key="close-tab-key" />
+	<command id="cmd_close_all_tabs" key="close-all-tabs-key" />
 
 	<command id="cmd_edit_copy_buckets" />
 	<command id="cmd_edit_record_buckets" />
@@ -69,6 +70,7 @@
 	<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-all-tabs-key" modifiers="accel,shift" key="W" command="cmd_close_all_tabs"/>
 	<key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
 	<key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
 	<key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
@@ -90,13 +92,11 @@
 		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.key;" key="new-window-key" command="cmd_new_window"/>
 		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.key;" key="new-tab-key" command="cmd_new_tab"/>
 		<menuseparator />
-	<!--
-		<menuitem label="&staff.main.menu.file.open.label;" accesskey="&staff.main.menu.file.open.key;" key="file-open-key" command="cmd_broken" disabled="true"/>
-		<menuitem label="&staff.main.menu.file.save.label;" accesskey="&staff.main.menu.file.save.key;" key="file-save-key" command="cmd_broken"/>
+		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="C" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
+		<menuitem label="Close All Tabs" accesskey="A" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
+		<menuitem label="&staff.main.menu.file.close.label;" accesskey="W" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
 		<menuseparator />
-	-->
-		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
+		<menuitem label="Quit Program" accesskey="Q" command="cmd_shutdown"/>
 	</menupopup>
 </menu>
 
-- 
2.43.2