Menu
▾
▴
[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.4.4.1,1.4.4.2 kernvelverbs.rc,1.1.4.1,1.1.4.2
|
From: David B. <dav...@us...> - 2005-01-17 01:21:28
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/resources/Win32 Modified Files: Tag: sidewinder-branch WinLand.rc kernvelverbs.rc Log Message: final merge step Index: WinLand.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** WinLand.rc 30 Nov 2004 13:04:20 -0000 1.4.4.1 --- WinLand.rc 17 Jan 2005 01:19:21 -0000 1.4.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 151,157 **** #ifdef PIKE ! ID_OP_ICON ICON DISCARDABLE radioDoc.ico /*7.0b31 PBS*/ #else ! ID_OP_ICON ICON DISCARDABLE FTop.ico #endif --- 153,159 ---- #ifdef PIKE ! ID_OP_ICON ICON DISCARDABLE radioDoc.ico /*7.0b31 PBS*/ #else ! ID_OP_ICON ICON DISCARDABLE FTop.ico #endif *************** *** 160,175 **** ID_TABLE_ICON ICON DISCARDABLE FTtb.ico ID_WP_ICON ICON DISCARDABLE FTwp.ico ! ID_DESKTOPSCRIPT_ICON ICON DISCARDABLE FTds.ico #ifdef PIKE ! ID_OPML_ICON ICON DISCARDABLE radioDoc.ico /*7.0b24 PBS*/ #endif ! /*Appears in title bar for About and Quick Script window -- generic windows.*/ #ifdef PIKE ! IDNOTE ICON DISCARDABLE radio.ico ! #else ! IDNOTE ICON DISCARDABLE note300.ico #endif --- 162,178 ---- ID_TABLE_ICON ICON DISCARDABLE FTtb.ico ID_WP_ICON ICON DISCARDABLE FTwp.ico ! ! /*Appears in title bar for About and Quick Script window -- generic windows.*/ #ifdef PIKE ! ID_NOTE_ICON ICON DISCARDABLE radio.ico ! #else ! ID_NOTE_ICON ICON DISCARDABLE note300.ico #endif ! ID_DESKTOPSCRIPT_ICON ICON DISCARDABLE FTds.ico #ifdef PIKE ! ID_OPML_ICON ICON DISCARDABLE radioDoc.ico /*7.0b24 PBS*/ #endif *************** *** 182,186 **** IDMULTIPAD1 MENU DISCARDABLE BEGIN ! MENUITEM "Dummy" 500 END #endif --- 185,189 ---- IDMULTIPAD1 MENU DISCARDABLE BEGIN ! MENUITEM "Dummy", 500 END #endif *************** *** 189,193 **** IDMULTIPAD MENU DISCARDABLE BEGIN ! MENUITEM "Dummy" 500 END #endif --- 192,196 ---- IDMULTIPAD MENU DISCARDABLE BEGIN ! MENUITEM "Dummy", 500 END #endif *************** *** 238,242 **** MENUITEM SEPARATOR MENUITEM "&Save\tCtrl+S", filemenu+saveitem ! MENUITEM "Save as Runnable..." filemenu+saverunnableitem MENUITEM "Save a &Copy...", filemenu+saveasitem MENUITEM "&Revert", filemenu+revertitem --- 241,245 ---- MENUITEM SEPARATOR MENUITEM "&Save\tCtrl+S", filemenu+saveitem ! MENUITEM "Save as Runnable...", filemenu+saverunnableitem MENUITEM "Save a &Copy...", filemenu+saveasitem MENUITEM "&Revert", filemenu+revertitem *************** *** 853,857 **** #else #ifdef fltrialsize ! VALUE "ProductVersion", "Trial " forntier_version_string "\0" #else VALUE "ProductVersion", frontier_version_string "\0" --- 856,860 ---- #else #ifdef fltrialsize ! VALUE "ProductVersion", "Trial " frontier_version_string "\0" #else VALUE "ProductVersion", frontier_version_string "\0" *************** *** 960,963 **** --- 963,967 ---- #define PICT_Errors 267 #define Window_Errors 268 + #define Math_errors 269 #define Script_Window_Buttons 300 #define Outline_Window_Buttons 301 *************** *** 1365,1369 **** 93 Lang_Errors DISCARDABLE BEGIN "\042^0\042 is not a supported key format specification. Valid formats are 'name', 'indx' and 'prop'.\0" END 94 Lang_Errors DISCARDABLE BEGIN "Can't perform the operation because the address of a binary value is required here.\0" END ! 95 Lang_Errors DISCARDABLE BEGIN "Can't coerce the string \042^0\042 into a floating point number because it isn't in the form \0421.234\042.\0" END 96 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as an XCMD because it isn't a binary value with binary type 'XCMD' or 'XFCN'.\0" END 97 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as a UCMD because it isn't a binary value with binary type 'UCMD'.\0" END --- 1369,1373 ---- 93 Lang_Errors DISCARDABLE BEGIN "\042^0\042 is not a supported key format specification. Valid formats are 'name', 'indx' and 'prop'.\0" END 94 Lang_Errors DISCARDABLE BEGIN "Can't perform the operation because the address of a binary value is required here.\0" END ! 95 Lang_Errors DISCARDABLE BEGIN "Can't coerce the string \042^0\042 into a floating point number because it isn't in the form \042\061.234\042.\0" END 96 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as an XCMD because it isn't a binary value with binary type 'XCMD' or 'XFCN'.\0" END 97 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as a UCMD because it isn't a binary value with binary type 'UCMD'.\0" END *************** *** 1411,1415 **** 139 Lang_Errors DISCARDABLE BEGIN "Can't save the database because there was an ^0.\0" END 140 Lang_Errors DISCARDABLE BEGIN "Can't rename \042^0\042 as \042^1\042 because an item with that name already exists.\0" END ! 141 Lang_Errors DISCARDABLE BEGIN "Can't encode \042^0\042 as an IP address because it isn't in the form \0420.0.0.0\042.\0" END 142 Lang_Errors DISCARDABLE BEGIN "Can't decode \042^0\042 as an IP address.\0" END 143 Lang_Errors DISCARDABLE BEGIN "Can't ^0 the specified window because it doesn't exist.\0" END --- 1415,1419 ---- 139 Lang_Errors DISCARDABLE BEGIN "Can't save the database because there was an ^0.\0" END 140 Lang_Errors DISCARDABLE BEGIN "Can't rename \042^0\042 as \042^1\042 because an item with that name already exists.\0" END ! 141 Lang_Errors DISCARDABLE BEGIN "Can't encode \042^0\042 as an IP address because it isn't in the form \042\060.0.0.0\042.\0" END 142 Lang_Errors DISCARDABLE BEGIN "Can't decode \042^0\042 as an IP address.\0" END 143 Lang_Errors DISCARDABLE BEGIN "Can't ^0 the specified window because it doesn't exist.\0" END *************** *** 1551,1554 **** --- 1555,1560 ---- 1 Window_Errors DISCARDABLE BEGIN "Internal error running \042window.^0\042.\0" END + + 1 Math_Errors DISCARDABLE BEGIN "Internal error running \042math.^0\042.\0" END 1 Script_Window_Buttons DISCARDABLE BEGIN "Run\0" END *************** *** 1892,1896 **** plain, 0, ! 40L, 40L, 460L, 100L, END --- 1898,1902 ---- plain, 0, ! 40L, 40L, 460L, 100L END *************** *** 1923,1927 **** plain, 0, ! 40L, 40L, 460L, 100L, END --- 1929,1933 ---- plain, 0, ! 40L, 40L, 460L, 100L END Index: kernvelverbs.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernvelverbs.rc,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** kernvelverbs.rc 22 Nov 2004 10:15:23 -0000 1.1.4.1 --- kernvelverbs.rc 17 Jan 2005 01:19:21 -0000 1.1.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 301,309 **** "clock\0", false, ! 6, "now\0", "set\0", "sleepfor\0", "ticks\0", "waitseconds\0", "waitsixtieths\0", --- 303,312 ---- "clock\0", false, ! 7, "now\0", "set\0", "sleepfor\0", "ticks\0", + "milliseconds\0", "waitseconds\0", "waitsixtieths\0", *************** *** 498,502 **** "read\0", "gettype\0", ! "write\0", END --- 501,505 ---- "read\0", "gettype\0", ! "write\0" END *************** *** 507,511 **** "string\0", //Function Processor Name false, //Window required ! 56 //Count of verbs "delete\0", "insert\0", --- 510,514 ---- "string\0", //Function Processor Name false, //Window required ! 56, //Count of verbs "delete\0", "insert\0", *************** *** 563,567 **** "ansitoutf8\0", "ansitoutf16\0", ! "multiplereplaceall\0", END --- 566,570 ---- "ansitoutf8\0", "ansitoutf16\0", ! "multiplereplaceall\0" END *************** *** 795,799 **** "getenvironmentvariable\0", "setenvironmentvariable\0", ! "unixshellcommand\0", END --- 798,802 ---- "getenvironmentvariable\0", "setenvironmentvariable\0", ! "unixshellcommand\0" END *************** *** 827,831 **** "frontier\0", //Function Processor Name true, //Window required ! 13, //Count of verbs "getprogrampath\0", "getfilepath\0", --- 830,834 ---- "frontier\0", //Function Processor Name true, //Window required ! 14, //Count of verbs "getprogrampath\0", "getfilepath\0", *************** *** 840,844 **** "gethashloopcount\0", "hideapplication\0", ! "isvalidserialnumber\0" END --- 843,848 ---- "gethashloopcount\0", "hideapplication\0", ! "isvalidserialnumber\0", ! "showapplication\0" END *************** *** 998,1002 **** "inetd\0", ! false 1, "supervisor\0" --- 1002,1006 ---- "inetd\0", ! false, 1, "supervisor\0" *************** *** 1036,1044 **** #endif //flregexpverbs ! #ifdef FRONTIER_PYTHON ! 1024 /*idpythonverbs*/ EFP DISCARDABLE BEGIN 1, //Number of "blocks" in this resource --- 1040,1057 ---- #endif //flregexpverbs ! 1024 /*mathverbs*/ EFP DISCARDABLE ! BEGIN ! 1, //Number of "blocks" in this resource ! "math\0", //Function Processor name ! false, //Window required ! 3, //Count of verbs ! "min\0", ! "max\0", ! "sqrt\0" ! END #ifdef FRONTIER_PYTHON ! 1025 /*idpythonverbs*/ EFP DISCARDABLE BEGIN 1, //Number of "blocks" in this resource |
