Menu
▾
▴
[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.12,1.13
|
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 |