[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.8,1.9

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2333

Modified Files:
	shellmenu.c 
Log Message:
Integrated changes in menu structure for OPML Editor. This should not affect the other targets.


Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shellmenu.c	31 Dec 2005 20:20:47 -0000	1.8
--- shellmenu.c	5 Feb 2006 16:12:02 -0000	1.9
***************
*** 907,911 ****
  		return;
  	
! 	pikegetfilemenuitemidentifier (ixmenu, bsitem);
  	
  	/*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/
--- 907,911 ----
  		return;
  	
! 	getfilemenuitemidentifier (ixmenu, bsitem);
  	
  	/*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/
***************
*** 939,943 ****
  		return;
  
! 	pikegetfilemenuitemidentifier (ixmenu, bsitem);
  
  	/*copystring ("\x20""pike.isFileMenuItemEnabled(\"^0\")", bsscript);*/
--- 939,943 ----
  		return;
  
! 	getfilemenuitemidentifier (ixmenu, bsitem);
  
  	/*copystring ("\x20""pike.isFileMenuItemEnabled(\"^0\")", bsscript);*/
***************
*** 969,973 ****
  		return;
  
! 	pikegetfilemenuitemidentifier (ixmenu, bsitem);
  
  	copystring ("\x1e""pike.getFileMenuItemName(\"^0\")", bsscript);
--- 969,973 ----
  		return;
  
! 	getfilemenuitemidentifier (ixmenu, bsitem);
  
  	copystring ("\x1e""pike.getFileMenuItemName(\"^0\")", bsscript);
***************
*** 999,1005 ****
  		return (true);
  
! 	pikegetfilemenuitemidentifier (quititem, bsitem);
  
! 	getsystemtablescript (idpikerunfilemenuscript, bsscript); /*7.1b4: get from resource.*/
  
  	/*copystring ("\x1c""pike.runFileMenuScript(\"^0\")", bsscript);*/
--- 999,1005 ----
  		return (true);
  
! 	getfilemenuitemidentifier (quititem, bsitem);
  
! 	getsystemtablescript (idrunfilemenuscript, bsscript); /*7.1b4: get from resource.*/
  
  	/*copystring ("\x1c""pike.runFileMenuScript(\"^0\")", bsscript);*/
***************
*** 1135,1140 ****
  	pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/
  	
  	pikesetfilemenuitemenable (openmanilasiteitem); /*7.0b27 PBS: enable/disable Open Manila Site item.*/
! 		
  	pikesetfilemenuitemenable (closeitem);
  		
--- 1135,1141 ----
  	pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/
  	
+ #ifndef OPMLEDITOR
  	pikesetfilemenuitemenable (openmanilasiteitem); /*7.0b27 PBS: enable/disable Open Manila Site item.*/
! #endif // OPMLEDITOR		
  	pikesetfilemenuitemenable (closeitem);
  		
***************
*** 1143,1149 ****
--- 1144,1152 ----
  	pikesetfilemenuitemenable (saveasitem);
  	
+ #ifndef OPMLEDITOR
  	pikesetfilemenuitemenable (saveashtmlitem); /*7.0b32 PBS: Save As HTML*/
  	
  	pikesetfilemenuitemenable (saveasplaintextitem); /*7.0b32 PBS: Save As Plain Text*/
+ #endif // OPMLEDITOR
  		
  	pikesetfilemenuitemenable (revertitem);
***************
*** 1163,1167 ****
--- 1166,1172 ----
  	enablemenuitem (hmenu, openitem);
  	
+ #ifndef OPMLEDITOR
  	enablemenuitem (hmenu, openrecentitem);
+ #endif // OPMLEDITOR
  	
  	setmenuitemenable (hmenu, closeitem, flwindow);
***************
*** 1228,1237 ****
  	setmenuitemenable (hmenu, selectallitem, flwindow);
  	
- 	setmenuitemenable (hmenu, insertdatetimeitem, flwindow);
- 
  #ifdef PIKE
! 	
  	setmenuitemenable (hmenu, opennotepaditem, true); /*7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.*/
! 	
  #endif
  	
--- 1233,1240 ----
  	setmenuitemenable (hmenu, selectallitem, flwindow);
  	
  #ifdef PIKE
! #ifndef OPMLEDITOR
  	setmenuitemenable (hmenu, opennotepaditem, true); /*7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.*/
! #endif // !OPMLEDITOR	
  #endif
  	
***************
*** 2135,2147 ****
  			copystring ("\x03""new", bsitem);
  			break;
! 
  		case openurlitem: /*7.0b17 PBS*/
  			copystring ("\x07""openurl", bsitem);
  			break;
  			
  		case openmanilasiteitem: /*7.0b27 PBS*/
  			copystring ("\x0e""openmanilasite", bsitem);
  			break;
! 			
  		case saveashtmlitem:
  			copystring ("\x0a""saveashtml", bsitem);
--- 2138,2152 ----
  			copystring ("\x03""new", bsitem);
  			break;
! 		
  		case openurlitem: /*7.0b17 PBS*/
  			copystring ("\x07""openurl", bsitem);
  			break;
+ 
+ 		#ifndef OPMLEDITOR
  			
  		case openmanilasiteitem: /*7.0b27 PBS*/
  			copystring ("\x0e""openmanilasite", bsitem);
  			break;
! 		
  		case saveashtmlitem:
  			copystring ("\x0a""saveashtml", bsitem);
***************
*** 2151,2154 ****
--- 2156,2161 ----
  			copystring ("\x0f""saveasplaintext", bsitem);
  			break;
+ 		
+ 		#endif //!OPMLEDITOR
  			
  		case viewinbrowseritem:
***************
*** 2164,2168 ****
  			break;
  
! 		#endif
  
  		default:
--- 2171,2175 ----
  			break;
  
! 		#endif //PIKE
  
  		default:
***************
*** 2298,2305 ****
  
  #ifdef PIKE
  			case opennotepaditem:
  				copystring ("\x0b""opennotepad", bsitem);
  				break;
! #endif
  			case insertdatetimeitem:
  				copystring ("\x0e""insertdatetime", bsitem);
--- 2305,2317 ----
  
  #ifdef PIKE
+ #ifndef OPMLEDITOR	
+ 
  			case opennotepaditem:
  				copystring ("\x0b""opennotepad", bsitem);
  				break;
! 
! #endif // !OPMLEDITOR		
! #endif // PIKE
! 
  			case insertdatetimeitem:
  				copystring ("\x0e""insertdatetime", bsitem);