Menu
▾
▴
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] |
