Menu
▾
▴
frontierkernel-commits — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(447) |
Nov
(163) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(172) |
Feb
|
Mar
(123) |
Apr
(64) |
May
(1) |
Jun
(278) |
Jul
(89) |
Aug
(97) |
Sep
(62) |
Oct
(53) |
Nov
(119) |
Dec
(60) |
| 2006 |
Jan
(76) |
Feb
(1094) |
Mar
(363) |
Apr
(163) |
May
(57) |
Jun
(43) |
Jul
(39) |
Aug
(15) |
Sep
(33) |
Oct
(62) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(9) |
Feb
(34) |
Mar
(2) |
Apr
(14) |
May
(8) |
Jun
(40) |
Jul
(21) |
Aug
(1) |
Sep
(20) |
Oct
(15) |
Nov
(26) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
|
Jul
|
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andre R. <and...@us...> - 2006-02-05 18:09:34
|
Update of /cvsroot/frontierkernel/Frontier/build_CWPro8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17722/build_CWPro8 Modified Files: Frontier.mcp Log Message: Replaced reference to kernvelverbs.r with kernelverbs.r, rename happened a while ago. Index: Frontier.mcp =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_CWPro8/Frontier.mcp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsV7CIHt and /tmp/cvs2fWNMW differ |
|
From: Andre R. <and...@us...> - 2006-02-05 17:11:15
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/source Modified Files: shellverbs.c Log Message: Re-enabled filemenu.saveCopy kernel token for backwards-compatibility. Index: shellverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellverbs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shellverbs.c 5 Feb 2006 16:06:25 -0000 1.7 --- shellverbs.c 5 Feb 2006 17:11:04 -0000 1.8 *************** *** 96,101 **** savefunc, ! /* 2006-02-04 aradke: reenabled & renamed; don't change order of tokens! */ ! saveasfunc, //savecopyfunc, /* 2005-11-01 creedon */ revertfunc, --- 96,100 ---- savefunc, ! savecopyfunc, /* 2006-02-05 aradke: re-enabled, don't change order of tokens */ revertfunc, *************** *** 105,109 **** quitfunc, ! //saveasfunc, /* 2005-10-26 creedon */ /* 2006-02-04 aradke: moved upwards */ ctfilemenuverbs --- 104,108 ---- quitfunc, ! saveasfunc, /* 2005-10-26 creedon */ ctfilemenuverbs *************** *** 1262,1265 **** --- 1261,1269 ---- 2005-10-26 creedon: disabled savecopyfunc case, saveasfunc can do it all added saveasfunc case, it wasn't possible to do a save as for a file-object + + 2006-02-05 aradke: re-enabled savecopyfunc case to avoid breakage. + verb tokens that have previously been referenced from glue scripts + should never be disabled again, like fileMenu.saveCopy in this case. + also kept kernelverbs.r and kernelverbs.rc in sync. */ *************** *** 1293,1297 **** } ! /* case savecopyfunc: { tyfilespec fs; --- 1297,1301 ---- } ! case savecopyfunc: { /* 2006-02-05 aradke: re-enabled */ tyfilespec fs; *************** *** 1306,1310 **** break; ! } */ case revertfunc: --- 1310,1314 ---- break; ! } case revertfunc: *************** *** 1329,1333 **** break; ! case saveasfunc: { tyfilespec fs; --- 1333,1337 ---- break; ! case saveasfunc: { tyfilespec fs; |
|
From: Andre R. <and...@us...> - 2006-02-05 17:11:15
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/d/Win32 Modified Files: kernelverbs.rc Log Message: Re-enabled filemenu.saveCopy kernel token for backwards-compatibility. Index: kernelverbs.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernelverbs.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kernelverbs.rc 1 Nov 2005 19:12:07 -0000 1.2 --- kernelverbs.rc 5 Feb 2006 17:11:04 -0000 1.3 *************** *** 746,750 **** "filemenu\0", //Function Processor Name true, //Window required ! 9, //Count of verbs "new\0", "open\0", --- 746,750 ---- "filemenu\0", //Function Processor Name true, //Window required ! 10, //Count of verbs "new\0", "open\0", *************** *** 752,756 **** "closeall\0", "save\0", ! // "savecopy\0", /* 2005-11-01 creedon */ "revert\0", "print\0", --- 752,756 ---- "closeall\0", "save\0", ! "savecopy\0", /* 2006-02-05 aradke: re-enabled, don't change order of tokens */ "revert\0", "print\0", |
|
From: Andre R. <and...@us...> - 2006-02-05 17:11:12
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/d/Mac Modified Files: kernelverbs.r Log Message: Re-enabled filemenu.saveCopy kernel token for backwards-compatibility. Index: kernelverbs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernelverbs.r,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kernelverbs.r 1 Nov 2005 19:11:52 -0000 1.2 --- kernelverbs.r 5 Feb 2006 17:11:03 -0000 1.3 *************** *** 787,791 **** "closeall", "save", ! // "savecopy", /* 2005-11-01 creedon */ "revert", "print", --- 787,791 ---- "closeall", "save", ! "savecopy", /* 2006-02-05 aradke: re-enabled, don't change order of tokens */ "revert", "print", |
|
From: Andre R. <and...@us...> - 2006-02-05 16:53:28
|
Update of /cvsroot/frontierkernel/Frontier/Common/stubs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16513 Modified Files: megastubs.c Log Message: Update message box title for OPML Editor. Index: megastubs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/stubs/megastubs.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** megastubs.c 11 Jan 2005 22:48:12 -0000 1.5 --- megastubs.c 5 Feb 2006 16:53:19 -0000 1.6 *************** *** 691,695 **** --- 691,699 ---- #ifdef PIKE /*7.0d8 PBS*/ + #ifndef OPMLEDITOR static char frontierstring [] = "Radio UserLand"; + #else //OPMLEDITOR + static char frontierstring [] = "OPML"; + #endif // OPMLEDITOR #else static char frontierstring [] = "UserLand Frontier"; |
|
From: Andre R. <and...@us...> - 2006-02-05 16:52:06
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15978 Modified Files: about.c Log Message: Import target-specific string definitions from versions.h. Index: about.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/about.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** about.c 12 Jan 2005 11:34:26 -0000 1.6 --- about.c 5 Feb 2006 16:51:58 -0000 1.7 *************** *** 166,184 **** static byte * aboutstrings [] = { ! //#ifdef PIKE ! // "\x2b" "The power of Web publishing on your desktop", /*7.0b1 PBS*/ ! //#else ! // "\x2e" "Powerful cross-platform web content management", /*6.1 AR*/ ! //#endif ! ! "\x25" "Powerful cross-platform web scripting", /*2005-01-12 aradke: re-enabled*/ ! "\x23" "© 1992-" copyright_year_string " UserLand Software, Inc.", ! ! #ifdef PIKE ! "\x26" "http://frontierkernel.sourceforge.net/", /*2005-01-12 aradke*/ ! #else ! "\x26" "http://frontierkernel.sourceforge.net/", /*2005-01-12 aradke*/ ! #endif "\x02" "^0", --- 166,174 ---- static byte * aboutstrings [] = { ! app_slogan, /* 2006-02-04 aradke: see versions.h */ ! app_copyright, /* 2006-02-04 aradke: see versions.h */ ! ! app_url, /* 2006-02-04 aradke: see versions.h */ "\x02" "^0", *************** *** 201,213 **** "\x0f" "Current Time: ", ! #ifdef PIKE ! "\x05" "Radio", /*2005-01-12 aradke*/ ! ! "\x0b" "About Radio", /*2005-01-12 aradke*/ ! #else ! "\x08" "Frontier", /*2005-01-12 aradke*/ ! ! "\x0e" "About Frontier", ! #endif "\x02" "^0", --- 191,195 ---- "\x0f" "Current Time: ", ! app_name, /* 2006-02-04 aradke: see versions.h */ "\x02" "^0", *************** *** 239,244 **** frontieritem, - titleitem, - versionitem }; --- 221,224 ---- *************** *** 1622,1626 **** // getstringlist (aboutlistnumber, abouttitlestring, bstitle); ! copystring (aboutstrings [flbootsplash? frontieritem: titleitem], bstitle); if (!newchildwindow (idaboutconfig, nil, &rwindow, &rzoom, bstitle, &w)) { --- 1602,1609 ---- // getstringlist (aboutlistnumber, abouttitlestring, bstitle); ! copystring (aboutstrings [frontieritem], bstitle); ! ! if (!flbootsplash) ! insertstring ("\x06" "About ", bstitle); /* 2006-02-04 aradke: eliminated titleitem */ if (!newchildwindow (idaboutconfig, nil, &rwindow, &rzoom, bstitle, &w)) { |
|
From: Andre R. <and...@us...> - 2006-02-05 16:45:18
|
Update of /cvsroot/frontierkernel/Frontier/resources/OPML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13804 Added Files: OPML.icns OPML_bkup.icns OPMLdoc.icns Log Message: New icons for OPML Editor, copyright by Frank Jonen. --- NEW FILE: OPML_bkup.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OPML.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OPMLdoc.icns --- (This appears to be a binary file; contents omitted.) |
|
From: Andre R. <and...@us...> - 2006-02-05 16:43:28
|
Update of /cvsroot/frontierkernel/Frontier/resources/OPML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13256/OPML Log Message: Directory /cvsroot/frontierkernel/Frontier/resources/OPML added to the repository |
|
From: Andre R. <and...@us...> - 2006-02-05 16:42:43
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12898 Added Files: OPMLapp.bmp OPMLapp.ico OPMLdoc.ico Log Message: New icons for OPML Editor, copyright by Frank Jonen. --- NEW FILE: OPMLdoc.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OPMLapp.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OPMLapp.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: Andre R. <and...@us...> - 2006-02-05 16:22:51
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6053 Modified Files: versions.h Log Message: Include version info for OPML Editor. Move some string constants from about.c to this file. Index: versions.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/versions.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** versions.h 7 Oct 2005 04:07:37 -0000 1.12 --- versions.h 5 Feb 2006 16:22:43 -0000 1.13 *************** *** 45,49 **** #define radio_stage_code 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */ ! #define radio_revision_level 5 /* for non-final releases only */ #define radio_build_number 5 /* increment by one for every release, final or not */ --- 45,49 ---- #define radio_stage_code 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */ ! #define radio_revision_level 5 /* for non-final releases only */ #define radio_build_number 5 /* increment by one for every release, final or not */ *************** *** 56,62 **** #define frontier_major_version_bcd 0x10 /* major version in BCD notation */ ! #define frontier_sub_version 1 #define frontier_minor_version 0 ! #define frontier_subminor_version_bcd 0x10 /* sub and minor version in BCD notation */ #define frontier_stage_code 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */ --- 56,62 ---- #define frontier_major_version_bcd 0x10 /* major version in BCD notation */ ! #define frontier_sub_version 1 #define frontier_minor_version 0 ! #define frontier_subminor_version_bcd 0x10 /* sub and minor version in BCD notation */ #define frontier_stage_code 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */ *************** *** 67,90 **** /* strings for all apps */ ! #define copyright_year_string "2005" /* Define app name and related strings */ #ifdef PIKE ! #define APPNAME "Radio UserLand" ! #define APPNAME_SHORT "Radio" #else ! #define APPNAME "Frontier" ! #define APPNAME_SHORT "Frontier" #endif /* app name for display -- ends with the trademark character */ ! #ifdef MACVERSION ! #define APPNAME_TM APPNAME /* 2005-01-12 aradke: app names no longer include trademark character - "\xAA" */ ! #endif ! #ifdef WIN95VERSION ! #define APPNAME_TM APPNAME /* 2005-01-12 aradke: app names no longer include trademark character - "\x99" */ ! #endif --- 67,127 ---- + /* OPML Editor version information */ + + #define opml_major_version 10 + #define opml_major_version_bcd 0x10 /* major version in BCD notation */ + + #define opml_sub_version 1 + #define opml_minor_version 0 + #define opml_subminor_version_bcd 0x10 /* sub and minor version in BCD notation */ + + #define opml_stage_code 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */ + #define opml_revision_level 5 /* for non-final releases only */ + #define opml_build_number 5 /* increment by one for every release, final or not */ + + #define opml_version_string "10.1a5" + + /* strings for all apps */ ! #define copyright_year_string "2006" /* Define app name and related strings */ #ifdef PIKE ! #ifndef OPMLEDITOR ! #define APPNAME "Radio" ! #else ! #define APPNAME "OPML" ! #endif #else ! #define APPNAME "Frontier" #endif + #define APPNAME_SHORT APPNAME /* 2006-02-04 aradke */ + /* app name for display -- ends with the trademark character */ ! /* 2005-01-12 aradke: app names no longer include trademark character */ ! #define APPNAME_TM APPNAME ! + /* 2006-02-04 aradke: Product slogan and url as shown in about window */ + + #ifdef PIKE + #ifndef OPMLEDITOR + #define app_name "\x05" "Radio" + #define app_slogan "\x2b" "The power of Web publishing on your desktop" + #define app_copyright "\x23" "© 1992-" copyright_year_string " UserLand Software, Inc." + #define app_url "\x26" "http://frontierkernel.sourceforge.net/" + #else + #define app_name "\x04" "OPML" + #define app_slogan "\x25" "Powerful OPML editing on your desktop" + #define app_copyright "\x20" "© 1992-" copyright_year_string " Scripting News, Inc." + #define app_url "\x18" "http://support.opml.org/" + #endif + #else + #define app_name "\x08" "Frontier" + #define app_slogan "\x25" "Powerful cross-platform web scripting" + #define app_copyright "\x23" "© 2004-" copyright_year_string " Frontier Kernel Project" + #define app_url "\x26" "http://frontierkernel.sourceforge.net/" + #endif |
|
From: Andre R. <and...@us...> - 2006-02-05 16:21:25
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5519 Modified Files: shellprivate.h Log Message: Double size of globals stack, required for OPML Editor. Index: shellprivate.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellprivate.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shellprivate.h 11 Jan 2005 22:48:02 -0000 1.3 --- shellprivate.h 5 Feb 2006 16:21:16 -0000 1.4 *************** *** 42,46 **** ! #define ctglobals 16 /*we can remember globals up to ctglobals levels deep*/ --- 42,46 ---- ! #define ctglobals 32 /*we can remember globals up to ctglobals levels deep*/ |
|
From: Andre R. <and...@us...> - 2006-02-05 16:20:20
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5046 Modified Files: frontierdefs.h Log Message: For the OPML Editor only, enable display of HTML in main window background on Windows. Index: frontierdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** frontierdefs.h 11 Jan 2005 22:48:01 -0000 1.7 --- frontierdefs.h 5 Feb 2006 16:20:08 -0000 1.8 *************** *** 37,41 **** --- 37,45 ---- #define PACKFLIPPED /* enable little endian / big endian conversion for database file functions */ #define FRONTIERCOM 1 + #ifndef OPMLEDITOR #define FRONTIERWEB 0 + #else //OPMLEDITOR + #define FRONTIERWEB 1 /* 2006-02-05 aradke: enable HTML display in main window background */ + #endif // OPMLEDITOR #undef winhybrid #define fljustpacking 0 |
|
From: Andre R. <and...@us...> - 2006-02-05 16:18:47
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4701/resources/Win32 Modified Files: WinLand.rc Log Message: Update menu structure and various other resources for OPML Editor. This should not affect the other build targets. Index: WinLand.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** WinLand.rc 29 Jan 2006 19:10:24 -0000 1.12 --- WinLand.rc 5 Feb 2006 16:18:38 -0000 1.13 *************** *** 72,78 **** #ifdef PIKE /*7.0d8 PBS: new icon for Radio UserLand*/ ! //IDB_FRONTIER_BITMAP BITMAP DISCARDABLE appIcon24.bmp IDB_FRONTIER_BITMAP BITMAP DISCARDABLE radiobluedot.bmp #else //IDB_FRONTIER_BITMAP BITMAP DISCARDABLE frontier.bmp IDB_FRONTIER_BITMAP BITMAP DISCARDABLE FrontierCactus.bmp --- 72,81 ---- #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 *************** *** 136,142 **** --- 139,150 ---- #ifdef PIKE + #ifndef OPMLEDITOR // ID_FRONTIER_ICON ICON DISCARDABLE radio.ico ID_FRONTIER_ICON ICON DISCARDABLE radiobluedot.ico ID_FRONTIERTRAY_ICON ICON DISCARDABLE RadioTrayIcon.ico + #else // OPMLEDITOR + ID_FRONTIER_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/ + ID_FRONTIERTRAY_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/ + #endif // OPMLEDITOR #else // ID_FRONTIER_ICON ICON DISCARDABLE Frontier.ico *************** *** 174,178 **** --- 182,190 ---- #ifdef PIKE + #ifndef OPMLEDITOR ID_OPML_ICON ICON DISCARDABLE radioDoc.ico /*7.0b24 PBS*/ + #else + ID_OPML_ICON ICON DISCARDABLE OPMLdoc.ico /*2006-02-05 aradke*/ + #endif #endif *************** *** 212,227 **** --- 224,248 ---- 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 + MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/ MENUITEM SEPARATOR *************** *** 280,284 **** --- 301,307 ---- MENUITEM "&Size", sizemenu MENUITEM SEPARATOR + #ifndef OPMLEDITOR MENUITEM "Open Notepad\tCtrl+Y", opennotepaditem + #endif // OPMLEDITOR MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem END *************** *** 333,338 **** --- 356,365 ---- BEGIN #ifdef PIKE + #ifndef OPMLEDITOR MENUITEM "Radio Website", helpmenu+1 /*7.0d8 PBS: name change*/ #else + MENUITEM "OPML Editor Website", helpmenu+1 /*7.0d8 PBS: name change*/ + #endif // OPMLEDITOR + #else MENUITEM "About Frontier", helpmenu+1 #endif *************** *** 448,452 **** END - #ifdef MACVERSION openrecentmenu MENU DISCARDABLE /* 2005-09-25 creedon */ BEGIN --- 475,478 ---- *************** *** 454,461 **** BEGIN MENUITEM SEPARATOR ! MENUITEM "Clear Menu", openrecentmenu+2 END END ! #endif ///////////////////////////////////////////////////////////////////////////// --- 480,487 ---- BEGIN MENUITEM SEPARATOR ! MENUITEM "Clear Menu", openrecentmenu+clearrecentmenuitem END END ! ///////////////////////////////////////////////////////////////////////////// *************** *** 814,820 **** --- 840,851 ---- VS_VERSION_INFO VERSIONINFO #ifdef PIKE + #ifndef OPMLEDITOR FILEVERSION radio_major_version,radio_sub_version,radio_minor_version,radio_build_number PRODUCTVERSION radio_major_version,radio_sub_version,radio_minor_version,radio_build_number #else + FILEVERSION opml_major_version,opml_sub_version,opml_minor_version,opml_build_number + PRODUCTVERSION opml_major_version,opml_sub_version,opml_minor_version,opml_build_number + #endif + #else FILEVERSION frontier_major_version,frontier_sub_version,frontier_minor_version,frontier_build_number PRODUCTVERSION frontier_major_version,frontier_sub_version,frontier_minor_version,frontier_build_number *************** *** 834,840 **** --- 865,879 ---- BLOCK "040904e4" BEGIN + #ifndef OPMLEDITOR VALUE "CompanyName", "UserLand Software, Inc.\0" + #else // OPMLEDITOR + VALUE "CompanyName", "Scripting News, Inc.\0" + #endif // OPMLEDITOR #ifdef PIKE + #ifndef OPMLEDITOR VALUE "FileDescription", "Radio UserLand\0" /*7.0d8 PBS: name change*/ + #else // OPMLEDITOR + VALUE "FileDescription", "OPML\0" /*2005-04-06 dluebbert: name change*/ + #endif // OPMLEDITOR #else VALUE "FileDescription", "UserLand Frontier\0" *************** *** 842,846 **** --- 881,889 ---- #ifdef fltrialsize #ifdef PIKE + #ifndef OPMLEDITOR VALUE "FileVersion", "Trial " radio_version_string "\0" + #else + VALUE "FileVersion", "Trial " opml_version_string "\0" + #endif #else VALUE "FileVersion", "Trial " frontier_version_string "\0" *************** *** 848,852 **** --- 891,899 ---- #else #ifdef PIKE + #ifndef OPMLEDITOR VALUE "FileVersion", radio_version_string "\0" + #else + VALUE "FileVersion", opml_version_string "\0" + #endif #else VALUE "FileVersion", frontier_version_string "\0" *************** *** 854,886 **** #endif #ifdef PIKE VALUE "InternalName", "Radio\0" /*7.0d8 PBS: name change*/ #else VALUE "InternalName", "Frontier\0" #endif // VALUE "Language", "English (United States)\0" - VALUE "LegalCopyright", "© 1992-2002 UserLand Software, Inc.\0" #ifdef PIKE /*7.0d8 PBS: name change*/ ! VALUE "LegalTrademarks", "\042UserLand\042 and \042Radio\042 are the trademarks of UserLand Software, Inc.\0" VALUE "OriginalFilename", "Radio.exe\0" VALUE "ProductName", "Radio UserLand\0" ! #else VALUE "LegalTrademarks", "\042UserLand\042 and \042Frontier\042 are the trademarks of UserLand Software, Inc.\0" VALUE "OriginalFilename", "Frontier.exe\0" VALUE "ProductName", "Frontier\0" - #endif VALUE "Full Copyright", "© Copyright UserLand Software, Inc. All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0" ! #ifdef PIKE ! #ifdef fltrialsize VALUE "ProductVersion", "Trial " radio_version_string "\0" #else ! VALUE "ProductVersion", radio_version_string "\0" ! #endif ! #else ! #ifdef fltrialsize VALUE "ProductVersion", "Trial " frontier_version_string "\0" ! #else VALUE "ProductVersion", frontier_version_string "\0" ! #endif ! #endif //PIKE END END --- 901,955 ---- #endif #ifdef PIKE + #ifndef OPMLEDITOR VALUE "InternalName", "Radio\0" /*7.0d8 PBS: name change*/ + #else // OPMLEDITOR + VALUE "InternalName", "OPML\0" /*2005-04-06 dluebbert: name change*/ + #endif // OPMLEDITOR #else VALUE "InternalName", "Frontier\0" #endif // VALUE "Language", "English (United States)\0" #ifdef PIKE /*7.0d8 PBS: name change*/ ! #ifndef OPMLEDITOR ! VALUE "LegalCopyright", "© 1992-2002 UserLand Software, Inc.\0" ! VALUE "LegalTrademarks", "\042Userland\042 and \042Radio\042 is the trademarks of UserLand Software, Inc.\0" VALUE "OriginalFilename", "Radio.exe\0" VALUE "ProductName", "Radio UserLand\0" ! VALUE "Full Copyright", "© Copyright UserLand Software, Inc. All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0" ! #else // OPMLEDITOR ! VALUE "LegalCopyright", "© 1992-2006 Scripting News, Inc.\0" ! VALUE "LegalTrademarks", "\042OPML\042 is a trademarks of Scripting News, Inc.\0" ! VALUE "OriginalFilename", "opml.exe\0" ! VALUE "ProductName", "OPML\0" ! VALUE "Full Copyright", "© Copyright Scripting News, Inc. All rights reserved. Permission and Use is Granted Subject to the GNU General Public License.\0" ! #endif // OPMLEDITOR ! #else // !PIKE ! VALUE "LegalCopyright", "© 1992-2002 UserLand Software, Inc.\0" VALUE "LegalTrademarks", "\042UserLand\042 and \042Frontier\042 are the trademarks of UserLand Software, Inc.\0" VALUE "OriginalFilename", "Frontier.exe\0" VALUE "ProductName", "Frontier\0" VALUE "Full Copyright", "© Copyright UserLand Software, Inc. All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0" ! #endif // !PIKE ! #ifdef fltrialsize ! #ifdef PIKE ! #ifndef OPMLEDITOR VALUE "ProductVersion", "Trial " radio_version_string "\0" #else ! VALUE "ProductVersion", "Trial " opml_version_string "\0" ! #endif ! #else VALUE "ProductVersion", "Trial " frontier_version_string "\0" ! #endif ! #else ! #ifdef PIKE ! #ifndef OPMLEDITOR ! VALUE "ProductVersion", radio_version_string "\0" ! #else ! VALUE "ProductVersion", opml_version_string "\0" ! #endif ! #else VALUE "ProductVersion", frontier_version_string "\0" ! #endif ! #endif END END *************** *** 913,917 **** #ifdef PIKE ! STRINGTABLE DISCARDABLE BEGIN --- 982,986 ---- #ifdef PIKE ! #ifndef OPMLEDITOR STRINGTABLE DISCARDABLE BEGIN *************** *** 922,927 **** IDS_PRINTERROR "Cannot print %s!" END ! ! #else STRINGTABLE DISCARDABLE --- 991,1005 ---- IDS_PRINTERROR "Cannot print %s!" END ! #else // OPMLEDITOR ! STRINGTABLE DISCARDABLE ! BEGIN ! IDS_CLIENTTITLE "OPML" //radio_version_string /*2005-04-06 dluebbert: name change*/ ! IDS_UNTITLED "Untitled" ! IDS_APPNAME "OPML" ! IDS_PRINTJOB "OPML - " ! IDS_PRINTERROR "Cannot print %s!" ! END ! #endif // OPMLEDITOR ! #else // !PIKE STRINGTABLE DISCARDABLE *************** *** 934,938 **** END ! #endif #endif // English (U.S.) resources --- 1012,1016 ---- END ! #endif //!PIKE #endif // English (U.S.) resources *************** *** 996,1000 **** --- 1074,1082 ---- #ifdef PIKE + #ifndef OPMLEDITOR 1 Defaults DISCARDABLE BEGIN "Radio UserLand®\0" END /*7.0d8 PBS*/ + #else //OPMLEDITOR + 1 Defaults DISCARDABLE BEGIN "OPML\0" END /*7.0d8 PBS*/ + #endif //OPMLEDITOR #else 1 Defaults DISCARDABLE BEGIN "UserLand Frontier®\0" END *************** *** 1004,1016 **** 4 Defaults DISCARDABLE BEGIN "Select a database file:\0" END #ifdef PIKE 6 Defaults DISCARDABLE BEGIN "Radio.root\0" END ! #else 6 Defaults DISCARDABLE BEGIN "Frontier.root\0" END ! #endif 7 Defaults DISCARDABLE BEGIN "Open a file:\0" END #ifdef PIKE 8 Defaults DISCARDABLE BEGIN radio_version_string "\0" END #else 8 Defaults DISCARDABLE BEGIN frontier_version_string "\0" END #endif //PIKE --- 1086,1106 ---- 4 Defaults DISCARDABLE BEGIN "Select a database file:\0" END #ifdef PIKE + #ifndef OPMLEDITOR 6 Defaults DISCARDABLE BEGIN "Radio.root\0" END ! #else // OPMLEDITOR ! 6 Defaults DISCARDABLE BEGIN "opml.root\0" END ! #endif // OPMLEDITOR ! #else // !PIKE 6 Defaults DISCARDABLE BEGIN "Frontier.root\0" END ! #endif //!PIKE 7 Defaults DISCARDABLE BEGIN "Open a file:\0" END #ifdef PIKE + #ifndef OPMLEDITOR 8 Defaults DISCARDABLE BEGIN radio_version_string "\0" END #else + 8 Defaults DISCARDABLE BEGIN opml_version_string "\0" END + #endif + #else 8 Defaults DISCARDABLE BEGIN frontier_version_string "\0" END #endif //PIKE *************** *** 1022,1026 **** --- 1112,1120 ---- 5 Interface DISCARDABLE BEGIN "Set Command Key \0" END 6 Interface DISCARDABLE BEGIN "Command Key:\0" END + #ifndef OPMLEDITOR 7 Interface DISCARDABLE BEGIN "Internal error#^0. Please report to UserLand Technical Support\0" END + #else + 7 Interface DISCARDABLE BEGIN "Internal error#^0. Please report to Scripting.com support\0" END + #endif //OPMLEDITOR 8 Interface DISCARDABLE BEGIN "; \0" END 9 Interface DISCARDABLE BEGIN "Cancel\0" END *************** *** 1035,1045 **** --- 1129,1150 ---- 18 Interface DISCARDABLE BEGIN "Save As...\0" END 19 Interface DISCARDABLE BEGIN "Save a Copy...\0" END + #ifndef OPMLEDITOR 20 Interface DISCARDABLE BEGIN "This database was created by an older version of Frontier and must be converted. Proceed?\0" END + #else //OPMLEDITOR + 20 Interface DISCARDABLE BEGIN "This database was created by an older version of OPML and must be converted. Proceed?\0" END + #endif //OPMLEDITOR 21 Interface DISCARDABLE BEGIN "Discard all changes made to \042^0\042?\0" END + #ifndef OPMLEDITOR 1 Trial DISCARDABLE BEGIN "This trial version of Frontier limits databases to 7 megabytes in size\0" END 2 Trial DISCARDABLE BEGIN "This is a trial version of Frontier and no more than three threads can be created\0" END 3 Trial DISCARDABLE BEGIN "The trial version of Frontier expired on ^0. For more information please visit http://www.userland.com/.\0" END 4 Trial DISCARDABLE BEGIN ". To purchase a license for the full version of Frontier, visit http://www.userland.com/.\0" END + #else // OPMLEDITOR + 1 Trial DISCARDABLE BEGIN "This trial version of OPML limits databases to 7 megabytes in size\0" END + 2 Trial DISCARDABLE BEGIN "This is a trial version of OPML and no more than three threads can be created\0" END + 3 Trial DISCARDABLE BEGIN "The trial version of OPML expired on ^0. For more information please visit http://opml.scripting.com/.\0" END + 4 Trial DISCARDABLE BEGIN ". To purchase a license for the full version of OPML, visit http://www.userland.com/.\0" END + #endif //OPMLEDITOR 1 Error_Info DISCARDABLE BEGIN "Go To\0" END *************** *** 1175,1179 **** --- 1280,1288 ---- #ifdef PIKE + #ifndef OPMLEDITOR 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Pike.\0" END + #else // OPMLEDITOR + 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of OPML.\0" END /*2005-04-06: dluebbert name change*/ + #endif // OPMLEDITOR #else 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Frontier.\0" END *************** *** 1184,1189 **** --- 1293,1303 ---- 5 alerts DISCARDABLE BEGIN "Can't paste this Clipboard type here.\0" END #ifdef PIKE + #ifndef OPMLEDITOR 6 alerts DISCARDABLE BEGIN "Not enough memory available to run Pike.\0" END 7 alerts DISCARDABLE BEGIN "Radio UserLand cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/ + #else // OPMLEDITOR + 6 alerts DISCARDABLE BEGIN "Not enough memory available to run OPML.\0" END + 7 alerts DISCARDABLE BEGIN "OPML cannot run on systems older than System 7.0.\0" END /*7.0d8 PBS*/ + #endif // OPMLEDITOR #else 6 alerts DISCARDABLE BEGIN "Not enough memory available to run Frontier.\0" END |
|
From: Andre R. <and...@us...> - 2006-02-05 16:18:45
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4701/resources/Mac Modified Files: SHELL.R Log Message: Update menu structure and various other resources for OPML Editor. This should not affect the other build targets. Index: SHELL.R =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/SHELL.R,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SHELL.R 31 Dec 2005 20:23:02 -0000 1.12 --- SHELL.R 5 Feb 2006 16:18:38 -0000 1.13 *************** *** 50,54 **** /*PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File menu now.*/ ! resource 'MENU' (2, "File") { 2, --- 50,54 ---- /*PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File menu now.*/ ! #ifndef OPMLEDITOR resource 'MENU' (2, "File") { 2, *************** *** 140,143 **** --- 140,224 ---- } }; + #else // OPMLEDITOR + + resource 'MENU' (2, "File") { + 2, + textMenuProc, + 0x7FFFFE77, + enabled, + "File", + { /* array: 9 elements */ + /* [1] */ + "New", noIcon, "N", noMark, plain, + /* [2] */ + "OpenÉ", noIcon, "O", noMark, plain, + /* [3] */ + "Open URLÉ", 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É", 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É", noIcon, noKey, noMark, plain, + /* [13] */ + "Work Offline", noIcon, noKey, noMark, plain, + /* [14] */ + "-", noIcon, noKey, noMark, plain, + /* [15] */ + "Quit", noIcon, "Q", 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É", noIcon, "O", noMark, plain, + /* [3] */ + "Open URLÉ", 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É", 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É", noIcon, noKey, noMark, plain, + /* [13] */ + "Work Offline", noIcon, noKey, noMark, plain + } + }; + #endif // OPMLEDITOR #else *************** *** 234,239 **** #endif ! #ifdef PIKE resource 'MENU' (3, "Edit") { 3, --- 315,321 ---- #endif ! #ifdef PIKE /*7.0b26 PBS: Radio UserLand has a different Edit menu.*/ + #ifndef OPMLEDITOR resource 'MENU' (3, "Edit") { 3, *************** *** 279,282 **** --- 361,409 ---- } }; + #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 //OPMLEDITOR #else *************** *** 494,498 **** { /* array: 4 elements */ /* [1] */ ! "Find...", noIcon, "F", noMark, plain, /* [2] */ "Replace", noIcon, noKey, noMark, plain, --- 621,625 ---- { /* array: 4 elements */ /* [1] */ ! "FindÉ", noIcon, "F", noMark, plain, /* [2] */ "Replace", noIcon, noKey, noMark, plain, *************** *** 635,640 **** --- 762,771 ---- { /* array StringArray: 6 elements */ #ifdef PIKE + #ifndef OPMLEDITOR /* [1] */ "Radio UserLandª", /*PBS 7.0b1: name change to Radio UserLand.*/ + #else // OPMLEDITOR + "OPML", + #endif //OPMLEDITOR #else /* [1] */ *************** *** 650,655 **** --- 781,790 ---- "", #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] */ *************** *** 2527,2534 **** #ifdef PIKE ! type 'PIKE' as 'STR '; resource 'PIKE' (0, "Owner resource") #else --- 2662,2674 ---- #ifdef PIKE ! #ifndef OPMLEDITOR type 'PIKE' as 'STR '; resource 'PIKE' (0, "Owner resource") + #else //OPMLEDITOR + type 'OPML' as 'STR '; + + resource 'OPML' (0, "Owner resource") + #endif // OPMLEDITOR #else *************** *** 2546,2549 **** --- 2686,2690 ---- resource 'vers' (1) { #ifdef PIKE + #ifndef OPMLEDITOR radio_major_version_bcd, radio_subminor_version_bcd, *************** *** 2553,2556 **** --- 2694,2705 ---- radio_version_string, #else + opml_major_version_bcd, + opml_subminor_version_bcd, + opml_stage_code, + opml_revision_level, + verUS, + opml_version_string, + #endif + #else frontier_major_version_bcd, frontier_subminor_version_bcd, *************** *** 2564,2568 **** --- 2713,2721 ---- #endif #ifdef PIKE + #ifndef OPMLEDITOR radio_version_string "; © 1992-" copyright_year_string ", UserLand Software, Inc." + #else //OPMLEDITOR + opml_version_string "; © 1992-" copyright_year_string ", Scripting News, Inc." + #endif // OPMLEDITOR #else frontier_version_string "; © 1992-" copyright_year_string ", UserLand Software, Inc." |
|
From: Andre R. <and...@us...> - 2006-02-05 16:18:45
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4701/d Modified Files: shellmenu.h Log Message: Update menu structure and various other resources for OPML Editor. This should not affect the other build targets. Index: shellmenu.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellmenu.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shellmenu.h 1 Oct 2005 17:34:27 -0000 1.4 --- shellmenu.h 5 Feb 2006 16:18:38 -0000 1.5 *************** *** 78,84 **** #define justifymenu 3500 #define findandreplacemenu 3600 ! #define virtualmenu 3900 #define commonstylesmenu 3700 /*7.0b26 PBS*/ #define newobjectmenu 3800 #endif --- 78,85 ---- #define justifymenu 3500 #define findandreplacemenu 3600 ! #define virtualmenu 4000 #define commonstylesmenu 3700 /*7.0b26 PBS*/ #define newobjectmenu 3800 + #define openrecentmenu 3900 /* 2006-02-05 aradke */ #endif *************** *** 87,91 **** #ifdef PIKE ! // #define filemenu (applemenu + mainmenuincrement) --- 88,92 ---- #ifdef PIKE ! #ifndef OPMLEDITOR // #define filemenu (applemenu + mainmenuincrement) *************** *** 111,114 **** --- 112,132 ---- #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 *************** *** 148,153 **** --- 166,175 ---- #define fontitem 13 #define sizeitem 14 + #ifndef OPMLEDITOR #define opennotepaditem 16 #define insertdatetimeitem 17 + #else // OPMLEDITOR + #define insertdatetimeitem 16 + #endif //OPMLEDITOR #define styleitem -1 *************** *** 247,251 **** #ifdef WIN95VERSION #define lastmainmenu helpmenu ! #define lasthiermenu newobjectmenu #endif --- 269,273 ---- #ifdef WIN95VERSION #define lastmainmenu helpmenu ! #define lasthiermenu openrecentmenu #endif |
|
From: Andre R. <and...@us...> - 2006-02-05 16:12:13
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2333 Modified Files: shellmenu.c Log Message: Integrated changes in menu structure for OPML Editor. This should not affect the other targets. Index: shellmenu.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shellmenu.c 31 Dec 2005 20:20:47 -0000 1.8 --- shellmenu.c 5 Feb 2006 16:12:02 -0000 1.9 *************** *** 907,911 **** return; ! pikegetfilemenuitemidentifier (ixmenu, bsitem); /*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/ --- 907,911 ---- return; ! getfilemenuitemidentifier (ixmenu, bsitem); /*copystring ("\x20" "pike.isFileMenuItemChecked(\"^0\")", bsscript);*/ *************** *** 939,943 **** return; ! pikegetfilemenuitemidentifier (ixmenu, bsitem); /*copystring ("\x20""pike.isFileMenuItemEnabled(\"^0\")", bsscript);*/ --- 939,943 ---- return; ! getfilemenuitemidentifier (ixmenu, bsitem); /*copystring ("\x20""pike.isFileMenuItemEnabled(\"^0\")", bsscript);*/ *************** *** 969,973 **** return; ! pikegetfilemenuitemidentifier (ixmenu, bsitem); copystring ("\x1e""pike.getFileMenuItemName(\"^0\")", bsscript); --- 969,973 ---- return; ! getfilemenuitemidentifier (ixmenu, bsitem); copystring ("\x1e""pike.getFileMenuItemName(\"^0\")", bsscript); *************** *** 999,1005 **** return (true); ! pikegetfilemenuitemidentifier (quititem, bsitem); ! getsystemtablescript (idpikerunfilemenuscript, bsscript); /*7.1b4: get from resource.*/ /*copystring ("\x1c""pike.runFileMenuScript(\"^0\")", bsscript);*/ --- 999,1005 ---- return (true); ! getfilemenuitemidentifier (quititem, bsitem); ! getsystemtablescript (idrunfilemenuscript, bsscript); /*7.1b4: get from resource.*/ /*copystring ("\x1c""pike.runFileMenuScript(\"^0\")", bsscript);*/ *************** *** 1135,1140 **** pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/ pikesetfilemenuitemenable (openmanilasiteitem); /*7.0b27 PBS: enable/disable Open Manila Site item.*/ ! pikesetfilemenuitemenable (closeitem); --- 1135,1141 ---- pikesetfilemenuitemenable (openurlitem); /*7.0b17 PBS: enable/disable Open URL... menu item.*/ + #ifndef OPMLEDITOR pikesetfilemenuitemenable (openmanilasiteitem); /*7.0b27 PBS: enable/disable Open Manila Site item.*/ ! #endif // OPMLEDITOR pikesetfilemenuitemenable (closeitem); *************** *** 1143,1149 **** --- 1144,1152 ---- pikesetfilemenuitemenable (saveasitem); + #ifndef OPMLEDITOR pikesetfilemenuitemenable (saveashtmlitem); /*7.0b32 PBS: Save As HTML*/ pikesetfilemenuitemenable (saveasplaintextitem); /*7.0b32 PBS: Save As Plain Text*/ + #endif // OPMLEDITOR pikesetfilemenuitemenable (revertitem); *************** *** 1163,1167 **** --- 1166,1172 ---- enablemenuitem (hmenu, openitem); + #ifndef OPMLEDITOR enablemenuitem (hmenu, openrecentitem); + #endif // OPMLEDITOR setmenuitemenable (hmenu, closeitem, flwindow); *************** *** 1228,1237 **** setmenuitemenable (hmenu, selectallitem, flwindow); - setmenuitemenable (hmenu, insertdatetimeitem, flwindow); - #ifdef PIKE ! setmenuitemenable (hmenu, opennotepaditem, true); /*7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.*/ ! #endif --- 1233,1240 ---- setmenuitemenable (hmenu, selectallitem, flwindow); #ifdef PIKE ! #ifndef OPMLEDITOR setmenuitemenable (hmenu, opennotepaditem, true); /*7.0b27 PBS: enable/disable Open Notepad, Insert Date/Time.*/ ! #endif // !OPMLEDITOR #endif *************** *** 2135,2147 **** copystring ("\x03""new", bsitem); break; ! case openurlitem: /*7.0b17 PBS*/ copystring ("\x07""openurl", bsitem); break; case openmanilasiteitem: /*7.0b27 PBS*/ copystring ("\x0e""openmanilasite", bsitem); break; ! case saveashtmlitem: copystring ("\x0a""saveashtml", bsitem); --- 2138,2152 ---- copystring ("\x03""new", bsitem); break; ! case openurlitem: /*7.0b17 PBS*/ copystring ("\x07""openurl", bsitem); break; + + #ifndef OPMLEDITOR case openmanilasiteitem: /*7.0b27 PBS*/ copystring ("\x0e""openmanilasite", bsitem); break; ! case saveashtmlitem: copystring ("\x0a""saveashtml", bsitem); *************** *** 2151,2154 **** --- 2156,2161 ---- copystring ("\x0f""saveasplaintext", bsitem); break; + + #endif //!OPMLEDITOR case viewinbrowseritem: *************** *** 2164,2168 **** break; ! #endif default: --- 2171,2175 ---- break; ! #endif //PIKE default: *************** *** 2298,2305 **** #ifdef PIKE case opennotepaditem: copystring ("\x0b""opennotepad", bsitem); break; ! #endif case insertdatetimeitem: copystring ("\x0e""insertdatetime", bsitem); --- 2305,2317 ---- #ifdef PIKE + #ifndef OPMLEDITOR + case opennotepaditem: copystring ("\x0b""opennotepad", bsitem); break; ! ! #endif // !OPMLEDITOR ! #endif // PIKE ! case insertdatetimeitem: copystring ("\x0e""insertdatetime", bsitem); |
|
From: Andre R. <and...@us...> - 2006-02-05 16:08:31
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv877 Modified Files: oppack.c Log Message: Made sure winplatform is defined as a proper string4. Index: oppack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppack.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** oppack.c 22 Jan 2005 18:35:56 -0000 1.5 --- oppack.c 5 Feb 2006 16:08:24 -0000 1.6 *************** *** 71,75 **** #define macplatform 'mac ' ! #define winplatform 'win' #ifdef MACVERSION --- 71,75 ---- #define macplatform 'mac ' ! #define winplatform 'win ' #ifdef MACVERSION |
|
From: Andre R. <and...@us...> - 2006-02-05 16:06:33
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv310 Modified Files: shellverbs.c Log Message: Re-established the previous order of tyfilemenutoken. Index: shellverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellverbs.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shellverbs.c 1 Nov 2005 19:11:57 -0000 1.6 --- shellverbs.c 5 Feb 2006 16:06:25 -0000 1.7 *************** *** 96,100 **** savefunc, ! // savecopyfunc, /* 2005-11-01 creedon */ revertfunc, --- 96,101 ---- savefunc, ! /* 2006-02-04 aradke: reenabled & renamed; don't change order of tokens! */ ! saveasfunc, //savecopyfunc, /* 2005-11-01 creedon */ revertfunc, *************** *** 104,108 **** quitfunc, ! saveasfunc, /* 2005-10-26 creedon */ ctfilemenuverbs --- 105,109 ---- quitfunc, ! //saveasfunc, /* 2005-10-26 creedon */ /* 2006-02-04 aradke: moved upwards */ ctfilemenuverbs |
|
From: Andre R. <and...@us...> - 2006-02-05 16:05:11
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32321 Modified Files: shellmouse.c Log Message: Don't call shellupdateopenrecentmenu in the OPML Editor since it doesn't have the Open Recent sub-menu of the File menu. Index: shellmouse.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmouse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shellmouse.c 20 Dec 2005 22:33:02 -0000 1.6 --- shellmouse.c 5 Feb 2006 16:05:04 -0000 1.7 *************** *** 406,412 **** case inMenuBar: #if TARGET_API_MAC_CARBON == 1 ! shellupdateopenrecentmenu (); /* 2005-09-25 creedon */ ! #endif --- 406,412 ---- case inMenuBar: #if TARGET_API_MAC_CARBON == 1 ! #ifndef OPMLEDITOR shellupdateopenrecentmenu (); /* 2005-09-25 creedon */ ! #endif #endif |
|
From: Andre R. <and...@us...> - 2006-02-05 16:00:39
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30459 Modified Files: scripts.c Log Message: Forward-declare scriptdebuggereventloop at top of file to fix compiler warning. Index: scripts.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** scripts.c 11 Jan 2005 22:48:10 -0000 1.4 --- scripts.c 5 Feb 2006 16:00:31 -0000 1.5 *************** *** 68,71 **** --- 68,73 ---- #include "error.h" + static boolean scriptdebuggereventloop (void); + #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ #include "aeutils.h" *************** *** 1162,1166 **** bigstring bstrap; boolean fl; ! static boolean scriptdebuggereventloop (void); //forward hdlhashnode hhashnode; #define str_userdebugprefs ("\x10" "user.prefs.debug") --- 1164,1168 ---- bigstring bstrap; boolean fl; ! //static boolean scriptdebuggereventloop (void); /* 2006-02-04 aradke: declare at top of file */ hdlhashnode hhashnode; #define str_userdebugprefs ("\x10" "user.prefs.debug") |
|
From: Andre R. <and...@us...> - 2006-02-05 15:59:05
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29976 Modified Files: langstartup.c Log Message: Added isFrontier and isOpmlEditor flags to system.environment table. Index: langstartup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langstartup.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** langstartup.c 11 Jan 2005 22:48:07 -0000 1.6 --- langstartup.c 5 Feb 2006 15:58:57 -0000 1.7 *************** *** 48,51 **** --- 48,53 ---- #define str_isPike "\x06" "isPike" + #define str_isOpmlEditor "\x0c" "isOpmlEditor" /* 2005-04-06 dluebbert */ + #define str_isFrontier "\x0a" "isFrontier" /* 2005-04-06 dluebbert */ #define str_isRadio "\x07" "isRadio" #define str_isMac "\x05" "isMac" *************** *** 388,400 **** #ifdef PIKE langassignbooleanvalue (ht, str_isPike, true); langassignbooleanvalue (ht, str_isRadio, true); /*7.0b37 PBS: system.environment.isRadio*/ ! #else langassignbooleanvalue (ht, str_isPike, false); langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/ ! #endif return (true); --- 390,414 ---- #ifdef PIKE + #ifndef 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*/ + #else // OPMLEDITOR + 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*/ + #endif // OPMLEDITOR ! #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*/ ! #endif //!PIKE return (true); |
|
From: Andre R. <and...@us...> - 2006-02-05 15:57:50
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29544 Modified Files: langhtml.c Log Message: Update HTTP Server header for OPML Editor. Index: langhtml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhtml.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** langhtml.c 19 Dec 2005 01:56:43 -0000 1.8 --- langhtml.c 5 Feb 2006 15:57:42 -0000 1.9 *************** *** 143,146 **** --- 143,148 ---- #ifdef PIKE /*7.0 PBS: server string is Radio UserLand*/ + #ifndef OPMLEDITOR + #if TARGET_API_MAC_CARBON == 1 #define STR_P_SERVERSTRING "\x15" "Radio UserLand/^0-^1X" *************** *** 149,153 **** #endif ! #else #if TARGET_API_MAC_CARBON == 1 --- 151,163 ---- #endif ! #else // OPMLEDITOR 2005-04-06 dluebbert ! #if TARGET_API_MAC_CARBON == 1 ! #define STR_P_SERVERSTRING "\x0b" "OPML/^0-^1X" ! #else ! #define STR_P_SERVERSTRING "\x0a" "OPML/^0-^1" ! #endif ! #endif // OPMLEDITOR ! ! #else // !PIKE #if TARGET_API_MAC_CARBON == 1 *************** *** 157,161 **** #endif ! #endif #define STR_P_RESPONDERERROR "\x16" "Responder method error" --- 167,171 ---- #endif ! #endif //!PIKE #define STR_P_RESPONDERERROR "\x16" "Responder method error" |
|
From: Andre R. <and...@us...> - 2006-02-05 15:55:45
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28839 Modified Files: FrontierWinMain.c Log Message: Don't hide OPML Editor app on startup. Updated various object name strings for OPML Editor. Index: FrontierWinMain.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/FrontierWinMain.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FrontierWinMain.c 30 Jan 2005 20:31:40 -0000 1.6 --- FrontierWinMain.c 5 Feb 2006 15:55:36 -0000 1.7 *************** *** 90,93 **** --- 90,95 ---- #ifdef PIKE + + #ifndef OPMLEDITOR CHAR szFrame[] = "pikeframe"; /* Class name for "frame" window */ *************** *** 104,108 **** CHAR sz_frontierstartreplace [] = "PikeStartReplace"; CHAR sz_frontierstartsearch [] = "PikeStartSearch"; ! #else CHAR szFrame[] = "frontierframe"; /* Class name for "frame" window */ --- 106,128 ---- CHAR sz_frontierstartreplace [] = "PikeStartReplace"; CHAR sz_frontierstartsearch [] = "PikeStartSearch"; ! ! #else // OPMLEDITOR ! CHAR szFrame[] = "opmlframe"; /* Class name for "frame" window */ ! ! CHAR szChild1[] = "opmlopchild"; /* Class name for op MDI window */ ! CHAR szChildFTop[] = "opmloutlinechild"; ! CHAR szChildFTwp[] = "opmlwpchild"; ! CHAR szChildFTtb[] = "opmltablechild"; ! CHAR szChildFTmb[] = "opmlmenuchild"; ! CHAR szChildFTsc[] = "opmlscriptchild"; ! CHAR szChildRoot[] = "opmlerootchild"; ! ! CHAR szChildHTML[] = "opmlHTMLchild"; ! ! CHAR sz_frontierstartreplace [] = "OpmlStartReplace"; ! CHAR sz_frontierstartsearch [] = "OpmlStartSearch"; ! #endif // OPMLEDITOR ! ! #else // !PIKE CHAR szFrame[] = "frontierframe"; /* Class name for "frame" window */ *************** *** 119,123 **** CHAR sz_frontierstartreplace [] = "FrontierStartReplace"; CHAR sz_frontierstartsearch [] = "FrontierStartSearch"; ! #endif UINT wm_startreplace; --- 139,143 ---- CHAR sz_frontierstartreplace [] = "FrontierStartReplace"; CHAR sz_frontierstartsearch [] = "FrontierStartSearch"; ! #endif // !PIKE UINT wm_startreplace; *************** *** 1305,1309 **** --- 1325,1333 ---- #ifdef PIKE /*7.0b24 PBS -- register OPML file type and icon.*/ + #ifndef OPMLEDITOR registerFileType ("\x05" ".opml", "\x04" "OPML", "\x0b" "text/x-opml", "\x1c" "Radio UserLand OPML Document", fsname(&fs), -1 * ID_OPML_ICON, bsopen); + #else + registerFileType ("\x05" ".opml", "\x04" "OPML", "\x0b" "text/x-opml", "\x0d" "OPML Document", fsname(&fs), -1 * ID_OPML_ICON, bsopen); + #endif #else *************** *** 1444,1448 **** --- 1468,1474 ---- //#ifdef PIKE + #ifndef OPMLEDITOR /*2005-04-17 dluebbert*/ nCmdShow = SW_HIDE; /* 9/24/01 RAB */ + #endif // OPMLEDITOR //#endif *************** *** 3067,3071 **** --- 3093,3101 ---- #ifdef PIKE /*7.0b26 PBS*/ + #ifndef OPMLEDITOR // 2005-04-06 dluebbert wm_frontieropenfile = RegisterWindowMessage ("PikeOpenFile"); + #else // OPMLEDITOR + wm_frontieropenfile = RegisterWindowMessage ("OpmlOpenFile"); + #endif // OPMLEDITOR #else wm_frontieropenfile = RegisterWindowMessage ("FrontierOpenFile"); *************** *** 3079,3083 **** --- 3109,3119 ---- #ifdef PIKE + + #ifndef OPMLEDITOR frontiermutex = CreateMutex (NULL, true, "PikeInstance"); + #else //OPMLEDITOR + frontiermutex = CreateMutex (NULL, true, "OpmlInstance"); + #endif // OPMLEDITOR + #else frontiermutex = CreateMutex (NULL, true, "FrontierInstance"); *************** *** 3133,3137 **** --- 3169,3177 ---- #ifdef PIKE + #ifndef OPMLEDITOR strcpy (statusIconData.szTip, "Radio UserLand"); + #else // OPMLEDITOR + strcpy (statusIconData.szTip, "OPML"); + #endif // OPMLEDITOR #else strcpy (statusIconData.szTip, "UserLand Frontier"); |
|
From: Andre R. <and...@us...> - 2006-02-05 15:53:27
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28466 Modified Files: threads.c Log Message: Update name of global mutex for OPML Editor. Index: threads.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/threads.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** threads.c 11 Jan 2005 22:48:11 -0000 1.5 --- threads.c 5 Feb 2006 15:53:19 -0000 1.6 *************** *** 197,204 **** #ifdef PIKE hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals"); ! #else hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals"); ! #endif ixlocalthreadglobals = TlsAlloc (); --- 197,208 ---- #ifdef PIKE + #ifndef OPMLEDITOR hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals"); ! #else // OPMLEDITOR ! hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals"); ! #endif // !OPMLEDITOR ! #else // !PIKE hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals"); ! #endif //!PIKE ixlocalthreadglobals = TlsAlloc (); |
|
From: Andre R. <and...@us...> - 2006-02-05 15:52:10
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27800 Modified Files: winregistry.c Log Message: Updated windows registry key for OPML Editor. Index: winregistry.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/winregistry.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** winregistry.c 11 Jan 2005 22:48:12 -0000 1.3 --- winregistry.c 5 Feb 2006 15:51:57 -0000 1.4 *************** *** 313,317 **** --- 313,321 ---- #ifdef PIKE + #ifndef OPMLEDITOR #define ProgramKey "\x16" "Software\\UserLand\\Pike" + #else //OPMLEDITOR + #define ProgramKey "\x16" "Software\\Scripting.com\\OPML" + #endif //OPMLEDITOR #else #define ProgramKey "\x1a" "Software\\UserLand\\Frontier" |
1 message has been excluded from this view by a project administrator.