[frontierkernel-commits] odbs/frontierRoot/system/menus buildSuitesSubmenu,1.2,1.3 virginSuitesMenu,1.1.1.1,1.2

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/menus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19377

Modified Files:
	buildSuitesSubmenu virginSuitesMenu 
Log Message:
suites are added to the top of the Suites menu w/built-in commands at bottom, virgin Suites menu reorganized

Index: virginSuitesMenu
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/menus/virginSuitesMenu,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** virginSuitesMenu	26 Mar 2005 19:41:52 -0000	1.1.1.1
--- virginSuitesMenu	30 Sep 2005 15:50:08 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:mbar:system.menus.virginSuitesMenu
  
! AAEFAQAAATsAAQAAAAAAAAAAAAABuwDbAuADdgAAAAAAAAZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgBkAGQBpAJEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAsAAAAJwAAAAAADwZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAsHeVVb32TiIAAAVUAAAAkQC7AVkCPExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAU3VpdGVzDQlNaW5pbWFsIE1lbnVzDQlOZXcgU3VpdGUuLi4NCS0NgAAAAAAAAAAAAAAKLQAAAAAAAXhFvAAAAAAACgAAAAAAAAF4RcAAAAAAAAAAAgAAAAYAAAA2AAACAAAPBkdlbmV2YQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAbAAACkOfY3sJceIgAAABwAAACxALYBLgHJTEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABtZW51Lm5vU3VpdGUgKCkgx3Jlc2V0IHRoZSBtZW51IGJhciwgbm8gc3VpdGUgcnVubmluZw2AAAAAAAAAAgAAAAYAAAAhAAACAAAPBkdlbmV2YQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAbAAACt/psdsJmaQgAAABsAAAFZAX8CIQMATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABzeXN0ZW0ubWVudXMuc2NyaXB0cy5uZXdTdWl0ZSAoKQ2AAAAAAAA=
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:mbar:system.menus.virginSuitesMenu
  
! AAEFAQAAATsAAQAAAAAAAAAAAAABuwDbAuADdgAAAAAAAAZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgArAAMD/QT9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAsAAAAJwAAAAAADwZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAsHeVVb9fUZsAAApGAAAAkQC7AVkCPExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAU3VpdGVzDQktDQlNaW5pbWFsIE1lbnVzDQlOZXcgU3VpdGUuLi4NgAAAAAAAAAAAAAAAAAAAAAAKLQAAAAAAAS8IpAAAAAAACgAAAAAAAAEvCKgAAgAAAAYAAAA2AAACAAAPBkdlbmV2YQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAbAAACkOfY3sJceIgAAACUAAACxALYBLgHJTEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABtZW51Lm5vU3VpdGUgKCkgx3Jlc2V0IHRoZSBtZW51IGJhciwgbm8gc3VpdGUgcnVubmluZw2AAAAAAAAAAgAAAAYAAAAhAAACAAAPBkdlbmV2YQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAbAAACt/psdsJmaQgAAACQAAAFZAX8CIQMATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABzeXN0ZW0ubWVudXMuc2NyaXB0cy5uZXdTdWl0ZSAoKQ2AAAAAAAA=
\ No newline at end of file

Index: buildSuitesSubmenu
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/menus/buildSuitesSubmenu,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildSuitesSubmenu	14 Jun 2005 02:48:18 -0000	1.2
--- buildSuitesSubmenu	30 Sep 2005 15:50:08 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.menus.buildSuitesSubmenu
  
! on buildSuitesSubMenu () {
	ÇBuild the Suites submenu in the Main menu.
		ÇChanges
			Ç12/4/04; 12:30:36 PM by TAC
				ÇMain menu is now Operations
			Ç9/23/99; 2:58:52 PM by PBS
				ÇYou can put the address of a suite in the suites table, and it will be added to the menu.
			Ç9/24/99; 10:50:48 AM by PBS
				ÇIf the suite is in a gdb, and the gdb is open, and the suite contains a suiteName item, use that when building the Suites submenu. Otherwise, if the gdb is not open, use the name of the object in the Suites table.
	
	local (localMenu = system.menus.virginSuitesMenu);
	local (oldTarget = target.get ());
	target.set (@localMenu);
	
	local (adrSuitesTable = @root.suites);
	local (i, ct = sizeOf (adrSuitesTable^), adrSuite, adrMenu, name, logic);
	for i = 1 to ct {
		adrSuite = @adrSuitesTable^ [i];
		
		local (suiteType = typeOf (adrSuite^));
		case suiteType { //handle tables and addresses
			tableType {
				adrMenu = @adrsuite^.menu;
				if not defined (adrMenu^) {
					continue};
				if typeOf (adrMenu^) != menubarType {
					continue};
				try {
					name = adrSuite^.suiteName}
				else {
					name = nameOf (adrSuite^)}};
			addressType {
				name = nameOf (adrSuite^);
				if defined (adrSuite^^.suiteName) { //PBS 9/24/99: if the gdb is open, and the suite contains a suiteName, use it
					name = adrSuite^^.suiteName}}}
		else { //if it's not a table or address, continue
			continue};
		
		logic = "system.menus.swapInSuite (@" + adrSuite + ")";
		menu.addMenuCommand (@localMenu, "Suites", name, logic)};
	
	if system.environment.isMac {
		menu.addSubMenu (@system.menus.menubar, "Operations", @localMenu)}; // 6/12/05; 11:59:39 PM by TAC
	if system.environment.isWindows {
		menu.addSubMenu (@system.menus.menubar, "&Operations", @localMenu)}; // 6/12/05; 11:59:48 PM by TAC
	
	try {target.set (oldTarget)}}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.menus.buildSuitesSubmenu
  
! on buildSuitesSubMenu () {
	ÇChanges
		Ç9/27/05; 7:47:41 PM by TAC
			Çsuites are added to the top of the menu w/built-in commands at bottom
		Ç12/4/04; 12:30:36 PM by TAC
			ÇMain menu is now Operations
		Ç9/23/99; 2:58:52 PM by PBS
			ÇYou can put the address of a suite in the suites table, and it will be added to the menu.
		Ç9/24/99; 10:50:48 AM by PBS
			ÇIf the suite is in a gdb, and the gdb is open, and the suite contains a suiteName item, use that when building the Suites submenu. Otherwise, if the gdb is not open, use the name of the object in the Suites table.
		ÇBuild the Suites submenu in the Main menu.
	
	local (localMenu = system.menus.virginSuitesMenu);
	local (oldTarget = target.get ());
	target.set (@localMenu);
	
	local (adrSuitesTable = @root.suites);
	local (i, ct = sizeOf (adrSuitesTable^), adrSuite, adrMenu, name, logic);
	for i = ct downTo 1 {
		adrSuite = @adrSuitesTable^ [i];
		
		local (suiteType = typeOf (adrSuite^));
		case suiteType { //handle tables and addresses
			tableType {
				adrMenu = @adrsuite^.menu;
				if not defined (adrMenu^) {
					continue};
				if typeOf (adrMenu^) != menubarType {
					continue};
				try {
					name = adrSuite^.suiteName}
				else {
					name = nameOf (adrSuite^)}};
			addressType {
				name = nameOf (adrSuite^);
				if defined (adrSuite^^.suiteName) { //PBS 9/24/99: if the gdb is open, and the suite contains a suiteName, use it
					name = adrSuite^^.suiteName}}}
		else { //if it's not a table or address, continue
			continue};
		
		logic = "system.menus.swapInSuite (@" + adrSuite + ")";
		menu.addMenuCommand (@localMenu, "Suites", name, logic);
		op.reorg (up, infinity)};
	
	if system.environment.isMac {
		menu.addSubMenu (@system.menus.menubar, "Operations", @localMenu)}; // 6/12/05; 11:59:39 PM by TAC
	if system.environment.isWindows {
		menu.addSubMenu (@system.menus.menubar, "&Operations", @localMenu)}; // 6/12/05; 11:59:48 PM by TAC
	
	try {target.set (oldTarget)}};

Çbundle // testing
	ÇbuildSuitesSubMenu ()
\ No newline at end of file