frontierkernel-commits Mailing List for Frontier Kernel (Page 4)

Brought to you by: andreradke, creecode, pbrentsimmons

frontierkernel-commits — Mailing list for Subversion commit messages.

You can subscribe to this list here.

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (447)	Nov (163)	Dec (57)
2005	Jan (172)	Feb	Mar (123)	Apr (64)	May (1)	Jun (278)	Jul (89)	Aug (97)	Sep (62)	Oct (53)	Nov (119)	Dec (60)
2006	Jan (76)	Feb (1094)	Mar (363)	Apr (163)	May (57)	Jun (43)	Jul (39)	Aug (15)	Sep (33)	Oct (62)	Nov (8)	Dec
2007	Jan (9)	Feb (34)	Mar (2)	Apr (14)	May (8)	Jun (40)	Jul (21)	Aug (1)	Sep (20)	Oct (15)	Nov (26)	Dec
2008	Jan (1)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec (1)
2009	Jan	Feb	Mar	Apr	May (32)	Jun	Jul	Aug (3)	Sep (3)	Oct	Nov	Dec
2010	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar (2)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov (7)	Dec
2012	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 6 .. 160 > >> (Page 4 of 160)

SF.net SVN: frontierkernel: [1768] Frontier/trunk/Common/source/filepath.c

From: <cre...@us...> - 2007-11-05 21:04:07

Revision: 1768
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1768&view=rev
Author:   creecode
Date:     2007-11-05 13:04:03 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
in pathtofilespec function, for Windows, call GetLongPathName to always store long path name

Modified Paths:
--------------
    Frontier/trunk/Common/source/filepath.c

Modified: Frontier/trunk/Common/source/filepath.c
===================================================================
--- Frontier/trunk/Common/source/filepath.c	2007-11-05 20:30:40 UTC (rev 1767)
+++ Frontier/trunk/Common/source/filepath.c	2007-11-05 21:04:03 UTC (rev 1768)
@@ -270,6 +270,8 @@
 boolean pathtofilespec ( bigstring bspath, ptrfilespec fs ) {
 	
 	//
+	// 2007-11-05 creedon: for Windows, call GetLongPathName to always store long path name
+	//
 	// 2006-10-16 creedon: for Mac, FSRef-ized
 	//
 	// 5.0d8 dmb: clear fs first thing
@@ -288,7 +290,13 @@
 	//
 	
 	bigstring bsfolder;
-
+	
+	#ifdef WIN95VERSION
+	
+		char fn [ 300 ];
+		
+	#endif
+	
 	clearbytes ( fs, sizeof ( *fs ) );
 
 	if ( isemptystring ( bspath ) )
@@ -526,6 +534,11 @@
 
 	#ifdef WIN95VERSION
 	
+		nullterminate ( bspath );
+		
+		if ( GetLongPathName ( stringbaseaddress ( bspath ), fn, 298 ) )	
+			copyctopstring ( fn, bspath );
+		
 		copystring (bspath, fsname (fs));
 
 		folderfrompath (bspath, bsfolder);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1767] Frontier/trunk/Common/resources/Win32/ WinLand.rc

From: <cre...@us...> - 2007-11-05 20:30:36

Revision: 1767
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1767&view=rev
Author:   creecode
Date:     2007-11-05 12:30:40 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
added ifdefs for IUDA Desktop target

Modified Paths:
--------------
    Frontier/trunk/Common/resources/Win32/WinLand.rc

Modified: Frontier/trunk/Common/resources/Win32/WinLand.rc
===================================================================
--- Frontier/trunk/Common/resources/Win32/WinLand.rc	2007-11-05 20:23:30 UTC (rev 1766)
+++ Frontier/trunk/Common/resources/Win32/WinLand.rc	2007-11-05 20:30:40 UTC (rev 1767)
@@ -65,21 +65,40 @@
 259                     CURSOR  DISCARDABLE     beachball_3.cur
 260                     CURSOR  DISCARDABLE     beachball_4.cur
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-#ifdef PIKE /*7.0d8 PBS: new icon for Radio UserLand*/
-#ifndef OPMLEDITOR
-IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     radiobluedot.bmp
-#else
-IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     opmlapp.bmp
-#endif
-#else
-//IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     frontier.bmp
-IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     FrontierCactus.bmp
-#endif
+#ifdef PIKE
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+			
+			IDB_FRONTIER_BITMAP	BITMAP	DISCARDABLE	black32x32.bmp
+
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     opmlapp.bmp
+			
+		#endif
+		
+	#else // Radio UserLand
+	
+		IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     radiobluedot.bmp // 7.0d8 PBS: new icon for Radio UserLand
+
+	#endif
+	
+#else // Frontier
+
+	IDB_FRONTIER_BITMAP		BITMAP  DISCARDABLE     FrontierCactus.bmp
+
+#endif // #ifdef PIKE
+
 IDB_BITMAP1             BITMAP  DISCARDABLE     bitmap1.bmp
 IDB_BITMAP2             BITMAP  DISCARDABLE     bitmap2.bmp
 IDB_BITMAP3             BITMAP  DISCARDABLE     bitmap3.bmp
@@ -129,6 +148,7 @@
 IDB_BITMAP47            BITMAP  DISCARDABLE     bitmap47.bmp
 IDB_BITMAP48            BITMAP  DISCARDABLE     bitmap48.bmp
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -138,20 +158,39 @@
 // remains consistent on all systems.
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-//	ID_FRONTIER_ICON        ICON    DISCARDABLE     radio.ico
-	ID_FRONTIER_ICON        ICON    DISCARDABLE     radiobluedot.ico
-	ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     RadioTrayIcon.ico
-#else // OPMLEDITOR
-	ID_FRONTIER_ICON        ICON    DISCARDABLE     OPMLapp.ico /*2006-02-05 aradke*/
-	ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     OPMLapp.ico /*2006-02-05 aradke*/
-#endif // OPMLEDITOR
-#else
-//	ID_FRONTIER_ICON        ICON    DISCARDABLE     Frontier.ico
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP // 2007-10-24 creedon
+			
+			ID_FRONTIER_ICON		ICON	DISCARDABLE		Black16x16Tray.ico
+			ID_FRONTIERTRAY_ICON    ICON	DISCARDABLE		Black16x16Tray.ico
+
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			ID_FRONTIER_ICON        ICON    DISCARDABLE     OPMLapp.ico /*2006-02-05 aradke*/
+			ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     OPMLapp.ico /*2006-02-05 aradke*/
+			
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		//ID_FRONTIER_ICON		ICON    DISCARDABLE     radio.ico
+		ID_FRONTIER_ICON        ICON    DISCARDABLE     radiobluedot.ico
+		ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     RadioTrayIcon.ico
+
+	#endif // Radio UserLand
+	
+#else // Frontier
+
+	/* // ID_FRONTIER_ICON		ICON    DISCARDABLE     Frontier.ico
 	ID_FRONTIER_ICON        ICON    DISCARDABLE     FrontierCactus.ico
-	ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     FrontierCactusTray.ico
-#endif
+	ID_FRONTIERTRAY_ICON    ICON    DISCARDABLE     FrontierCactusTray.ico */
 
+#endif  // Frontier
+
 ID_FATPAGE_ICON         ICON    DISCARDABLE     fatp.ico
 ID_ROOT_ICON            ICON    DISCARDABLE     root.ico
 ID_2CLK_ICON            ICON    DISCARDABLE     "2clk.ico"
@@ -207,137 +246,209 @@
 END
 #endif
 
+
 #ifdef PIKE
 
-/* PBS 07/22/00: Pike's File menu has been revised. It's more
-like a standard File menu now that we're creating outlines
-and saving them to disk. No more What Is This? command.
-Now there's an Open command.
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
 
-7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
+		#ifdef IUDADESKTOP
+		
+			filemenu MENU DISCARDABLE
+			BEGIN
+				POPUP "&File"
+				BEGIN
+					MENUITEM "&New\tCtrl+N",                 filemenu+newitem
+					MENUITEM "&Open...\tCtrl+O",             filemenu+openitem
+					MENUITEM "Open Recent",                	 openrecentmenu
+					MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
+					MENUITEM SEPARATOR
+					MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
+					MENUITEM "Save As...",                   filemenu+saveasitem
+					MENUITEM SEPARATOR
+					MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
+				END
+			END
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			filemenu MENU DISCARDABLE
+			BEGIN
+				POPUP "&File"
+				BEGIN
+					MENUITEM "&New\tCtrl+N",                 filemenu+newitem
+					MENUITEM "&Open...\tCtrl+O",             filemenu+openitem
+					MENUITEM "Open URL...",                  filemenu+openurlitem /*7.0b17 PBS*/
+					MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
+					MENUITEM SEPARATOR
+					MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
+					MENUITEM "Save As...",                   filemenu+saveasitem
+					MENUITEM "&Revert",                      filemenu+revertitem
+					MENUITEM SEPARATOR
+					MENUITEM "&View in Browser\tCtrl+P",     filemenu+viewinbrowseritem
+					MENUITEM SEPARATOR
+					MENUITEM "Update Opml.root...",         filemenu+updateradiorootitem
+					MENUITEM "Work Offline",                 filemenu+workofflineitem /*7.0b25 PBS*/
+					MENUITEM SEPARATOR
+					MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
+				END
+			END
+			
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		/* PBS 07/22/00: Pike's File menu has been revised. It's more
+		like a standard File menu now that we're creating outlines
+		and saving them to disk. No more What Is This? command.
+		Now there's an Open command.
 
-filemenu MENU DISCARDABLE
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&New\tCtrl+N",                 filemenu+newitem
-		MENUITEM "&Open...\tCtrl+O",             filemenu+openitem
-		MENUITEM "Open URL...",                  filemenu+openurlitem /*7.0b17 PBS*/
-#ifndef OPMLEDITOR
-		MENUITEM "Open Manila Site...",          filemenu+openmanilasiteitem /*7.0b27 PBS*/
-#endif // !OPMLEDITOR
-        MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
-        MENUITEM SEPARATOR
-        MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
-		MENUITEM "Save As...",                   filemenu+saveasitem
-#ifndef OPMLEDITOR
-		MENUITEM "Save As HTML...",              filemenu+saveashtmlitem /*7.0b32 PBS*/
-		MENUITEM "Save As Plain Text...",        filemenu+saveasplaintextitem /*7.0b32 PBS*/
-#endif // OPMLEDITOR
-        MENUITEM "&Revert",                      filemenu+revertitem
-        MENUITEM SEPARATOR
-        MENUITEM "&View in Browser\tCtrl+P",     filemenu+viewinbrowseritem
-		MENUITEM SEPARATOR
-#ifndef OPMLEDITOR
-		MENUITEM "Update Radio.root...",         filemenu+updateradiorootitem
-#else
-		MENUITEM "Update Opml.root...",         filemenu+updateradiorootitem
-#endif // OPMLEDITOR
+		7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
 
-		MENUITEM "Work Offline",                 filemenu+workofflineitem /*7.0b25 PBS*/
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
-    END
-END
+		filemenu MENU DISCARDABLE
+		BEGIN
+			POPUP "&File"
+			BEGIN
+				MENUITEM "&New\tCtrl+N",                 filemenu+newitem
+				MENUITEM "&Open...\tCtrl+O",             filemenu+openitem
+				MENUITEM "Open URL...",                  filemenu+openurlitem // 7.0b17 PBS
+				MENUITEM "Open Manila Site...",          filemenu+openmanilasiteitem // 7.0b27 PBS
+				MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
+				MENUITEM SEPARATOR
+				MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
+				MENUITEM "Save As...",                   filemenu+saveasitem
+				MENUITEM "Save As HTML...",              filemenu+saveashtmlitem // 7.0b32 PBS
+				MENUITEM "Save As Plain Text...",        filemenu+saveasplaintextitem // 7.0b32 PBS
+				MENUITEM "&Revert",                      filemenu+revertitem
+				MENUITEM SEPARATOR
+				MENUITEM "&View in Browser\tCtrl+P",     filemenu+viewinbrowseritem
+				MENUITEM SEPARATOR
+				MENUITEM "Update Radio.root...",         filemenu+updateradiorootitem
+				MENUITEM "Work Offline",                 filemenu+workofflineitem // 7.0b25 PBS
+				MENUITEM SEPARATOR
+				MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
+			END
+		END
 
-#else
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-filemenu MENU DISCARDABLE
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&New",						 newobjectmenu
-        MENUITEM "&Open... \tCtrl+O",            filemenu+openitem
-        MENUITEM "Open Recent",                	 openrecentmenu /* 2006-02-11 aradke */
-        MENUITEM SEPARATOR
-        MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
-        MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
-        MENUITEM "Save as Runnable...",			 filemenu+saverunnableitem
-        MENUITEM "Save &As...",              filemenu+saveasitem /* 2005-10-26 creedon - changed to Save As*/
-        MENUITEM "&Revert",                      filemenu+revertitem
-        MENUITEM SEPARATOR
-   //   MENUITEM "Expert Mode",                 filemenu+expertitem
-   //   MENUITEM SEPARATOR
-        MENUITEM "Page Set&up...",                 filemenu+pagesetupitem
-        MENUITEM "&Print...\tCtrl+P",              filemenu+printitem
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
-    END
-END
+	filemenu MENU DISCARDABLE
+	BEGIN
+		POPUP "&File"
+		BEGIN
+			MENUITEM "&New",						 newobjectmenu
+			MENUITEM "&Open... \tCtrl+O",            filemenu+openitem
+			MENUITEM "Open Recent",                	 openrecentmenu // 2006-02-11 aradke
+			MENUITEM SEPARATOR
+			MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
+			MENUITEM "&Save\tCtrl+S",                filemenu+saveitem
+			MENUITEM "Save as Runnable...",			 filemenu+saverunnableitem
+			MENUITEM "Save &As...",              filemenu+saveasitem // 2005-10-26 creedon - changed to Save As
+			MENUITEM "&Revert",                      filemenu+revertitem
+			MENUITEM SEPARATOR
+	   //   MENUITEM "Expert Mode",                 filemenu+expertitem
+	   //   MENUITEM SEPARATOR
+			MENUITEM "Page Set&up...",                 filemenu+pagesetupitem
+			MENUITEM "&Print...\tCtrl+P",              filemenu+printitem
+			MENUITEM SEPARATOR
+			MENUITEM "E&xit\tCtrl+Q",                filemenu+quititem
+		END
+	END
 
-#endif
+#endif  // Frontier
 
-#ifdef PIKE /*7.0b26 PBS: Edit menu differs from Frontier's.*/
 
-editmenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "&Undo\tCtrl+Z",				editmenu+undoitem
-        MENUITEM SEPARATOR
-        MENUITEM "Cu&t\tCtrl+X",				editmenu+cutitem
-        MENUITEM "&Copy\tCtrl+C",				editmenu+copyitem
-        MENUITEM "&Paste\tCtrl+V",				editmenu+pasteitem
-        MENUITEM "Clear",						editmenu+clearitem
-        MENUITEM SEPARATOR
-        MENUITEM "Select A&ll\tCtrl+A",			editmenu+selectallitem
-        MENUITEM SEPARATOR
-        MENUITEM "Find and Replace",			findandreplacemenu
-        MENUITEM "Common Styles",				commonstylesmenu
-        MENUITEM SEPARATOR
-        MENUITEM "&Font",						fontmenu
-        MENUITEM "&Size",						sizemenu
-        MENUITEM SEPARATOR
-#ifndef OPMLEDITOR
-        MENUITEM "Open Notepad\tCtrl+Y",		opennotepaditem
-#endif // OPMLEDITOR
-        MENUITEM "Insert Date/Time\tCtrl+4",	insertdatetimeitem
-    END
-END
+#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
 
-#else
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
 
-editmenu MENU DISCARDABLE
+		editmenu MENU DISCARDABLE
+		BEGIN
+			POPUP "&Edit"
+			BEGIN
+				MENUITEM "&Undo\tCtrl+Z",				editmenu+undoitem
+				MENUITEM SEPARATOR
+				MENUITEM "Cu&t\tCtrl+X",				editmenu+cutitem
+				MENUITEM "&Copy\tCtrl+C",				editmenu+copyitem
+				MENUITEM "&Paste\tCtrl+V",				editmenu+pasteitem
+				MENUITEM "Clear",						editmenu+clearitem
+				MENUITEM SEPARATOR
+				MENUITEM "Select A&ll\tCtrl+A",			editmenu+selectallitem
+				MENUITEM SEPARATOR
+				MENUITEM "Find and Replace",			findandreplacemenu
+				MENUITEM "Common Styles",				commonstylesmenu
+				MENUITEM SEPARATOR
+				MENUITEM "&Font",						fontmenu
+				MENUITEM "&Size",						sizemenu
+				MENUITEM SEPARATOR
+				MENUITEM "Insert Date/Time\tCtrl+4",	insertdatetimeitem
+			END
+		END
 
-/* 2005-09-25 creedon: changed for edit menu items calling scripts */
+	#else // Radio UserLand
+	
+		editmenu MENU DISCARDABLE
+		BEGIN
+			POPUP "&Edit"
+			BEGIN
+				MENUITEM "&Undo\tCtrl+Z",				editmenu+undoitem
+				MENUITEM SEPARATOR
+				MENUITEM "Cu&t\tCtrl+X",				editmenu+cutitem
+				MENUITEM "&Copy\tCtrl+C",				editmenu+copyitem
+				MENUITEM "&Paste\tCtrl+V",				editmenu+pasteitem
+				MENUITEM "Clear",						editmenu+clearitem
+				MENUITEM SEPARATOR
+				MENUITEM "Select A&ll\tCtrl+A",			editmenu+selectallitem
+				MENUITEM SEPARATOR
+				MENUITEM "Find and Replace",			findandreplacemenu
+				MENUITEM "Common Styles",				commonstylesmenu
+				MENUITEM SEPARATOR
+				MENUITEM "&Font",						fontmenu
+				MENUITEM "&Size",						sizemenu
+				MENUITEM SEPARATOR
+				MENUITEM "Open Notepad\tCtrl+Y",		opennotepaditem
+				MENUITEM "Insert Date/Time\tCtrl+4",	insertdatetimeitem
+			END
+		END
 
-BEGIN
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "&Undo\tCtrl+Z",                   editmenu+undoitem
-        MENUITEM SEPARATOR
-        MENUITEM "Cu&t\tCtrl+X",                     editmenu+cutitem
-        MENUITEM "&Copy\tCtrl+C",                   editmenu+copyitem
-        MENUITEM "&Paste\tCtrl+V",                  editmenu+pasteitem
-        MENUITEM "Clear",                                editmenu+clearitem
-        MENUITEM SEPARATOR
-        MENUITEM "Select A&ll\tCtrl+A",             editmenu+selectallitem
-        MENUITEM SEPARATOR
-	 MENUITEM "Find and Replace",                findandreplacemenu
-        MENUITEM SEPARATOR
-        MENUITEM "&Font",                               fontmenu
-        MENUITEM "&Size",                               sizemenu
-        MENUITEM "St&yle",                              stylemenu
-        MENUITEM "Leading",                            leadingmenu
-        MENUITEM "Justify",                             justifymenu
-	 MENUITEM "Common Styles",                 commonstylesmenu
-        MENUITEM SEPARATOR
-        MENUITEM "Insert Date/Time\tCtrl+4",    insertdatetimeitem
-    END
-END
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-#endif
+	// 2005-09-25 creedon: changed for edit menu items calling scripts
 
+	editmenu MENU DISCARDABLE
+	BEGIN
+		POPUP "&Edit"
+		BEGIN
+			MENUITEM "&Undo\tCtrl+Z",                   editmenu+undoitem
+			MENUITEM SEPARATOR
+			MENUITEM "Cu&t\tCtrl+X",                    editmenu+cutitem
+			MENUITEM "&Copy\tCtrl+C",                   editmenu+copyitem
+			MENUITEM "&Paste\tCtrl+V",                  editmenu+pasteitem
+			MENUITEM "Clear",                                editmenu+clearitem
+			MENUITEM SEPARATOR
+			MENUITEM "Select A&ll\tCtrl+A"			editmenu+selectallitem
+			MENUITEM SEPARATOR
+			MENUITEM "Find and Replace",                findandreplacemenu
+			MENUITEM SEPARATOR
+			MENUITEM "&Font",                               fontmenu
+			MENUITEM "&Size",                               sizemenu
+			MENUITEM "St&yle",                              stylemenu
+			MENUITEM "Leading",                            leadingmenu
+			MENUITEM "Justify",						justifymenu
+			MENUITEM "Common Styles",				commonstylesmenu
+			MENUITEM SEPARATOR
+			MENUITEM "Insert Date/Time\tCtrl+4",	insertdatetimeitem
+		END
+	END
+
+#endif  // Frontier
+
+
 windowsmenu MENU DISCARDABLE
 BEGIN
     POPUP "&Window"
@@ -352,17 +463,37 @@
 BEGIN
     POPUP "&Help"
     BEGIN
-#ifdef PIKE
-#ifndef OPMLEDITOR
+
+#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			MENUITEM "About IUDA Desktop",				helpmenu+1
+
+		#endif
+
+		#ifdef OPMLEDITOR
+
+			MENUITEM "OPML Editor Website",				helpmenu+1
+
+		#endif
+
+	#else // Radio UserLand
+	
 		MENUITEM "Radio Website",				helpmenu+1 /*7.0d8 PBS: name change*/
-#else
-		MENUITEM "OPML Editor Website",				helpmenu+1 /*7.0d8 PBS: name change*/
-#endif // OPMLEDITOR
-#else
-		MENUITEM "About Frontier",				helpmenu+1
-#endif
-		END
+
+	#endif // Radio UserLand
+	
+#else // Frontier
+
+	MENUITEM "About Frontier",				helpmenu+1
+
+#endif  // Frontier
+
 END
+END
 #endif
 
 #ifdef fontmenu
@@ -518,13 +649,24 @@
 	"O",			filemenu+openitem,			VIRTKEY, CONTROL, NOINVERT
 	"W",			filemenu+closeitem,			VIRTKEY, CONTROL, NOINVERT
 	"S",			filemenu+saveitem,			VIRTKEY, CONTROL, NOINVERT
-#ifdef PIKE
-	"P",			filemenu+viewinbrowseritem,	VIRTKEY, CONTROL, NOINVERT
-	"N",			filemenu+newitem,			VIRTKEY, CONTROL, NOINVERT
-#else
-	"P",			filemenu+printitem,			VIRTKEY, CONTROL, NOINVERT
-	"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
-#endif
+
+	#ifdef PIKE
+
+		#ifndef IUDADESKTOP
+
+			"P",			filemenu+viewinbrowseritem,	VIRTKEY, CONTROL, NOINVERT
+
+		#endif
+
+		"N",			filemenu+newitem,			VIRTKEY, CONTROL, NOINVERT
+
+	#else
+
+		"P",			filemenu+printitem,			VIRTKEY, CONTROL, NOINVERT
+		"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
+
+	#endif
+
 	"Q",			filemenu+quititem,			VIRTKEY, CONTROL, NOINVERT
 	"Z",			editmenu+undoitem,			VIRTKEY, CONTROL, NOINVERT
 	"X",			editmenu+cutitem,			VIRTKEY, CONTROL, NOINVERT
@@ -546,7 +688,6 @@
 END
 
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -880,38 +1021,82 @@
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", APP_COPYRIGHT_HOLDER "\0"
-#ifdef PIKE
-#ifndef OPMLEDITOR
-            VALUE "FileDescription", "Radio UserLand\0" /*7.0d8 PBS: name change*/
-#else   // OPMLEDITOR
-			 VALUE "FileDescription", "OPML\0" /*2005-04-06 dluebbert: name change*/
-#endif  // OPMLEDITOR
-#else
-            VALUE "FileDescription", "Frontier\0"
-#endif
+
+			#ifdef PIKE
+
+				#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+					#ifdef IUDADESKTOP
+
+						VALUE "FileDescription", "IUDA Desktop\0" // 2007-10-23: creedon
+
+					#endif  // IUDADESKTOP
+
+					#ifdef OPMLEDITOR
+
+						VALUE "FileDescription", "OPML\0" // 2005-04-06 dluebbert: name change
+
+					#endif  // OPMLEDITOR
+
+				#else
+
+					VALUE "FileDescription", "Radio AserLand\0" // 7.0d8 PBS: name change
+
+				#endif
+
+			#else
+
+				VALUE "FileDescription", "Frontier\0"
+
+			#endif
+
 #ifdef fltrialsize
           	VALUE "FileVersion", "Trial " APP_VERSION_STRING "\0"
 #else
           	VALUE "FileVersion", APP_VERSION_STRING "\0"
 #endif
+
             VALUE "InternalName", APPNAME "\0"
       //    VALUE "Language", "English (United States)\0"
             VALUE "LegalCopyright", "\xA9 " APP_COPYRIGHT "\0"
-#ifdef PIKE /*7.0d8 PBS: name change*/
-#ifndef OPMLEDITOR
-            VALUE "OriginalFilename", "Radio.exe\0"
-            VALUE "ProductName", "Radio UserLand\0"
-            VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0"
-#else  // OPMLEDITOR
+
+#ifdef PIKE // 7.0d8 PBS: name change
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+            VALUE "OriginalFilename", APPNAME ".exe\0"
+            VALUE "ProductName", APPNAME "\0"
+            VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
+
+		#endif  // IUDADESKTOP
+
+		#ifdef OPMLEDITOR
+
             VALUE "OriginalFilename", "opml.exe\0"
-            VALUE "ProductName", "OPML\0"
+            VALUE "ProductName", APPNAME "\0"
             VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
-#endif // OPMLEDITOR
-#else  // !PIKE
-            VALUE "OriginalFilename", "Frontier.exe\0"
-            VALUE "ProductName", "Frontier\0"
-            VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
-#endif  // !PIKE
+
+		#endif  // OPMLEDITOR
+
+	#else
+
+        VALUE "OriginalFilename", APPNAME ".exe\0"
+        VALUE "ProductName", APPNAME " BserLand\0"
+        VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0"
+
+	#endif
+
+#else
+
+    VALUE "OriginalFilename", APPNAME ".exe\0"
+    VALUE "ProductName", APPNAME "\0"
+    VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
+
+#endif
+
+
 #ifdef fltrialsize
             VALUE "ProductVersion", "Trial " APP_VERSION_STRING "\0"
 #else
@@ -947,37 +1132,61 @@
 END
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CLIENTTITLE         "Radio UserLand" //radio_version_string /*7.0d8 PBS: name change*/
-    IDS_UNTITLED            "Untitled"
-    IDS_APPNAME             "Radio UserLand"
-    IDS_PRINTJOB            "Radio UserLand - "
-    IDS_PRINTERROR          "Cannot print %s!"
-END
-#else // OPMLEDITOR
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			STRINGTABLE DISCARDABLE
+			BEGIN
+				IDS_CLIENTTITLE         "IUDA Desktop" // iudadesktop_version_string // 2007-10-24 creedon
+				IDS_UNTITLED            "Untitled"
+				IDS_APPNAME             "IUDA Desktop"
+				IDS_PRINTJOB            "IUDA Desktop - "
+				IDS_PRINTERROR          "Cannot print %s!"
+			END
+
+		#endif  // IUDADESKTOP
+
+		#ifdef OPMLEDITOR
+
+			STRINGTABLE DISCARDABLE
+			BEGIN
+				IDS_CLIENTTITLE         "OPML" //radio_version_string /*2005-04-06 dluebbert: name change*/
+				IDS_UNTITLED            "Untitled"
+				IDS_APPNAME             "OPML"
+				IDS_PRINTJOB            "OPML - "
+				IDS_PRINTERROR          "Cannot print %s!"
+			END
+
+		#endif  // OPMLEDITOR
+
+	#else
+
+		STRINGTABLE DISCARDABLE
+		BEGIN
+			IDS_CLIENTTITLE         "Radio UserLand" // radio_version_string // 7.0d8 PBS: name change
+			IDS_UNTITLED            "Untitled"
+			IDS_APPNAME             "Radio UserLand"
+			IDS_PRINTJOB            "Radio UserLand - "
+			IDS_PRINTERROR          "Cannot print %s!"
+		END
+
+	#endif
+
+#else
+
 	STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CLIENTTITLE         "OPML" //radio_version_string /*2005-04-06 dluebbert: name change*/
-    IDS_UNTITLED            "Untitled"
-    IDS_APPNAME             "OPML"
-    IDS_PRINTJOB            "OPML - "
-    IDS_PRINTERROR          "Cannot print %s!"
-END
-#endif // OPMLEDITOR
-#else  // !PIKE
+	BEGIN
+		IDS_CLIENTTITLE         "Frontier" // frontier_version_string
+		IDS_UNTITLED            "Untitled"
+		IDS_APPNAME             "Frontier"
+		IDS_PRINTJOB            "Frontier - "
+		IDS_PRINTERROR          "Cannot print %s!"
+	END
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CLIENTTITLE         "Frontier" //frontier_version_string
-    IDS_UNTITLED            "Untitled"
-    IDS_APPNAME             "Frontier"
-    IDS_PRINTJOB            "Frontier - "
-    IDS_PRINTERROR          "Cannot print %s!"
-END
+#endif
 
-#endif  //!PIKE
 
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
@@ -1039,26 +1248,65 @@
 #define configres				cnfg
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-	1 Defaults DISCARDABLE BEGIN "Radio UserLand\xAE\0" END /*7.0d8 PBS*/
-#else   //OPMLEDITOR
-	1 Defaults DISCARDABLE BEGIN "OPML\0" END /*7.0d8 PBS*/
-#endif  //OPMLEDITOR
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			1 Defaults DISCARDABLE BEGIN "IUDA Desktop\0" END // 2007-10-23: creedon
+
+		#endif
+
+		#ifdef OPMLEDITOR
+
+			1 Defaults DISCARDABLE BEGIN "OPML\0" END // 7.0d8 PBS
+
+		#endif
+
+	#else
+
+		1 Defaults DISCARDABLE BEGIN "Radio UserLand\xAE\0" END // 7.0d8 PBS
+
+	#endif
+
 #else
+
 	1 Defaults DISCARDABLE BEGIN "Frontier\0" END
+
 #endif
+
 	2 Defaults DISCARDABLE BEGIN "Untitled\0" END
 	3 Defaults DISCARDABLE BEGIN "Untitled\0" END
 	4 Defaults DISCARDABLE BEGIN "Select a database file:\0" END
+
 #ifdef PIKE
-#ifndef OPMLEDITOR
-	6 Defaults DISCARDABLE BEGIN "Radio.root\0" END
-#else  // OPMLEDITOR
-	6 Defaults DISCARDABLE BEGIN "opml.root\0" END
-#endif // OPMLEDITOR 
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			6 Defaults DISCARDABLE BEGIN "IUDA Desktop.root\0" END
+
+		#endif
+
+		#ifdef OPMLEDITOR
+
+			6 Defaults DISCARDABLE BEGIN "opml.root\0" END
+
+		#endif
+
+	#else
+
+		6 Defaults DISCARDABLE BEGIN "Radio.root\0" END
+
+	#endif
+
 #else  // !PIKE
+
 	6 Defaults DISCARDABLE BEGIN "Frontier.root\0" END
+
 #endif  //!PIKE
+
 	7 Defaults DISCARDABLE BEGIN "Open a file:\0" END
 
 	8 Defaults DISCARDABLE BEGIN APP_VERSION_STRING "\0" END
@@ -1069,11 +1317,27 @@
 	4 Interface DISCARDABLE BEGIN "Ctrl\0" END
 	5 Interface DISCARDABLE BEGIN "Set Command Key \0" END
 	6 Interface DISCARDABLE BEGIN "Command Key:\0" END
-#ifndef OPMLEDITOR
-	7 Interface DISCARDABLE BEGIN "Internal error#^0.  Please report to UserLand Technical Support\0" END
-#else
-	7 Interface DISCARDABLE BEGIN "Internal error#^0.  Please report to Scripting.com support\0" END
-#endif //OPMLEDITOR
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			7 Interface DISCARDABLE BEGIN "Internal error#^0.  Please report to discussionArchive.imzUral.info support\0" END
+
+		#endif
+
+		#ifdef OPMLEDITOR
+
+			7 Interface DISCARDABLE BEGIN "Internal error#^0.  Please report to Scripting.com support\0" END
+
+		#endif
+
+	#else
+
+		7 Interface DISCARDABLE BEGIN "Internal error#^0.  Please report to UserLand Technical Support\0" END
+
+	#endif
+
 	8 Interface DISCARDABLE BEGIN "; \0" END
 	9 Interface DISCARDABLE BEGIN "Cancel\0" END
 	10 Interface DISCARDABLE BEGIN "Script for \042^0\042\0" END
@@ -1086,11 +1350,27 @@
 	17 Interface DISCARDABLE BEGIN "&Save Database\tCtrl+S\0" END
 	18 Interface DISCARDABLE BEGIN "Save As...\0" END
 	19 Interface DISCARDABLE BEGIN "Save a Copy...\0" END
-#ifndef OPMLEDITOR
-	20 Interface DISCARDABLE BEGIN "This database was created by an older version of Frontier and must be converted. Proceed?\0" END
-#else  //OPMLEDITOR
-	20 Interface DISCARDABLE BEGIN "This database was created by an older version of OPML and must be converted. Proceed?\0" END
-#endif  //OPMLEDITOR
+
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+
+			20 Interface DISCARDABLE BEGIN "This database was created by an older version of IUDA Desktop and must be converted. Proceed?\0" END
+
+		#endif
+
+		#ifdef OPMLEDITOR
+
+		20 Interface DISCARDABLE BEGIN "This database was created by an older version of OPML and must be converted. Proceed?\0" END
+
+		#endif
+
+	#else
+
+		20 Interface DISCARDABLE BEGIN "This database was created by an older version of Frontier and must be converted. Proceed?\0" END
+
+	#endif
+
 	21 Interface DISCARDABLE BEGIN "Discard all changes made to \042^0\042?\0" END
 
 #ifndef OPMLEDITOR
@@ -1236,31 +1516,71 @@
 	22 DB_Stats DISCARDABLE BEGIN "header/trailer info disagrees\0" END
 	23 DB_Stats DISCARDABLE BEGIN "free list shadow out of synch\0" END
 
-#ifdef PIKE
-#ifndef OPMLEDITOR
-	1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Pike.\0" END
-#else // OPMLEDITOR
-	1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of OPML.\0" END /*2005-04-06: dluebbert name change*/ 
-#endif // OPMLEDITOR
-#else
-	1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Frontier.\0" END
-#endif
+	#ifdef PIKE
+
+		#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+			#ifdef IUDADESKTOP
+
+				1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of IUDA Desktop.\0" END // 2007-10-23: creedon
+
+			#endif
+
+			#ifdef OPMLEDITOR
+
+				1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of OPML.\0" END // 2005-04-06: dluebbert name change
+
+			#endif
+
+		#else
+
+			1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Pike.\0" END
+
+		#endif
+
+	#else
+
+		1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Frontier.\0" END
+
+	#endif
+
 	2 alerts DISCARDABLE BEGIN "That name is too long.  Item names can have up to 255 characters\0" END
 	3 alerts DISCARDABLE BEGIN "That name is already in use.  Please use a different name\0" END
 	4 alerts DISCARDABLE BEGIN "A fresh copy of the file could not be opened.\0" END
 	5 alerts DISCARDABLE BEGIN "Can't paste this Clipboard type here.\0" END
-#ifdef PIKE
-#ifndef OPMLEDITOR
-	6 alerts DISCARDABLE BEGIN "Not enough memory available to run Pike.\0" END
-	7 alerts DISCARDABLE BEGIN "Radio UserLand cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/
-#else   // OPMLEDITOR
-	6 alerts DISCARDABLE BEGIN "Not enough memory available to run OPML.\0" END
-	7 alerts DISCARDABLE BEGIN "OPML cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/
-#endif  // OPMLEDITOR
-#else
-	6 alerts DISCARDABLE BEGIN "Not enough memory available to run Frontier.\0" END
-	7 alerts DISCARDABLE BEGIN "Frontier cannot run on systems older than System 7.0.\0" END
-#endif
+
+	#ifdef PIKE
+
+		#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+			#ifdef IUDADESKTOP
+
+				6 alerts DISCARDABLE BEGIN "Not enough memory available to run IUDA Desktop.\0" END
+				7 alerts DISCARDABLE BEGIN "IUDA Desktop cannot run on systems older than System 7.0.\0" END // this is a ref to Mac OS, what is it doing on Windows?
+
+			#endif
+
+			#ifdef OPMLEDITOR
+
+				6 alerts DISCARDABLE BEGIN "Not enough memory available to run OPML.\0" END
+				7 alerts DISCARDABLE BEGIN "OPML cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/
+
+			#endif
+
+		#else
+
+			6 alerts DISCARDABLE BEGIN "Not enough memory available to run Pike.\0" END
+			7 alerts DISCARDABLE BEGIN "Radio UserLand cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/
+
+		#endif
+
+	#else
+
+		6 alerts DISCARDABLE BEGIN "Not enough memory available to run Frontier.\0" END
+		7 alerts DISCARDABLE BEGIN "Frontier cannot run on systems older than System 7.0.\0" END
+
+	#endif
+
 	8 alerts DISCARDABLE BEGIN "The Thread Manager is not installed.  Some features will be unavailable.\0" END
 
 	1 special_folder DISCARDABLE BEGIN "system\0" END
@@ -2226,4 +2546,3 @@
 	END
 
 
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1766] Frontier/trunk/Common/resources/Mac/ SHELL.R

From: <cre...@us...> - 2007-11-05 20:23:29

Revision: 1766
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1766&view=rev
Author:   creecode
Date:     2007-11-05 12:23:30 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
added ifdefs for IUDA Desktop target

Modified Paths:
--------------
    Frontier/trunk/Common/resources/Mac/SHELL.R

Modified: Frontier/trunk/Common/resources/Mac/SHELL.R
===================================================================
--- Frontier/trunk/Common/resources/Mac/SHELL.R	2007-11-05 20:03:19 UTC (rev 1765)
+++ Frontier/trunk/Common/resources/Mac/SHELL.R	2007-11-05 20:23:30 UTC (rev 1766)
@@ -44,419 +44,407 @@
 	}
 };
 
-#ifdef PIKE
+#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
 
-/*PBS 7.0b1: File menu changes for Radio UserLand.
-It's a standard File menu now.*/
-#ifndef OPMLEDITOR
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Save As HTML\xC9", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Work Offline", noIcon, noKey, noMark, plain,
-		/* [17] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [18] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
+	//
+	// PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File
+	//		    menu now.
+	//
+	
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP
+		
+			resource 'MENU' (412, "File") { // Carbon File menu
+				2,
+				textMenuProc,
+				0x7FFFFE77,
+				enabled,
+				"File",
+				{	// array: 7 elements
+				
+					// [1]
+					"New", noIcon, "N", noMark, plain,
+					
+					// [2]
+					"Open\xC9", noIcon, "O", noMark, plain,
+					
+					// [3]
+					"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+					
+					// [4]
+					"Close", noIcon, "W", noMark, plain,
+					
+					// [5]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [6]
+					"Save", noIcon, "S", noMark, plain,
+					
+					// [7]
+					"Save As\xC9", noIcon, noKey, noMark, plain,
+					
+					/* // [8]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [9]
+					"Update IUDA Desktop.root\xC9", noIcon, noKey, noMark, plain, */
+				}
+			};
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			resource 'MENU' (412, "File") { // Carbon File menu
+				2,
+				textMenuProc,
+				0x7FFFFE77,
+				enabled,
+				"File",
+				{	// array: 13 elements
+					/* [1] */
+					"New", noIcon, "N", noMark, plain,
+					/* [2] */
+					"Open\xC9", noIcon, "O", noMark, plain,
+					/* [3] */
+					"Open URL\xC9", noIcon, noKey, noMark, plain, // 7.0b17 PBS
+					/* [4] */
+					"Close", noIcon, "W", noMark, plain,
+					/* [5] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [6] */
+					"Save", noIcon, "S", noMark, plain,
+					/* [7] */
+					"Save As\xC9", noIcon, noKey, noMark, plain,
+					/* [8] */
+					"Revert", noIcon, noKey, noMark, plain,
+					/* [9] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [10] */
+					"View in Browser", noIcon, "P", noMark, plain,
+					/* [11] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [12] */
+					"Update opml.root\xC9", noIcon, noKey, noMark, plain,
+					/* [13] */
+					"Work Offline", noIcon, noKey, noMark, plain
+				}
+			};
+			
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		resource 'MENU' (412, "File") { // Carbon File menu
+			2,
+			textMenuProc,
+			0x7FFFFE77,
+			enabled,
+			"File",
+			{	/* array: 16 elements */
+				/* [1] */
+				"New", noIcon, "N", noMark, plain,
+				/* [2] */
+				"Open\xC9", noIcon, "O", noMark, plain,
+				/* [3] */
+				"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+				/* [4] */
+				"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
+				/* [5] */
+				"Close", noIcon, "W", noMark, plain,
+				/* [6] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [7] */
+				"Save", noIcon, "S", noMark, plain,
+				/* [8] */
+				"Save As\xC9", noIcon, noKey, noMark, plain,
+				/* [9] */
+				"Save As HTML\xC9", noIcon, noKey, noMark, plain,
+				/* [10] */
+				"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
+				/* [11] */
+				"Revert", noIcon, noKey, noMark, plain,
+				/* [12] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [13] */
+				"View in Browser", noIcon, "P", noMark, plain,
+				/* [14] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [15] */
+				"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
+				/* [16] */
+				"Work Offline", noIcon, noKey, noMark, plain
+			}
+		};
+		
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-/*Carbon File menu*/
+	// Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
+	// This is the conditional menu for carbon. You do not need a quit item in
+	// carbon
+	
+	resource 'MENU' (412, "File") {
+		2,
+		textMenuProc,
+		0x7FFFFE77,
+		enabled,
+		"File",
+		{	/* array: 12 elements */
+		
+			#ifdef version42orgreater
+					/* [1] */
+					"New", noIcon, hierarchicalMenu, "\0d135", plain,
+			#else
+					/* [1] */
+					"New", noIcon, noKey, noMark, plain,
+			#endif
+			
+			/* [2] */
+			"Open\xC9", noIcon, "O", noMark, plain,
+			/* [3] */
+			"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+			/* [4] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [5] */
+			"Close", noIcon, "W", noMark, plain,
+			/* [6] */
+			"Save", noIcon, "S", noMark, plain,
+			/* [7] */
+			"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
+			/* [8] */
+			"Save As\xC9", noIcon, noKey, noMark, plain, // 2005-11-01 creedon
+			/* [9] */
+			"Revert", noIcon, noKey, noMark, plain,
+			/* [10] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [11] */
+			"Page Setup\xC9", noIcon, noKey, noMark, plain,
+			/* [12] */
+			"Print\xC9", noIcon, "P", noMark, plain
+		}
+	};
+		
+#endif  // Frontier
 
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Save As HTML\xC9", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Work Offline", noIcon, noKey, noMark, plain
-	}
-};
-#else // OPMLEDITOR
+#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
 
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+	//
+	// 7.0b26 PBS: Radio UserLand has a different Edit menu.
+	//
+ 
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP
 		
-		/* [4] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [5] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Update opml.root\xC9", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Work Offline", noIcon, noKey, noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
+			resource 'MENU' (3, "Edit") {
+				3,
+				textMenuProc,
+				0x7FFFFF5D,
+				enabled,
+				"Edit",
+				{	// array: 16 elements
+				
+					// [1]
+					"Undo", noIcon, "Z", noMark, plain,
+					
+					// [2]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [3]
+					"Cut", noIcon, "X", noMark, plain,
+					
+					// [4]
+					"Copy", noIcon, "C", noMark, plain,
+					
+					// [5]
+					"Paste", noIcon, "V", noMark, plain,
+					
+					// [6]
+					"Clear", noIcon, noKey, noMark, plain,
+					
+					// [7]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [8]
+					"Select All", noIcon, "A", noMark, plain,
+					
+					// [9]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [10]
+					"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+					
+					// [11]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [12]
+					"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+					
+					// [13]
+					"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+					
+					// [14]
+					"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+					
+					// [15]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [16]
+					"Insert Date/Time", noIcon, "4", noMark, plain,
+				}
+			};
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			resource 'MENU' (3, "Edit") {
+				3,
+				textMenuProc,
+				0x7FFFFF5D,
+				enabled,
+				"Edit",
+				{	/* array: 14 elements */
+					/* [1] */
+					"Undo", noIcon, "Z", noMark, plain,
+					/* [2] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [3] */
+					"Cut", noIcon, "X", noMark, plain,
+					/* [4] */
+					"Copy", noIcon, "C", noMark, plain,
+					/* [5] */
+					"Paste", noIcon, "V", noMark, plain,
+					/* [6] */
+					"Clear", noIcon, noKey, noMark, plain,
+					/* [7] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [8] */
+					"Select All", noIcon, "A", noMark, plain,
+					/* [9] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [10] */
+					"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+					/* [11] */
+					"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+					/* [12] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [13] */
+					"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+					/* [14] */
+					"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+					/* [15] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [16] */
+					"Insert Date/Time", noIcon, "4", noMark, plain,
+				}
+			};
+			
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		resource 'MENU' (3, "Edit") {
+			3,
+			textMenuProc,
+			0x7FFFFF5D,
+			enabled,
+			"Edit",
+			{	/* array: 17 elements */
+				/* [1] */
+				"Undo", noIcon, "Z", noMark, plain,
+				/* [2] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [3] */
+				"Cut", noIcon, "X", noMark, plain,
+				/* [4] */
+				"Copy", noIcon, "C", noMark, plain,
+				/* [5] */
+				"Paste", noIcon, "V", noMark, plain,
+				/* [6] */
+				"Clear", noIcon, noKey, noMark, plain,
+				/* [7] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [8] */
+				"Select All", noIcon, "A", noMark, plain,
+				/* [9] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [10] */
+				"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+				/* [11] */
+				"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+				/* [12] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [13] */
+				"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+				/* [14] */
+				"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+				/* [15] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [16] */
+				"Open Notepad", noIcon, "Y", noMark, plain,
+				/* [17] */
+				"Insert Date/Time", noIcon, "4", noMark, plain,
+			}
+		};
+		
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-/*Carbon File menu*/
-
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [5] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Update opml.root\xC9", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Work Offline", noIcon, noKey, noMark, plain
-	}
-};
-#endif // OPMLEDITOR
-#else
-
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 14 elements */
-#ifdef version42orgreater
-		/* [1] */
-		"New", noIcon, hierarchicalMenu, "\0d135", plain,
-#else
-		/* [1] */
-		"New", noIcon, noKey, noMark, plain,
-#endif
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
-		/* [4] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"-", noIcon, noKey, noMark, plain,
-
-//		/* [10] */
-//		"Expert Mode", noIcon, noKey, noMark, plain,
-//		/* [9] */
-//		"-", noIcon, noKey, noMark, plain,
-
-		/* [11] */
-		"Page Setup\xC9", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Print\xC9", noIcon, "P", noMark, plain,
-		/* [13] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [14] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
-
-//Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
-//This is the conditional menu for carbon. You do not need a quit 
-//item in carbon
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 12 elements */
-#ifdef version42orgreater
-		/* [1] */
-		"New", noIcon, hierarchicalMenu, "\0d135", plain,
-#else
-		/* [1] */
-		"New", noIcon, noKey, noMark, plain,
-#endif
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
-		/* [4] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Page Setup\xC9", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Print\xC9", noIcon, "P", noMark, plain
-	}
-};
-#endif
-
-#ifdef PIKE /*7.0b26 PBS: Radio UserLand has a different Edit menu.*/
-
-#ifndef OPMLEDITOR
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 17 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [14] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [15] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Open Notepad", noIcon, "Y", noMark, plain,
-		/* [17] */
-		"Insert Date/Time", noIcon, "4", noMark, plain,
-	}
-};
-#else //OPMLEDITOR
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 14 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [14] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [15] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Insert Date/Time", noIcon, "4", noMark, plain,
+	resource 'MENU' (3, "Edit") {
+		3,
+		textMenuProc,
+		0x7FFFFF5D,
+		enabled,
+		"Edit",
+		{	/* array: 19 elements */
+			/* [1] */
+			"Undo", noIcon, "Z", noMark, plain,
+			/* [2] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [3] */
+			"Cut", noIcon, "X", noMark, plain,
+			/* [4] */
+			"Copy", noIcon, "C", noMark, plain,
+			/* [5] */
+			"Paste", noIcon, "V", noMark, plain,
+			/* [6] */
+			"Clear", noIcon, noKey, noMark, plain,
+			/* [7] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [8] */
+			"Select All", noIcon, "A", noMark, plain,
+			/* [9] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [10] */
+			"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+			/* [11] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [12] */
+			"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+			/* [13] */
+			"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+			/* [14] */
+			"Style", noIcon, hierarchicalMenu, "\0d129", plain,
+			/* [15] */
+			"Leading", noIcon, hierarchicalMenu, "\0d131", plain,
+			/* [16] */
+			"Justify", noIcon, hierarchicalMenu, "\0d132", plain,
+			/* [17] */
+			"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+			/* [18] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [19] */
+			"Insert Date/Time", noIcon, "4", noMark, plain
+		}
+	};
 		
-	}
-};
+#endif  // Frontier
 
-#endif //OPMLEDITOR
-
-#else
-
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 19 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [13] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [14] */
-		"Style", noIcon, hierarchicalMenu, "\0d129", plain,
-		/* [15] */
-		"Leading", noIcon, hierarchicalMenu, "\0d131", plain,
-		/* [16] */
-		"Justify", noIcon, hierarchicalMenu, "\0d132", plain,
-		/* [17] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [18] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [19] */
-		"Insert Date/Time", noIcon, "4", noMark, plain
-	}
-};
-
-#endif
-
 resource 'MENU' (4, "Window") {
 	4,
 	textMenuProc,
@@ -625,15 +613,24 @@
 		/* [3] */
 		"Find Next", noIcon, "G", noMark, plain,
 		/* [4] */
-		#ifdef PIKE /* 2005-09-25 creedon */
 		
-		"Replace & Find Next", noIcon, "H", noMark, plain
+		#ifdef PIKE // 2005-09-25 creedon
 		
-		#else
+			#ifdef IUDADESKTOP // 2007-09-09 creedon
+			
+				"Replace & Find Next", noIcon, "1", noMark, plain
+			
+			#else // OPML Editor or Radio UserLand
+			
+				"Replace & Find Next", noIcon, "H", noMark, plain
+			
+			#endif //
+			
+		#else // Frontier
 		
-		"Replace & Find Next", noIcon, "1", noMark, plain
+			"Replace & Find Next", noIcon, "1", noMark, plain
 		
-		#endif
+		#endif // Frontier
 	}
 };
 
@@ -758,41 +755,78 @@
 
 
 resource 'STR#' (129, "Defaults", purgeable) {
-	{	/* array StringArray: 6 elements */
-#ifdef PIKE
-#ifndef OPMLEDITOR
-		/* [1] */
-		"Radio UserLand\xAA", /*PBS 7.0b1: name change to Radio UserLand.*/
-#else  // OPMLEDITOR
-		"OPML",
-#endif  //OPMLEDITOR
-#else
-		/* [1] */
-		"Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */
-#endif
-		/* [2] */
+	{	// array StringArray: 6 elements
+	
+		#ifdef PIKE // [1]
+		
+			#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+			
+				#ifdef IUDADESKTOP
+				
+					"IUDA Desktop",
+					
+				#endif // IUDADESKTOP
+				
+				#ifdef OPMLEDITOR
+				
+					"OPML",
+					
+				#endif // OPMLEDITOR
+				
+			#else
+			
+				"Radio UserLand\xAA", // PBS 7.0b1: name change to Radio UserLand.
+				
+			#endif
+			
+		#else
+		
+			"Frontier", // 2005-01-04 creedon - removed UserLand and (tm) for open source release
+			
+		#endif // [1]
+		
+		// [2]
 		"Untitled",
-		/* [3] */
+		// [3]
 		"Untitled",
-		/* [4] */
+		// [4]	  
 		"Select a database file:",
-		/* [5] */
-		"",
-#ifdef PIKE
-#ifndef OPMLEDITOR
-		/* [6] -- default DB name*/ /*PBS 7.0b1: changed from Pike.root to Radio.root.*/
-		"Radio.root",
-#else  // OPMLEDITOR
-		"opml.root",
-#endif  //OPMLEDITOR
-#else
-		/* [6] */
-		"Frontier.root",
-#endif
-		/* [7] */
+		// [5]
+		"", 
+		
+		#ifdef PIKE // [6] -- default DB name
+
+			#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+			
+				#ifdef IUDADESKTOP
+				
+					"IUDA Desktop.root",
+					
+				#endif // IUDADESKTOP
+				
+				#ifdef OPMLEDITOR
+				
+					"opml.root",
+					
+				#endif // OPMLEDITOR
+				
+			#else
+			
+				"Radio.root", // PBS 7.0b1: changed from Pike.root to Radio.root.
+			
+			#endif
+			
+		#else
+
+			"Frontier.root",
+			
+		#endif // [6]
+
+		// [7]
 		"Open a file:"
-	}
-};
+		
+		}
+	};
 
 resource 'STR#' (130, "Interface", locked, preload) {
 	{	/* array StringArray: 15 elements */
@@ -4472,22 +4506,41 @@
 
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-type 'PIKE' as 'STR ';
 
-resource 'PIKE' (0, "Owner resource")
-#else   //OPMLEDITOR
-type 'OPML' as 'STR ';
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP
+		
+			type 'IUDA' as 'STR ';
 
-resource 'OPML' (0, "Owner resource")
-#endif // OPMLEDITOR
+			resource 'IUDA' ( 0, "Owner resource" )
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			type 'OPML' as 'STR ';
 
+			resource 'OPML' (0, "Owner resource")
+			
+		#endif // OPMLEDITOR
+		
+	#else
+	
+		type 'PIKE' as 'STR ';
+
+		resource 'PIKE' (0, "Owner resource")
+				
+	#endif
+	
 #else
 
-type 'LAND' as 'STR ';
+	type 'LAND' as 'STR ';
 
-resource 'LAND' (0, "Owner resource")
+	resource 'LAND' (0, "Owner resource")
+		
 #endif
+
 {
 	"Copyright \xA9 " APP_COPYRIGHT
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1765] Frontier/trunk/Common/headers/WinLand.h

From: <cre...@us...> - 2007-11-05 20:03:16

Revision: 1765
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1765&view=rev
Author:   creecode
Date:     2007-11-05 12:03:19 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
minor formatting tweaks

Modified Paths:
--------------
    Frontier/trunk/Common/headers/WinLand.h

Modified: Frontier/trunk/Common/headers/WinLand.h
===================================================================
--- Frontier/trunk/Common/headers/WinLand.h	2007-11-05 19:55:30 UTC (rev 1764)
+++ Frontier/trunk/Common/headers/WinLand.h	2007-11-05 20:03:19 UTC (rev 1765)
@@ -313,3 +313,5 @@
 #define IDB_BITMAP46                     46
 #define IDB_BITMAP47                     47
 #define IDB_BITMAP48                     48
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1764] Frontier/trunk/Common/headers/versions.h

From: <cre...@us...> - 2007-11-05 19:55:27

Revision: 1764
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1764&view=rev
Author:   creecode
Date:     2007-11-05 11:55:30 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
added ifdefs and bumped version for IUDA Desktop target

Modified Paths:
--------------
    Frontier/trunk/Common/headers/versions.h

Modified: Frontier/trunk/Common/headers/versions.h
===================================================================
--- Frontier/trunk/Common/headers/versions.h	2007-11-05 19:49:43 UTC (rev 1763)
+++ Frontier/trunk/Common/headers/versions.h	2007-11-05 19:55:30 UTC (rev 1764)
@@ -46,64 +46,98 @@
 #define	APP_COPYRIGHT_TILL	"2007"
 
 
-/* target-specific strings and version info */
+// target-specific strings and version info
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
 
-	/* version info for RADIO targets (formerly known as PIKE) */
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+		#ifdef IUDADESKTOP
+		
+			// version info for IUDADESKTOP targets
+			
+			#define	APPNAME					"IUDA Desktop"
+			
+			#define	APP_COPYRIGHT_HOLDER		"Thomas A. Creedon"
+			
+			#define	bs_APP_NAME				BIGSTRING ( "\x0c" "IUDA Desktop" )
+			#define	bs_APP_SLOGAN				BIGSTRING ( "\x2b" "IMZ-Ural Dicsussion Archive on your desktop" )
+			#define	bs_APP_COPYRIGHT			BIGSTRING ( "\x19" "\xA9 " APP_COPYRIGHT_TILL " Thomas A. Creedon." )
+			#define	bs_APP_URL				BIGSTRING ( "\x26" "http://discussionArchive.imzUral.info/" )
+			
+			#define	APP_MAJOR_VERSION			10
+			#define	APP_MAJOR_VERSION_BCD		0x10	// major version in BCD notation
+			
+			#define	APP_SUB_VERSION			1
+			#define	APP_MINOR_VERSION			0
+			#define	APP_SUBMINOR_VERSION_BCD		0x10	// sub and minor version in BCD notation
+			
+			#define	APP_STAGE_CODE				0x40	// dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
+			#define	APP_REVISION_LEVEL			16	// for non-final releases only
+			#define	APP_BUILD_NUMBER			16	// increment by one for every release, final or not
+			
+			#define	APP_VERSION_STRING			"10.1a16"
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			// version info for OPMLEDITOR targets
+			
+			#define	APPNAME					"OPML"
+			
+			#define	APP_COPYRIGHT_HOLDER		"Scripting News, Inc"
+			
+			#define	bs_APP_NAME				BIGSTRING ("\x04" "OPML")
+			#define	bs_APP_SLOGAN				BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
+			#define	bs_APP_COPYRIGHT			BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
+			#define	bs_APP_URL				BIGSTRING ("\x18" "http://support.opml.org/")
+			
+			#define	APP_MAJOR_VERSION			10
+			#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
+			
+			#define	APP_SUB_VERSION			1
+			#define	APP_MINOR_VERSION			0
+			#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
+			
+			#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+			#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
+			#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
+			
+			#define	APP_VERSION_STRING			"10.1a15"
+			
+		#endif // OPMLEDITOR
+		
+	#else
 	
-	#define	APPNAME					"Radio"
-	#define	APP_COPYRIGHT_HOLDER		"UserLand Software, Inc"
-	
-	#define	bs_APP_NAME				BIGSTRING ("\x05" "Radio")
-	#define	bs_APP_SLOGAN				BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
-	#define	bs_APP_COPYRIGHT			BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
-	#define	bs_APP_URL				BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
-	
-	#define	APP_MAJOR_VERSION			10
-	#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
-	
-	#define	APP_SUB_VERSION			1
-	#define	APP_MINOR_VERSION			0
-	#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
-	
-	#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
-	#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
-	
-	#define	APP_VERSION_STRING			"10.1a15"
+		// version info for RADIO targets (formerly known as PIKE)
+		
+		#define	APPNAME					"Radio"
+		#define	APP_COPYRIGHT_HOLDER		"UserLand Software, Inc"
+		
+		#define	bs_APP_NAME				BIGSTRING ("\x05" "Radio")
+		#define	bs_APP_SLOGAN				BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
+		#define	bs_APP_COPYRIGHT			BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
+		#define	bs_APP_URL				BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
+		
+		#define	APP_MAJOR_VERSION			10
+		#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
+		
+		#define	APP_SUB_VERSION			1
+		#define	APP_MINOR_VERSION			0
+		#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
+		
+		#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+		#define	APP_REVISION_LEVEL			00	/* for non-final releases only */
+		#define	APP_BUILD_NUMBER			00	/* increment by one for every release, final or not */
+		
+		#define	APP_VERSION_STRING			"10.1a15"
 
-#else
-
-	/* version info for OPMLEDITOR targets */
+	#endif
 	
-	#define	APPNAME					"OPML"
-	
-	#define	APP_COPYRIGHT_HOLDER		"Scripting News, Inc"
-	
-	#define	bs_APP_NAME				BIGSTRING ("\x04" "OPML")
-	#define	bs_APP_SLOGAN				BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
-	#define	bs_APP_COPYRIGHT			BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
-	#define	bs_APP_URL				BIGSTRING ("\x18" "http://support.opml.org/")
-	
-	#define	APP_MAJOR_VERSION			10
-	#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
-	
-	#define	APP_SUB_VERSION			1
-	#define	APP_MINOR_VERSION			0
-	#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
-	
-	#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
-	#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
-	
-	#define	APP_VERSION_STRING			"10.1a15"
-	
-#endif
-#else
+ #else
 
-	/* version info for FRONTIER targets */
+	// version info for FRONTIER targets
 	
 	#define	APPNAME					"Frontier"
 	#define	APP_COPYRIGHT_HOLDER		"Frontier Kernel Project"
@@ -114,17 +148,17 @@
 	#define	bs_APP_URL				BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
 	
 	#define	APP_MAJOR_VERSION			10
-	#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
+	#define	APP_MAJOR_VERSION_BCD		0x10	// major version in BCD notation
 	
 	#define	APP_SUB_VERSION			1
 	#define	APP_MINOR_VERSION			0
-	#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
+	#define	APP_SUBMINOR_VERSION_BCD		0x10	// sub and minor version in BCD notation
 	
-	#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
-	#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
+	#define	APP_STAGE_CODE				0x40	// dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
+	#define	APP_REVISION_LEVEL			15	// for non-final releases only
+	#define	APP_BUILD_NUMBER			15	// increment by one for every release, final or not
 	
-	#define	APP_VERSION_STRING			"10.1a15"
+	#define	APP_VERSION_STRING			"10.1a15" */
 	
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1763] Frontier/trunk/Common/headers/shellmenu. h

From: <cre...@us...> - 2007-11-05 19:49:40

Revision: 1763
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1763&view=rev
Author:   creecode
Date:     2007-11-05 11:49:43 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
added ifdefs for IUDA Desktop target

Modified Paths:
--------------
    Frontier/trunk/Common/headers/shellmenu.h

Modified: Frontier/trunk/Common/headers/shellmenu.h
===================================================================
--- Frontier/trunk/Common/headers/shellmenu.h	2007-11-05 19:36:30 UTC (rev 1762)
+++ Frontier/trunk/Common/headers/shellmenu.h	2007-11-05 19:49:43 UTC (rev 1763)
@@ -85,21 +85,42 @@
 	#define lastmainmenu		helpmenu
 
 	#ifdef PIKE
+
 		#undef stylemenu
 		#undef leadingmenu
 		#undef justifymenu
 		#undef newobjectmenu
-		#undef openrecentmenu
 
-		#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
+		#define virtualmenu			5100	// 2006-02-25 aradke: never actually displayed
 		#define fontmenu			5200
 		#define sizemenu			5300
 		#define findandreplacemenu	5400
-		#define commonstylesmenu	5500	/*7.0b26 PBS*/
+		#define commonstylesmenu	5500	// 7.0b26 PBS
+		
+		#ifdef IUDADESKTOP
+		
+			#define openrecentmenu	5600	// 2007-10-22 creedon
+		
+		#else
+		
+			#undef openrecentmenu
 
+		#endif
+		
 		#define firsthiermenu		fontmenu
-		#define lasthiermenu		commonstylesmenu
+
+		#ifdef IUDADESKTOP
+		
+			#define lasthiermenu	openrecentmenu	// 2007-10-22 creedon
+		
+		#else
+		
+			#define lasthiermenu	commonstylesmenu
+
+		#endif
+		
 	#else //!PIKE
+
 		#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
 		#define fontmenu			5200
 		#define stylemenu			5300
@@ -122,57 +143,82 @@
 #define aboutitem 1
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-	// #define filemenu (applemenu + mainmenuincrement)
 
-	/*PBS 07/22/00: Pike's File menu has been revised --
-	the number, order, and names of items have changed.
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP
+		
+			#define newitem		   1
+			#define openitem		   2
+			#define openrecentitem	   3
+			#define closeitem		   4
+			#define saveitem		   6
+			#define saveasitem		   7
+			// #define updateradiorootitem 9
+			#define quititem		   9
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR // OPMLEDITOR 2005-04-06 dluebbert
+		
+			#define newitem		    1
+			#define openitem		    2
+			#define openurlitem		    3 // 7.0b17 PBS: Open URL... command
+		//	#define openmanilasiteitem 4
+			#define closeitem		    4
+			#define saveitem		    6
+			#define saveasitem		    7
+		//	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
+		//	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
+			#define revertitem		    8
+			#define changetitleitem	    5
+			#define viewinbrowseritem   10
+			#define updateradiorootitem 12
+			#define workofflineitem	   13 // 7.0b25 PBS: Work Offline
+			#define quititem		   15
+					
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		//
+		// 7.0d10 PBS: Radio UserLand has an Update Radio.root... command in the
+		//			File menu.
+		//
+		// PBS 07/22/00: Pike's File menu has been revised -- the number, order,
+		//			  and names of items have changed.
+		//
+		
+		// #define filemenu (applemenu + mainmenuincrement)
 
-	7.0d10 PBS: Radio UserLand has an Update Radio.root...
-	command in the File menu.*/
+		#define newitem		    1
+		#define openitem		    2
+		#define openurlitem		    3 // 7.0b17 PBS: Open URL... command
+		#define openmanilasiteitem   4
+		#define closeitem		    5
+		#define saveitem		    7
+		#define saveasitem		    8
+		#define saveashtmlitem	    9 // 7.0b32 PBS: Save As HTML... command
+		#define saveasplaintextitem 10 // 7.0b32 PBS: Save As Plain Text... command
+		#define revertitem		   11
+		#define changetitleitem	    8
+		#define viewinbrowseritem   13
+		#define updateradiorootitem 15
+		#define workofflineitem     16 // 7.0b25 PBS: Work Offline
+		#define quititem		   18
 
-	#define newitem 1
-	#define openitem 2
-	#define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
-	#define openmanilasiteitem 4
-	#define closeitem 5
-	#define saveitem 7
-	#define	saveasitem 8
-	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
-	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
-	#define revertitem 11
-	#define changetitleitem 8
-	#define viewinbrowseritem 13
-	#define updateradiorootitem 15
-	#define workofflineitem 16 /*7.0b25 PBS: Work Offline*/
-	#define quititem 18
-#else //OPMLEDITOR
-	#define newitem 1
-	#define openitem 2
-	#define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
-//	#define openmanilasiteitem 4
-	#define closeitem 4
-	#define saveitem 6
-	#define	saveasitem 7
-//	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
-//	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
-	#define revertitem 8
-	#define changetitleitem 5
-	#define viewinbrowseritem 10
-	#define updateradiorootitem 12
-	#define workofflineitem 13 /*7.0b25 PBS: Work Offline*/
-	#define quititem 15
-#endif // OPMLEDITOR
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-#else
-
 	// #define filemenu (applemenu + mainmenuincrement)
+	
 	#define newitem		1
 	#define openitem		2
 	#define openrecentitem	3
 	#define closeitem		5
 	#define saveitem		6
-	#define saverunnableitem	7
+	#define saverunnableitem 7
 	#define saveasitem		8
 	#define revertitem		9
 
@@ -181,56 +227,93 @@
 	#define pagesetupitem	11
 	#define printitem		12
 	#define quititem		14
+	
+#endif // Frontier
 
-#endif
-
 // #define editmenu (filemenu + mainmenuincrement)
 
 #define windowsitem				-1
 
 #ifdef PIKE
 
-	#define undoitem			1
-	#define cutitem				3
-	#define copyitem			4
-	#define pasteitem			5
-	#define clearitem			6
-	#define selectallitem			8
-	#define findandreplaceitem	10
-	#define commonstylesitem	11
-	#define fontitem			13
-	#define sizeitem			14
-#ifndef OPMLEDITOR
-	#define opennotepaditem		16
-	#define insertdatetimeitem	17
-#else // OPMLEDITOR
-	#define insertdatetimeitem	16
-#endif //OPMLEDITOR
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP
+		
+			#define undoitem		  1
+			#define cutitem		  3
+			#define copyitem		  4
+			#define pasteitem		  5
+			#define clearitem		  6
+			#define selectallitem	  8
+			#define findandreplaceitem 10
+			#define fontitem		  12
+			#define sizeitem		  13
+			#define commonstylesitem	  14
+			#define insertdatetimeitem 16
+			
+		#endif // IUDADESKTOP
+		
+		#ifdef OPMLEDITOR
+		
+			#define undoitem		  1
+			#define cutitem		  3
+			#define copyitem		  4
+			#define pasteitem		  5
+			#define clearitem		  6
+			#define selectallitem	  8
+			#define findandreplaceitem 10
+			#define commonstylesitem	  11
+			#define fontitem		  13
+			#define sizeitem		  14
+			#define insertdatetimeitem 16
+			
+			#define styleitem		  -1
+			#define leadingitem		  -1
+			#define justifyitem		  -1
+					
+		#endif // OPMLEDITOR
+		
+	#else // Radio UserLand
+	
+		#define undoitem		  1
+		#define cutitem		  3
+		#define copyitem		  4
+		#define pasteitem		  5
+		#define clearitem		  6
+		#define selectallitem	  8
+		#define findandreplaceitem 10
+		#define commonstylesitem	  11
+		#define fontitem		  13
+		#define sizeitem		  14
+		#define opennotepaditem	  16
+		#define insertdatetimeitem 17
+		
+		#define styleitem		  -1
+		#define leadingitem		  -1
+		#define justifyitem		  -1
+		
+	#endif // Radio UserLand
+	
+#else // Frontier
 
-	#define styleitem			-1
-	#define leadingitem			-1
-	#define justifyitem			-1
+	#define undoitem		  1
+	#define cutitem		  3
+	#define copyitem		  4
+	#define pasteitem		  5
+	#define clearitem		  6
+	#define selectallitem	  8
+	#define findandreplaceitem 10
+	#define fontitem		  12
+	#define sizeitem		  13
+	#define styleitem		  14
+	#define leadingitem		  15
+	#define justifyitem		  16
+	#define commonstylesitem	  17
+	#define insertdatetimeitem 19
+	
+#endif // Frontier
 
-#else
-
-	#define undoitem			1
-	#define cutitem				3
-	#define copyitem			4
-	#define pasteitem			5
-	#define clearitem			6
-	#define selectallitem			8
-	#define findandreplaceitem	10
-	#define fontitem			12
-	#define sizeitem			13
-	#define styleitem			14
-	#define leadingitem			15
-	#define justifyitem			16
-	#define commonstylesitem	17
-	#define insertdatetimeitem	19
-
-#endif
-
-
 // #define windowsmenu (editmenu + mainmenuincrement)
 #define hidewindowitem 1
 #if TARGET_API_MAC_CARBON == 1
@@ -369,3 +452,5 @@
 #endif //!defined(REZ) && !defined(RC_INVOKED)
 
 #endif //shellmenuinclude
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1762] Frontier/trunk/Common/headers/ frontierdefs.h

From: <cre...@us...> - 2007-11-05 19:36:55

Revision: 1762
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1762&view=rev
Author:   creecode
Date:     2007-11-05 11:36:30 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
minor formatting tweaks no functional changes

Modified Paths:
--------------
    Frontier/trunk/Common/headers/frontierdefs.h

Modified: Frontier/trunk/Common/headers/frontierdefs.h
===================================================================
--- Frontier/trunk/Common/headers/frontierdefs.h	2007-10-28 00:20:00 UTC (rev 1761)
+++ Frontier/trunk/Common/headers/frontierdefs.h	2007-11-05 19:36:30 UTC (rev 1762)
@@ -34,24 +34,31 @@
 
 
 #ifdef WIN95VERSION
+
 	#define FRONTIERCOM 1
 
-	#ifndef OPMLEDITOR
+	#ifdef OPMLEDITOR
+
+		#define FRONTIERWEB 1	// 2006-02-05 aradke: enable HTML display in main window background
+
+	#else
+
 		#define FRONTIERWEB 0
-	#else //OPMLEDITOR
-		#define FRONTIERWEB 1	/* 2006-02-05 aradke: enable HTML display in main window background */
-	#endif // OPMLEDITOR
 
+	#endif
+
 	#undef winhybrid
 	#define fljustpacking 0
 	#undef flcomponent
 	#define gray3Dlook 1
 	#define noextended 1
-	#define NEWFILESPECTYPE 1	
-#endif /* WIN95VERSION */
+	#define NEWFILESPECTYPE 1
 
+#endif // WIN95VERSION
 
+
 #ifdef MACVERSION
+
 	#define flcomponent 1
 	#ifdef __powerc
 		#define noextended 1
@@ -60,6 +67,7 @@
 	#else
 		#define noextended 0
 	#endif
+
 #endif /* MACVERSION */
 
 
@@ -87,6 +95,7 @@
 
 
 #ifdef MACVERSION
+
 	#define macBirdRuntime	1
 	#undef appRunsCards			/*for Applet Toolkit, Iowa Runtime is baked in*/
 	#define iowaRuntimeInApp	/*iowa code knows it's in an app*/
@@ -94,9 +103,11 @@
 	#define cmdPeriodKillsCard
 	#define IOAinsideApp		/*all the IOA's are baked into the app*/
 	#undef coderesource			/*we're not running inside a code resource*/
+
 #endif
 
 #ifdef WIN95VERSION
+
 	#undef macBirdRuntime
 	#undef appRunsCards			/*for Applet Toolkit, Iowa Runtime is baked in*/
 	#undef iowaRuntimeInApp		/*iowa code knows it's in an app*/
@@ -104,6 +115,7 @@
 	#undef cmdPeriodKillsCard
 	#undef IOAinsideApp			/*all the IOA's are baked into the app*/
 	#undef coderesource			/*we're not running inside a code resource*/
+
 #endif
 
 
@@ -115,3 +127,5 @@
 
 
 #endif /*__FRONTIERDEFS_H__*/
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1761] Frontier/branches/IUDA_Desktop/Common

From: <cre...@us...> - 2007-10-28 00:19:56

Revision: 1761
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1761&view=rev
Author:   creecode
Date:     2007-10-27 17:20:00 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
various changes unique to IUDA Desktop target, use of preprocessor defines, etc.

Modified Paths:
--------------
    Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h
    Frontier/branches/IUDA_Desktop/Common/headers/versions.h
    Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R
    Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
    Frontier/branches/IUDA_Desktop/Common/source/langstartup.c
    Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c

Modified: Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h	2007-10-28 00:20:00 UTC (rev 1761)
@@ -52,7 +52,7 @@
 	#define leadingmenu				131
 	#define justifymenu				132
 	#define findandreplacemenu		133
-	#define commonstylesmenu		134
+	#define commonstylesmenu			134
 	#define newobjectmenu			135
 	#define virtualmenu				136 /* never appears in user interface -- used for extended keyboard */
 	#define openrecentmenu			137
@@ -121,58 +121,83 @@
 
 #define aboutitem 1
 
+
 #ifdef PIKE
-#ifndef OPMLEDITOR
-	// #define filemenu (applemenu + mainmenuincrement)
 
-	/*PBS 07/22/00: Pike's File menu has been revised --
-	the number, order, and names of items have changed.
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			#define newitem		   1
+			#define openitem		   2
+			#define openrecentitem	   3
+			#define closeitem		   4
+			#define saveitem		   6
+			#define saveasitem		   7
+			#define quititem		   9
+			
+		#endif
+		
+		#ifdef OPMLEDITOR // OPMLEDITOR 2005-04-06 dluebbert
+		
+			#define newitem		    1
+			#define openitem		    2
+			#define openurlitem		    3 // 7.0b17 PBS: Open URL... command
+		//	#define openmanilasiteitem 4
+			#define closeitem		    4
+			#define saveitem		    6
+			#define saveasitem		    7
+		//	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
+		//	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
+			#define revertitem		    8
+			#define changetitleitem	    5
+			#define viewinbrowseritem   10
+			#define updateradiorootitem 12
+			#define workofflineitem	   13 // 7.0b25 PBS: Work Offline
+			#define quititem		   15
+					
+		#endif
+		
+	#else // Radio UserLand
+	
+		//
+		// 7.0d10 PBS: Radio UserLand has an Update Radio.root... command in the
+		//			File menu.
+		//
+		// PBS 07/22/00: Pike's File menu has been revised -- the number, order,
+		//			  and names of items have changed.
+		//
+		
+		// #define filemenu (applemenu + mainmenuincrement)
 
-	7.0d10 PBS: Radio UserLand has an Update Radio.root...
-	command in the File menu.*/
+		#define newitem		    1
+		#define openitem		    2
+		#define openurlitem		    3 // 7.0b17 PBS: Open URL... command
+		#define openmanilasiteitem   4
+		#define closeitem		    5
+		#define saveitem		    7
+		#define saveasitem		    8
+		#define saveashtmlitem	    9 // 7.0b32 PBS: Save As HTML... command
+		#define saveasplaintextitem 10 // 7.0b32 PBS: Save As Plain Text... command
+		#define revertitem		   11
+		#define changetitleitem	    8
+		#define viewinbrowseritem   13
+		#define updateradiorootitem 15
+		#define workofflineitem     16 // 7.0b25 PBS: Work Offline
+		#define quititem		   18
 
-	#define newitem 1
-	#define openitem 2
-	#define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
-	#define openmanilasiteitem 4
-	#define closeitem 5
-	#define saveitem 7
-	#define	saveasitem 8
-	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
-	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
-	#define revertitem 11
-	#define changetitleitem 8
-	#define viewinbrowseritem 13
-	#define updateradiorootitem 15
-	#define workofflineitem 16 /*7.0b25 PBS: Work Offline*/
-	#define quititem 18
-#else //OPMLEDITOR
-	#define newitem 1
-	#define openitem 2
-	#define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
-//	#define openmanilasiteitem 4
-	#define closeitem 4
-	#define saveitem 6
-	#define	saveasitem 7
-//	#define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
-//	#define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
-	#define revertitem 8
-	#define changetitleitem 5
-	#define viewinbrowseritem 10
-	#define updateradiorootitem 12
-	#define workofflineitem 13 /*7.0b25 PBS: Work Offline*/
-	#define quititem 15
-#endif // OPMLEDITOR
+	#endif
+	
+#else // Frontier
 
-#else
-
 	// #define filemenu (applemenu + mainmenuincrement)
+	
 	#define newitem		1
 	#define openitem		2
 	#define openrecentitem	3
 	#define closeitem		5
 	#define saveitem		6
-	#define saverunnableitem	7
+	#define saverunnableitem 7
 	#define saveasitem		8
 	#define revertitem		9
 
@@ -181,56 +206,96 @@
 	#define pagesetupitem	11
 	#define printitem		12
 	#define quititem		14
+	
+#endif // #ifdef PIKE
 
-#endif
 
 // #define editmenu (filemenu + mainmenuincrement)
 
 #define windowsitem				-1
 
+
 #ifdef PIKE
 
-	#define undoitem			1
-	#define cutitem				3
-	#define copyitem			4
-	#define pasteitem			5
-	#define clearitem			6
-	#define selectallitem			8
-	#define findandreplaceitem	10
-	#define commonstylesitem	11
-	#define fontitem			13
-	#define sizeitem			14
-#ifndef OPMLEDITOR
-	#define opennotepaditem		16
-	#define insertdatetimeitem	17
-#else // OPMLEDITOR
-	#define insertdatetimeitem	16
-#endif //OPMLEDITOR
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			#define undoitem		  1
+			#define cutitem		  3
+			#define copyitem		  4
+			#define pasteitem		  5
+			#define clearitem		  6
+			#define selectallitem	  8
+			#define findandreplaceitem 10
+			#define fontitem		  12
+			#define sizeitem		  13
+			#define commonstylesitem	  14
+			#define insertdatetimeitem 16
+			
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			#define undoitem		  1
+			#define cutitem		  3
+			#define copyitem		  4
+			#define pasteitem		  5
+			#define clearitem		  6
+			#define selectallitem	  8
+			#define findandreplaceitem 10
+			#define commonstylesitem	  11
+			#define fontitem		  13
+			#define sizeitem		  14
+			#define insertdatetimeitem 16
+			
+			#define styleitem		  -1
+			#define leadingitem		  -1
+			#define justifyitem		  -1
+					
+		#endif
+		
+	#else // Radio UserLand
+	
+		#define undoitem		  1
+		#define cutitem		  3
+		#define copyitem		  4
+		#define pasteitem		  5
+		#define clearitem		  6
+		#define selectallitem	  8
+		#define findandreplaceitem 10
+		#define commonstylesitem	  11
+		#define fontitem		  13
+		#define sizeitem		  14
+		#define opennotepaditem	  16
+		#define insertdatetimeitem 17
+		
+		#define styleitem		  -1
+		#define leadingitem		  -1
+		#define justifyitem		  -1
+		
+	#endif
+	
+#else // Frontier
 
-	#define styleitem			-1
-	#define leadingitem			-1
-	#define justifyitem			-1
+	#define undoitem		  1
+	#define cutitem		  3
+	#define copyitem		  4
+	#define pasteitem		  5
+	#define clearitem		  6
+	#define selectallitem	  8
+	#define findandreplaceitem 10
+	#define fontitem		  12
+	#define sizeitem		  13
+	#define styleitem		  14
+	#define leadingitem		  15
+	#define justifyitem		  16
+	#define commonstylesitem	  17
+	#define insertdatetimeitem 19
+	
+#endif // #ifdef PIKE
 
-#else
 
-	#define undoitem			1
-	#define cutitem				3
-	#define copyitem			4
-	#define pasteitem			5
-	#define clearitem			6
-	#define selectallitem			8
-	#define findandreplaceitem	10
-	#define fontitem			12
-	#define sizeitem			13
-	#define styleitem			14
-	#define leadingitem			15
-	#define justifyitem			16
-	#define commonstylesitem	17
-	#define insertdatetimeitem	19
-
-#endif
-
-
 // #define windowsmenu (editmenu + mainmenuincrement)
 #define hidewindowitem 1
 #if TARGET_API_MAC_CARBON == 1

Modified: Frontier/branches/IUDA_Desktop/Common/headers/versions.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/versions.h	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/headers/versions.h	2007-10-28 00:20:00 UTC (rev 1761)
@@ -46,65 +46,91 @@
 #define	APP_COPYRIGHT_TILL	"2007"
 
 
-/* target-specific strings and version info */
+// target-specific strings and version info
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
 
-	/* version info for RADIO targets (formerly known as PIKE) */
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
 	
-	#define	APPNAME					"Radio"
-	#define	APP_COPYRIGHT_HOLDER		"UserLand Software, Inc"
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			#define	APPNAME					"IUDA Desktop"
+			
+			#define	APP_COPYRIGHT_HOLDER		"Thomas A. Creedon"
+			
+			#define	bs_APP_NAME				BIGSTRING ( "\x0c" "IUDA Desktop" )
+			#define	bs_APP_SLOGAN				BIGSTRING ( "\x2b" "IMZ-Ural Dicsussion Archive on your desktop" )
+			#define	bs_APP_COPYRIGHT			BIGSTRING ( "\x19" "\xA9 " APP_COPYRIGHT_TILL " Thomas A. Creedon." )
+			#define	bs_APP_URL				BIGSTRING ( "\x26" "http://discussionArchive.imzUral.info/" )
+			
+			#define	APP_MAJOR_VERSION			10
+			#define	APP_MAJOR_VERSION_BCD		0x10	// major version in BCD notation
+			
+			#define	APP_SUB_VERSION			1
+			#define	APP_MINOR_VERSION			0
+			#define	APP_SUBMINOR_VERSION_BCD		0x10	// sub and minor version in BCD notation
+			
+			#define	APP_STAGE_CODE				0x40	// dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
+			#define	APP_REVISION_LEVEL			16	// for non-final releases only
+			#define	APP_BUILD_NUMBER			16	// increment by one for every release, final or not
+			
+			#define	APP_VERSION_STRING			"10.1a16"
+			
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			#define	APPNAME					"OPML"
+			
+			#define	APP_COPYRIGHT_HOLDER		"Scripting News, Inc"
+			
+			#define	bs_APP_NAME				BIGSTRING ("\x04" "OPML")
+			#define	bs_APP_SLOGAN				BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
+			#define	bs_APP_COPYRIGHT			BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
+			#define	bs_APP_URL				BIGSTRING ("\x18" "http://support.opml.org/")
+			
+			#define	APP_MAJOR_VERSION			10
+			#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
+			
+			#define	APP_SUB_VERSION			1
+			#define	APP_MINOR_VERSION			0
+			#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
+			
+			#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+			#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
+			#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
+			
+			#define	APP_VERSION_STRING			"10.1a15"
+			
+		#endif
+		
+	#else // Radio UserLand
 	
-	#define	bs_APP_NAME				BIGSTRING ("\x05" "Radio")
-	#define	bs_APP_SLOGAN				BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
-	#define	bs_APP_COPYRIGHT			BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
-	#define	bs_APP_URL				BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
-	
-	#define	APP_MAJOR_VERSION			10
-	#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
-	
-	#define	APP_SUB_VERSION			1
-	#define	APP_MINOR_VERSION			0
-	#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
-	
-	#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
-	#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
-	
-	#define	APP_VERSION_STRING			"10.1a15"
+		#define	APPNAME					"Radio"
+		#define	APP_COPYRIGHT_HOLDER		"UserLand Software, Inc"
+		
+		#define	bs_APP_NAME				BIGSTRING ("\x05" "Radio")
+		#define	bs_APP_SLOGAN				BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
+		#define	bs_APP_COPYRIGHT			BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
+		#define	bs_APP_URL				BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
+		
+		#define	APP_MAJOR_VERSION			10
+		#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
+		
+		#define	APP_SUB_VERSION			1
+		#define	APP_MINOR_VERSION			0
+		#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
+		
+		#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+		#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
+		#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
+		
+		#define	APP_VERSION_STRING			"10.1a15"
 
-#else
-
-	/* version info for OPMLEDITOR targets */
+	#endif
 	
-	#define	APPNAME					"OPML"
-	
-	#define	APP_COPYRIGHT_HOLDER		"Scripting News, Inc"
-	
-	#define	bs_APP_NAME				BIGSTRING ("\x04" "OPML")
-	#define	bs_APP_SLOGAN				BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
-	#define	bs_APP_COPYRIGHT			BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
-	#define	bs_APP_URL				BIGSTRING ("\x18" "http://support.opml.org/")
-	
-	#define	APP_MAJOR_VERSION			10
-	#define	APP_MAJOR_VERSION_BCD		0x10	/* major version in BCD notation */
-	
-	#define	APP_SUB_VERSION			1
-	#define	APP_MINOR_VERSION			0
-	#define	APP_SUBMINOR_VERSION_BCD		0x10	/* sub and minor version in BCD notation */
-	
-	#define	APP_STAGE_CODE				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL			15	/* for non-final releases only */
-	#define	APP_BUILD_NUMBER			15	/* increment by one for every release, final or not */
-	
-	#define	APP_VERSION_STRING			"10.1a15"
-	
-#endif
-#else
+#else // Frontier
 
-	/* version info for FRONTIER targets */
-	
 	#define	APPNAME					"Frontier"
 	#define	APP_COPYRIGHT_HOLDER		"Frontier Kernel Project"
 	
@@ -126,8 +152,9 @@
 	
 	#define	APP_VERSION_STRING			"10.1a15"
 	
-#endif
+#endif // #ifdef PIKE
 
+
 #define	bs_APP_COPYRIGHT2	BIGSTRING ("\x22" "\xA9 1992-2004 UserLand Software, Inc")
 #define	APP_COPYRIGHT		APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " " APP_COPYRIGHT_HOLDER
 

Modified: Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R	2007-10-28 00:20:00 UTC (rev 1761)
@@ -44,419 +44,412 @@
 	}
 };
 
-#ifdef PIKE
 
-/*PBS 7.0b1: File menu changes for Radio UserLand.
-It's a standard File menu now.*/
-#ifndef OPMLEDITOR
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Save As HTML\xC9", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Work Offline", noIcon, noKey, noMark, plain,
-		/* [17] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [18] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
+#ifdef PIKE // File menu for IUDA Desktop, OPML Editor, or Radio UserLand
 
-/*Carbon File menu*/
+	//
+	// PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File
+	//		    menu now.
+	//
+	
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			resource 'MENU' (412, "File") { // Carbon File menu
+				2,
+				textMenuProc,
+				0x7FFFFE77,
+				enabled,
+				"File",
+				{	// array: 7 elements
+				
+					// [1]
+					"New", noIcon, "N", noMark, plain,
+					
+					// [2]
+					"Open\xC9", noIcon, "O", noMark, plain,
+					
+					// [3]
+					"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+					
+					// [4]
+					"Close", noIcon, "W", noMark, plain,
+					
+					// [5]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [6]
+					"Save", noIcon, "S", noMark, plain,
+					
+					// [7]
+					"Save As\xC9", noIcon, noKey, noMark, plain,
+					
+					/* // [8]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [9]
+					"Update IUDA Desktop.root\xC9", noIcon, noKey, noMark, plain, */
+				}
+			};
+			
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			resource 'MENU' (412, "File") { // Carbon File menu
+				2,
+				textMenuProc,
+				0x7FFFFE77,
+				enabled,
+				"File",
+				{	// array: 13 elements
+					/* [1] */
+					"New", noIcon, "N", noMark, plain,
+					/* [2] */
+					"Open\xC9", noIcon, "O", noMark, plain,
+					/* [3] */
+					"Open URL\xC9", noIcon, noKey, noMark, plain, // 7.0b17 PBS
+					/* [4] */
+					"Close", noIcon, "W", noMark, plain,
+					/* [5] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [6] */
+					"Save", noIcon, "S", noMark, plain,
+					/* [7] */
+					"Save As\xC9", noIcon, noKey, noMark, plain,
+					/* [8] */
+					"Revert", noIcon, noKey, noMark, plain,
+					/* [9] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [10] */
+					"View in Browser", noIcon, "P", noMark, plain,
+					/* [11] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [12] */
+					"Update opml.root\xC9", noIcon, noKey, noMark, plain,
+					/* [13] */
+					"Work Offline", noIcon, noKey, noMark, plain
+				}
+			};
+			
+		#endif
+		
+	#else // Radio UserLand
+	
+		resource 'MENU' (412, "File") { // Carbon File menu
+			2,
+			textMenuProc,
+			0x7FFFFE77,
+			enabled,
+			"File",
+			{	/* array: 16 elements */
+				/* [1] */
+				"New", noIcon, "N", noMark, plain,
+				/* [2] */
+				"Open\xC9", noIcon, "O", noMark, plain,
+				/* [3] */
+				"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+				/* [4] */
+				"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
+				/* [5] */
+				"Close", noIcon, "W", noMark, plain,
+				/* [6] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [7] */
+				"Save", noIcon, "S", noMark, plain,
+				/* [8] */
+				"Save As\xC9", noIcon, noKey, noMark, plain,
+				/* [9] */
+				"Save As HTML\xC9", noIcon, noKey, noMark, plain,
+				/* [10] */
+				"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
+				/* [11] */
+				"Revert", noIcon, noKey, noMark, plain,
+				/* [12] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [13] */
+				"View in Browser", noIcon, "P", noMark, plain,
+				/* [14] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [15] */
+				"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
+				/* [16] */
+				"Work Offline", noIcon, noKey, noMark, plain
+			}
+		};
+		
+	#endif
+	
+#else // Frontier
 
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Save As HTML\xC9", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Update Radio.root\xC9", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Work Offline", noIcon, noKey, noMark, plain
-	}
-};
-#else // OPMLEDITOR
-
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+	//
+	// Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
+	// This is the conditional menu for carbon. You do not need a quit item in
+	// carbon
+	//
+	
+	resource 'MENU' (412, "File") {
+		2,
+		textMenuProc,
+		0x7FFFFE77,
+		enabled,
+		"File",
+		{	/* array: 12 elements */
 		
-		/* [4] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [5] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Update opml.root\xC9", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Work Offline", noIcon, noKey, noMark, plain,
-		/* [14] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [15] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
+			#ifdef version42orgreater
+					/* [1] */
+					"New", noIcon, hierarchicalMenu, "\0d135", plain,
+			#else
+					/* [1] */
+					"New", noIcon, noKey, noMark, plain,
+			#endif
+			
+			/* [2] */
+			"Open\xC9", noIcon, "O", noMark, plain,
+			/* [3] */
+			"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+			/* [4] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [5] */
+			"Close", noIcon, "W", noMark, plain,
+			/* [6] */
+			"Save", noIcon, "S", noMark, plain,
+			/* [7] */
+			"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
+			/* [8] */
+			"Save As\xC9", noIcon, noKey, noMark, plain, // 2005-11-01 creedon
+			/* [9] */
+			"Revert", noIcon, noKey, noMark, plain,
+			/* [10] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [11] */
+			"Page Setup\xC9", noIcon, noKey, noMark, plain,
+			/* [12] */
+			"Print\xC9", noIcon, "P", noMark, plain
+		}
+	};
+	
+#endif  // #ifdef PIKE
 
-/*Carbon File menu*/
 
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 9 elements */
-		/* [1] */
-		"New", noIcon, "N", noMark, plain,
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
-		/* [4] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [5] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save As\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"View in Browser", noIcon, "P", noMark, plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Update opml.root\xC9", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Work Offline", noIcon, noKey, noMark, plain
-	}
-};
-#endif // OPMLEDITOR
-#else
+#ifdef PIKE // Edit menu for IUDA Desktop, OPML Editor, or Radio UserLand
 
-resource 'MENU' (2, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 14 elements */
-#ifdef version42orgreater
-		/* [1] */
-		"New", noIcon, hierarchicalMenu, "\0d135", plain,
-#else
-		/* [1] */
-		"New", noIcon, noKey, noMark, plain,
-#endif
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
-		/* [4] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"-", noIcon, noKey, noMark, plain,
+	//
+	// 7.0b26 PBS: Radio UserLand has a different Edit menu.
+	//
+ 
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			resource 'MENU' (3, "Edit") {
+				3,
+				textMenuProc,
+				0x7FFFFF5D,
+				enabled,
+				"Edit",
+				{	// array: 16 elements
+				
+					// [1]
+					"Undo", noIcon, "Z", noMark, plain,
+					
+					// [2]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [3]
+					"Cut", noIcon, "X", noMark, plain,
+					
+					// [4]
+					"Copy", noIcon, "C", noMark, plain,
+					
+					// [5]
+					"Paste", noIcon, "V", noMark, plain,
+					
+					// [6]
+					"Clear", noIcon, noKey, noMark, plain,
+					
+					// [7]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [8]
+					"Select All", noIcon, "A", noMark, plain,
+					
+					// [9]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [10]
+					"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+					
+					// [11]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [12]
+					"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+					
+					// [13]
+					"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+					
+					// [14]
+					"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+					
+					// [15]
+					"-", noIcon, noKey, noMark, plain,
+					
+					// [16]
+					"Insert Date/Time", noIcon, "4", noMark, plain,
+				}
+			};
+			
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			resource 'MENU' (3, "Edit") {
+				3,
+				textMenuProc,
+				0x7FFFFF5D,
+				enabled,
+				"Edit",
+				{	/* array: 14 elements */
+					/* [1] */
+					"Undo", noIcon, "Z", noMark, plain,
+					/* [2] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [3] */
+					"Cut", noIcon, "X", noMark, plain,
+					/* [4] */
+					"Copy", noIcon, "C", noMark, plain,
+					/* [5] */
+					"Paste", noIcon, "V", noMark, plain,
+					/* [6] */
+					"Clear", noIcon, noKey, noMark, plain,
+					/* [7] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [8] */
+					"Select All", noIcon, "A", noMark, plain,
+					/* [9] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [10] */
+					"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+					/* [11] */
+					"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+					/* [12] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [13] */
+					"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+					/* [14] */
+					"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+					/* [15] */
+					"-", noIcon, noKey, noMark, plain,
+					/* [16] */
+					"Insert Date/Time", noIcon, "4", noMark, plain,
+				}
+			};
+			
+		#endif
+		
+	#else // Radio UserLand
+	
+		resource 'MENU' (3, "Edit") {
+			3,
+			textMenuProc,
+			0x7FFFFF5D,
+			enabled,
+			"Edit",
+			{	/* array: 17 elements */
+				/* [1] */
+				"Undo", noIcon, "Z", noMark, plain,
+				/* [2] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [3] */
+				"Cut", noIcon, "X", noMark, plain,
+				/* [4] */
+				"Copy", noIcon, "C", noMark, plain,
+				/* [5] */
+				"Paste", noIcon, "V", noMark, plain,
+				/* [6] */
+				"Clear", noIcon, noKey, noMark, plain,
+				/* [7] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [8] */
+				"Select All", noIcon, "A", noMark, plain,
+				/* [9] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [10] */
+				"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+				/* [11] */
+				"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+				/* [12] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [13] */
+				"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+				/* [14] */
+				"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+				/* [15] */
+				"-", noIcon, noKey, noMark, plain,
+				/* [16] */
+				"Open Notepad", noIcon, "Y", noMark, plain,
+				/* [17] */
+				"Insert Date/Time", noIcon, "4", noMark, plain,
+			}
+		};
+		
+	#endif
+	
+#else // Frontier
 
-//		/* [10] */
-//		"Expert Mode", noIcon, noKey, noMark, plain,
-//		/* [9] */
-//		"-", noIcon, noKey, noMark, plain,
-
-		/* [11] */
-		"Page Setup\xC9", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Print\xC9", noIcon, "P", noMark, plain,
-		/* [13] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [14] */
-		"Quit", noIcon, "Q", noMark, plain
-	}
-};
-
-//Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
-//This is the conditional menu for carbon. You do not need a quit 
-//item in carbon
-resource 'MENU' (412, "File") {
-	2,
-	textMenuProc,
-	0x7FFFFE77,
-	enabled,
-	"File",
-	{	/* array: 12 elements */
-#ifdef version42orgreater
-		/* [1] */
-		"New", noIcon, hierarchicalMenu, "\0d135", plain,
-#else
-		/* [1] */
-		"New", noIcon, noKey, noMark, plain,
-#endif
-		/* [2] */
-		"Open\xC9", noIcon, "O", noMark, plain,
-		/* [3] */
-		"Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
-		/* [4] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [5] */
-		"Close", noIcon, "W", noMark, plain,
-		/* [6] */
-		"Save", noIcon, "S", noMark, plain,
-		/* [7] */
-		"Save as Runnable\xC9", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
-		/* [9] */
-		"Revert", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [11] */
-		"Page Setup\xC9", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Print\xC9", noIcon, "P", noMark, plain
-	}
-};
-#endif
-
-#ifdef PIKE /*7.0b26 PBS: Radio UserLand has a different Edit menu.*/
-
-#ifndef OPMLEDITOR
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 17 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [14] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [15] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Open Notepad", noIcon, "Y", noMark, plain,
-		/* [17] */
-		"Insert Date/Time", noIcon, "4", noMark, plain,
-	}
-};
-#else //OPMLEDITOR
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 14 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [12] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [13] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [14] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [15] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [16] */
-		"Insert Date/Time", noIcon, "4", noMark, plain,
+	resource 'MENU' (3, "Edit") {
+		3,
+		textMenuProc,
+		0x7FFFFF5D,
+		enabled,
+		"Edit",
+		{	/* array: 19 elements */
+			/* [1] */
+			"Undo", noIcon, "Z", noMark, plain,
+			/* [2] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [3] */
+			"Cut", noIcon, "X", noMark, plain,
+			/* [4] */
+			"Copy", noIcon, "C", noMark, plain,
+			/* [5] */
+			"Paste", noIcon, "V", noMark, plain,
+			/* [6] */
+			"Clear", noIcon, noKey, noMark, plain,
+			/* [7] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [8] */
+			"Select All", noIcon, "A", noMark, plain,
+			/* [9] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [10] */
+			"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+			/* [11] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [12] */
+			"Font", noIcon, hierarchicalMenu, "\0d128", plain,
+			/* [13] */
+			"Size", noIcon, hierarchicalMenu, "\0d130", plain,
+			/* [14] */
+			"Style", noIcon, hierarchicalMenu, "\0d129", plain,
+			/* [15] */
+			"Leading", noIcon, hierarchicalMenu, "\0d131", plain,
+			/* [16] */
+			"Justify", noIcon, hierarchicalMenu, "\0d132", plain,
+			/* [17] */
+			"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+			/* [18] */
+			"-", noIcon, noKey, noMark, plain,
+			/* [19] */
+			"Insert Date/Time", noIcon, "4", noMark, plain
+		}
+	};
 		
-	}
-};
+#endif  // #ifdef PIKE
 
-#endif //OPMLEDITOR
 
-#else
-
-resource 'MENU' (3, "Edit") {
-	3,
-	textMenuProc,
-	0x7FFFFF5D,
-	enabled,
-	"Edit",
-	{	/* array: 19 elements */
-		/* [1] */
-		"Undo", noIcon, "Z", noMark, plain,
-		/* [2] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [3] */
-		"Cut", noIcon, "X", noMark, plain,
-		/* [4] */
-		"Copy", noIcon, "C", noMark, plain,
-		/* [5] */
-		"Paste", noIcon, "V", noMark, plain,
-		/* [6] */
-		"Clear", noIcon, noKey, noMark, plain,
-		/* [7] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [8] */
-		"Select All", noIcon, "A", noMark, plain,
-		/* [9] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [10] */
-		"Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-		/* [11] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [12] */
-		"Font", noIcon, hierarchicalMenu, "\0d128", plain,
-		/* [13] */
-		"Size", noIcon, hierarchicalMenu, "\0d130", plain,
-		/* [14] */
-		"Style", noIcon, hierarchicalMenu, "\0d129", plain,
-		/* [15] */
-		"Leading", noIcon, hierarchicalMenu, "\0d131", plain,
-		/* [16] */
-		"Justify", noIcon, hierarchicalMenu, "\0d132", plain,
-		/* [17] */
-		"Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-		/* [18] */
-		"-", noIcon, noKey, noMark, plain,
-		/* [19] */
-		"Insert Date/Time", noIcon, "4", noMark, plain
-	}
-};
-
-#endif
-
 resource 'MENU' (4, "Window") {
 	4,
 	textMenuProc,
@@ -625,13 +618,22 @@
 		/* [3] */
 		"Find Next", noIcon, "G", noMark, plain,
 		/* [4] */
-		#ifdef PIKE /* 2005-09-25 creedon */
 		
-		"Replace & Find Next", noIcon, "H", noMark, plain
+		#ifdef PIKE // 2005-09-25 creedon
 		
+			#ifdef IUDADESKTOP // 2007-09-09 creedon
+			
+				"Replace & Find Next", noIcon, "1", noMark, plain
+			
+			#else // OPML Editor or Radio UserLand
+			
+				"Replace & Find Next", noIcon, "H", noMark, plain
+			
+			#endif
+			
 		#else
 		
-		"Replace & Find Next", noIcon, "1", noMark, plain
+			"Replace & Find Next", noIcon, "1", noMark, plain
 		
 		#endif
 	}
@@ -758,41 +760,78 @@
 
 
 resource 'STR#' (129, "Defaults", purgeable) {
-	{	/* array StringArray: 6 elements */
-#ifdef PIKE
-#ifndef OPMLEDITOR
-		/* [1] */
-		"Radio UserLand\xAA", /*PBS 7.0b1: name change to Radio UserLand.*/
-#else  // OPMLEDITOR
-		"OPML",
-#endif  //OPMLEDITOR
-#else
-		/* [1] */
-		"Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */
-#endif
-		/* [2] */
+	{	// array StringArray: 6 elements
+	
+		#ifdef PIKE // [1]
+		
+			#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+			
+				#ifdef IUDADESKTOP // 2007-10-27 creedon
+				
+					"IUDA Desktop",
+					
+				#endif
+				
+				#ifdef OPMLEDITOR
+				
+					"OPML",
+					
+				#endif
+				
+			#else
+			
+				"Radio UserLand\xAA", // PBS 7.0b1: name change to Radio UserLand.
+				
+			#endif
+			
+		#else
+		
+			"Frontier", // 2005-01-04 creedon - removed UserLand and (tm) for open source release
+			
+		#endif // [1]
+		
+		// [2]
 		"Untitled",
-		/* [3] */
+		// [3]
 		"Untitled",
-		/* [4] */
+		// [4]	  
 		"Select a database file:",
-		/* [5] */
-		"",
-#ifdef PIKE
-#ifndef OPMLEDITOR
-		/* [6] -- default DB name*/ /*PBS 7.0b1: changed from Pike.root to Radio.root.*/
-		"Radio.root",
-#else  // OPMLEDITOR
-		"opml.root",
-#endif  //OPMLEDITOR
-#else
-		/* [6] */
-		"Frontier.root",
-#endif
-		/* [7] */
+		// [5]
+		"", 
+		
+		#ifdef PIKE // [6] -- default DB name
+
+			#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+			
+				#ifdef IUDADESKTOP // 2007-10-27 creedon
+				
+					"IUDA Desktop.root",
+					
+				#endif
+				
+				#ifdef OPMLEDITOR
+				
+					"opml.root",
+					
+				#endif
+				
+			#else
+			
+				"Radio.root", // PBS 7.0b1: changed from Pike.root to Radio.root.
+			
+			#endif
+			
+		#else
+
+			"Frontier.root",
+			
+		#endif // [6]
+
+		// [7]
 		"Open a file:"
-	}
-};
+		
+		}
+	};
 
 resource 'STR#' (130, "Interface", locked, preload) {
 	{	/* array StringArray: 15 elements */
@@ -4472,22 +4511,41 @@
 
 
 #ifdef PIKE
-#ifndef OPMLEDITOR
-type 'PIKE' as 'STR ';
 
-resource 'PIKE' (0, "Owner resource")
-#else   //OPMLEDITOR
-type 'OPML' as 'STR ';
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			type 'IUDA' as 'STR ';
 
-resource 'OPML' (0, "Owner resource")
-#endif // OPMLEDITOR
+			resource 'IUDA' ( 0, "Owner resource" )
+			
+		#endif
+		
+		#ifdef OPMLEDITOR
+		
+			type 'OPML' as 'STR ';
 
-#else
+			resource 'OPML' (0, "Owner resource")
+			
+		#endif
+		
+	#else // Radio UserLand
+	
+		type 'PIKE' as 'STR ';
 
-type 'LAND' as 'STR ';
+		resource 'PIKE' (0, "Owner resource")
+				
+	#endif
+	
+#else // Frontier
 
-resource 'LAND' (0, "Owner resource")
-#endif
+	type 'LAND' as 'STR ';
+
+	resource 'LAND' (0, "Owner resource")
+		
+#endif // #ifdef PIKe
+
 {
 	"Copyright \xA9 " APP_COPYRIGHT
 };

Modified: Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langhtml.c	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/source/langhtml.c	2007-10-28 00:20:00 UTC (rev 1761)
@@ -141,34 +141,36 @@
 
 #define STR_P_flprocessmacrosintags     BIGSTRING ("\x17" "processmacrosinhtmltags")
 
-#ifdef PIKE /*7.0 PBS: server string is Radio UserLand*/
 
-#ifndef OPMLEDITOR
+#ifdef PIKE
 
-	#if TARGET_API_MAC_CARBON == 1
-		#define STR_P_SERVERSTRING				BIGSTRING ("\x15" "Radio UserLand/^0-^1X")
+	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+	
+		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		
+			#define STR_P_SERVERSTRING BIGSTRING ("\x13" "IUDA Desktop/^0-^1X")
+			
+		#endif
+		
+		#ifdef OPMLEDITOR // 2005-04-06 dluebbert
+		
+			#define STR_P_SERVERSTRING BIGSTRING ("\x0b" "OPML/^0-^1X")
+			
+		#endif
+		
 	#else
-		#define STR_P_SERVERSTRING				BIGSTRING ("\x14" "Radio UserLand/^0-^1")
-	#endif
+	
+		#define STR_P_SERVERSTRING BIGSTRING ("\x15" "Radio UserLand/^0-^1X") // 7.0 PBS: server string is Radio UserLand
 
-#else  // OPMLEDITOR 2005-04-06 dluebbert
-	#if TARGET_API_MAC_CARBON == 1
-		#define STR_P_SERVERSTRING				BIGSTRING ("\x0b" "OPML/^0-^1X")
-	#else
-		#define STR_P_SERVERSTRING				BIGSTRING ("\x0a" "OPML/^0-^1")
 	#endif
-#endif // OPMLEDITOR
+	
+#else
 
-#else // !PIKE
+	#define STR_P_SERVERSTRING BIGSTRING ("\x0f" "Frontier/^0-^1X") // 2005-01-04 creedon - removed UserLand for open source release
+	
+#endif // #ifdef PIKE
 
-	#if TARGET_API_MAC_CARBON == 1
-		#define STR_P_SERVERSTRING			BIGSTRING ("\x0f" "Frontier/^0-^1X") /* 2005-01-04 creedon - removed UserLand for open source release */
-	#else
-		#define STR_P_SERVERSTRING			BIGSTRING ("\x0e" "Frontier/^0-^1") /* 2005-01-04 creedon - removed UserLand for open source release */
-	#endif
 
-#endif  //!PIKE
-
 #define STR_P_RESPONDERERROR			BIGSTRING ("\x16" "Responder method error")
 #define STR_P_LOGADD					BIGSTRING ("\x16" "log.addToGuestDatabase")
 #define STR_P_USERWEBSERVERCONFIG		BIGSTRING ("\x15" "user.webserver.config")

Modified: Frontier/branches/IUDA_Desktop/Common/source/langstartup.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langstartup.c	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/source/langstartup.c	2007-10-28 00:20:00 UTC (rev 1761)
@@ -45,24 +45,26 @@
 #include "byteorder.h"	/* 2006-04-16 aradke: swap byte-order in loadfunctionprocessor */
 
 
+#define str_isFrontier			BIGSTRING ("\x0a" "isFrontier") // 2005-04-06 dluebbert
+#define str_isIudaDesktop		BIGSTRING ("\x0d" "isIudaDesktop") // 2007-09-08 creedon
+#define str_isOpmlEditor			BIGSTRING ("\x0c" "isOpmlEditor") // 2005-04-06 dluebbert
 #define str_isPike				BIGSTRING ("\x06" "isPike")
-#define str_isOpmlEditor        BIGSTRING ("\x0c" "isOpmlEditor")    /* 2005-04-06 dluebbert */
-#define str_isFrontier          BIGSTRING ("\x0a" "isFrontier")      /* 2005-04-06 dluebbert */
 #define str_isRadio				BIGSTRING ("\x07" "isRadio")
+
+#define str_isCarbon			BIGSTRING ("\x08" "isCarbon")
 #define str_isMac				BIGSTRING ("\x05" "isMac")
-#define str_isMacOsClassic		BIGSTRING ("\x0e" "isMacOsClassic") /* 2004-11-19 creedon */
-#define str_isServer			BIGSTRING ("\x08" "isServer") /* 2004-11-19 creedon */
+#define str_isMacOsClassic		BIGSTRING ("\x0e" "isMacOsClassic") // 2004-11-19 creedon
+#define str_isServer			BIGSTRING ("\x08" "isServer") // 2004-11-19 creedon
 #define str_isWindows			BIGSTRING ("\x09" "isWindows")
+#define str_maxTcpConnections		BIGSTRING ("\x11" "maxTcpConnections")
+#define str_osBuildNumber		BIGSTRING ("\x0d" "osBuildNumber")
 #define str_osFlavor			BIGSTRING ("\x08" "osFlavor")
+#define str_osFullNameForDisplay	BIGSTRING ("\x14" "osFullNameForDisplay")
 #define str_osMajorVersion		BIGSTRING ("\x0e" "osMajorVersion")
 #define str_osMinorVersion		BIGSTRING ("\x0e" "osMinorVersion")
-#define str_osPointVersion		BIGSTRING ("\x0e" "osPointVersion") /* 2004-11-19 creedon */
-#define str_osBuildNumber		BIGSTRING ("\x0d" "osBuildNumber")
+#define str_osPointVersion		BIGSTRING ("\x0e" "osPointVersion") // 2004-11-19 creedon
 #define str_osVersionString		BIGSTRING ("\x0f" "osVersionString")
-#define str_osFullNameForDisplay	BIGSTRING ("\x14" "osFullNameForDisplay")
 #define str_winServicePackNumber	BIGSTRING ("\x14" "winServicePackNumber")
-#define str_isCarbon				BIGSTRING ("\x08" "isCarbon")
-#define str_maxTcpConnections		BIGSTRING ("\x11" "maxTcpConnections")
 
 
 void initsegment (void) {
@@ -408,31 +410,48 @@
 	langassignstringvalue ( ht, str_osVersionString, bsversion );
 	
 	#ifdef PIKE
-	
-		#ifndef OPMLEDITOR
+
+		#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
 		
-			langassignbooleanvalue (ht, str_isPike, true);
-			langassignbooleanvalue (ht, str_isRadio, true); /*7.0b37 PBS: system.environment.isRadio*/
-			langassignbooleanvalue (ht, str_isOpmlEditor, false); /*2005-04-06 dluebbert: system.environment.isOPML*/
-			langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+			#ifdef IUDADESKTOP // 2007-10-27 creedon
 			
-		#else // OPMLEDITOR
+				langassignbooleanvalue ( ht, str_isFrontier, false ); // 2005-04-06 dluebbert: system.environment.isFrontier
+				langassignbooleanvalue ( ht, str_isIudaDesktop, true ); // 2007-09-08 creedon: system.environment.isIudaDesktop
+				langassignbooleanvalue ( ht, str_isOpmlEditor, false ); // 2005-04-06 dluebbert: system.environment.isOPML
+				langassignbooleanvalue ( ht, str_isPike, false );
+				langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
+				
+			#endif
+			
+			#ifdef OPMLEDITOR
+			
+				langassignbooleanvalue ( ht, str_isFrontier, false ); // 2005-04-06 dluebbert: system.environment.isFrontier
+				langassignbooleanvalue ( ht, str_isIudaDesktop, false ); // 2007-09-08 creedon: system.environment.isIudaDesktop
+				langassignbooleanvalue ( ht, str_isOpmlEditor, true ); // 2005-04-06 dluebbert: system.environment.isOPML
+				langassignbooleanvalue ( ht, str_isPike, false );
+				langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
+				
+			#endif
+			
+		#else // Radio UserLand
 		
-			langassignbooleanvalue (ht, str_isPike, false);
-			langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/
-			langassignbooleanvalue (ht, str_isOpmlEditor, true); /*2005-04-06 dluebbert: system.environment.isOPML*/
-			langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+			langassignbooleanvalue ( ht, str_isFrontier, false ); // 2005-04-06 dluebbert: system.environment.isFrontier
+			langassignbooleanvalue ( ht, str_isIudaDesktop, false ); // 2007-09-08 creedon: system.environment.isIudaDesktop
+			langassignbooleanvalue ( ht, str_isOpmlEditor, false ); // 2005-04-06 dluebbert: system.environment.isOPML
+			langassignbooleanvalue ( ht, str_isPike, true );
+			langassignbooleanvalue ( ht, str_isRadio, true ); // 7.0b37 PBS: system.environment.isRadio
 			
-		#endif // OPMLEDITOR
+		#endif
 		
-	#else //!PIKE
-	
-		langassignbooleanvalue (ht, str_isPike, false);
-		langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/
-		langassignbooleanvalue (ht, str_isOpmlEditor, false); /*2005-04-06 dluebbert: system.environment.isOPML*/
-		langassignbooleanvalue (ht, str_isFrontier, true); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+	#else
+
+		langassignbooleanvalue ( ht, str_isFrontier, true ); // 2005-04-06 dluebbert: system.environment.isFrontier
+		langassignbooleanvalue ( ht, str_isIudaDesktop, false ); // 2007-09-08 creedon: system.environment.isIudaDesktop
+		langassignbooleanvalue ( ht, str_isOpmlEditor, false ); // 2005-04-06 dluebbert: system.environment.isOPML
+		langassignbooleanvalue ( ht, str_isPike, false );
+		langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
 		
-	#endif //!PIKE
+	#endif // #ifdef PIKE
 
 	return ( true );
 		

Modified: Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c	2007-10-28 00:14:21 UTC (rev 1760)
+++ Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c	2007-10-28 00:20:00 UTC (rev 1761)
@@ -906,36 +906,40 @@
 
 #ifdef PIKE
 
-static void pikesetfilemenuitemchecked (short ixmenu) {
-	
-	/*
-	7.0b25 PBS: Run a Radio UserLand script that returns true if the item should get
-	a check mark. If true, put a check next to the item.
+	#if ! defined ( IUDADESKTOP ) // 2007-10-27 creedon
+			
+		static void pikesetfilemenuitemchecked (short ixmenu) {
+			
+			/*
+			7.0b25 PBS: Run a Radio UserLand script that returns true if the item should get
+			a check mark. If true, put a check next to the item.
 
-	7.1b4 PBS: Get script from resource, don't hard-code.
-	*/
-	
-	bigstring bsscript, bsitem, bsresult;
-	
-	if (roottable == nil)
-		return;
-	
-	getfilemenuitemidentifier (ixmenu, bsitem);
-	
-	/*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/
+			7.1b4 PBS: Get script from resource, don't hard-code.
+			*/
+			
+			bigstring bsscript, bsitem, bsresult;
+			
+			if (roottable == nil)
+				return;
+			
+			getfilemenuitemidentifier (ixmenu, bsitem);
+			
+			/*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/
 
-	getsystemtablescript (idpikeisfilemenuitemcheckedscript, bsscript);
-	
-	parsedialogstring (bsscript, bsitem, nil, nil, nil, bsscript);
+			getsystemtablescript (idpikeisfilemenuitemcheckedscript, bsscript);
+			
+			parsedialogstring (bsscript, bsitem, nil, nil, nil, bsscript);
 
-	grabthreadglobals ();
-	
-	langrunstringnoerror (bsscript, bsresult);
-	
-	releasethreadglobals ();
+			grabthreadglobals ();
+			
+			langrunstringnoerror (bsscript, bsresult);
+			
+			releasethreadglobals ();
 
-	checkmenuitem (shellmenuhandle (filemenu), ixmenu, equalstrings (bsresult, bstrue));
-	} /*pikesetfilemenuitemchecked*/
+			checkmenuitem (shellmenuhandle (filemenu), ixmenu, equalstrings (bsresult, bstrue));
+			
+			} /*pikesetfilemenuitemchecked*/
+	#endif
 
 
 static void pikesetfilemenuitemenable (short ixmenu) {
@@ -1041,7 +1045,8 @@
 	2005-10-26 creedon: the file menu item that provides save as functionality now reads Save As... for database or file-object save for Frontier
 	
 	2005-09-25 creedon: added open recent menu
-					 changed to support calling script for some file/edit menu commands on all targets
+					changed to support calling script for some file/edit
+					menu commands on all targets
 	
 	8/1/90 dmb: call menuhooks with menu & item set to zero to give 
 	hooks a chance to update their menus
@@ -1068,9 +1073,9 @@
 	hdlwindowinfo hrootinfo = nil;
 	tyselectioninfo x;
 
-#ifndef PIKE
-	Handle hdata;
-#endif
+	#ifndef PIKE
+		Handle hdata;
+	#endif
 
 	/*7.0b32 PBS: if shellwindow is root window but it's hidden, act as
 	if no windows are open -- because, to the user, no windows *are* open.*/
@@ -1126,106 +1131,141 @@
 	
 	if (hmenu == nil) /*skip file menu adjusting*/
 		goto L1;	
+		
+	#ifdef PIKE
 
-#ifdef PIKE
+		#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+		
+			#ifdef IUDADESKTOP // 2007-09-09 creedon
+			
+				enablemenuitem ( hmenu, newitem );
 
-/*7.0b1 PBS: Radio UserLand has a functioning About item in the Apple menu.*/
+				enablemenuitem ( hmenu, openitem );
+								
+				enablemenuitem ( hmenu, openrecentitem );
+		
+				pikesetfilemenuitemenable ( closeitem );
+					
+				pikesetfilemenuitemenable ( saveitem );
 
-/*#ifdef MACVERSION
-	disablemenuitem (happlemenu, aboutitem); //disable this command until we have a splash screen
-#endif*/
+				pikesetfilemenuitemenable ( saveasitem );
+				
+				// pikesetfilemenuitemenable ( updateradiorootitem );
+				
+			#endif
+			
+			#ifdef OPMLEDITOR
+			
+				enablemenuitem (hmenu, newitem);
 
-	/*
-	6.2a2 AR: For Pike, we want to manage the state of the items
-	in the File menu by calling a UserTalk script.
+				enablemenuitem (hmenu, openitem);
+				
+				pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/
+				
+				pikesetfilemenuitemenable (closeitem);
+					
+				pikesetfilemenuitemenable (saveitem);
 
-	7.0d6 PBS: Pike's File menu has changed. It's more like a standard
-	File menu. The names, number, and order of items have changed.
+				pikesetfilemenuitemenable (saveasitem);
+				
+				pikesetfilemenuitemenable (revertitem);
 
-	7.0d10 PBS: Radio UserLand now has Update Radio.root... in the File menu.
-	*/
+				pikesetfilemenuitemenable (viewinbrowseritem);
 
-	enablemenuitem (hmenu, newitem);
-
-	enablemenuitem (hmenu, openitem);
-	
-	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);
+				pikesetfilemenuitemenable (updateradiorootitem); /*7.0d10 PBS*/
+				
+				pikesetfilemenuitemenable (workofflineitem); /*7.0b25 PBS*/
+				
+				pikesetfilemenuitemchecked (workofflineitem); /*7.0b25 PBS*/
+						
+			#endif
+			
+		#else // Radio UserLand
 		
-	pikesetfilemenuitemenable (saveitem);
+			enablemenuitem (hmenu, newitem);
 
-	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);
+			enablemenuitem (hmenu, openitem);
+			
+			pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/
+			
+			pikesetfilemenuitemenable (openmanilasiteitem); /*7.0b27 PBS: enable/disable Open Manila Site item.*/
+					
+			pikesetfilemenuitemenable (closeitem);
+				
+			pikesetfilemenuitemenable (saveitem);
 
-	pikesetfilemenuitemenable (viewinbrowseritem);
+			pikesetfilemenuitemenable (saveasitem);
+			
+			pikesetfilemenuitemenable (saveashtmlitem); /*7.0b32 PBS: Save As HTML*/
+			
+			pikesetfilemenuitemenable (saveasplaintextitem); /*7.0b32 PBS: Save As Plain Text*/
+				
+			pikesetfilemenuitemenable (revertitem);
 
-	pikesetfilemenuitemenable (updateradiorootitem); /*7.0d10 PBS*/
-	
-	pikesetfilemenuitemenable (workofflineitem); /*7.0b25 PBS*/
-	
-	pikesetfilemenuitemchecked (workofflineitem); /*7.0b25 PBS*/
+			pikesetfilemenuitemenable (viewinbrowseritem);
 
-#else
+			pikesetfilemenuitemenable (updateradiorootitem); /*7.0d10 PBS*/
+			
+			pikesetfilemenuitemenable (workofflineitem); /*7.0b25 PBS*/
+			
+			pikesetfilemenuitemchecked (workofflineitem); /*7.0b25 PBS*/
+			
+		#endif
+		
+	#else // Frontier
 
-	enablemenuitem (hmenu, newitem);
-	
-	enablemenuitem (hmenu, openitem);
-	
-	enablemenuitem (hmenu, openrecentitem);
-	
-	setmenuitemenable (hmenu, closeitem, flwindow);
+		enablemenuitem (hmenu, newitem);
+		
+		enablemenuitem (hmenu, openitem);
+		
+		enablemenuitem (hmenu, openrecentitem);
+		
+		setmenuitemenable (hmenu, closeitem, flwindow);
 
-	/*3/30/90 DW -- saveitem is not dependent on flchanges.  this allows you to save
-	even when there have been no changes -- needed because changes to the symbol table
-	no longer dirty the window it lives in.
-	
-	11/8/90 DW -- it's nice to be able to save even if we haven't made any changes.
-	
-	setmenuitemenable (hmenu, saveitem, flchanges);
-	
-	5.0a18 dmb: only enable save runnable for scripts
-	*/
+		/*3/30/90 DW -- saveitem is not dependent on flchanges.  this allows you to save
+		even when there have been no changes -- needed because changes to the symbol table
+		no longer dirty the window it lives in.
+		
+		11/8/90 DW -- it's nice to be able to save even if we haven't made any changes.
+		
+		setmenuitemenable (hmenu, saveitem, flchanges);
+		
+		5.0a18 dmb: only enable save runnable for scripts
+		*/
 
-	setmenuitemenable (hmenu, saveitem, flwindow || hrootinfo);
+		setmenuitemenable (hmenu, saveitem, flwindow || hrootinfo);
 
-	if ((hrootinfo != nil) && (!flwindow || (**hrootinfo).configresnum == iddefaultconfig)) {
+		if ((hrootinfo != nil) && (!flwindow || (**hrootinfo).configresnum ==
+			iddefaultconfig)) {
+			
+			shellsetmenuitemstring (hmenu, saveitem, savedatabaseitemstring); // "Save Database");
+			
+			// shellsetmenuitemstring (hmenu, saveasitem, saveacopyitemstring); // "Save a Copy\xC9");
+			
+			}
+		else {
 		
-		shellsetmenuitemstring (hmenu, saveitem, savedatabaseitemstring); // "Save Database");
+			shellsetmenuitemstring (hmenu, saveitem, saveitemstring); // "\x07" "Save");
+			
+			// shellsetmenuitemstring (hmenu, saveasitem, saveasitemstring); // "\x07" "Save As\xC9");
+			
+			}
 		
-		// shellsetmenuitemstring (hmenu, saveasitem, saveacopyitemstring); // "Save a Copy\xC9");
-		}
-	else {
-		shellsetmenuitemstring (hmenu, saveitem, saveitemstring); // "\x07" "Save");
+		setmenuitemenable (hmenu, saveasitem, flwindow || hrootinfo);
 		
-		// shellsetmenuitemstring (hmenu, saveasitem, saveasitemstring); // "\x07" "Save As\xC9");
-		}
-	
-	setmenuitemenable (hmenu, saveasitem, flwindow || hrootinfo);
-	
-	setmenuitemenable (hmenu, saverunnableitem, 
-		flwindow && 
-		shellgetexternaldata (shellwindowinfo, &hdata) && 
-		(**(hdlexternalhandle) hdata).id == idscriptprocessor);
-	
-	setmenuitemenable (hmenu, revertitem, flchanges && ((**hrootinfo).fnum != 0) && !(**hrootinfo).flneversaved);
-	
-	setmenuitemenable (hmenu, pagesetupitem, flwindow);
-	
-	setmenuitemenable (hmenu, printitem, flwindow);
+		setmenuitemenable (hmenu, saverunnableitem, flwindow && 
+			shellgetexternaldata (shellwindowinfo, &hdata) && 
+			(**(hdlexternalhandle) hdata).id == idscriptprocessor);
+		
+		setmenuitemenable (hmenu, revertitem, flchanges && ((**hrootinfo).fnum
+			!= 0) && !(**hrootinfo).flneversaved);
+		
+		setmenuitemenable (hmenu, pagesetupitem, flwindow);
+		
+		setmenuitemenable (hmenu, printitem, flwindow);
+		
+	#endif // #ifdef PIKE
 
-#endif
-	
 	enablemenuitem (hmenu, quititem);
 	
 	L1: /*goto here to skip the adjustment of the file menu*/
@@ -1249,12 +1289,16 @@
 	
 	setmenuitemenable (hmenu, insertdatetimeitem, flwindow); /* 2006-01-06 creedon: re-establish code, went missing in sf repository revision 1.9 */
 	
-#ifdef PIKE
-#ifndef OPMLEDITOR
-	setmenuitemenable (hmenu, opennotepaditem, true); /*7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.*/
-#endif // !OPMLEDITOR	
-#endif
+	#ifdef PIKE
 	
+		#if ! ( defined ( IUDADESKTOP ) || defined ( OPMLEDITOR ) ) // 2007-10-27 creedon
+		
+			setmenuitemenable (hmenu, opennotepaditem, true); // 7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.
+			
+		#endif
+		
+	#endif
+		
 	if (menustate == modaldialogmenus)
 		return;
 	
@@ -1270,15 +1314,15 @@
 	
 	setmenuitemenable (hmenu, sizeitem, x.flcansetsize);
 	
-#ifndef PIKE
+	#ifndef PIKE
 
-	setmenuitemenable (hmenu, styleitem, x.flcansetstyle);
-	
-	setmenuitemenable (hmenu, leadingitem, x.flcansetleading);
-	
-	setmenuitemenable (hmenu, justifyitem, x.flcansetjust);
+		setmenuitemenable (hmenu, styleitem, x.flcansetstyle);
+		
+		setmenuitemenable (hmenu, leadingitem, x.flcansetleading);
+		
+		setmenuitemenable (hmenu, justifyitem, x.flcansetjust);
 
-#endif
+	#endif
 
 	hmenu = shellmenuhandle (findandreplacemenu); /*Find and Replace sub-menu*/
 				
@@ -1431,22 +1475,28 @@
 			enableallmenuitems (hmenu, flwindow);
 		}
 
-#ifndef PIKE
+	#ifndef PIKE
 
-	hmenu = shellmenuhandle (newobjectmenu);
-	
-	if (hmenu)
-		enableallmenuitems (hmenu, true);
+		hmenu = shellmenuhandle (newobjectmenu);
+		
+		if (hmenu)
+			enableallmenuitems (hmenu, true);
 
-	/* 2005-09-25 creedon - open recent menu */
+		if (hmenu)
+			enableallmenuitems (hmenu, true);
+	#endif
 	
-	hmenu = shellmenuhandle (openrecentmenu);
+	#if ! defined ( PIKE ) || defined ( IUDADESKTOP ) // 2007-10-27 creedon: IUDA Desktop
 	
-	if (hmenu)
-		enableallmenuitems (hmenu, true);
-#endif
-
+		hmenu = shellmenuhandle ( openrecentmenu );
+		
+		if ( hmenu )
+			enableallmenuitems ( hmenu, true );
+			
+	#endif
+	
 	#ifdef WIN95VERSION
+	
 		hmenu = shellmenuhandle (helpmenu);
 		
 		if (hmenu)
@@ -1455,8 +1505,9 @@
 	
 	shelladjustundo ();
 	
-	shellcallmenuhooks (0, 0); /*let menu hooks update their menu items*/
-	} /*shelladjustmenus*/
+	shellcallmenuhooks (0, 0); // let menu hooks update their menu items
+	
+	} // shelladjustmenus
 
 
 void shellupdatemenus (void) {
@@ -1488,9 +1539,12 @@
 	
 	shellupdatewindowmenu ();
 	
-#ifndef PIKE
-	shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
-#endif
+	#if ! defined ( PIKE ) || defined ( IUDADESKTOP ) // 2007-10-27 creedon: IUDA Desktop
+	
+		shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
+		
+	#endif
+	
 	} /*shellupdatemenus*/
 	
 	
@@ -2047,67 +2101,75 @@
 				break;
 
 		#ifdef MACVERSION
-		case virtualmenu: { /*special key on the extended keyboard*/
-			
-			switch (iditem) {
+		
+			case virtualmenu: { // special key on the extended keyboard
 				
-				case helpitem:
-					aboutcommand (); /*until we have help...*/
+				switch (iditem) {
 					
-					break;
-				
-				case homeitem:
-					(*shellglobals.scrollroutine) (down, false, longinfinity);
+					case helpitem:
 					
-					break;
-				
-				case enditem:
-					(*shellglobals.scrollroutine) (up, false, longinfinity);
+						aboutcommand (); // until we have help...
+						
+						break;
 					
-					break;
-				
-				case pageupitem:
-					(*shellglobals.scrollroutine) (down, true, 1);
+					case homeitem:
 					
-					break;
-				
-				case pagedownitem:
-					(*shellglobals.scrollroutine) (up, true, 1);
+						(*shellglobals.scrollroutine) (down, false, longi...
 
[truncated message content]

SF.net SVN: frontierkernel: [1760] Frontier/branches/IUDA_Desktop/Common/ source/threads.c

From: <cre...@us...> - 2007-10-28 00:14:17

Revision: 1760
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1760&view=rev
Author:   creecode
Date:     2007-10-27 17:14:21 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
in initmainthread function removed old code; for Mac, removed pre-carbon code (A5)

Modified Paths:
--------------
    Frontier/branches/IUDA_Desktop/Common/source/threads.c

Modified: Frontier/branches/IUDA_Desktop/Common/source/threads.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/threads.c	2007-10-28 00:06:49 UTC (rev 1759)
+++ Frontier/branches/IUDA_Desktop/Common/source/threads.c	2007-10-28 00:14:21 UTC (rev 1760)
@@ -178,67 +178,67 @@
 
 boolean initmainthread (void * hglobals) {
 
+	//
+	// 2007-10-27 creedon: removed old code
+	//
+	//				   for Mac, removed pre-carbon code (A5)
+	//
+	
+	#ifdef MACVERSION
+	
+		setthreadprocs (kApplicationThreadID, hglobals);
+		
+		GetCurrentThread (&idmainthread);
+		
+		return (true);
+		
+	#endif // MACVERSION
 
-	/*
-	if (oserror (CreateThreadPool (kCooperativeThread, threadpoolsize, (Size) macmemoryconfig.minstacksize)))
-		return (false);
-	*/
+	#ifdef WIN95VERSION
 	
-#ifdef MACVERSION
-	#if !TARGET_API_MAC_CARBON
-		RememberA5 ();
-		#endif /*for thread procs*/
+	#ifdef PIKE
+	#ifndef OPMLEDITOR
+		hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals");
+	#else  // OPMLEDITOR
+		hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals");
+	#endif // !OPMLEDITOR
+	#else // !PIKE
+		hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals");
+	#endif //!PIKE
 	
-	setthreadprocs (kApplicationThreadID, hglobals);
+		ixlocalthreadglobals = TlsAlloc ();
+		
+		if (ixlocalthreadglobals == (DWORD) -1) {
+			
+			oserror (GetLastError ());
 	
-	GetCurrentThread (&idmainthread);
+			return (false);
+			}
 	
-	return (true);
-#endif
-
-#ifdef WIN95VERSION
-
-#ifdef PIKE
-#ifndef OPMLEDITOR
-	hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals");
-#else  // OPMLEDITOR
-	hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals");
-#endif // !OPMLEDITOR
-#else // !PIKE
-	hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals");
-#endif //!PIKE
-
-	ixlocalthreadglobals = TlsAlloc ();
+		if (!TlsSetValue (ixlocalthreadglobals, hglobals)) {
+			
+			oserror (GetLastError ());
 	
-	if (ixlocalthreadglobals == (DWORD) -1) {
+			return (false);
+			}
 		
-		oserror (GetLastError ());
-
-		return (false);
-		}
-
-	if (!TlsSetValue (ixlocalthreadglobals, hglobals)) {
+		(*threadcallbacks.swapincallback) (hglobals);
+	
+		ixthreadglobalsgrabcount = TlsAlloc ();
 		
-		oserror (GetLastError ());
-
-		return (false);
-		}
+		TlsSetValue (ixthreadglobalsgrabcount, 0);
 	
-	(*threadcallbacks.swapincallback) (hglobals);
-
-	ixthreadglobalsgrabcount = TlsAlloc ();
+		GLOBALgrabcount = 0;
 	
-	TlsSetValue (ixthreadglobalsgrabcount, 0);
+		idmainthread = GetCurrentThreadId ();
+	
+		return (true);
 
-	GLOBALgrabcount = 0;
+	#endif
 
-	idmainthread = GetCurrentThreadId ();
+	} // initmainthread
 
-	return (true);
-#endif
-	} /*initmainthread*/
 
-
 boolean inmainthread (void) {
 	
 #ifdef MACVERSION


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1759] Frontier/branches/IUDA_Desktop/Common/ source/shellverbs.c

From: <cre...@us...> - 2007-10-28 00:06:44

Revision: 1759
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1759&view=rev
Author:   creecode
Date:     2007-10-27 17:06:49 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
in filemenufunctionvalue, function for newfunc case, clearbytes of fs and for Mac, copy path element of fs

Modified Paths:
--------------
    Frontier/branches/IUDA_Desktop/Common/source/shellverbs.c

Modified: Frontier/branches/IUDA_Desktop/Common/source/shellverbs.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/shellverbs.c	2007-10-27 22:58:34 UTC (rev 1758)
+++ Frontier/branches/IUDA_Desktop/Common/source/shellverbs.c	2007-10-28 00:06:49 UTC (rev 1759)
@@ -1056,37 +1056,43 @@
 
 
 static boolean filemenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
+	//
+	// 2007-10-27 creedon: newfunc clearbytes of fs and for Mac, copy path
+	//				   element of fs
+	//
+	// 5.1.4 dmb: closefunc takes optional win parameter; savefunc checks
+	//		    hinfo for nil
+	//
+	// 5.0d18 dmb: closefunc respects the target
+	//
+	// 5.0d16 dmb: savefunc, newfunc need new (optional) parameters
+	//
+	// 3.0b15 dmb: quitfunc should just return false and let everything flow
+	//			normally, instead of yielding here. this could problems
+	//			calling filemenu.quit from a component menusharing (osa)
+	//			client...  however it doesn't, so this change is disabled
+	//			for the time being.
+	//
+	// 1993-06-01 dmb: when vreturned is nil, return whether or not verb token
+	//			    must be run in the Frontier process
+	//
+	// 1993-05-19 dmb: closefunc uses getfrontwindow, not shellwindow
+	//
+	// 1991-10-23 dmb: must try to restore globals after revert, so new globals
+	//			    aren't in effect when deferred disposal takes place.
+	//
+	// 1991-10-03 dmb: split off fileMenu verbs from shell verbs
+	//
+	// 1991-02-07 dmb: functions that change the current file (closeall, new,
+	//			    open, revert) have to save & restore the language
+	//			    globals.  we don't want the language to have to do this
+	//			    on every external call, so we do it selectively here
+	//
+	//			    added parameters to new, open & save; added boolean to
+	//			    avoid dialog in various shell routines.
+	//
 	
-	/*
-	2/7/91 dmb: added parameters to new, open & save; added boolean to avoid 
-	dialog in various shell routines.
-	
-	2/7/91 dmb: functions that change the current file (closeall, new, open, revert) have 
-	to save & restore the language globals.  we don't want the language to have 
-	to do this on every external call, so we do it selectively here
-	
-	10/3/91 dmb: split off fileMenu verbs from shell verbs
-	
-	10/23/91 dmb: must try to restore globals after revert, so new globals aren't 
-	in effect when deferred disposal takes place.
-	
-	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
-	
-	6/1/93 dmb: when vreturned is nil, return whether or not verb token must 
-	be run in the Frontier process
-	
-	3.0b15 dmb: quitfunc should just return false and let everything flow normally, 
-	instead of yielding here. this could problems calling filemenu.quit from a 
-	component menusharing (osa) client...  however it doesn't, so this change is 
-	disabled for the time being.
-	
-	5.0d16 dmb: savefunc, newfunc need new (optional) parameters
-	
-	5.0d18 dmb: closefunc respects the target
-	
-	5.1.4 dmb: closefunc takes optional win parameter; savefunc checks hinfo for nil
-	*/
-	
 	register tyvaluerecord *v = vreturned;
 	register boolean fl;
 	
@@ -1098,14 +1104,16 @@
 	switch (token) { /*these verbs don't need any special globals pushed*/
 		
 		case newfunc: {
+		
+			WindowPtr w;
+			short ctconsumed = 0, ctpositional;
+			tyexternalid id;
+			tyfilespec fs;
 			tyvaluerecord val;
-			tyfilespec fs;
-			tyexternalid id;
 			tyvaluerecord vhidden;
-			short ctconsumed = 0;
-			short ctpositional;
-			WindowPtr w;
 			
+			clearbytes ( &fs, sizeof ( fs ) );
+			
 			if (!getparamvalue (hparam1, ++ctconsumed, &val))
 				return (false);
 			
@@ -1129,8 +1137,19 @@
 				if (!coercetofilespec (&val))
 					return (false);
 				
-				fs = (**val.data.filespecvalue);
+				#ifdef MACVERSION
 				
+					fs.fsref = ( **val.data.filespecvalue ).fsref;
+					
+					if ( ( **val.data.filespecvalue ).path != NULL )
+						fs.path = CFStringCreateCopy ( kCFAllocatorDefault, ( **val.data.filespecvalue ).path );
+						
+				#else
+				
+					fs = **val.data.filespecvalue;
+					
+				#endif
+				
 				langsaveglobals (); /*see comment at function head*/
 				
 				fl = shellnewfile (&fs, vhidden.data.flvalue, &w);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1758] Frontier/branches/IUDA_Desktop/Common/ source/dialogs.c

From: <cre...@us...> - 2007-10-27 22:58:30

Revision: 1758
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1758&view=rev
Author:   creecode
Date:     2007-10-27 15:58:34 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
updated alertdialog function to use CreateStandardAlert and RunStandardAlert

Modified Paths:
--------------
    Frontier/branches/IUDA_Desktop/Common/source/dialogs.c

Modified: Frontier/branches/IUDA_Desktop/Common/source/dialogs.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/dialogs.c	2007-10-27 17:42:44 UTC (rev 1757)
+++ Frontier/branches/IUDA_Desktop/Common/source/dialogs.c	2007-10-27 22:58:34 UTC (rev 1758)
@@ -964,7 +964,7 @@
 	
 
 pascal boolean modaldialogcallback (DialogPtr pdialog, EventRecord *ev, short *item) {
- 	
+
  	/*
  	standard dialog & alert event filtering.
  	
@@ -1819,39 +1819,32 @@
 	} /*customalert*/
 
 
-boolean alertdialog (bigstring bsprompt) {
+boolean alertdialog ( bigstring bsprompt ) {
+
+	//
+	// 2007-10-27 creedon: updated to use CreateStandardAlert and
+	//				   RunStandardAlert
+	//
+	// put up the standard "alert" dialog, with the provided prompt and return
+	// true if the user clicked on ok.  false if cancel was clicked.
+	//
 	
-	/*
-	put up the standard "alert" dialog, with the provided prompt and return
-	true if the user clicked on ok.  false if cancel was clicked.
-	*/
+	CFStringRef csr = CFStringCreateWithPascalString ( kCFAllocatorDefault,
+		bsprompt, kCFStringEncodingMacRoman );
+	DialogItemIndex itemIndex;
+	DialogRef theAlert;
 	
-	register DialogPtr pdialog;
-	register short itemnumber;
+	CreateStandardAlert ( kAlertCautionAlert, csr, NULL, NULL, &theAlert );
 	
-	sysbeep ();
+	RunStandardAlert ( theAlert, NULL, &itemIndex );
 	
-	if ((pdialog = newmodaldialog (alertdialogid, alertokitem)) == nil)
-		return (false);
+	CFRelease ( csr );
 	
-	setdialogtext (pdialog, alertmsgitem, bsprompt);
-	
-	#if TARGET_API_MAC_CARBON == 1
-	{
-	WindowRef pWind = GetDialogWindow(pdialog);
-	ShowWindow(pWind);
-	}
-	#else
-	ShowWindow (pdialog);
-	#endif
-	itemnumber = runmodaldialog ();
-	
-	disposemodaldialog (pdialog);
-	
-	return (itemnumber == alertokitem);
-	} /*alertdialog*/
+	return ( itemIndex == alertokitem );
 
+	} // alertdialog
 
+
 boolean alertstring (short iderror) {
 	
 	bigstring bs;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1757] Frontier/branches/IUDA_Desktop/

From: <cre...@us...> - 2007-10-27 17:42:42

Revision: 1757
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1757&view=rev
Author:   creecode
Date:     2007-10-27 10:42:44 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
Creating a private branch of /Frontier/trunk.

Added Paths:
-----------
    Frontier/branches/IUDA_Desktop/

Copied: Frontier/branches/IUDA_Desktop (from rev 1756, Frontier/trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1756] Frontier/trunk/Common/headers/ langinternal.h

From: <cre...@us...> - 2007-10-17 02:30:27

Revision: 1756
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1756&view=rev
Author:   creecode
Date:     2007-10-16 19:30:31 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
defined sqlitecompileerror

Modified Paths:
--------------
    Frontier/trunk/Common/headers/langinternal.h

Modified: Frontier/trunk/Common/headers/langinternal.h
===================================================================
--- Frontier/trunk/Common/headers/langinternal.h	2007-10-12 20:22:58 UTC (rev 1755)
+++ Frontier/trunk/Common/headers/langinternal.h	2007-10-17 02:30:31 UTC (rev 1756)
@@ -200,15 +200,18 @@
 #define frbadgroupnameerror 158
 #define frnonexistantgroupnumbererror 159
 #define frnonexistantgroupnameerror 160
-#define replaceitemerror 161 /* 2005-09-26 creedon */
-#define cmdshellnotfounderror 162 /* 2006-03-10 aradke */
-#define sqliteopenerror 163 /* 2006-03-17 gewirtz */
-#define sqlitedberror 164 /* 2006-03-17 gewirtz */
+#define replaceitemerror 161 // 2005-09-26 creedon
+#define cmdshellnotfounderror 162 // 2006-03-10 aradke
+#define sqliteopenerror 163 // 2006-03-17 gewirtz
+#define sqlitedberror 164 // 2006-03-17 gewirtz
+#define sqlitecompileerror 165 // 2007-10-11 creedon
 
+
 #define langstacklist 137
 
-typedef enum tystackid { /*stack names*/
-	
+
+typedef enum tystackid { // stack names
+
 	idtablestack = 1,
 	
 	iderrorcallbackstack,
@@ -218,6 +221,7 @@
 	idlocalsstack,
 	
 	idprogramstack
+	
 	} tystackid;
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1755] Frontier/trunk/Common/resources/Mac/lang .r

From: <cre...@us...> - 2007-10-12 20:22:53

Revision: 1755
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1755&view=rev
Author:   creecode
Date:     2007-10-12 13:22:58 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
for STR# 257, Lang Errors: added missing comma for element 161, copied, 164 and 165 from WinLand.rc, added 165

Modified Paths:
--------------
    Frontier/trunk/Common/resources/Mac/lang.r

Modified: Frontier/trunk/Common/resources/Mac/lang.r
===================================================================
--- Frontier/trunk/Common/resources/Mac/lang.r	2007-10-12 20:19:55 UTC (rev 1754)
+++ Frontier/trunk/Common/resources/Mac/lang.r	2007-10-12 20:22:58 UTC (rev 1755)
@@ -393,7 +393,7 @@
 
 
 resource 'STR#' (257, "Lang Errors", purgeable) {
-	{	/* array StringArray: 98 elements */
+	{	/* array StringArray: 165 elements */
 		/* [1] */
 		"Unknown error.",
 		/* [2] */
@@ -715,11 +715,21 @@
 		/* [160] */
 		"Can't execute command because the replacement string contains a non-existant group name at character #^0.",
 		/* [161] */
-		"An item named \xD2^0\xD3 already exists." // Replace it or create a duplicate?", /* 2005-09-26 creedon */
+		"An item named \xD2^0\xD3 already exists.", // Replace it or create a duplicate?", // 2005-09-26 creedon
 		/* [162] */
-		"Can't run shell command because the shell \042^0\042 was not found.", /* 2006-03-10 aradke */
-	}
-};
+		"Can't run shell command because the shell \042^0\042 was not found.", // 2006-03-10 aradke
+		
+		// [163]
+		"Can't open database: ^0.", // 2007-10-11 creedon: cribbed from WinLand.rc
+		
+		// [164]
+		"Database error: ^0.", // 2007-10-11 creedon: cribbed from WinLand.rc
+		
+		// [165]
+		"Can't compile query ^0." // 2007-10-11 creedon
+		
+		}
+	};
 
 resource 'STR#' (258, "Mac Errors", purgeable) {
 	{	/* array StringArray: 92 elements */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1754] Frontier/trunk/Common/resources/Win32/ WinLand.rc

From: <cre...@us...> - 2007-10-12 20:19:51

Revision: 1754
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1754&view=rev
Author:   creecode
Date:     2007-10-12 13:19:55 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
added 165 Lang_Errors

minor formatting tweaks

Modified Paths:
--------------
    Frontier/trunk/Common/resources/Win32/WinLand.rc

Modified: Frontier/trunk/Common/resources/Win32/WinLand.rc
===================================================================
--- Frontier/trunk/Common/resources/Win32/WinLand.rc	2007-10-12 20:18:11 UTC (rev 1753)
+++ Frontier/trunk/Common/resources/Win32/WinLand.rc	2007-10-12 20:19:55 UTC (rev 1754)
@@ -1531,10 +1531,11 @@
 	158 Lang_Errors DISCARDABLE BEGIN "Can't execute command because the replacement string contains a bad group name at character #^0.\0" END
 	159 Lang_Errors DISCARDABLE BEGIN "Can't execute command because the replacement string contains a non-existant group number at character #^0.\0" END
 	160 Lang_Errors DISCARDABLE BEGIN "Can't execute command because the replacement string contains a non-existant group name at character #^0.\0" END
-	161 Lang_Errors DISCARDABLE BEGIN "An item named \042^0\042 already exists.\0" END // Replace it or create a duplicate?" /* 2005-09-26 creedon */
-	162 Lang_Errors DISCARDABLE BEGIN "Can't run shell command because the shell \042^0\042 was not found.\0" END /* 2006-03-10 aradke */
-	163 Lang_Errors DISCARDABLE BEGIN "Can't open database: ^0.\0" END /* 2006-03-17 gewirtz */
-	164 Lang_Errors DISCARDABLE BEGIN "Database error: ^0.\0" END /* 2006-03-17 gewirtz */
+	161 Lang_Errors DISCARDABLE BEGIN "An item named \042^0\042 already exists.\0" END // Replace it or create a duplicate?" // 2005-09-26 creedon
+	162 Lang_Errors DISCARDABLE BEGIN "Can't run shell command because the shell \042^0\042 was not found.\0" END // 2006-03-10 aradke
+	163 Lang_Errors DISCARDABLE BEGIN "Can't open database: ^0.\0" END // 2006-03-17 gewirtz
+	164 Lang_Errors DISCARDABLE BEGIN "Database error: ^0.\0" END // 2006-03-17 gewirtz
+	165 Lang_Errors DISCARDABLE BEGIN "Can't compile query ^0.\0" END // 2007-10-11 creedon
 	
 	1 Mac_Errors DISCARDABLE BEGIN "The \042^0\042 folder is full.\0" END
 	2 Mac_Errors DISCARDABLE BEGIN "The disk is full.\0" END


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1753] Frontier/trunk/Common/source/langsqlite. c

From: <cre...@us...> - 2007-10-12 20:18:11

Revision: 1753
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1753&view=rev
Author:   creecode
Date:     2007-10-12 13:18:11 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
in function sqlitecompilequeryverb replaced call to sqliteDatabaseError with new sqliteCompileError function

created sqliteCompileError function

Modified Paths:
--------------
    Frontier/trunk/Common/source/langsqlite.c

Modified: Frontier/trunk/Common/source/langsqlite.c
===================================================================
--- Frontier/trunk/Common/source/langsqlite.c	2007-10-03 21:54:30 UTC (rev 1752)
+++ Frontier/trunk/Common/source/langsqlite.c	2007-10-12 20:18:11 UTC (rev 1753)
@@ -254,13 +254,32 @@
 	bigstring bserrmsg;
 
 	copyctopstring (errmsg, bserrmsg); /* This creates a pstring at bserrmsg */
-	getstringlist (langerrorlist, notfunctionerror, bserror); 
+	getstringlist (langerrorlist, notfunctionerror, bserror);
 	parsedialogstring (bserror, bserrmsg, nil, nil, nil, bserror);
 
 	return;
 	} /*sqliteScriptError*/
 
 
+static void sqliteCompileError ( const char *errmsg, bigstring bserror ) {
+
+	//
+	// 2007-10-11 creedon: created, cribbed from sqliteDatabaseError function
+	//
+	
+	bigstring bserrmsg;
+
+	copyctopstring ( errmsg, bserrmsg );
+	
+	getstringlist ( langerrorlist, sqlitecompileerror, bserror );
+	
+	parsedialogstring ( bserror, bserrmsg, nil, nil, nil, bserror );
+
+	return;
+	
+	} // sqliteCompileError
+
+
 boolean sqliteopenverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
 
 	Handle dbfile;	// path to database file
@@ -391,46 +410,54 @@
 
 
 boolean sqlitecompilequeryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
+	//
+	// 2007-10-12 creedon: replaced call to sqliteDatabaseError with new
+	//				   sqliteCompileError function
+	
+	// sqlite.compileQuery ( dbid, query )
+	//
+	// Action:  compile an SQLite query
+	// Params:  a database id and a query string
+	// Returns: a query id
+	// Usage:   call in a try statement
+	// Notes:   do not pass the opened database ID across threads.
+	//
+	// SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_prepare.
+	//
+	// Code that is a good example of prepare in use: http://souptonuts.sourceforge.net/code/eatblob.c.html
+	//
+	
 	Handle query;				/* the SQL query passed to the SQLite engine */
 	sqlite3 *dbid;				/* the SQLite database handle */
 	sqlite3_stmt *queryid = 0;	/* the compiled query */
-	int returnCode;				/* return code from SQLite call */
-
-	/*	
-		sqlite.compileQuery(dbid, query)
-
-		Action:  compile an SQLite query
-		Params:  a database id and a query string
-		Returns: a query id
-		Usage:   call in a try statement
-		Notes:   do not pass the opened database ID across threads.
-
-		SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_prepare.
-
-		Code that is a good example of prepare in use:
-		http://souptonuts.sourceforge.net/code/eatblob.c.html
-	*/
-
+	int returnCode;			/* return code from SQLite call */
+	
 	if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
 		return (false);
-
+		
 	flnextparamislast = true;	/* makes sure Frontier throws an error if more than one param is passed */
 	
 	if (!getreadonlytextvalue (hparam1, 2, &query)) /* get the query param */
 		return (false);
-
+		
 	/* Process the SQLite sequence */
 	returnCode = sqlite3_prepare(dbid, *query, gethandlesize(query), &queryid, 0);
-	if(returnCode != SQLITE_OK || queryid == NULL) {
-		sqliteDatabaseError(sqlite3_errmsg(dbid), bserror); /* send database error */
-		return (false);
-	}
-
+	
+	if ( returnCode != SQLITE_OK || queryid == NULL ) {
+	
+		sqliteCompileError ( sqlite3_errmsg ( dbid ), bserror ); // send database error
+		
+		return ( false );
+		
+		}
+		
 	return (setlongvalue ((long) queryid, vreturned)); /* return the db address to the scripter */
 
 
-} /* sqlitecompilequeryverb */
+	} // sqlitecompilequeryverb
 
+
 boolean sqliteclearqueryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
 	sqlite3_stmt *queryid;	/* query id */
 	int returnCode;			/* return code from SQLite call */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1752] Frontier/trunk/Common/source/shellverbs. c

From: <cre...@us...> - 2007-10-03 21:54:26

Revision: 1752
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1752&view=rev
Author:   creecode
Date:     2007-10-03 14:54:30 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
rollback to version 1593, changes to filemenu newfunc need deeper examination

Modified Paths:
--------------
    Frontier/trunk/Common/source/shellverbs.c

Modified: Frontier/trunk/Common/source/shellverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellverbs.c	2007-10-03 21:50:00 UTC (rev 1751)
+++ Frontier/trunk/Common/source/shellverbs.c	2007-10-03 21:54:30 UTC (rev 1752)
@@ -1056,59 +1056,39 @@
 
 
 static boolean filemenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
-
-	//
-	// 2007-10-03 creedon: in newfunc case use copyvaluerecord so we don't
-	//				   alter the value record grabbed by getparamvalue
-	//
-	// 2006-02-05 aradke: re-enabled savecopyfunc case to avoid breakage. verb
-	//				  tokens that have previously been referenced from glue
-	//				  scripts should never be disabled again, like
-	//				  fileMenu.saveCopy in this case.  also kept
-	//				  kernelverbs.r and kernelverbs.rc in sync.
-	// 
-	// 2005-10-26 creedon: disabled savecopyfunc case, saveasfunc can do it all
-	//				   added saveasfunc case, it wasn't possible to do a
-	//				   save as for a file-object
-	//
-	// 2005-09-14 creedon: in closefunc case added fldialog parameter, this
-	//				   might be improved as I only dealt with the situation
-	//				   with one or more parameters are defined
-	//
-	// 5.1.4 dmb: closefunc takes optional win parameter; savefunc checks hinfo
-	//		    for nil
-	//
-	// 5.0d18 dmb: closefunc respects the target
-	//
-	// 5.0d16 dmb: savefunc, newfunc need new (optional) parameters
-	//
-	// 3.0b15 dmb: quitfunc should just return false and let everything flow
-	//			normally, instead of yielding here. this could problems
-	//			calling filemenu.quit from a component menusharing (osa)
-	//			client...  however it doesn't, so this change is disabled
-	//			for the time being.
-	//
-	// 1993-06-01 dmb: when vreturned is nil, return whether or not verb token
-	//			    must be run in the Frontier process
-	//
-	// 1993-05-19 dmb: closefunc uses getfrontwindow, not shellwindow
-	//
-	// 1991-10-23 dmb: must try to restore globals after revert, so new globals
-	//			    aren't in effect when deferred disposal takes place.
-	//
-	// 1991-10-03 dmb: split off fileMenu verbs from shell verbs
-	//
-	// 1991-02-07 dmb: functions that change the current file (closeall, new,
-	//			    open, revert) have to save & restore the language
-	//			    globals.  we don't want the language to have to do this
-	//			    on every external call, so we do it selectively here
-	//
-	//			    added parameters to new, open & save; added boolean to
-	//			    avoid dialog in various shell routines.
-	//
 	
-	register boolean fl;
+	/*
+	2/7/91 dmb: added parameters to new, open & save; added boolean to avoid 
+	dialog in various shell routines.
+	
+	2/7/91 dmb: functions that change the current file (closeall, new, open, revert) have 
+	to save & restore the language globals.  we don't want the language to have 
+	to do this on every external call, so we do it selectively here
+	
+	10/3/91 dmb: split off fileMenu verbs from shell verbs
+	
+	10/23/91 dmb: must try to restore globals after revert, so new globals aren't 
+	in effect when deferred disposal takes place.
+	
+	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
+	
+	6/1/93 dmb: when vreturned is nil, return whether or not verb token must 
+	be run in the Frontier process
+	
+	3.0b15 dmb: quitfunc should just return false and let everything flow normally, 
+	instead of yielding here. this could problems calling filemenu.quit from a 
+	component menusharing (osa) client...  however it doesn't, so this change is 
+	disabled for the time being.
+	
+	5.0d16 dmb: savefunc, newfunc need new (optional) parameters
+	
+	5.0d18 dmb: closefunc respects the target
+	
+	5.1.4 dmb: closefunc takes optional win parameter; savefunc checks hinfo for nil
+	*/
+	
 	register tyvaluerecord *v = vreturned;
+	register boolean fl;
 	
 	if (v == nil) /*need Frontier process?*/
 		return (true);
@@ -1118,25 +1098,26 @@
 	switch (token) { /*these verbs don't need any special globals pushed*/
 		
 		case newfunc: {
-		
-			WindowPtr w;
-			short ctconsumed = 0, ctpositional;
-			tyexternalid id;
+			tyvaluerecord val;
 			tyfilespec fs;
-			tyvaluerecord val, vhidden;
+			tyexternalid id;
+			tyvaluerecord vhidden;
+			short ctconsumed = 0;
+			short ctpositional;
+			WindowPtr w;
 			
 			if (!getparamvalue (hparam1, ++ctconsumed, &val))
 				return (false);
-				
+			
 			flnextparamislast = true;
 			
 			ctpositional = ctconsumed;
 			
-			setbooleanvalue (false, &vhidden); // default value
+			setbooleanvalue (false, &vhidden); //default value
 			
 			if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, str_hidden, &vhidden))
 				return (false);
-				
+			
 			disablelangerror ();
 			
 			fl = coercetoostype (&val);
@@ -1145,36 +1126,31 @@
 			
 			if (!fl) { // old style, new database
 			
-				if (!copyvaluerecord (val, &val))
-					return (false);
-					
 				if (!coercetofilespec (&val))
 					return (false);
-					
-				fs = **val.data.filespecvalue;
 				
-				langsaveglobals (); // see comment at function head
+				fs = (**val.data.filespecvalue);
 				
+				langsaveglobals (); /*see comment at function head*/
+				
 				fl = shellnewfile (&fs, vhidden.data.flvalue, &w);
 				
 				if (!langrestoreglobals ())
 					fl = false;
-					
+				
 				if (!fl)
 					return (false);
 				}
 			else {
-			
 				id = (tyexternalid) (langgetvaluetype (val.data.ostypevalue) - outlinevaluetype);
 				
 				if (!ccnewfilewindow (id, &w, vhidden.data.flvalue))
 					return (false);
 				}
-				
-			return (setwinvalue (w, v));
 			
+			return (setwinvalue (w, v));
 			}
-			
+		
 		case openfunc: {
 		
 			tyfilespec fs;
@@ -1205,18 +1181,22 @@
 				return (false);
 			
 			return (fl && setwinvalue (w, v));
-			
 			}
-			
-		case closefunc: { // close the frontmost window
 		
+		case closefunc: {
+			/*
+			close the frontmost window
+			
+			2005-09-14 creedon: added fldialog parameter, this might be improved as I only dealt with the situation with one or more parameters are defined
+			*/
+			
 			hdlwindowinfo hinfo;
 			WindowPtr targetwindow = nil;
 			tyvaluerecord val;
 			boolean fldialog;
-			
+
 			setbooleanvalue (false, &val); /* defaults to false */
-			
+
 			if (langgetparamcount (hparam1) == 0) { // old style, use the target
 			
 				if (!langfindtargetwindow (-1, &targetwindow))
@@ -1247,22 +1227,19 @@
 			//return (langrestoreglobals ());
 			
 			return (true);
-			
 			}
 		
 		case closeallfunc:
-		
 			if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters*/
 				return (false);
-				
+			
 			langsaveglobals (); /*see comment at function head*/
 			
 			(*v).data.flvalue = shellcloseall (nil, false);
 			
 			return (langrestoreglobals ());
-			
-		case quitfunc:
 		
+		case quitfunc:
 			if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters*/
 				return (false);
 			
@@ -1270,29 +1247,37 @@
 			
 			#if 0  /*maybe try this out after 3.0*/
 			
-				return (false); /*kill the script*/
+			return (false); /*kill the script*/
 			
 			#else
 			
-				processyield (); /*give it a chance to happen*/
-				
-				(*v).data.flvalue = false; /*we didn't quit -- we got here, didn't we?*/
-				
-				return (true);
-				
-			#endif
+			processyield (); /*give it a chance to happen*/
 			
-		} // switch
-		
+			(*v).data.flvalue = false; /*we didn't quit -- we're got here, didn't we?*/
+			
+			return (true);
+			
+			#endif
+		} /*switch*/
+	
 	if (!shellpushtargetglobals ())
 		return (false);
-		
+	
 	fl = false; /*default return value for this function*/
 	
 	switch (token) { /*these verbs assume that the frontmost window's globals are pushed*/
 	
-		case savefunc: { /*save the frontmost window*/
+		/*
+		2005-10-26 creedon: disabled savecopyfunc case, saveasfunc can do it all
+						 added saveasfunc case, it wasn't possible to do a save as for a file-object
 		
+		2006-02-05 aradke: re-enabled savecopyfunc case to avoid breakage.
+				verb tokens that have previously been referenced from glue scripts
+				should never be disabled again, like fileMenu.saveCopy in this case.
+				also kept kernelverbs.r and kernelverbs.rc in sync.
+		*/ 
+		
+		case savefunc: { /*save the frontmost window*/
 			hdlwindowinfo hinfo;
 			
 			if (langgetparamcount (hparam1) == 0) { // old style, save the root
@@ -1301,7 +1286,6 @@
 					break;
 				}
 			else {
-			
 				flnextparamislast = true;
 				
 				if (!getwinparam (hparam1, 1, &hinfo))
@@ -1314,17 +1298,15 @@
 					break;
 					}
 				}
-				
+			
 			(*v).data.flvalue = shellsave ((**hinfo).macwindow);
 			
 			fl = true;
 			
 			break;
-			
 			}
-			
-		case savecopyfunc: {
 		
+		case savecopyfunc: {	/* 2006-02-05 aradke: re-enabled */
 			tyfilespec fs;
 			
 			flnextparamislast = true;
@@ -1337,14 +1319,12 @@
 			fl = true;
 			
 			break;
-			
-			}
-			
-		case revertfunc:
+			} 
 		
+		case revertfunc:
 			if (!langcheckparamcount (hparam1, 0))
 				break;
-				
+			
 			langsaveglobals (); /*see comment at function head*/
 			
 			(*v).data.flvalue = shellrevert (shellwindow, false);
@@ -1352,9 +1332,8 @@
 			fl = langrestoreglobals (); /*should return false; script can't continue after a revert*/
 			
 			break;
-			
-		case printfunc:
 		
+		case printfunc:
 			if (!langcheckparamcount (hparam1, 0))
 				break;
 			
@@ -1363,9 +1342,8 @@
 			fl = true;
 			
 			break;
-			
+
 		case saveasfunc: {
-		
 			tyfilespec fs;
 			short ctconsumed = 0;
 			short ctpositional = 0;
@@ -1377,15 +1355,13 @@
 			
 			if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, BIGSTRING ("\x04""path"), &val))
 				return (false);
-				
-			if (val.data.stringvalue) {
 			
+			if (val.data.stringvalue) {
 				bigstring bs;
 				
 				texthandletostring (val.data.stringvalue, bs);
 				pathtofilespec (bs, &fs);
 				(*v).data.flvalue = shellsaveas (shellwindow, &fs, false);
-				
 				}
 			else
 				(*v).data.flvalue = shellsaveas (shellwindow, nil, false);
@@ -1393,16 +1369,14 @@
 			fl = true;
 			
 			break;
-			
 			}
 		
-		} // switch -- funcs with front globals pushed
-		
+		} /*switch -- funcs with front globals pushed*/
+	
 	shellpopglobals ();
 	
 	return (fl);
-	
-	} // filemenufunctionvalue
+	} /*filemenufunctionvalue*/
 
 
 static boolean editmenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
@@ -1629,6 +1603,3 @@
 	return (shellinitbuiltins ());
 	} /*shellinitverbs*/
 
-
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1751] Frontier/trunk/Common/source/langvalue.c

From: <cre...@us...> - 2007-10-03 21:49:56

Revision: 1751
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1751&view=rev
Author:   creecode
Date:     2007-10-03 14:50:00 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
rollback to version 1672, changes to copyvaluerecord need deeper examination

Modified Paths:
--------------
    Frontier/trunk/Common/source/langvalue.c

Modified: Frontier/trunk/Common/source/langvalue.c
===================================================================
--- Frontier/trunk/Common/source/langvalue.c	2007-10-03 21:23:29 UTC (rev 1750)
+++ Frontier/trunk/Common/source/langvalue.c	2007-10-03 21:50:00 UTC (rev 1751)
@@ -831,117 +831,91 @@
 
 
 boolean copyvaluerecord (tyvaluerecord v, tyvaluerecord *vreturned) {
+	
+	/*
+	create a copy of v in vreturned.  for strings and passwords and other
+	relatively small heap-allocated objects, we create a copy of the data.
+	
+	for other types, externals and binaries, we create another reference
+	to the heap-allocated object.  it's important that values copied for
+	externals and binaries not be stored in the symbol table structure.
+	
+	2/15/91 dmb: no longer treat binary values like externals.  since we 
+	now support passing values by reference (i.e. address values), the 
+	script writer can avoid the overhead of large objects when desired. 
+	binary values can now be used like any other automatic type.
+	
+	8/16/91 dmb: going even further, we'll now use the new fl.tmpdata 
+	mechanism to avoid copying binary values when we don't need to.
+	
+	12/26/91 dmb: make sure that if an allocation failure occurs, we return 
+	an empty value.
+	
+	4.0.2b1 dmb: handle fldiskvals
+	
+	5.0.2b12 dmb: use new opcopylist for lists
 
-	//
-	// 2007-10-03 creedon: for Mac, use CFStringCreateCopy to copy path member
-	//				   of filespecvalue, CFStrings don't copy like other
-	//				   simple assignments, e.g. fs = val.data.filespecvalue
-	//
-	// 5.1.4 dmb: don't do anything special for addresses; just copy the
-	//		    current binary state.
-	//
-	// 5.0.2b12 dmb: use new opcopylist for lists
-	//
-	// 4.0.2b1 dmb: handle fldiskvals
-	//
-	// 1991-12-26 dmb: make sure that if an allocation failure occurs, we
-	//			    return an empty value.
-	//
-	// 1991-08-16 dmb: going even further, we'll now use the new fl.tmpdata 
-	//			    mechanism to avoid copying binary values when we don't
-	//			    need to.
-	//
-	// 1991-02-15 dmb: no longer treat binary values like externals.  since we 
-	//			    now support passing values by reference (i.e. address
-	//			    values), the script writer can avoid the overhead of
-	//			    large objects when desired.  binary values can now be
-	//			    used like any other automatic type.
-	//
-	// create a copy of v in vreturned.  for strings and passwords and other
-	// relatively small heap-allocated objects, we create a copy of the data.
-	//
-	// for other types, externals and binaries, we create another reference
-	// to the heap-allocated object.  it's important that values copied for
-	// externals and binaries not be stored in the symbol table structure.
-	//
+	5.1.4 dmb: don't do anything special for addresses; just copy the current
+	binary state.
+	*/
 	
 	Handle x;
 	hdllistrecord hlist;
+#ifndef version5orgreater
+	bigstring bs;
+	hdlhashtable htable;
+#endif
 	
-	#ifndef version5orgreater
+#ifdef tmpcopydebug
+	static long ctdups = 0;
+	static long cttmps = 0;
+	static long cthits = 0;
 	
-		bigstring bs;
-		hdlhashtable htable;
-		
-	#endif
+	++ctdups;
 	
-	#ifdef tmpcopydebug
-	
-		static long ctdups = 0;
-		static long cttmps = 0;
-		static long cthits = 0;
+	if (v.fltmpstack) {
 		
-		++ctdups;
+		++cttmps;
 		
-		if (v.fltmpstack) {
-		
-			++cttmps;
+		if (findheaptmp (&v)) {
+			++cthits;
 			
-			if (findheaptmp (&v)) {
-			
-				++cthits;
-				
-				*vreturned = v;
-				(*vreturned).fltmpdata = true;		
-				return (true);
-				
-				}
+			*vreturned = v;
+			(*vreturned).fltmpdata = true;		
+			return (true);
 			}
-	#endif
-	
+		}
+#endif
+
 	switch (v.valuetype) {
-	
-		case addressvaluetype:
 		
+		case addressvaluetype:
 		#ifndef version5orgreater
-		
 			initvalue (vreturned, novaluetype);
 			
 			if (!getaddressvalue (v, &htable, bs))
 				return (false);
-				
-			return (setaddressvalue (htable, bs, vreturned));
 			
+			return (setaddressvalue (htable, bs, vreturned));
 		#endif
-		
 		case stringvaluetype:
 		case passwordvaluetype:
 		case rectvaluetype:
 		case patternvaluetype:
 		case rgbvaluetype:
 		case objspecvaluetype:
-		
-		#ifndef MACVERSION
-		
-			case filespecvaluetype:
-			
-		#endif
-		
+		case filespecvaluetype:
 		case aliasvaluetype:
 		case doublevaluetype:
 		case binaryvaluetype:
-		
-		#ifndef oplanglists
-		
-			case listvaluetype:
-			case recordvaluetype:
-			
-		#endif
-		
+	#ifndef oplanglists
+		case listvaluetype:
+		case recordvaluetype:
+	#endif
 			initvalue (vreturned, novaluetype);
 			
 			#ifdef flnewfeatures
-			
+				
 				if (v.fldiskval) {
 					/*
 					4.0.2b1 dmb: for disk-based scalars, the copy will be the actual 
@@ -951,7 +925,6 @@
 					
 					if (!dbrefhandle (v.data.diskvalue, &x))
 						return (false);
-						
 					}
 				else {
 					if (!copyhandle (v.data.binaryvalue, &x))
@@ -961,63 +934,39 @@
 			
 				if (!copyhandle (v.data.binaryvalue, &x))
 					return (false);
-					
-			#endif
 			
+			#endif
+
 			return (setheapvalue (x, v.valuetype, vreturned));
-			
-		#ifdef oplanglists
 		
-			case listvaluetype:
-			case recordvaluetype:
+	#ifdef oplanglists
+		case listvaluetype:
+		case recordvaluetype:
+			initvalue (vreturned, v.valuetype);
 			
-				initvalue (vreturned, v.valuetype);
-				
-				if (!opcopylist (v.data.listvalue, &hlist))
-					return (false);
-					
-				return (setheapvalue ((Handle) hlist, v.valuetype, vreturned));
-		#endif
-		
+			if (!opcopylist (v.data.listvalue, &hlist))
+				return (false);
+			
+			return (setheapvalue ((Handle) hlist, v.valuetype, vreturned));
+	#endif
+
 		case codevaluetype:
 		case externalvaluetype:
-		
 			*vreturned = v;
 			
 			(*vreturned).fltmpdata = true; /*see hashassign, disposevaluerecord*/
 			
 			break;
-			
-		#ifdef MACVERSION
 		
-			case filespecvaluetype: {
-			
-				tyfilespec fs = { { { 0 } }, 0 };
-				
-				fs.fsref = ( *( ( ( v ).data ).filespecvalue ) ) -> fsref;
-				
-				if ( ( *( ( ( v ).data ).filespecvalue ) ) -> path != NULL )
-					fs.path = CFStringCreateCopy ( kCFAllocatorDefault, ( *( ( ( v ).data ).filespecvalue ) ) -> path );
-					
-				return ( setfilespecvalue ( &fs, vreturned ) );
-				
-				}
-				
-		#endif
-		
 		default:
-		
 			*vreturned = v;
 			
 			break;
-			
-		} // switch
-		
-	return (true); 
+		} /*switch*/
 	
-	} // copyvaluerecord
+	return (true); 
+	} /*copyvaluerecord*/
 
-
 #ifdef DATABASE_DEBUG
 
 void debug_disposevaluerecord (tyvaluerecord val, boolean fldisk, long line, char *sourcefile)
@@ -1077,11 +1026,10 @@
 				exemptfromtmpstack (&val);
 				
 				disposehandle (val.data.binaryvalue);
-				
 				}
-				
-			break;
 			
+			break;
+		
 	#ifdef oplanglists
 		case listvaluetype:
 		case recordvaluetype:
@@ -8908,6 +8856,3 @@
 		return (builtinvalue ((tyfunctype) val.data.tokenvalue, hparam1, vreturned));
 	} /*functionvalue*/
 
-
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1750] Frontier/trunk/Common/source/langvalue.c

From: <cre...@us...> - 2007-10-03 21:23:25

Revision: 1750
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1750&view=rev
Author:   creecode
Date:     2007-10-03 14:23:29 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
in copyvaluerecord function, for Mac, for filespecvaluetype, only assign member path of filespecvalue when not NULL

Modified Paths:
--------------
    Frontier/trunk/Common/source/langvalue.c

Modified: Frontier/trunk/Common/source/langvalue.c
===================================================================
--- Frontier/trunk/Common/source/langvalue.c	2007-10-03 19:52:48 UTC (rev 1749)
+++ Frontier/trunk/Common/source/langvalue.c	2007-10-03 21:23:29 UTC (rev 1750)
@@ -992,12 +992,13 @@
 		
 			case filespecvaluetype: {
 			
-				tyfilespec fs;
+				tyfilespec fs = { { { 0 } }, 0 };
 				
 				fs.fsref = ( *( ( ( v ).data ).filespecvalue ) ) -> fsref;
-			
-				fs.path = CFStringCreateCopy ( kCFAllocatorDefault, ( *( ( ( v ).data ).filespecvalue ) ) -> path );
 				
+				if ( ( *( ( ( v ).data ).filespecvalue ) ) -> path != NULL )
+					fs.path = CFStringCreateCopy ( kCFAllocatorDefault, ( *( ( ( v ).data ).filespecvalue ) ) -> path );
+					
 				return ( setfilespecvalue ( &fs, vreturned ) );
 				
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1749] Frontier/trunk/Common/source/langvalue.c

From: <cre...@us...> - 2007-10-03 20:36:34

Revision: 1749
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1749&view=rev
Author:   creecode
Date:     2007-10-03 12:52:48 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
in copyvaluerecord function, for Mac, use CFStringCreateCopy to copy path member of filespecvalue, CFStrings don't copy like other simple assignments, e.g. fs = val.data.filespecvalue

Modified Paths:
--------------
    Frontier/trunk/Common/source/langvalue.c

Modified: Frontier/trunk/Common/source/langvalue.c
===================================================================
--- Frontier/trunk/Common/source/langvalue.c	2007-10-03 19:45:06 UTC (rev 1748)
+++ Frontier/trunk/Common/source/langvalue.c	2007-10-03 19:52:48 UTC (rev 1749)
@@ -831,91 +831,117 @@
 
 
 boolean copyvaluerecord (tyvaluerecord v, tyvaluerecord *vreturned) {
-	
-	/*
-	create a copy of v in vreturned.  for strings and passwords and other
-	relatively small heap-allocated objects, we create a copy of the data.
-	
-	for other types, externals and binaries, we create another reference
-	to the heap-allocated object.  it's important that values copied for
-	externals and binaries not be stored in the symbol table structure.
-	
-	2/15/91 dmb: no longer treat binary values like externals.  since we 
-	now support passing values by reference (i.e. address values), the 
-	script writer can avoid the overhead of large objects when desired. 
-	binary values can now be used like any other automatic type.
-	
-	8/16/91 dmb: going even further, we'll now use the new fl.tmpdata 
-	mechanism to avoid copying binary values when we don't need to.
-	
-	12/26/91 dmb: make sure that if an allocation failure occurs, we return 
-	an empty value.
-	
-	4.0.2b1 dmb: handle fldiskvals
-	
-	5.0.2b12 dmb: use new opcopylist for lists
 
-	5.1.4 dmb: don't do anything special for addresses; just copy the current
-	binary state.
-	*/
+	//
+	// 2007-10-03 creedon: for Mac, use CFStringCreateCopy to copy path member
+	//				   of filespecvalue, CFStrings don't copy like other
+	//				   simple assignments, e.g. fs = val.data.filespecvalue
+	//
+	// 5.1.4 dmb: don't do anything special for addresses; just copy the
+	//		    current binary state.
+	//
+	// 5.0.2b12 dmb: use new opcopylist for lists
+	//
+	// 4.0.2b1 dmb: handle fldiskvals
+	//
+	// 1991-12-26 dmb: make sure that if an allocation failure occurs, we
+	//			    return an empty value.
+	//
+	// 1991-08-16 dmb: going even further, we'll now use the new fl.tmpdata 
+	//			    mechanism to avoid copying binary values when we don't
+	//			    need to.
+	//
+	// 1991-02-15 dmb: no longer treat binary values like externals.  since we 
+	//			    now support passing values by reference (i.e. address
+	//			    values), the script writer can avoid the overhead of
+	//			    large objects when desired.  binary values can now be
+	//			    used like any other automatic type.
+	//
+	// create a copy of v in vreturned.  for strings and passwords and other
+	// relatively small heap-allocated objects, we create a copy of the data.
+	//
+	// for other types, externals and binaries, we create another reference
+	// to the heap-allocated object.  it's important that values copied for
+	// externals and binaries not be stored in the symbol table structure.
+	//
 	
 	Handle x;
 	hdllistrecord hlist;
-#ifndef version5orgreater
-	bigstring bs;
-	hdlhashtable htable;
-#endif
 	
-#ifdef tmpcopydebug
-	static long ctdups = 0;
-	static long cttmps = 0;
-	static long cthits = 0;
+	#ifndef version5orgreater
 	
-	++ctdups;
+		bigstring bs;
+		hdlhashtable htable;
+		
+	#endif
 	
-	if (v.fltmpstack) {
+	#ifdef tmpcopydebug
+	
+		static long ctdups = 0;
+		static long cttmps = 0;
+		static long cthits = 0;
 		
-		++cttmps;
+		++ctdups;
 		
-		if (findheaptmp (&v)) {
-			++cthits;
+		if (v.fltmpstack) {
+		
+			++cttmps;
 			
-			*vreturned = v;
-			(*vreturned).fltmpdata = true;		
-			return (true);
+			if (findheaptmp (&v)) {
+			
+				++cthits;
+				
+				*vreturned = v;
+				(*vreturned).fltmpdata = true;		
+				return (true);
+				
+				}
 			}
-		}
-#endif
-
+	#endif
+	
 	switch (v.valuetype) {
+	
+		case addressvaluetype:
 		
-		case addressvaluetype:
 		#ifndef version5orgreater
+		
 			initvalue (vreturned, novaluetype);
 			
 			if (!getaddressvalue (v, &htable, bs))
 				return (false);
+				
+			return (setaddressvalue (htable, bs, vreturned));
 			
-			return (setaddressvalue (htable, bs, vreturned));
 		#endif
+		
 		case stringvaluetype:
 		case passwordvaluetype:
 		case rectvaluetype:
 		case patternvaluetype:
 		case rgbvaluetype:
 		case objspecvaluetype:
-		case filespecvaluetype:
+		
+		#ifndef MACVERSION
+		
+			case filespecvaluetype:
+			
+		#endif
+		
 		case aliasvaluetype:
 		case doublevaluetype:
 		case binaryvaluetype:
-	#ifndef oplanglists
-		case listvaluetype:
-		case recordvaluetype:
-	#endif
+		
+		#ifndef oplanglists
+		
+			case listvaluetype:
+			case recordvaluetype:
+			
+		#endif
+		
 			initvalue (vreturned, novaluetype);
 			
 			#ifdef flnewfeatures
-				
+			
 				if (v.fldiskval) {
 					/*
 					4.0.2b1 dmb: for disk-based scalars, the copy will be the actual 
@@ -925,6 +951,7 @@
 					
 					if (!dbrefhandle (v.data.diskvalue, &x))
 						return (false);
+						
 					}
 				else {
 					if (!copyhandle (v.data.binaryvalue, &x))
@@ -934,39 +961,62 @@
 			
 				if (!copyhandle (v.data.binaryvalue, &x))
 					return (false);
+					
+			#endif
 			
-			#endif
-
 			return (setheapvalue (x, v.valuetype, vreturned));
+			
+		#ifdef oplanglists
 		
-	#ifdef oplanglists
-		case listvaluetype:
-		case recordvaluetype:
-			initvalue (vreturned, v.valuetype);
+			case listvaluetype:
+			case recordvaluetype:
 			
-			if (!opcopylist (v.data.listvalue, &hlist))
-				return (false);
-			
-			return (setheapvalue ((Handle) hlist, v.valuetype, vreturned));
-	#endif
-
+				initvalue (vreturned, v.valuetype);
+				
+				if (!opcopylist (v.data.listvalue, &hlist))
+					return (false);
+					
+				return (setheapvalue ((Handle) hlist, v.valuetype, vreturned));
+		#endif
+		
 		case codevaluetype:
 		case externalvaluetype:
+		
 			*vreturned = v;
 			
 			(*vreturned).fltmpdata = true; /*see hashassign, disposevaluerecord*/
 			
 			break;
+			
+		#ifdef MACVERSION
 		
+			case filespecvaluetype: {
+			
+				tyfilespec fs;
+				
+				fs.fsref = ( *( ( ( v ).data ).filespecvalue ) ) -> fsref;
+			
+				fs.path = CFStringCreateCopy ( kCFAllocatorDefault, ( *( ( ( v ).data ).filespecvalue ) ) -> path );
+				
+				return ( setfilespecvalue ( &fs, vreturned ) );
+				
+				}
+				
+		#endif
+		
 		default:
+		
 			*vreturned = v;
 			
 			break;
-		} /*switch*/
+			
+		} // switch
+		
+	return (true); 
 	
-	return (true); 
-	} /*copyvaluerecord*/
+	} // copyvaluerecord
 
+
 #ifdef DATABASE_DEBUG
 
 void debug_disposevaluerecord (tyvaluerecord val, boolean fldisk, long line, char *sourcefile)
@@ -1026,10 +1076,11 @@
 				exemptfromtmpstack (&val);
 				
 				disposehandle (val.data.binaryvalue);
+				
 				}
+				
+			break;
 			
-			break;
-		
 	#ifdef oplanglists
 		case listvaluetype:
 		case recordvaluetype:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1748] Frontier/trunk/Common/source/shellverbs. c

From: <cre...@us...> - 2007-10-03 19:53:58

Revision: 1748
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1748&view=rev
Author:   creecode
Date:     2007-10-03 12:45:06 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
in filemenufunctionvalue, in newfunc case, use copyvaluerecord so we don't alter the value record grabbed by getparamvalue

Modified Paths:
--------------
    Frontier/trunk/Common/source/shellverbs.c

Modified: Frontier/trunk/Common/source/shellverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellverbs.c	2007-10-01 00:23:16 UTC (rev 1747)
+++ Frontier/trunk/Common/source/shellverbs.c	2007-10-03 19:45:06 UTC (rev 1748)
@@ -1056,39 +1056,59 @@
 
 
 static boolean filemenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
+	//
+	// 2007-10-03 creedon: in newfunc case use copyvaluerecord so we don't
+	//				   alter the value record grabbed by getparamvalue
+	//
+	// 2006-02-05 aradke: re-enabled savecopyfunc case to avoid breakage. verb
+	//				  tokens that have previously been referenced from glue
+	//				  scripts should never be disabled again, like
+	//				  fileMenu.saveCopy in this case.  also kept
+	//				  kernelverbs.r and kernelverbs.rc in sync.
+	// 
+	// 2005-10-26 creedon: disabled savecopyfunc case, saveasfunc can do it all
+	//				   added saveasfunc case, it wasn't possible to do a
+	//				   save as for a file-object
+	//
+	// 2005-09-14 creedon: in closefunc case added fldialog parameter, this
+	//				   might be improved as I only dealt with the situation
+	//				   with one or more parameters are defined
+	//
+	// 5.1.4 dmb: closefunc takes optional win parameter; savefunc checks hinfo
+	//		    for nil
+	//
+	// 5.0d18 dmb: closefunc respects the target
+	//
+	// 5.0d16 dmb: savefunc, newfunc need new (optional) parameters
+	//
+	// 3.0b15 dmb: quitfunc should just return false and let everything flow
+	//			normally, instead of yielding here. this could problems
+	//			calling filemenu.quit from a component menusharing (osa)
+	//			client...  however it doesn't, so this change is disabled
+	//			for the time being.
+	//
+	// 1993-06-01 dmb: when vreturned is nil, return whether or not verb token
+	//			    must be run in the Frontier process
+	//
+	// 1993-05-19 dmb: closefunc uses getfrontwindow, not shellwindow
+	//
+	// 1991-10-23 dmb: must try to restore globals after revert, so new globals
+	//			    aren't in effect when deferred disposal takes place.
+	//
+	// 1991-10-03 dmb: split off fileMenu verbs from shell verbs
+	//
+	// 1991-02-07 dmb: functions that change the current file (closeall, new,
+	//			    open, revert) have to save & restore the language
+	//			    globals.  we don't want the language to have to do this
+	//			    on every external call, so we do it selectively here
+	//
+	//			    added parameters to new, open & save; added boolean to
+	//			    avoid dialog in various shell routines.
+	//
 	
-	/*
-	2/7/91 dmb: added parameters to new, open & save; added boolean to avoid 
-	dialog in various shell routines.
-	
-	2/7/91 dmb: functions that change the current file (closeall, new, open, revert) have 
-	to save & restore the language globals.  we don't want the language to have 
-	to do this on every external call, so we do it selectively here
-	
-	10/3/91 dmb: split off fileMenu verbs from shell verbs
-	
-	10/23/91 dmb: must try to restore globals after revert, so new globals aren't 
-	in effect when deferred disposal takes place.
-	
-	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
-	
-	6/1/93 dmb: when vreturned is nil, return whether or not verb token must 
-	be run in the Frontier process
-	
-	3.0b15 dmb: quitfunc should just return false and let everything flow normally, 
-	instead of yielding here. this could problems calling filemenu.quit from a 
-	component menusharing (osa) client...  however it doesn't, so this change is 
-	disabled for the time being.
-	
-	5.0d16 dmb: savefunc, newfunc need new (optional) parameters
-	
-	5.0d18 dmb: closefunc respects the target
-	
-	5.1.4 dmb: closefunc takes optional win parameter; savefunc checks hinfo for nil
-	*/
-	
+	register boolean fl;
 	register tyvaluerecord *v = vreturned;
-	register boolean fl;
 	
 	if (v == nil) /*need Frontier process?*/
 		return (true);
@@ -1098,26 +1118,25 @@
 	switch (token) { /*these verbs don't need any special globals pushed*/
 		
 		case newfunc: {
-			tyvaluerecord val;
+		
+			WindowPtr w;
+			short ctconsumed = 0, ctpositional;
+			tyexternalid id;
 			tyfilespec fs;
-			tyexternalid id;
-			tyvaluerecord vhidden;
-			short ctconsumed = 0;
-			short ctpositional;
-			WindowPtr w;
+			tyvaluerecord val, vhidden;
 			
 			if (!getparamvalue (hparam1, ++ctconsumed, &val))
 				return (false);
-			
+				
 			flnextparamislast = true;
 			
 			ctpositional = ctconsumed;
 			
-			setbooleanvalue (false, &vhidden); //default value
+			setbooleanvalue (false, &vhidden); // default value
 			
 			if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, str_hidden, &vhidden))
 				return (false);
-			
+				
 			disablelangerror ();
 			
 			fl = coercetoostype (&val);
@@ -1126,31 +1145,36 @@
 			
 			if (!fl) { // old style, new database
 			
+				if (!copyvaluerecord (val, &val))
+					return (false);
+					
 				if (!coercetofilespec (&val))
 					return (false);
+					
+				fs = **val.data.filespecvalue;
 				
-				fs = (**val.data.filespecvalue);
+				langsaveglobals (); // see comment at function head
 				
-				langsaveglobals (); /*see comment at function head*/
-				
 				fl = shellnewfile (&fs, vhidden.data.flvalue, &w);
 				
 				if (!langrestoreglobals ())
 					fl = false;
-				
+					
 				if (!fl)
 					return (false);
 				}
 			else {
+			
 				id = (tyexternalid) (langgetvaluetype (val.data.ostypevalue) - outlinevaluetype);
 				
 				if (!ccnewfilewindow (id, &w, vhidden.data.flvalue))
 					return (false);
 				}
+				
+			return (setwinvalue (w, v));
 			
-			return (setwinvalue (w, v));
 			}
-		
+			
 		case openfunc: {
 		
 			tyfilespec fs;
@@ -1181,22 +1205,18 @@
 				return (false);
 			
 			return (fl && setwinvalue (w, v));
+			
 			}
+			
+		case closefunc: { // close the frontmost window
 		
-		case closefunc: {
-			/*
-			close the frontmost window
-			
-			2005-09-14 creedon: added fldialog parameter, this might be improved as I only dealt with the situation with one or more parameters are defined
-			*/
-			
 			hdlwindowinfo hinfo;
 			WindowPtr targetwindow = nil;
 			tyvaluerecord val;
 			boolean fldialog;
-
+			
 			setbooleanvalue (false, &val); /* defaults to false */
-
+			
 			if (langgetparamcount (hparam1) == 0) { // old style, use the target
 			
 				if (!langfindtargetwindow (-1, &targetwindow))
@@ -1227,19 +1247,22 @@
 			//return (langrestoreglobals ());
 			
 			return (true);
+			
 			}
 		
 		case closeallfunc:
+		
 			if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters*/
 				return (false);
-			
+				
 			langsaveglobals (); /*see comment at function head*/
 			
 			(*v).data.flvalue = shellcloseall (nil, false);
 			
 			return (langrestoreglobals ());
+			
+		case quitfunc:
 		
-		case quitfunc:
 			if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters*/
 				return (false);
 			
@@ -1247,37 +1270,29 @@
 			
 			#if 0  /*maybe try this out after 3.0*/
 			
-			return (false); /*kill the script*/
+				return (false); /*kill the script*/
 			
 			#else
 			
-			processyield (); /*give it a chance to happen*/
+				processyield (); /*give it a chance to happen*/
+				
+				(*v).data.flvalue = false; /*we didn't quit -- we got here, didn't we?*/
+				
+				return (true);
+				
+			#endif
 			
-			(*v).data.flvalue = false; /*we didn't quit -- we're got here, didn't we?*/
-			
-			return (true);
-			
-			#endif
-		} /*switch*/
-	
+		} // switch
+		
 	if (!shellpushtargetglobals ())
 		return (false);
-	
+		
 	fl = false; /*default return value for this function*/
 	
 	switch (token) { /*these verbs assume that the frontmost window's globals are pushed*/
 	
-		/*
-		2005-10-26 creedon: disabled savecopyfunc case, saveasfunc can do it all
-						 added saveasfunc case, it wasn't possible to do a save as for a file-object
+		case savefunc: { /*save the frontmost window*/
 		
-		2006-02-05 aradke: re-enabled savecopyfunc case to avoid breakage.
-				verb tokens that have previously been referenced from glue scripts
-				should never be disabled again, like fileMenu.saveCopy in this case.
-				also kept kernelverbs.r and kernelverbs.rc in sync.
-		*/ 
-		
-		case savefunc: { /*save the frontmost window*/
 			hdlwindowinfo hinfo;
 			
 			if (langgetparamcount (hparam1) == 0) { // old style, save the root
@@ -1286,6 +1301,7 @@
 					break;
 				}
 			else {
+			
 				flnextparamislast = true;
 				
 				if (!getwinparam (hparam1, 1, &hinfo))
@@ -1298,15 +1314,17 @@
 					break;
 					}
 				}
-			
+				
 			(*v).data.flvalue = shellsave ((**hinfo).macwindow);
 			
 			fl = true;
 			
 			break;
+			
 			}
+			
+		case savecopyfunc: {
 		
-		case savecopyfunc: {	/* 2006-02-05 aradke: re-enabled */
 			tyfilespec fs;
 			
 			flnextparamislast = true;
@@ -1319,12 +1337,14 @@
 			fl = true;
 			
 			break;
-			} 
+			
+			}
+			
+		case revertfunc:
 		
-		case revertfunc:
 			if (!langcheckparamcount (hparam1, 0))
 				break;
-			
+				
 			langsaveglobals (); /*see comment at function head*/
 			
 			(*v).data.flvalue = shellrevert (shellwindow, false);
@@ -1332,8 +1352,9 @@
 			fl = langrestoreglobals (); /*should return false; script can't continue after a revert*/
 			
 			break;
+			
+		case printfunc:
 		
-		case printfunc:
 			if (!langcheckparamcount (hparam1, 0))
 				break;
 			
@@ -1342,8 +1363,9 @@
 			fl = true;
 			
 			break;
-
+			
 		case saveasfunc: {
+		
 			tyfilespec fs;
 			short ctconsumed = 0;
 			short ctpositional = 0;
@@ -1355,13 +1377,15 @@
 			
 			if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, BIGSTRING ("\x04""path"), &val))
 				return (false);
+				
+			if (val.data.stringvalue) {
 			
-			if (val.data.stringvalue) {
 				bigstring bs;
 				
 				texthandletostring (val.data.stringvalue, bs);
 				pathtofilespec (bs, &fs);
 				(*v).data.flvalue = shellsaveas (shellwindow, &fs, false);
+				
 				}
 			else
 				(*v).data.flvalue = shellsaveas (shellwindow, nil, false);
@@ -1369,14 +1393,16 @@
 			fl = true;
 			
 			break;
+			
 			}
 		
-		} /*switch -- funcs with front globals pushed*/
-	
+		} // switch -- funcs with front globals pushed
+		
 	shellpopglobals ();
 	
 	return (fl);
-	} /*filemenufunctionvalue*/
+	
+	} // filemenufunctionvalue
 
 
 static boolean editmenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1747] ODBs/trunk/frontierRoot/system/agents/ StatusMessage.fvc

From: <cre...@us...> - 2007-10-01 00:23:14

Revision: 1747
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1747&view=rev
Author:   creecode
Date:     2007-09-30 17:23:16 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
use Frontier.getProgramName to get product string

Modified Paths:
--------------
    ODBs/trunk/frontierRoot/system/agents/StatusMessage.fvc

Modified: ODBs/trunk/frontierRoot/system/agents/StatusMessage.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/agents/StatusMessage.fvc	2007-09-30 23:53:28 UTC (rev 1746)
+++ ODBs/trunk/frontierRoot/system/agents/StatusMessage.fvc	2007-10-01 00:23:16 UTC (rev 1747)
@@ -1,68 +1,77 @@
-FrontierVcsFile:1:scpt:system.agents.StatusMessage
+FrontierVcsFile:3:scpt:system.agents.StatusMessage
 
-\xC7Rewrite 9/8/99; 11:43:58 AM by DW
-	\xC7I noticed that the standard version of this script doesn't report the number of hits if the web server is turned on. I think this is an essential readout, and I wanted to see if there were any other ideas out there for improvement to this script. I'd like to include this in the root updates before the release of 6.1.
-	\xC7Added callback in response to Philippe Martin's request. Any script in user.callbacks.statusMessage will be called each time the message is generated. Each script in the table returns a bit of information which is then inserted into the message we display.
-	\xC7http://frontier.userland.com/stories/storyReader$1304
-	\xC7Changes:
-		\xC703/23/00; 10:22:53 PM by PBS
-			\xC7Now works for both Pike and Frontier -- it says Frontier if you're running Frontier, Pike if you're running Pike.
-		\xC707/25/00; 4:45:54 PM by PBS
-			\xC7Name change from Pike to Radio UserLand.
-		\xC704/30/01; 3:59:04 PM by JES
-			\xC7If this is a Mac, restart the web server after waking the computer from sleep.
-local (productString = "Frontier");
-if defined (system.environment.isPike) {
-	if system.environment.isPike { //it's either Radio UserLand or Pike
-		if date.versionLessThan (Frontier.version (), "7.0d8") {
-			productString = "Pike"}
-		else {
-			productString = "Radio UserLand"}}};
-\xC7if system.environment.isMac //restart server after waking from sleep
-	\xC7if not temp.Frontier.startingUp
-		\xC7local (flRestartServer = false, ipa = tcp.dns.getMyDottedId ())
-		\xC7if not defined (temp.Frontier.webserverCheckTime)
-			\xC7temp.Frontier.webserverCheckTime = clock.now ()
-		\xC7if not defined (temp.Frontier.lastIpAddress)
-			\xC7temp.Frontier.lastIpAddress = ipa
-		\xC7if number (clock.now () - temp.Frontier.webserverCheckTime) > 90 //1.5 minutes
-			\xC7flRestartServer = true
-		\xC7if ipa != temp.Frontier.lastIpAddress
-			\xC7flRestartServer = true
-		\xC7if flRestartServer
-			\xC7local (isRunning = inetd.isDaemonRunning (@user.inetd.config.http))
-			\xC7if isRunning //restart the server
-				\xC7inetd.stopOne (@user.inetd.config.http)
-				\xC7inetd.startOne (@user.inetd.config.http)
-			\xC7bundle //make a dummy HTTP request, to clear an error state in the MacOS TCP/IP stack
-				\xC7local (flOnline = false)
-				\xC7if defined (system.environment.isPike)
-					\xC7if system.environment.isPike
-						\xC7flOnline = not tcp.isOffline ()
-				\xC7if isRunning
-					\xC7flOnline = true
-				\xC7if flOnline
-					\xC7try
-						\xC7tcp.httpReadUrl ("http://www.yahoo.com/")
-		\xC7temp.Frontier.webserverCheckTime = clock.now ()
-local (s = productString + " " + Frontier.version () + ": " + string.megabyteString (memAvail ()) + " free, " + string.timeString () + "; ");
+«Changes
+	«9/28/07; 11:04:13 PM by TAC
+		«use Frontier.getProgramName to get product string
+	«03/23/00; 10:22:53 PM by PBS
+		«Now works for both Pike and Frontier -- it says Frontier if you're running Frontier, Pike if you're running Pike.
+	«07/25/00; 4:45:54 PM by PBS
+		«Name change from Pike to Radio UserLand.
+	«04/30/01; 3:59:04 PM by JES
+		«If this is a Mac, restart the web server after waking the computer from sleep.
+	«9/8/99; 11:43:58 AM by DW
+		«Rewrite.  I noticed that the standard version of this script doesn't report the number of hits if the web server is turned on. I think this is an essential readout, and I wanted to see if there were any other ideas out there for improvement to this script. I'd like to include this in the root updates before the release of 6.1.
+		«Added callback in response to Philippe Martin's request. Any script in user.callbacks.statusMessage will be called each time the message is generated. Each script in the table returns a bit of information which is then inserted into the message we display.
+		«http://frontier.userland.com/stories/storyReader$1304
+
+local ( productString = Frontier.getProgramName ( ) );
+
+«if system.environment.isMac //restart server after waking from sleep
+	«if not temp.Frontier.startingUp
+		«local (flRestartServer = false, ipa = tcp.dns.getMyDottedId ())
+		«if not defined (temp.Frontier.webserverCheckTime)
+			«temp.Frontier.webserverCheckTime = clock.now ()
+		«if not defined (temp.Frontier.lastIpAddress)
+			«temp.Frontier.lastIpAddress = ipa
+		«if number (clock.now () - temp.Frontier.webserverCheckTime) > 90 //1.5 minutes
+			«flRestartServer = true
+		«if ipa != temp.Frontier.lastIpAddress
+			«flRestartServer = true
+		«if flRestartServer
+			«local (isRunning = inetd.isDaemonRunning (@user.inetd.config.http))
+			«if isRunning //restart the server
+				«inetd.stopOne (@user.inetd.config.http)
+				«inetd.startOne (@user.inetd.config.http)
+			«bundle //make a dummy HTTP request, to clear an error state in the MacOS TCP/IP stack
+				«local (flOnline = false)
+				«if defined (system.environment.isPike)
+					«if system.environment.isPike
+						«flOnline = not tcp.isOffline ()
+				«if isRunning
+					«flOnline = true
+				«if flOnline
+					«try
+						«tcp.httpReadUrl ("http://www.yahoo.com/")
+		«temp.Frontier.webserverCheckTime = clock.now ()
+
+local (s = productString + ": " + string.megabyteString (memAvail ()) + " free, " + string.timeString () + "; ");
+
 bundle { //add threads
 	local (ctthreads = Frontier.countThreads ());
+	
 	if ctthreads == 1 {
 		s = s + "1 thread"}
 	else {
 		s = s + ctthreads + " threads"}};
+
 bundle { //add hits if web server is turned on
 	if inetd.isDaemonRunning (@user.inetd.config.http) { //web server is turned on
 		s = s +"; " +  user.webserver.stats.hits + " hits"}};
+
 bundle { //call the callbacks
 	if defined (user.callbacks.statusMessage) {
 		if typeOf (user.callbacks.statusMessage) == tableType { //don't bomb while the user is creating the callback
 			local (i);
+			
 			for i = 1 to sizeof (user.callbacks.statusMessage) {
 				try {
 					local (callbackresult = user.callbacks.statusMessage [i] ());
+					
 					if sizeof (callbackresult) > 0 {
 						s = s + "; " + callbackresult}}}}}};
+
 s = s + ".";
-msg (s)
\ No newline at end of file
+
+msg (s)
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1746] ODBs/trunk/frontierRoot/suites/fUnit/ testSuperStress/testCrypt.fvc

From: <cre...@us...> - 2007-09-30 23:53:29

Revision: 1746
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1746&view=rev
Author:   creecode
Date:     2007-09-30 16:53:28 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
added test for crypt.MD5

reordered bundle in alpha order for easier code browsing

Modified Paths:
--------------
    ODBs/trunk/frontierRoot/suites/fUnit/testSuperStress/testCrypt.fvc

Modified: ODBs/trunk/frontierRoot/suites/fUnit/testSuperStress/testCrypt.fvc
===================================================================
--- ODBs/trunk/frontierRoot/suites/fUnit/testSuperStress/testCrypt.fvc	2007-09-30 23:50:39 UTC (rev 1745)
+++ ODBs/trunk/frontierRoot/suites/fUnit/testSuperStress/testCrypt.fvc	2007-09-30 23:53:28 UTC (rev 1746)
@@ -1,7 +1,10 @@
-FrontierVcsFile:2:scpt:suites.fUnit.testSuperStress.testCrypt
+FrontierVcsFile:3:scpt:suites.fUnit.testSuperStress.testCrypt
 
 on testCrypt () {
 	«Changes
+		«12/3/06; 11:09:17 AM by TAC
+			«added test for crypt.MD5
+			«reordered bundle in alpha order for easier code browsing
 		«3/11/06; 4:09:17 PM by TAC
 			«added test for crypt.SHA1, crypt.hmacSHA1
 		«3/10/06; 11:30:10 AM by TAC
@@ -12,18 +15,6 @@
 		
 		assertEqual (crypt.cramMD5 ("tim", "tanstaaftanstaaf", base64.decode ("PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+")), "tim b913a602c7eda7a495b4e6e7334d3890", "crypt.cramMD5 is broken")};
 	
-	bundle { // crypt.whirlpool
-		«see < http://en.wikipedia.org/wiki/WHIRLPOOL >, < http://paginas.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html >
-		
-		assertEqual (crypt.whirlpool (""), "19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("a"), "8aca2602792aec6f11a67206531fb7d7f0dff59413145e6973c45001d0087b42d11bc645413aeff63a42391a39145a591a92200d560195e53b478584fdae231a", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("abc"), "4e2448a4c6f486bb16b6562c73b4020bf3043e3a731bce721ae1b303d97e6d4c7181eebdb6c57e277d0e34957114cbd6c797fc9d95d8b582d225292076d4eef5", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("message digest"), "378c84a4126e2dc6e56dcc7458377aac838d00032230f53ce1f5700c0ffb4d3b8421557659ef55c106b4b52ac5a4aaa692ed920052838f3362e86dbd37a8903e", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("abcdefghijklmnopqrstuvwxyz"), "f1d754662636ffe92c82ebb9212a484a8d38631ead4238f5442ee13b8054e41b08bf2a9251c30b6a0b8aae86177ab4a6f68f673e7207865d5d9819a3dba4eb3b", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"), "dc37e008cf9ee69bf11f00ed9aba26901dd7c28cdec066cc6af42e40f82f3a1e08eba26629129d8fb7cb57211b9281a65517cc879d7b962142c65f5a7af01467", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("12345678901234567890123456789012345678901234567890123456789012345678901234567890"), "466ef18babb0154d25b9d38a6414f5c08784372bccb204d6549c4afadb6014294d5bd8df2a6c44e538cd047b2681a51a2c60481e88c5a20b2c2a80cf3a9a083b", "crypt.whirlpool is broken");
-		assertEqual (crypt.whirlpool ("abcdbcdecdefdefgefghfghighijhijk"), "2a987ea40f917061f5d6f0a0e4644f488a7a5a52deee656207c562f988e95c6916bdc8031bc5be1b7b947639fe050b56939baaa0adff9ae6745b7b181c3be3fd", "crypt.whirlpool is broken")};
-	
 	bundle { // crypt.hmacMD5
 		«see < ftp://ftp.rfc-editor.org/in-notes/rfc2104.txt > for test vectors
 		
@@ -31,6 +22,28 @@
 		assertEqual (crypt.hmacMD5 ("what do ya want for nothing?", "Jefe"), "750c783e6ab0b503eaa86e310a5db738", "crypt.hmacMD5 is broken");
 		assertEqual (crypt.hmacMD5 (string.hexStringToBinary ("0xDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"), string.hexStringToBinary ("0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")), "56be34521d144c88dbb8c733f0e8b3f6", "crypt.hmacMD5 is broken")};
 	
+	bundle { // crypt.hmacSHA1
+		«see < ftp://ftp.rfc-editor.org/in-notes/rfc2104.txt > for test vectors
+		
+		assertEqual (crypt.hmacSHA1 ("Hi There", string.hexStringToBinary ("0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")), "b617318655057264e28bc0b6fb378c8ef146be00", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 ("what do ya want for nothing?", "Jefe"), "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 (string.hexStringToBinary ("0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"), string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "125d7342b9ac11cd91a39af48aa17b4f63f175d3", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 (string.hexStringToBinary ("0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"), string.hexStringToBinary ("0x0102030405060708090a0b0c0d0e0f10111213141516171819")), "4c9007f4026250c6bc8414f9bf50c86c2d7235da", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 ("Test With Truncation", string.hexStringToBinary ("0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c")), "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 ("Test Using Larger Than Block-Size Key - Hash Key First", string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "aa4ae5e15272d00e95705637ce8a3b55ed402112", "crypt.hmacSHA1 is broken");
+		assertEqual (crypt.hmacSHA1 ("Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "e8e99d0f45237d786d6bbaa7965c7808bbff1a91", "crypt.hmacSHA1 is broken")};
+	
+	bundle { // crypt.MD5
+		«see < http://tools.ietf.org/html/rfc1321> for test vectors
+		
+		assertEqual ( crypt.MD5 ( "" ), "d41d8cd98f00b204e9800998ecf8427e", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "a" ), "0cc175b9c0f1b6a831c399e269772661", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "abc" ), "900150983cd24fb0d6963f7d28e17f72", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "message digest" ), "f96b697d7cb7938d525a2f31aaf161d0", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "abcdefghijklmnopqrstuvwxyz" ), "c3fcd3d76192e4007dfb496cca67e13b", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" ), "d174ab98d277d9f5a5611c2c9f419d9f", "crypt.MD5 is broken" );
+		assertEqual ( crypt.MD5 ( "12345678901234567890123456789012345678901234567890123456789012345678901234567890" ), "57edf4a22be3c955ac49da2e2107b67a", "crypt.MD5 is broken" )};
+	
 	bundle { // crypt.SHA1
 		bundle { // < http://en.wikipedia.org/wiki/Sha1#SHA1_hashes >
 			assertEqual (crypt.SHA1 ("The quick brown fox jumps over the lazy dog"), "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12", "crypt.SHA1 is broken");
@@ -171,15 +184,18 @@
 				assertEqual (crypt.SHA1 (string.hexStringToBinary (["50408"].Msg)), ["50408"].MD, "crypt.SHA1 is broken");
 				assertEqual (crypt.SHA1 (string.hexStringToBinary (["51200"].Msg)), ["51200"].MD, "crypt.SHA1 is broken")}}};
 	
-	bundle { // crypt.hmacSHA1
-		«see < ftp://ftp.rfc-editor.org/in-notes/rfc2104.txt > for test vectors
+	bundle { // crypt.whirlpool
+		«see < http://en.wikipedia.org/wiki/WHIRLPOOL >, < http://paginas.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html >
 		
-		assertEqual (crypt.hmacSHA1 ("Hi There", string.hexStringToBinary ("0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")), "b617318655057264e28bc0b6fb378c8ef146be00", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 ("what do ya want for nothing?", "Jefe"), "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 (string.hexStringToBinary ("0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"), string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "125d7342b9ac11cd91a39af48aa17b4f63f175d3", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 (string.hexStringToBinary ("0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"), string.hexStringToBinary ("0x0102030405060708090a0b0c0d0e0f10111213141516171819")), "4c9007f4026250c6bc8414f9bf50c86c2d7235da", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 ("Test With Truncation", string.hexStringToBinary ("0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c")), "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 ("Test Using Larger Than Block-Size Key - Hash Key First", string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "aa4ae5e15272d00e95705637ce8a3b55ed402112", "crypt.hmacSHA1 is broken");
-		assertEqual (crypt.hmacSHA1 ("Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", string.hexStringToBinary ("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")), "e8e99d0f45237d786d6bbaa7965c7808bbff1a91", "crypt.hmacSHA1 is broken")}};
+		assertEqual (crypt.whirlpool (""), "19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("a"), "8aca2602792aec6f11a67206531fb7d7f0dff59413145e6973c45001d0087b42d11bc645413aeff63a42391a39145a591a92200d560195e53b478584fdae231a", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("abc"), "4e2448a4c6f486bb16b6562c73b4020bf3043e3a731bce721ae1b303d97e6d4c7181eebdb6c57e277d0e34957114cbd6c797fc9d95d8b582d225292076d4eef5", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("message digest"), "378c84a4126e2dc6e56dcc7458377aac838d00032230f53ce1f5700c0ffb4d3b8421557659ef55c106b4b52ac5a4aaa692ed920052838f3362e86dbd37a8903e", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("abcdefghijklmnopqrstuvwxyz"), "f1d754662636ffe92c82ebb9212a484a8d38631ead4238f5442ee13b8054e41b08bf2a9251c30b6a0b8aae86177ab4a6f68f673e7207865d5d9819a3dba4eb3b", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"), "dc37e008cf9ee69bf11f00ed9aba26901dd7c28cdec066cc6af42e40f82f3a1e08eba26629129d8fb7cb57211b9281a65517cc879d7b962142c65f5a7af01467", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("12345678901234567890123456789012345678901234567890123456789012345678901234567890"), "466ef18babb0154d25b9d38a6414f5c08784372bccb204d6549c4afadb6014294d5bd8df2a6c44e538cd047b2681a51a2c60481e88c5a20b2c2a80cf3a9a083b", "crypt.whirlpool is broken");
+		assertEqual (crypt.whirlpool ("abcdbcdecdefdefgefghfghighijhijk"), "2a987ea40f917061f5d6f0a0e4644f488a7a5a52deee656207c562f988e95c6916bdc8031bc5be1b7b947639fe050b56939baaa0adff9ae6745b7b181c3be3fd", "crypt.whirlpool is broken")}};
 
-callScript (@fUnit.testSuperStress.testCrypt, {}, @fUnit.contextForTests)
\ No newline at end of file
+callScript (@fUnit.testSuperStress.testCrypt, {}, @fUnit.contextForTests)
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1745] ODBs/trunk/frontierRoot/system/startup/ startupScript.fvc

From: <cre...@us...> - 2007-09-30 23:50:35

Revision: 1745
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1745&view=rev
Author:   creecode
Date:     2007-09-30 16:50:39 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
don't hard code program name in user dialogs

changed alert dialog text to user-in-charge text

instead of displaying licenses, we just make sure they're in the application folder

Modified Paths:
--------------
    ODBs/trunk/frontierRoot/system/startup/startupScript.fvc

Modified: ODBs/trunk/frontierRoot/system/startup/startupScript.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/startup/startupScript.fvc	2007-09-30 23:49:22 UTC (rev 1744)
+++ ODBs/trunk/frontierRoot/system/startup/startupScript.fvc	2007-09-30 23:50:39 UTC (rev 1745)
@@ -1,6 +1,11 @@
 FrontierVcsFile:3:scpt:system.startup.startupScript
 
 «Changes
+	«9/30/07; 4:46:45 PM by TAC
+		«don't hard code program name in user dialogs
+	«11/3/06; 7:36:49 AM by TAC and ARF
+		«changed alert dialog text to user-in-charge text
+		«instead of displaying licenses, we just make sure they're in the application folder
 	«7/16/06; 2:26:14 PM by TAC and KW
 		«changed logic so that the script can be run again if the script failed for some reason, without having to fiddle with tables
 	«5/19/06; 3:37:07 PM by TAC
@@ -273,6 +278,8 @@
 
 «fileMenu.save ()
 
+local ( programName = Frontier.getProgramName ( false ) );
+
 bundle { // miscellaneous variable initializations and checks, phase 2 of 2
 	system.menus.data.currentsuite = "";
 	system.menus.data.currentMenuType = nil;
@@ -281,7 +288,7 @@
 	bundle { // check for presence of Psapi.dll
 		if sys.os ( ) == "WinNT" {
 			if not ( sys.appIsRunning ( file.fileFromPath ( Frontier.getProgramPath ( ) ) ) ) { // 11/27/04; 12:14:40 PM by TAC - would it be possible for Frontier to install this on its own?
-				dialog.alert ( "You need to run the Frontier Psapi Installer for certain Frontier verbs to work properly." )}}}};
+				dialog.alert ( programName + " needs you to run the Frontier Psapi Installer for certain " + programName + " verbs to work properly." )}}}};
 
 bundle { // open the about window if the pref says we should
 	«added 12/16/98; 6:47:28 PM by DW
@@ -443,7 +450,7 @@
 						if not ( kernelCall ( @name, @initials, @organization, @email ) ) {
 							return ( false )};
 						if initials == "" {
-							dialog.alert ( "You must specify your initials." );
+							dialog.alert ( programName + " needs the initials of your name." );
 							infoDialog ( )};
 						user.prefs.name = name;
 						user.prefs.initials = initials;
@@ -483,18 +490,35 @@
 		«window.close ( s )
 	
 	bundle { // license
-		local ( adrWindow = @system.startup.license, sH, sV );
+		local ( adr, f, path = file.getPath ( ) );
 		
-		target.set ( adrWindow );
-		window.setPosition ( adrWindow, 0, 0 );
-		window.setSize ( adrWindow, infinity, infinity );
-		window.zoom ( adrWindow );
-		window.getSize ( adrWindow, @sH, @sV );
-		window.setSize ( adrWindow, sH + 50, sV - 100 );
-		window.setPosition ( adrWindow, 50, 100 );
-		window.scroll ( down, infinity );
-		wp.setSelect ( 0, 0 );
-		edit ( adrWindow )}}; // 12/4/04; 9:26:35 PM by TAC - i rather do this near the beginning of phase 1 firstRootRun but had a problem with this window and setting up the quick script window 
+		bundle { // license
+			adr = @system.startup.license;
+			f = path + "LICENSE.txt";
+			
+			if not ( file.exists ( f ) ) or timeModified ( adr ) > file.modified ( f ) {
+				file.writeWholeFile ( f, string ( adr^ ), 'TEXT', 'LAND' )}};
+		
+		bundle { // copying ( GPL )
+			adr = @system.startup.copying;
+			f = path + "COPYING.txt";
+			
+			if not ( file.exists ( f ) ) or timeModified ( adr ) > file.modified ( f ) {
+				file.writeWholeFile ( f, string ( adr^ ), 'TEXT', 'LAND' )}};
+		}};
+		«old code
+			«local ( adrWindow = @system.startup.license, sH, sV )
+			«
+			«target.set ( adrWindow )
+			«window.setPosition ( adrWindow, 0, 0 )
+			«window.setSize ( adrWindow, infinity, infinity )
+			«window.zoom ( adrWindow )
+			«window.getSize ( adrWindow, @sH, @sV )
+			«window.setSize ( adrWindow, sH + 50, sV - 100 )
+			«window.setPosition ( adrWindow, 50, 100 )
+			«window.scroll ( down, infinity )
+			«wp.setSelect ( 0, 0 )
+			«edit ( adrWindow ) // 12/4/04; 9:26:35 PM by TAC - i rather do this near the beginning of phase 1 firstRootRun but had a problem with this window and setting up the quick script window 
 
 bundle { // build menu bar
 	system.menus.buildMenuBar ( );
@@ -510,7 +534,7 @@
 
 if flFirstRootRun {
 	if defined ( system.temp.installer.urlToOpen ) {
-		dialog.alert ( "Frontier is going to use your web browser to complete its installation." );
+		dialog.alert ( programName + " needs to use your web browser to complete its installation." );
 		webBrowser.openUrl ( system.temp.installer.urlToOpen );
 		webBrowser.bringToFront ( )};
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: frontierkernel: [1744] ODBs/trunk/frontierRoot/system/startup/ license.fvc

From: <cre...@us...> - 2007-09-30 23:49:18

Revision: 1744
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1744&view=rev
Author:   creecode
Date:     2007-09-30 16:49:22 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
bumped copyright year

Modified Paths:
--------------
    ODBs/trunk/frontierRoot/system/startup/license.fvc

Modified: ODBs/trunk/frontierRoot/system/startup/license.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/startup/license.fvc	2007-09-30 23:48:13 UTC (rev 1743)
+++ ODBs/trunk/frontierRoot/system/startup/license.fvc	2007-09-30 23:49:22 UTC (rev 1744)
@@ -3,7 +3,7 @@
 Frontier™ -- High performance Web content management, object database, system-level and Internet scripting environment, including source code editing and debugging.
 
 Copyright © 1992-2004 UserLand Software, Inc.
-Copyright © 2004-2006 Frontier Kernel Project
+Copyright © 2004-2007 Frontier Kernel Project
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 
@@ -12,3 +12,4 @@
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 message has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 2 3 4 5 6 .. 160 > >> (Page 4 of 160)