Menu
▾
▴
[frontierkernel-commits] Frontier/Common/resources/Mac ResEditTMPLsForShell.r,1.1,1.1.4.1 SHELL.R,1.4,1.4.4.1 aeut.r,1.3,1.3.4.1 carb.r,1.2,1.2.4.1 clut.r,1.2,1.2.4.1 ioaapp.r,1.2,1.2.4.1 iowaruntime.r,1.2,1.2.4.1 kernvelverbs.r,1.2.4.3,1.2.4.4 lang.r,1.4,1.4.4.1 opicons.r,1.2,1.2.4.1 osacomponent.r,1.4,1.4.4.1 osxdialogs.r,1.2,1.2.4.1 ppat.r,1.2,1.2.4.1 sicn.r,1.2,1.2.4.1
|
From: David B. <dav...@us...> - 2005-01-17 01:21:19
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/resources/Mac Modified Files: Tag: sidewinder-branch ResEditTMPLsForShell.r SHELL.R aeut.r carb.r clut.r ioaapp.r iowaruntime.r kernvelverbs.r lang.r opicons.r osacomponent.r osxdialogs.r ppat.r sicn.r Log Message: final merge step Index: SHELL.R =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/SHELL.R,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** SHELL.R 26 Oct 2004 10:14:27 -0000 1.4 --- SHELL.R 17 Jan 2005 01:19:20 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 572,576 **** #else /* [1] */ ! "UserLand Frontierª", #endif /* [2] */ --- 574,578 ---- #else /* [1] */ ! "Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ #endif /* [2] */ *************** *** 609,613 **** "Command Key:", /* [7] */ ! "Internal error#^0. Please report to UserLand Technical Support", /* [8] */ "; ", --- 611,615 ---- "Command Key:", /* [7] */ ! "Internal error#^0. Please report to <http://groups.yahoo.com/group/frontierkernel/>", /* [8] */ "; ", *************** *** 2086,2090 **** --- 2088,2096 ---- 'BigD', 'STAT', + #if TARGET_API_MAC_CARBON + 133, /* normal window */ + #else 128, + #endif {100, 25, 175, 200}, 2, *************** *** 2679,2683 **** resource 'STR ' (256) { ! "UserLand Frontierª\n\nPowerful cross-platform web scripting.\n\nUse Frontier to manage large, dynamic websites with multiple authors." }; --- 2685,2689 ---- resource 'STR ' (256) { ! "Frontierª\n\nHigh performance Web content management, object database, system-level and Internet scripting environment, including source code editing and debugging" }; Index: ResEditTMPLsForShell.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ResEditTMPLsForShell.r,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ResEditTMPLsForShell.r 9 Oct 2004 08:55:53 -0000 1.1 --- ResEditTMPLsForShell.r 17 Jan 2005 01:19:20 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opicons.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/opicons.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** opicons.r 26 Oct 2004 10:13:28 -0000 1.2 --- opicons.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: osacomponent.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/osacomponent.r,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** osacomponent.r 26 Oct 2004 10:13:48 -0000 1.4 --- osacomponent.r 17 Jan 2005 01:19:21 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- *************** *** 44,49 **** { ! "Through", 'thgh', ! "Between", 'btwn', "Against", 'agst', "OutOf", 'outo', --- 45,50 ---- { ! "Through", 'thgh', ! "Between", 'btwn', "Against", 'agst', "OutOf", 'outo', *************** *** 52,56 **** "Around", 'arnd', "Beside", 'bsid', ! "Beneath", 'bnth', "Under", 'undr', "Above", 'abve', --- 53,57 ---- "Around", 'arnd', "Beside", 'bsid', ! "Beneath", 'bnth', "Under", 'undr', "Above", 'abve', *************** *** 64,73 **** resource 'thng' (128, sysHeap) { ! 'osa ', 'LAND', 'LAND', /* ComponentDescription */ kOSASupportsCompiling + kOSASupportsConvenience + kOSASupportsEventHandling, 0x00, /*flags & mask*/ ! 'STUB', 128, /* resource where Component code is found */ ! 'STR ', 128, /* name string resource */ ! 'STR ', 129, /* info string resource */ ! 'ICON', 129 /* icon resource */ }; --- 65,74 ---- resource 'thng' (128, sysHeap) { ! 'osa ', 'LAND', 'LAND', /* ComponentDescription */ kOSASupportsCompiling + kOSASupportsConvenience + kOSASupportsEventHandling, 0x00, /*flags & mask*/ ! 'STUB', 128, /* resource where Component code is found */ ! 'STR ', 128, /* name string resource */ ! 'STR ', 129, /* info string resource */ ! 'ICON', 129 /* icon resource */ }; *************** *** 94,106 **** { /* array StringArray: 5 elements */ /* [1] */ ! "UserLand Frontierª", /* [2] */ "UserTalk", /* [2] */ ! "UserLand Frontierª UserTalk scripting component", /* [4] */ ! "UserLand Frontierª Menu Sharing component", /* [5] */ ! "UserLand Frontierª Window Sharing component" } }; --- 95,107 ---- { /* array StringArray: 5 elements */ /* [1] */ ! "Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [2] */ "UserTalk", /* [2] */ ! "Frontier UserTalk scripting component", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [4] */ ! "Frontier Menu Sharing component", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [5] */ ! "Frontier Window Sharing component" /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ } }; Index: osxdialogs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/osxdialogs.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** osxdialogs.r 26 Oct 2004 10:13:59 -0000 1.2 --- osxdialogs.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: ioaapp.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ioaapp.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioaapp.r 26 Oct 2004 10:12:24 -0000 1.2 --- ioaapp.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: kernvelverbs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** kernvelverbs.r 28 Nov 2004 06:51:47 -0000 1.2.4.3 --- kernvelverbs.r 17 Jan 2005 01:19:21 -0000 1.2.4.4 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" #include "kernelverbdefs.h" --- 26,29 ---- *************** *** 337,340 **** --- 338,342 ---- "sleepfor", "ticks", + "milliseconds", /* 2005-01-08 SMD */ "waitseconds", "waitsixtieths" *************** *** 884,888 **** "gethashloopcount", "hideapplication", ! "isvalidserialnumber" } } --- 886,891 ---- "gethashloopcount", "hideapplication", ! "isvalidserialnumber", ! "showapplication" } } *************** *** 1098,1101 **** --- 1101,1115 ---- }; + resource 'EFP#' (idmathverbs, "math") { /*2004-12-29 SMD: math verbs*/ + + { + "math", false, { + + "min", + "max", + "sqrt" + } + } + }; #ifdef FRONTIER_PYTHON *************** *** 1112,1115 **** #endif - - --- 1126,1127 ---- Index: iowaruntime.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/iowaruntime.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** iowaruntime.r 26 Oct 2004 10:12:37 -0000 1.2 --- iowaruntime.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: lang.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/lang.r,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** lang.r 26 Oct 2004 10:13:15 -0000 1.4 --- lang.r 17 Jan 2005 01:19:21 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- *************** *** 1031,1034 **** --- 1032,1042 ---- }; + resource 'STR#' (269, "Math Errors", purgeable) { + { /* array StringArray: 1 elements */ + /* [1] */ + "Internal error running \"math.^0\"." + } + }; + resource 'DLOG' (259, "notify", purgeable) { {0, 0, 107, 375}, Index: aeut.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/aeut.r,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** aeut.r 26 Oct 2004 10:11:51 -0000 1.3 --- aeut.r 17 Jan 2005 01:19:20 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: clut.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/clut.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** clut.r 26 Oct 2004 10:12:13 -0000 1.2 --- clut.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: sicn.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/sicn.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** sicn.r 26 Oct 2004 10:14:38 -0000 1.2 --- sicn.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: carb.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/carb.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** carb.r 26 Oct 2004 10:12:02 -0000 1.2 --- carb.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: ppat.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ppat.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ppat.r 26 Oct 2004 10:14:14 -0000 1.2 --- ppat.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- |
