Menu
▾
▴
SF.net SVN: frontierkernel: [1770] Frontier/trunk/Common
|
From: <cre...@us...> - 2007-11-06 22:23:05
|
Revision: 1770
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1770&view=rev
Author: creecode
Date: 2007-11-06 14:23:02 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
undoing changes committed in r1762:1769, somehow IUDA Desktop changes inadvertently got into the trunk
Modified Paths:
--------------
Frontier/trunk/Common/headers/WinLand.h
Frontier/trunk/Common/headers/frontierdefs.h
Frontier/trunk/Common/headers/shellmenu.h
Frontier/trunk/Common/headers/versions.h
Frontier/trunk/Common/resources/Mac/SHELL.R
Frontier/trunk/Common/resources/Win32/WinLand.rc
Frontier/trunk/Common/source/FrontierWinMain.c
Frontier/trunk/Common/source/filepath.c
Modified: Frontier/trunk/Common/headers/WinLand.h
===================================================================
--- Frontier/trunk/Common/headers/WinLand.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/WinLand.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -313,5 +313,3 @@
#define IDB_BITMAP46 46
#define IDB_BITMAP47 47
#define IDB_BITMAP48 48
-
-
Modified: Frontier/trunk/Common/headers/frontierdefs.h
===================================================================
--- Frontier/trunk/Common/headers/frontierdefs.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/frontierdefs.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -34,31 +34,24 @@
#ifdef WIN95VERSION
-
#define FRONTIERCOM 1
- #ifdef OPMLEDITOR
-
- #define FRONTIERWEB 1 // 2006-02-05 aradke: enable HTML display in main window background
-
- #else
-
+ #ifndef OPMLEDITOR
#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
+ #define NEWFILESPECTYPE 1
+#endif /* WIN95VERSION */
-#endif // WIN95VERSION
-
#ifdef MACVERSION
-
#define flcomponent 1
#ifdef __powerc
#define noextended 1
@@ -67,7 +60,6 @@
#else
#define noextended 0
#endif
-
#endif /* MACVERSION */
@@ -95,7 +87,6 @@
#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*/
@@ -103,11 +94,9 @@
#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*/
@@ -115,7 +104,6 @@
#undef cmdPeriodKillsCard
#undef IOAinsideApp /*all the IOA's are baked into the app*/
#undef coderesource /*we're not running inside a code resource*/
-
#endif
@@ -127,5 +115,3 @@
#endif /*__FRONTIERDEFS_H__*/
-
-
Modified: Frontier/trunk/Common/headers/shellmenu.h
===================================================================
--- Frontier/trunk/Common/headers/shellmenu.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/shellmenu.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -85,42 +85,21 @@
#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
-
- #ifdef IUDADESKTOP
-
- #define openrecentmenu 5600 // 2007-10-22 creedon
-
- #else
-
- #undef openrecentmenu
+ #define commonstylesmenu 5500 /*7.0b26 PBS*/
- #endif
-
#define firsthiermenu fontmenu
-
- #ifdef IUDADESKTOP
-
- #define lasthiermenu openrecentmenu // 2007-10-22 creedon
-
- #else
-
- #define lasthiermenu commonstylesmenu
-
- #endif
-
+ #define lasthiermenu commonstylesmenu
#else //!PIKE
-
#define virtualmenu 5100 /* 2006-02-25 aradke: never actually displayed */
#define fontmenu 5200
#define stylemenu 5300
@@ -143,82 +122,57 @@
#define aboutitem 1
#ifdef PIKE
+#ifndef OPMLEDITOR
+ // #define filemenu (applemenu + mainmenuincrement)
- #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)
+ /*PBS 07/22/00: Pike's File menu has been revised --
+ the number, order, and names of items have changed.
- #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
+ 7.0d10 PBS: Radio UserLand has an Update Radio.root...
+ command in the File menu.*/
- #endif // Radio UserLand
-
-#else // Frontier
+ #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
+#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
@@ -227,93 +181,56 @@
#define pagesetupitem 11
#define printitem 12
#define quititem 14
-
-#endif // Frontier
+#endif
+
// #define editmenu (filemenu + mainmenuincrement)
#define windowsitem -1
#ifdef PIKE
- #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 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
- #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
+ #define styleitem -1
+ #define leadingitem -1
+ #define justifyitem -1
+#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
@@ -452,5 +369,3 @@
#endif //!defined(REZ) && !defined(RC_INVOKED)
#endif //shellmenuinclude
-
-
Modified: Frontier/trunk/Common/headers/versions.h
===================================================================
--- Frontier/trunk/Common/headers/versions.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/versions.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -46,98 +46,64 @@
#define APP_COPYRIGHT_TILL "2007"
-// target-specific strings and version info
+/* target-specific strings and version info */
#ifdef PIKE
+#ifndef OPMLEDITOR
- #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
+ /* version info for RADIO targets (formerly known as PIKE) */
- // 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"
+ #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"
- #endif
+#else
+
+ /* version info for OPMLEDITOR targets */
- #else
+ #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
- // version info for FRONTIER targets
+ /* version info for FRONTIER targets */
#define APPNAME "Frontier"
#define APP_COPYRIGHT_HOLDER "Frontier Kernel Project"
@@ -148,17 +114,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
Modified: Frontier/trunk/Common/resources/Mac/SHELL.R
===================================================================
--- Frontier/trunk/Common/resources/Mac/SHELL.R 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/resources/Mac/SHELL.R 2007-11-06 22:23:02 UTC (rev 1770)
@@ -44,407 +44,419 @@
}
};
-#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
+#ifdef PIKE
- //
- // 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
+/*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
+ }
+};
- // 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
+/*Carbon File menu*/
-#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
+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
- //
- // 7.0b26 PBS: Radio UserLand has a different Edit menu.
- //
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
+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*/
- 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
+ /* [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: 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
- }
- };
+/*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,
-#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,
@@ -613,24 +625,15 @@
/* [3] */
"Find Next", noIcon, "G", noMark, plain,
/* [4] */
+ #ifdef PIKE /* 2005-09-25 creedon */
- #ifdef PIKE // 2005-09-25 creedon
+ "Replace & Find Next", noIcon, "H", noMark, plain
- #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
+ #else
- "Replace & Find Next", noIcon, "1", noMark, plain
+ "Replace & Find Next", noIcon, "1", noMark, plain
- #endif // Frontier
+ #endif
}
};
@@ -755,78 +758,41 @@
resource 'STR#' (129, "Defaults", purgeable) {
- { // 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]
+ { /* 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] */
"Untitled",
- // [3]
+ /* [3] */
"Untitled",
- // [4]
+ /* [4] */
"Select a database file:",
- // [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]
+ /* [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] */
"Open a file:"
-
- }
- };
+ }
+};
resource 'STR#' (130, "Interface", locked, preload) {
{ /* array StringArray: 15 elements */
@@ -4506,41 +4472,22 @@
#ifdef PIKE
+#ifndef OPMLEDITOR
+type 'PIKE' as 'STR ';
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- type 'IUDA' as 'STR ';
+resource 'PIKE' (0, "Owner resource")
+#else //OPMLEDITOR
+type 'OPML' as 'STR ';
- resource 'IUDA' ( 0, "Owner resource" )
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- type 'OPML' as 'STR ';
+resource 'OPML' (0, "Owner resource")
+#endif // OPMLEDITOR
- 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
};
Modified: Frontier/trunk/Common/resources/Win32/WinLand.rc
===================================================================
--- Frontier/trunk/Common/resources/Win32/WinLand.rc 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/resources/Win32/WinLand.rc 2007-11-06 22:23:02 UTC (rev 1770)
@@ -65,40 +65,21 @@
259 CURSOR DISCARDABLE beachball_3.cur
260 CURSOR DISCARDABLE beachball_4.cur
-
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
-#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
-
+#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
IDB_BITMAP1 BITMAP DISCARDABLE bitmap1.bmp
IDB_BITMAP2 BITMAP DISCARDABLE bitmap2.bmp
IDB_BITMAP3 BITMAP DISCARDABLE bitmap3.bmp
@@ -148,7 +129,6 @@
IDB_BITMAP47 BITMAP DISCARDABLE bitmap47.bmp
IDB_BITMAP48 BITMAP DISCARDABLE bitmap48.bmp
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -158,39 +138,20 @@
// remains consistent on all systems.
#ifdef PIKE
-
- #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
+#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
ID_FRONTIER_ICON ICON DISCARDABLE FrontierCactus.ico
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico */
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico
+#endif
-#endif // Frontier
-
ID_FATPAGE_ICON ICON DISCARDABLE fatp.ico
ID_ROOT_ICON ICON DISCARDABLE root.ico
ID_2CLK_ICON ICON DISCARDABLE "2clk.ico"
@@ -246,209 +207,137 @@
END
#endif
-
#ifdef PIKE
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+/* 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.
- #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.
+7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
- 7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
+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
- 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
+ MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+END
- #endif // Radio UserLand
-
-#else // Frontier
+#else
- 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 // Frontier
+#endif
+#ifdef PIKE /*7.0b26 PBS: Edit menu differs from Frontier's.*/
-#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
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+#else
- 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
+editmenu MENU DISCARDABLE
- #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
+/* 2005-09-25 creedon: changed for edit menu items calling scripts */
- #endif // Radio UserLand
-
-#else // Frontier
+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
- // 2005-09-25 creedon: changed for edit menu items calling scripts
+#endif
- 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"
@@ -463,37 +352,17 @@
BEGIN
POPUP "&Help"
BEGIN
-
-#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
-
+#ifdef PIKE
+#ifndef OPMLEDITOR
MENUITEM "Radio Website", helpmenu+1 /*7.0d8 PBS: name change*/
-
- #endif // Radio UserLand
-
-#else // Frontier
-
- MENUITEM "About Frontier", helpmenu+1
-
-#endif // Frontier
-
+#else
+ MENUITEM "OPML Editor Website", helpmenu+1 /*7.0d8 PBS: name change*/
+#endif // OPMLEDITOR
+#else
+ MENUITEM "About Frontier", helpmenu+1
+#endif
+ END
END
-END
#endif
#ifdef fontmenu
@@ -649,24 +518,13 @@
"O", filemenu+openitem, VIRTKEY, CONTROL, NOINVERT
"W", filemenu+closeitem, VIRTKEY, CONTROL, NOINVERT
"S", filemenu+saveitem, VIRTKEY, CONTROL, NOINVERT
-
- #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
-
+#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
"Q", filemenu+quititem, VIRTKEY, CONTROL, NOINVERT
"Z", editmenu+undoitem, VIRTKEY, CONTROL, NOINVERT
"X", editmenu+cutitem, VIR...
[truncated message content] |
