[frontierkernel-commits] odbs/frontierRoot/system/menus buildMenuBar,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-serv14509

Modified Files:
	buildMenuBar 
Log Message:
commented out bookmarkmenu in case statement; disabled modal menu install, let agent handle it

Index: buildMenuBar
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/menus/buildMenuBar,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildMenuBar	26 Mar 2005 19:41:50 -0000	1.1.1.1
--- buildMenuBar	14 Jun 2005 02:58:02 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.menus.buildMenuBar
  
! on add (adrmenu) {
	try {
		menu.install (adrmenu)}};

menu.clearMenuBar ();

bundle { //install menus
	if defined (user.menus.menubar) {
		add (@user.menus.menubar)}
	else {
		add (@system.menus.menubar)};
	html.menu.install ();
	add (@user.menus.bookmarkMenu);
	add (@user.menus.customMenu);
	local (i);
	for i = 1 to sizeOf (user.menus) { //PBS 8/13/98: add additional user menus
		local (adrMenu = @user.menus [i]);
		if typeOf (adrMenu^) == addressType { //menus can be address
			if not defined (adrMenu^^) {
				continue};
			adrMenu = adrMenu^};
		if typeOf (adrMenu^) == menuBarType {
			case string.lower (nameOf (user.menus [i])) {
				"bookmarkmenu";
				"custommenu";
				"menubar" {
					continue}};
			add (adrMenu)}};
	add (@system.menus.helpMenu)};

bundle { //add the modal menu, based on the type of the frontmost window
	local (winType = window.getType (window.frontmost ()));
	try {
		menu.install (@system.menus.modals.[winType])}
	else {
		winType = 0};
	system.menus.data.currentMenuType = winType}; //see system.menus.agent

menu.buildMenuBar () //force update
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.menus.buildMenuBar
  
! ÇChanges
	Ç12/4/04; 11:59:40 PM by TAC
		Çcommented out bookmarkmenu in case statement
		Çdisabled modal menu install, let agent handle it
on add (adrmenu) {
	try {
		menu.install (adrmenu)}};

menu.clearMenuBar ();

bundle { //install menus
	if defined (user.menus.menubar) {
		add (@user.menus.menubar)}
	else {
		add (@system.menus.menubar)};
	Çhtml.menu.install () // 11/27/04; 12:07:59 PM by TAC
	Çadd (@user.menus.bookmarkMenu) // 11/27/04; 12:08:05 PM by TAC
	add (@user.menus.customMenu);
	local (i);
	for i = 1 to sizeOf (user.menus) { //PBS 8/13/98: add additional user menus
		local (adrMenu = @user.menus [i]);
		if typeOf (adrMenu^) == addressType { //menus can be address
			if not defined (adrMenu^^) {
				continue};
			adrMenu = adrMenu^};
		if typeOf (adrMenu^) == menuBarType {
			case string.lower (nameOf (user.menus [i])) {
				Ç"bookmarkmenu"
				"custommenu";
				"menubar" {
					continue}};
			add (adrMenu)}};
	add (@system.menus.helpMenu)};

Çbundle //add the modal menu, based on the type of the frontmost window
	Çlocal (winType = window.getType (window.frontmost ()))
	Çtry
		Çmenu.install (@system.menus.modals.[winType])
	Çelse
		ÇwinType = 0
	Çsystem.menus.data.currentMenuType = winType //see system.menus.agent

menu.buildMenuBar () //force update
\ No newline at end of file