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: <set...@us...> - 2009-05-23 17:17:31
|
Revision: 1792
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1792&view=rev
Author: sethdill
Date: 2009-05-23 17:17:25 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fixed a bug in the string compiler. Was not properly handling escaped double quotes in macro parameters.
Modified Paths:
--------------
Frontier/branches/Conversant/Common/source/conversantverbs.c
Modified: Frontier/branches/Conversant/Common/source/conversantverbs.c
===================================================================
--- Frontier/branches/Conversant/Common/source/conversantverbs.c 2008-09-21 20:52:50 UTC (rev 1791)
+++ Frontier/branches/Conversant/Common/source/conversantverbs.c 2009-05-23 17:17:25 UTC (rev 1792)
@@ -403,8 +403,22 @@
}
else if ( s[ ix ] == '\\' )
{
- if ( ( s[ ix + 1 ] == '\\' ) || ( s[ ix + 1 ] == '"' ) ) /* skip the next char */
- ix++;
+ // <!--#abc def="<a href=\"ghi\">jkl</a>"-->
+ if ( ix < ct - 1 )
+ {
+ if ( !conv_addtextrange( (*adrdest).ht, src, ixstart, ix ) )
+ break;
+
+ // next range starts with char after the backslash
+ ixstart = ++ix;
+
+ // don't look at that next char, though, we don't care what it is
+ ++ix;
+
+ continue;
+ }
+// if ( ( s[ ix + 1 ] == '\\' ) || ( s[ ix + 1 ] == '"' ) ) /* skip the next char */
+// ix++;
}
else if ( s[ ix ] == '<' ) /* macro delim? */
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: ecomVia G. S. <no-...@ec...> - 2008-12-12 10:36:11
|
Boost your sales & Start getting new buyers Sir / Madam, As we have been attracted to your site "Frontier Kernel", we are proud to bring you the option of unique kind of priceless online presentation for your company and your products, that will bring you new potential buyers of your products and multiple your sales. With ecomVia Global System you can: Represent your company Introduce the activities and production of your company in a very latest kind of online presentation, by providing all details and information. Allow potential buyers to get a complete outlook on your company by providing images from inside life, production, etc. Display all of your products Attract daily visitors and convert them to your new buyers. Just add the complete and detailed descriptions of all your products, add the detailed and inviting images and use the enhancements to stand out of products of other companies. Access up-to-date requests & offers Check out, what the others need. There’s a high possibility, that someone is looking for product, you are able to produce or supply. Obtaining a new order has never been easier – just few clicks away. Get contacted with inquiries from possible buyers Providing detailed information about your company and products supplemented with inviting images assures a high possibility of early contacting by new potential buyers. Find supplies & partners for your company Search in milions of suppliers and products and find what you are looking for. At slovak-products.com you are able to find anything you require for your production and even find new dealers and local distributors for your products. Ready yet to receive new orders? Go to http://www.ecomvia.info/registration to start now! Thanks and best regards, ecomVia Inc. SNP street 119, SK-90873 Velke Levare. Slovakia Tel.: +421-910-353111 |
|
From: <and...@us...> - 2008-09-21 20:52:54
|
Revision: 1791
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1791&view=rev
Author: andreradke
Date: 2008-09-21 20:52:50 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Add build configurations for OPML Editor to Visual Studio 2005 project.
Modified Paths:
--------------
Frontier/trunk/build_VC2K5/Frontier.sln
Frontier/trunk/build_VC2K5/Frontier.vcproj
Property Changed:
----------------
Frontier/trunk/build_VC2K5/
Property changes on: Frontier/trunk/build_VC2K5
___________________________________________________________________
Modified: svn:ignore
- *.plg
*.opt
*.ncb
*.suo
*.user
_build
debug
release
memtrack
dbtracker
+ *.plg
*.opt
*.ncb
*.suo
*.user
_build
debug
release
memtrack
dbtracker
opml_release
opml_debug
frontier_release
frontier_debug
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-09-14 21:21:24
|
Revision: 1790
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1790&view=rev
Author: andreradke
Date: 2008-09-14 21:21:34 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
Update OPML Editor build configuration for Xcode.
Modified Paths:
--------------
Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
Modified: Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-09-14 20:19:40 UTC (rev 1789)
+++ Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-09-14 21:21:34 UTC (rev 1790)
@@ -1037,6 +1037,14 @@
6515294D072C000900411831 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6515294C072C000900411831 /* QuickTime.framework */; };
6515294F072C000D00411831 /* pgMTraps.h in Headers */ = {isa = PBXBuildFile; fileRef = 6515294E072C000D00411831 /* pgMTraps.h */; };
65152951072C001700411831 /* PGERRORS.H in Headers */ = {isa = PBXBuildFile; fileRef = 65152950072C001700411831 /* PGERRORS.H */; };
+ 65287D840E7DAF68003E6F8A /* FSCopyObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91000ADEDFA80000E67B /* FSCopyObject.c */; };
+ 65287D850E7DAF68003E6F8A /* FSCopyObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91010ADEDFA80000E67B /* FSCopyObject.h */; };
+ 65287D870E7DAF6F003E6F8A /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D5837F00C0E02FA00DB769C /* langmysql.c */; };
+ 65287D880E7DAF71003E6F8A /* langmysql.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D5837F20C0E035D00DB769C /* langmysql.h */; };
+ 65287D890E7DAF72003E6F8A /* langsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D4E1E470AAA17E900DF6890 /* langsqlite.c */; };
+ 65287D8A0E7DAF73003E6F8A /* langsqlite.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D4E1E480AAA17E900DF6890 /* langsqlite.h */; };
+ 65287D900E7DAF8A003E6F8A /* GenLinkedList.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91020ADEDFA80000E67B /* GenLinkedList.c */; };
+ 65287D910E7DAF8B003E6F8A /* GenLinkedList.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91030ADEDFA80000E67B /* GenLinkedList.h */; };
655A983609E929CC009EFFEA /* byteorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 655A983509E929CC009EFFEA /* byteorder.h */; };
655A983709E929CC009EFFEA /* byteorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 655A983509E929CC009EFFEA /* byteorder.h */; };
6599180709C494EA00F6F58C /* whirlpool.c in Sources */ = {isa = PBXBuildFile; fileRef = 6599180609C494EA00F6F58C /* whirlpool.c */; };
@@ -1071,7 +1079,7 @@
/* Begin PBXBuildRule section */
5D18A84C0AD3AE1200613FDB /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.c;
isEditable = 1;
outputFiles = (
@@ -1079,7 +1087,7 @@
};
5D18A84D0AD3AE1900613FDB /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.asm;
isEditable = 1;
outputFiles = (
@@ -1087,7 +1095,7 @@
};
5D4E1E3F0AAA0E1800DF6890 /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.c;
isEditable = 1;
outputFiles = (
@@ -1095,7 +1103,7 @@
};
5D4E1E400AAA0E3200DF6890 /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.asm;
isEditable = 1;
outputFiles = (
@@ -1103,7 +1111,7 @@
};
BB37A3C80AB82E200077C6A1 /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.asm.asm;
isEditable = 1;
outputFiles = (
@@ -1111,7 +1119,7 @@
};
BB37A3C90AB82E270077C6A1 /* PBXBuildRule */ = {
isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc.3_3;
+ compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.c;
isEditable = 1;
outputFiles = (
@@ -1119,23 +1127,6 @@
};
/* End PBXBuildRule section */
-/* Begin PBXBuildStyle section */
- 655E9E2B0E520A8600E41637 /* Development */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- };
- name = Development;
- };
- 655E9E2C0E520A8600E41637 /* Deployment */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- };
- name = Deployment;
- };
-/* End PBXBuildStyle section */
-
/* Begin PBXContainerItemProxy section */
BB37A3170AB827EA0077C6A1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@@ -1718,7 +1709,7 @@
65B70CE90797CF78008C2F1A /* FastTimes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FastTimes.h; path = ../Common/headers/FastTimes.h; sourceTree = SOURCE_ROOT; };
65BBB661072E563B008E2F34 /* frontier.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = frontier.r; path = ../Common/headers/frontier.r; sourceTree = SOURCE_ROOT; };
65BBB663072E5643008E2F34 /* frontierdefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = frontierdefs.h; path = ../Common/headers/frontierdefs.h; sourceTree = SOURCE_ROOT; };
- 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
65D516AA072CED430097D18E /* frontier.xcode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = frontier.xcode.h; sourceTree = SOURCE_ROOT; };
65F9C21E09C4CD9700DCC29E /* sha_locl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha_locl.h; path = ../Common/headers/sha_locl.h; sourceTree = SOURCE_ROOT; };
65F9C21F09C4CD9700DCC29E /* sha.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha.h; path = ../Common/headers/sha.h; sourceTree = SOURCE_ROOT; };
@@ -2892,6 +2883,10 @@
65F9C22209C4CD9800DCC29E /* sha_locl.h in Headers */,
65F9C22309C4CD9800DCC29E /* sha.h in Headers */,
655A983709E929CC009EFFEA /* byteorder.h in Headers */,
+ 65287D850E7DAF68003E6F8A /* FSCopyObject.h in Headers */,
+ 65287D880E7DAF71003E6F8A /* langmysql.h in Headers */,
+ 65287D8A0E7DAF73003E6F8A /* langsqlite.h in Headers */,
+ 65287D910E7DAF8B003E6F8A /* GenLinkedList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3226,12 +3221,6 @@
65152560072BFC6500411831 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier" */;
- buildSettings = {
- };
- buildStyles = (
- 655E9E2B0E520A8600E41637 /* Development */,
- 655E9E2C0E520A8600E41637 /* Deployment */,
- );
hasScannedForEncodings = 1;
mainGroup = 6515255C072BFC6500411831;
productRefGroup = 6515255C072BFC6500411831;
@@ -3642,6 +3631,10 @@
6599180809C494EA00F6F58C /* whirlpool.c in Sources */,
6599181509C4950300F6F58C /* langcrypt.c in Sources */,
65F9C22809C4CDDE00DCC29E /* sha1dgst.c in Sources */,
+ 65287D840E7DAF68003E6F8A /* FSCopyObject.c in Sources */,
+ 65287D870E7DAF6F003E6F8A /* langmysql.c in Sources */,
+ 65287D890E7DAF72003E6F8A /* langsqlite.c in Sources */,
+ 65287D900E7DAF8A003E6F8A /* GenLinkedList.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3971,6 +3964,7 @@
5D4E1D3F0AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = NO;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -4029,6 +4023,7 @@
5D4E1D400AAA0B1400DF6890 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = YES;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -4083,61 +4078,10 @@
};
name = Deployment;
};
- 5D4E1D410AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_Frontier.plist;
- LIBRARY_SEARCH_PATHS = (
- tools,
- "$(SRCROOT)",
- "$(SRCROOT)/tools",
- "$(SRCROOT)/../Common/sqlite3",
- );
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers";
- PRODUCT_NAME = Frontier;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- };
- name = Default;
- };
5D4E1D430AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = NO;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -4171,7 +4115,6 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"tools\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/tools\"";
OTHER_CFLAGS = (
"-fno-inline",
"-malign-mac68k",
@@ -4200,6 +4143,7 @@
5D4E1D440AAA0B1400DF6890 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = YES;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -4211,61 +4155,8 @@
GCC_OPTIMIZATION_LEVEL = 2;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = NO;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_OPML.plist;
- LIBRARY_SEARCH_PATHS = (
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"tools\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/tools\"";
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers -d PIKE=1 -d OPMLEDITOR=1";
- PRODUCT_NAME = OPML;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 5D4E1D450AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
GCC_PREPROCESSOR_DEFINITIONS = (
+ NDEBUG,
"PIKE=1",
"OPMLEDITOR=1",
);
@@ -4285,7 +4176,6 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"tools\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/tools\"";
OTHER_CFLAGS = (
"-fno-inline",
"-malign-mac68k",
@@ -4307,8 +4197,9 @@
"-Wno-unknown-pragmas",
"-Wno-long-double",
);
+ ZERO_LINK = NO;
};
- name = Default;
+ name = Deployment;
};
5D4E1D470AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
@@ -4328,18 +4219,10 @@
};
name = Deployment;
};
- 5D4E1D490AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "$(inherited)";
- SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
- };
- name = Default;
- };
BB37A29E0AB826C60077C6A1 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -4362,6 +4245,7 @@
BB37A29F0AB826C60077C6A1 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = ppc;
COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -4379,24 +4263,6 @@
};
name = Deployment;
};
- BB37A2A00AB826C60077C6A1 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- PREBINDING = NO;
- PRODUCT_NAME = SQLite3;
- SKIP_INSTALL = NO;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Default;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -4405,40 +4271,36 @@
buildConfigurations = (
5D4E1D3F0AAA0B1400DF6890 /* Development */,
5D4E1D400AAA0B1400DF6890 /* Deployment */,
- 5D4E1D410AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D420AAA0B1400DF6890 /* Build configuration list for PBXNativeTarget "OPML" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D430AAA0B1400DF6890 /* Development */,
5D4E1D440AAA0B1400DF6890 /* Deployment */,
- 5D4E1D450AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D470AAA0B1400DF6890 /* Development */,
5D4E1D480AAA0B1400DF6890 /* Deployment */,
- 5D4E1D490AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
BB37A29D0AB826C60077C6A1 /* Build configuration list for PBXNativeTarget "SQLite3" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BB37A29E0AB826C60077C6A1 /* Development */,
BB37A29F0AB826C60077C6A1 /* Deployment */,
- BB37A2A00AB826C60077C6A1 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
/* End XCConfigurationList section */
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-09-14 20:19:31
|
Revision: 1789
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1789&view=rev
Author: andreradke
Date: 2008-09-14 20:19:40 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
Add preprocessor macro for enabling/disabling sqlite and mysql support. Update OPML Editor build configuration for Xcode.
Modified Paths:
--------------
Frontier/trunk/Common/headers/frontierdefs.h
Frontier/trunk/Common/source/langmysql.c
Frontier/trunk/Common/source/langsqlite.c
Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
Modified: Frontier/trunk/Common/headers/frontierdefs.h
===================================================================
--- Frontier/trunk/Common/headers/frontierdefs.h 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/headers/frontierdefs.h 2008-09-14 20:19:40 UTC (rev 1789)
@@ -110,6 +110,10 @@
#define Rez true
#define DeRez false
+#ifndef OPMLEDITOR /*2008-09-08 aradke: keep opml editor lean and mean*/
+ #define FRONTIER_MYSQL 1 /*include mysql database client library*/
+ #define FRONTIER_SQLITE 1 /*include sqlite database code*/
+#endif
#define SystemSevenOrLater 1
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/source/langmysql.c 2008-09-14 20:19:40 UTC (rev 1789)
@@ -42,14 +42,11 @@
#include "oplist.h"
#include "langsystem7.h"
-// #ifdef WIN95VERSION
+#include "langmysql.h"
-// #include "my_global.h"
-
-// #endif // WIN95VERSION
-
+#ifdef FRONTIER_MYSQL
#include "mysql.h"
-#include "langmysql.h"
+#endif
/*
@@ -110,6 +107,8 @@
setbooleanvalue ( false, v ); // by default, sqlite functions return false
switch ( token ) {
+
+#ifdef FRONTIER_MYSQL
case initfunc: // initialize MySQL
@@ -218,6 +217,8 @@
case closefunc: // close a MySQL db
return ( mysqlcloseverb ( hp1, v, bserror ) );
+
+#endif
default:
@@ -236,6 +237,7 @@
} /* mysqlinitverbs */
+#ifdef FRONTIER_MYSQL
boolean mysqlinitverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
@@ -1776,3 +1778,5 @@
} /* mysqlisthreadsafeverb */
+#endif /*FRONTIER_MYSQL*/
+
Modified: Frontier/trunk/Common/source/langsqlite.c
===================================================================
--- Frontier/trunk/Common/source/langsqlite.c 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/source/langsqlite.c 2008-09-14 20:19:40 UTC (rev 1789)
@@ -44,6 +44,9 @@
#include "langexternal.h"
#include "langsqlite.h"
+
+#ifdef FRONTIER_SQLITE
+
#include <sqlite3.h>
#ifdef MACVERSION
@@ -60,6 +63,7 @@
#endif // WIN95VERSION
+#endif
/* Building SQLite into Frontier
@@ -125,7 +129,9 @@
setbooleanvalue (false, v); /* by default, sqlite functions return false */
switch (token) {
-
+
+#ifdef FRONTIER_SQLITE
+
case openfunc: { /* 2006-03-14 gewirtz: open an SQLite db */
return (sqliteopenverb (hp1, v, bserror));
@@ -209,6 +215,8 @@
return ( getlastinsertrowidverb ( hp1, v, bserror ) );
+#endif
+
default:
getstringlist (langerrorlist, unimplementedverberror, bserror);
@@ -227,6 +235,7 @@
return (loadfunctionprocessor (idsqliteverbs, &sqlitefunctionvalue));
} /* sqliteinitverbs */
+#ifdef FRONTIER_SQLITE
static void sqliteOpenError (const char *errmsg, bigstring bserror) {
bigstring bserrmsg;
@@ -1218,3 +1227,5 @@
} // getlastinsertrowidverb
+#endif /*FRONTIER_SQLITE*/
+
Modified: Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2008-09-14 20:19:40 UTC (rev 1789)
@@ -1059,6 +1059,12 @@
65B70CEA0797CF78008C2F1A /* FastTimes.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B70CE90797CF78008C2F1A /* FastTimes.h */; };
65BBB662072E563B008E2F34 /* frontier.r in Rez */ = {isa = PBXBuildFile; fileRef = 65BBB661072E563B008E2F34 /* frontier.r */; };
65BBB664072E5643008E2F34 /* frontierdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BBB663072E5643008E2F34 /* frontierdefs.h */; };
+ 65C4999B0E7D8F2B0078B6DB /* FSCopyObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91000ADEDFA80000E67B /* FSCopyObject.c */; };
+ 65C4999E0E7D8F320078B6DB /* FSCopyObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91010ADEDFA80000E67B /* FSCopyObject.h */; };
+ 65C499A10E7D8F360078B6DB /* GenLinkedList.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91020ADEDFA80000E67B /* GenLinkedList.c */; };
+ 65C499A40E7D8F3A0078B6DB /* GenLinkedList.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91030ADEDFA80000E67B /* GenLinkedList.h */; };
+ 65C499A70E7D8F450078B6DB /* langsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D4E1E470AAA17E900DF6890 /* langsqlite.c */; };
+ 65C499AA0E7D8F4C0078B6DB /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D8F1EF30C25B51A00927B97 /* langmysql.c */; };
65D516AB072CED430097D18E /* frontier.xcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D516AA072CED430097D18E /* frontier.xcode.h */; };
65F9C22009C4CD9800DCC29E /* sha_locl.h in Headers */ = {isa = PBXBuildFile; fileRef = 65F9C21E09C4CD9700DCC29E /* sha_locl.h */; };
65F9C22109C4CD9800DCC29E /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = 65F9C21F09C4CD9700DCC29E /* sha.h */; };
@@ -1155,7 +1161,7 @@
5D8F1EF30C25B51A00927B97 /* langmysql.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = langmysql.c; path = ../Common/source/langmysql.c; sourceTree = SOURCE_ROOT; };
5D8F1EF60C25B56600927B97 /* langmysql.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = langmysql.h; path = ../Common/headers/langmysql.h; sourceTree = SOURCE_ROOT; };
5DCA3B0B0AF552C700D6155D /* libpaigefat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpaigefat.a; path = tools/libpaigefat.a; sourceTree = SOURCE_ROOT; };
- 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; };
65059B760996945100410571 /* OPML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPML.icns; path = ../resources/OPML/OPML.icns; sourceTree = SOURCE_ROOT; };
65059B770996945100410571 /* OPMLdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPMLdoc.icns; path = ../resources/OPML/OPMLdoc.icns; sourceTree = SOURCE_ROOT; };
65059B800996958700410571 /* BNDL.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = BNDL.r; path = ../resources/OPML/BNDL.r; sourceTree = SOURCE_ROOT; };
@@ -2835,6 +2841,8 @@
65F9C22209C4CD9800DCC29E /* sha_locl.h in Headers */,
65F9C22309C4CD9800DCC29E /* sha.h in Headers */,
655A983709E929CC009EFFEA /* byteorder.h in Headers */,
+ 65C4999E0E7D8F320078B6DB /* FSCopyObject.h in Headers */,
+ 65C499A40E7D8F3A0078B6DB /* GenLinkedList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3575,6 +3583,10 @@
6599180809C494EA00F6F58C /* whirlpool.c in Sources */,
6599181509C4950300F6F58C /* langcrypt.c in Sources */,
65F9C22809C4CDDE00DCC29E /* sha1dgst.c in Sources */,
+ 65C4999B0E7D8F2B0078B6DB /* FSCopyObject.c in Sources */,
+ 65C499A10E7D8F360078B6DB /* GenLinkedList.c in Sources */,
+ 65C499A70E7D8F450078B6DB /* langsqlite.c in Sources */,
+ 65C499AA0E7D8F4C0078B6DB /* langmysql.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4016,58 +4028,6 @@
};
name = Deployment;
};
- 5D4E1D410AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_Frontier.plist;
- LIBRARY_SEARCH_PATHS = (
- tools,
- "$(SRCROOT)",
- "$(SRCROOT)/tools",
- "$(SRCROOT)/../Common/sqlite3",
- );
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers";
- PRODUCT_NAME = Frontier;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- };
- name = Default;
- };
5D4E1D430AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4142,59 +4102,8 @@
GCC_OPTIMIZATION_LEVEL = 2;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_OPML.plist;
- LIBRARY_SEARCH_PATHS = (
- tools,
- "$(SRCROOT)/tools",
- );
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers -d PIKE=1 -d OPMLEDITOR=1";
- PRODUCT_NAME = OPML;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 5D4E1D450AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
GCC_PREPROCESSOR_DEFINITIONS = (
+ NDEBUG,
"PIKE=1",
"OPMLEDITOR=1",
);
@@ -4234,8 +4143,9 @@
"-Wno-unknown-pragmas",
"-Wno-long-double",
);
+ ZERO_LINK = NO;
};
- name = Default;
+ name = Deployment;
};
5D4E1D470AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
@@ -4261,18 +4171,6 @@
};
name = Deployment;
};
- 5D4E1D490AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- OTHER_CFLAGS = "";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Default;
- };
BB37A29E0AB826C60077C6A1 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4315,24 +4213,6 @@
};
name = Deployment;
};
- BB37A2A00AB826C60077C6A1 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- PREBINDING = NO;
- PRODUCT_NAME = SQLite3;
- SKIP_INSTALL = NO;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Default;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -4341,40 +4221,36 @@
buildConfigurations = (
5D4E1D3F0AAA0B1400DF6890 /* Development */,
5D4E1D400AAA0B1400DF6890 /* Deployment */,
- 5D4E1D410AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D420AAA0B1400DF6890 /* Build configuration list for PBXNativeTarget "OPML" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D430AAA0B1400DF6890 /* Development */,
5D4E1D440AAA0B1400DF6890 /* Deployment */,
- 5D4E1D450AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier Universal Binary" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D470AAA0B1400DF6890 /* Development */,
5D4E1D480AAA0B1400DF6890 /* Deployment */,
- 5D4E1D490AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
BB37A29D0AB826C60077C6A1 /* Build configuration list for PBXNativeTarget "SQLite3" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BB37A29E0AB826C60077C6A1 /* Development */,
BB37A29F0AB826C60077C6A1 /* Deployment */,
- BB37A2A00AB826C60077C6A1 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
/* End XCConfigurationList section */
};
Modified: Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-09-14 20:19:40 UTC (rev 1789)
@@ -1119,6 +1119,23 @@
};
/* End PBXBuildRule section */
+/* Begin PBXBuildStyle section */
+ 655E9E2B0E520A8600E41637 /* Development */ = {
+ isa = PBXBuildStyle;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ };
+ name = Development;
+ };
+ 655E9E2C0E520A8600E41637 /* Deployment */ = {
+ isa = PBXBuildStyle;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ };
+ name = Deployment;
+ };
+/* End PBXBuildStyle section */
+
/* Begin PBXContainerItemProxy section */
BB37A3170AB827EA0077C6A1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@@ -1701,7 +1718,7 @@
65B70CE90797CF78008C2F1A /* FastTimes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FastTimes.h; path = ../Common/headers/FastTimes.h; sourceTree = SOURCE_ROOT; };
65BBB661072E563B008E2F34 /* frontier.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = frontier.r; path = ../Common/headers/frontier.r; sourceTree = SOURCE_ROOT; };
65BBB663072E5643008E2F34 /* frontierdefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = frontierdefs.h; path = ../Common/headers/frontierdefs.h; sourceTree = SOURCE_ROOT; };
- 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
65D516AA072CED430097D18E /* frontier.xcode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = frontier.xcode.h; sourceTree = SOURCE_ROOT; };
65F9C21E09C4CD9700DCC29E /* sha_locl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha_locl.h; path = ../Common/headers/sha_locl.h; sourceTree = SOURCE_ROOT; };
65F9C21F09C4CD9700DCC29E /* sha.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha.h; path = ../Common/headers/sha.h; sourceTree = SOURCE_ROOT; };
@@ -3209,6 +3226,12 @@
65152560072BFC6500411831 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier" */;
+ buildSettings = {
+ };
+ buildStyles = (
+ 655E9E2B0E520A8600E41637 /* Development */,
+ 655E9E2C0E520A8600E41637 /* Deployment */,
+ );
hasScannedForEncodings = 1;
mainGroup = 6515255C072BFC6500411831;
productRefGroup = 6515255C072BFC6500411831;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2008-01-07 19:28:41
|
Revision: 1788
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1788&view=rev
Author: creecode
Date: 2008-01-07 11:28:28 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
added -isysroot to cc commands for Xcode v2.5 compatibility
Modified Paths:
--------------
Frontier/trunk/build_Xcode/tools/postlinking.sh
Modified: Frontier/trunk/build_Xcode/tools/postlinking.sh
===================================================================
--- Frontier/trunk/build_Xcode/tools/postlinking.sh 2007-11-27 19:00:51 UTC (rev 1787)
+++ Frontier/trunk/build_Xcode/tools/postlinking.sh 2008-01-07 19:28:28 UTC (rev 1788)
@@ -34,12 +34,14 @@
export MACOSX_DEPLOYMENT_TARGET="10.1"
# extract the APP_VERSION_STRING
-cc ${preprocessor_defs} -I"${SRCROOT}/../Common/headers" -o appversion appversion.c
+echo "cc ${preprocessor_defs} -isysroot ${SDKROOT} -I \"${SRCROOT}/../Common/headers\" -o appversion appversion.c"
+cc ${preprocessor_defs} -isysroot ${SDKROOT} -I"${SRCROOT}/../Common/headers" -o appversion appversion.c
version_str=`./appversion`
echo "Using version string: ${version_str}"
# extract the copyright_year_string
-cc ${preprocessor_defs} -I"${SRCROOT}/../Common/headers" -o appcopyright appcopyright.c
+echo "cc ${preprocessor_defs} -isysroot ${SDKROOT} -I \"${SRCROOT}/../Common/headers\" -o appcopyright appcopyright.c"
+cc ${preprocessor_defs} -isysroot ${SDKROOT} -I"${SRCROOT}/../Common/headers" -o appcopyright appcopyright.c
copyright_str=`./appcopyright`
echo "Using copyright string: ${copyright_str}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-27 19:00:47
|
Revision: 1787
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1787&view=rev
Author: creecode
Date: 2007-11-27 11:00:51 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
minor formatting tweaks
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/fileverbs.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/fileverbs.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/fileverbs.c 2007-11-27 18:56:45 UTC (rev 1786)
+++ Frontier/branches/IUDA_Desktop/Common/source/fileverbs.c 2007-11-27 19:00:51 UTC (rev 1787)
@@ -2723,9 +2723,9 @@
static boolean filedeleteverb ( hdltreenode hp1, tyvaluerecord *vreturned ) {
//
- // 2006-06-23 creedon: FSRef-ized
+ // 2006-06-23 creedon: FSRef-ized
//
- // created, factored from filefunctionvalue function
+ // created, factored from filefunctionvalue function
//
tyfilespec fs;
@@ -2749,8 +2749,9 @@
static boolean getposixpathverb ( hdltreenode hp1, tyvaluerecord *vreturned ) {
//
- // 2006-11-01 creedon: for Mac, replace convertcstring function with code to convert from c string in UTF-8 to bigstring in
- // Mac Roman
+ // 2006-11-01 creedon: for Mac, replace convertcstring function with code
+ // to convert from c string in UTF-8 to bigstring in
+ // Mac Roman
//
// 2006-10-07 creedon: created
//
@@ -3524,7 +3525,7 @@
flnextparamislast = true;
if ( ! getfilespecvalue ( hp1, 1, &fs ) )
- break;
+ break;
#ifdef MACVERSION
@@ -3532,7 +3533,7 @@
if ( extendfilespec ( &fs, &fst ) )
if ( ! deletefile ( &fst ) )
- break;
+ break;
#endif // MACVERSION
@@ -4154,6 +4155,7 @@
#endif
default:
+
getstringlist (langerrorlist, unimplementedverberror, bserror);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-27 18:56:42
|
Revision: 1786
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1786&view=rev
Author: creecode
Date: 2007-11-27 10:56:45 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
in deletefile function, for Mac, call FSDeleteContainer when deleting folders, this seems to solve a problem which FSDeleteObject has running into locked files
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/file.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/file.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/file.c 2007-11-25 23:12:54 UTC (rev 1785)
+++ Frontier/branches/IUDA_Desktop/Common/source/file.c 2007-11-27 18:56:45 UTC (rev 1786)
@@ -759,6 +759,10 @@
boolean deletefile ( const ptrfilespec fs ) {
//
+ // 2007-11-27 creedon: for Mac, call FSDeleteContainer when deleting
+ // folders, this seems to solve a problem which
+ // FSDeleteObject has running into locked files.
+ //
// 2006-06-26 creedon: for Mac, FSRef-ized
//
// 5.0.1 dmb: always setfserror param
@@ -769,13 +773,25 @@
#ifdef MACVERSION
OSErr err;
-
+ boolean fl;
+
setfserrorparam ( fs ); // in case error message takes a filename parameter
-
- FSClearNameLocked ( &( *fs ).fsref );
- err = FSDeleteObject ( &( *fs ).fsref );
+ if ( ! fileisfolder ( fs, &fl ) )
+ return ( false );
+
+ if ( fl )
+ err = FSDeleteContainer ( &( *fs ).fsref );
+
+ else {
+
+ FSClearNameLocked ( &( *fs ).fsref );
+
+ err = FSDeleteObject ( &( *fs ).fsref );
+
+ }
+
return ( ! oserror ( err ) );
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-25 23:12:49
|
Revision: 1785
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1785&view=rev
Author: creecode
Date: 2007-11-25 15:12:54 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
moved maxRows < 0 check above loop, define result
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-11-25 23:08:07 UTC (rev 1784)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-11-25 23:12:54 UTC (rev 1785)
@@ -3,21 +3,28 @@
on easyQuery ( databaseId, query, maxRows = 0 ) {
«Changes
+ «8/27/07; 8:05:14 PM by TAC
+ «moved maxRows < 0 check above loop
+ «define result
«7/20/07; 12:38:56 PM by TAC
«changed method for checking if maxRows is a number
+ «check if queryId is not 0
«6/2/07; 12:00:00 AM by DG
«only get rows if queryId is greater than zero
«5/29/07; 12:00:00 AM by DG
«created
- local ( queryId, dataSet = { }, row, rowCount = 0 );
+ local ( queryId, dataSet = { }, result, row, rowCount = 0 );
- bundle { // is maxRow a number?
+ bundle { // is maxRows a number?
try {
number ( maxRows )}
else {
scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )}};
+ if ( maxRows < 0 ) {
+ scriptError ( "mySql.easyQuery requires maxRows to be zero or greater." )};
+
queryId = mySql.compileQuery ( databaseId, query ); // this will scriptError on its own if it fails
if queryId > 0 {
@@ -27,9 +34,7 @@
if result == 0 { // MySQL's code for no more rows
break};
- ++rowCount;
-
- if ( maxRows > 0 ) and ( rowCount > maxRows ) {
+ if ++rowCount > maxRows {
break};
dataSet [ rowCount ] = result};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-25 23:08:03
|
Revision: 1784
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1784&view=rev
Author: creecode
Date: 2007-11-25 15:08:07 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
added missing query param
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc 2007-11-14 22:44:59 UTC (rev 1783)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc 2007-11-25 23:08:07 UTC (rev 1784)
@@ -1,8 +1,10 @@
FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.compileQuery
-on compileQuery ( databaseId ) {
+on compileQuery ( databaseId, query ) {
«Changes
+ «11/25/07; 3:01:52 PM by SMD and TAC
+ «added missing query param
«5/29/07; 12:00:00 AM by DG
«created
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-14 22:46:57
|
Revision: 1783
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1783&view=rev
Author: creecode
Date: 2007-11-14 14:44:59 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
adding abs, acos, asin, atan, ceil, cos, cosh, exp, floor, log, log10, sin, sinh, tan, tanh, trunc, power, mod, and rnd functions
Modified Paths:
--------------
Frontier/branches/math_functions/Common/resources/Mac/kernelverbs.r
Frontier/branches/math_functions/Common/resources/Win32/kernelverbs.rc
Frontier/branches/math_functions/Common/source/langmath.c
Modified: Frontier/branches/math_functions/Common/resources/Mac/kernelverbs.r
===================================================================
--- Frontier/branches/math_functions/Common/resources/Mac/kernelverbs.r 2007-11-13 01:21:29 UTC (rev 1782)
+++ Frontier/branches/math_functions/Common/resources/Mac/kernelverbs.r 2007-11-14 22:44:59 UTC (rev 1783)
@@ -1120,18 +1120,39 @@
}
};
-resource 'EFP#' (idmathverbs, "math") { /*2004-12-29 SMD: math verbs*/
-
+
+resource 'EFP#' (idmathverbs, "math") { // 2004-12-29 SMD: math verbs
{
- "math", false, {
-
- "min",
- "max",
- "sqrt"
+ "math", false, {
+
+ "min",
+ "max",
+ "sqrt",
+ "power", // 2007-11-12 dah: added power thru trunc
+ "abs",
+ "acos",
+ "asin",
+ "atan",
+ "ceil",
+ "cos",
+ "cosh",
+ "exp",
+ "floor",
+ "log",
+ "log10",
+ "sin",
+ "sinh",
+ "tan",
+ "tanh",
+ "mod",
+ "rnd",
+ "trunc"
+
+ }
}
- }
-};
+ };
+
resource 'EFP#' (idcryptverbs, "crypt") { // 2006-03-07 creedon: crypt verbs
{
"crypt", false, {
@@ -1146,6 +1167,7 @@
}
};
+
resource 'EFP#' (idsqliteverbs, "sqlite") { // 2006-08-31 gewirtz sqlite verbs
{
"sqlite", false, {
@@ -1172,6 +1194,7 @@
}
};
+
resource 'EFP#' (idmysqlverbs, "mysql") { /* 2007-04-09 gewirtz mysql verbs */
{
"mysql", false, {
Modified: Frontier/branches/math_functions/Common/resources/Win32/kernelverbs.rc
===================================================================
--- Frontier/branches/math_functions/Common/resources/Win32/kernelverbs.rc 2007-11-13 01:21:29 UTC (rev 1782)
+++ Frontier/branches/math_functions/Common/resources/Win32/kernelverbs.rc 2007-11-14 22:44:59 UTC (rev 1783)
@@ -1055,17 +1055,38 @@
#endif //flregexpverbs
-1024 /*mathverbs*/ EFP DISCARDABLE
+
+1024 /* mathverbs */ EFP DISCARDABLE
BEGIN
- 1, //Number of "blocks" in this resource
- "math\0", //Function Processor name
- false, //Window required
- 3, //Count of verbs
+ 1, // Number of "blocks" in this resource
+ "math\0", // Function Processor name
+ false, // Window required
+ 22, // Count of verbs
"min\0",
"max\0",
- "sqrt\0"
+ "sqrt\0",
+ "power\0", // 2007-11-12 dah: added power thru trunc
+ "abs\0",
+ "acos\0",
+ "asin\0",
+ "atan\0",
+ "ceil\0",
+ "cos\0",
+ "cosh\0",
+ "exp\0",
+ "floor\0",
+ "log\0",
+ "log10\0",
+ "sin\0",
+ "sinh\0",
+ "tan\0",
+ "tanh\0",
+ "mod\0",
+ "rnd\0",
+ "trunc\0"
END
+
1025 /* cryptverbs */ EFP DISCARDABLE // 2006-03-07 creedon: crypt verbs
BEGIN
1, // Number of "blocks" in this resource
@@ -1079,6 +1100,7 @@
"hmacSHA1\0"
END
+
1026 /* sqliteverbs */ EFP DISCARDABLE
BEGIN
1, // Number of "blocks" in this resource
@@ -1104,6 +1126,7 @@
"getLastInsertRowId\0" // 2007-08-28 creedon
END
+
1027 /* mysqlverbs */ EFP DISCARDABLE
BEGIN
1, // Number of "blocks" in this resource
@@ -1138,4 +1161,5 @@
"isThreadSafe\0",
"close\0"
END
-
+
+
\ No newline at end of file
Modified: Frontier/branches/math_functions/Common/source/langmath.c
===================================================================
--- Frontier/branches/math_functions/Common/source/langmath.c 2007-11-13 01:21:29 UTC (rev 1782)
+++ Frontier/branches/math_functions/Common/source/langmath.c 2007-11-14 22:44:59 UTC (rev 1783)
@@ -45,32 +45,83 @@
#include "timedate.h"
#include "langmath.h"
+
#define matherrorlist 269
#define notimplementederror 1
-typedef enum tymathtoken { /*verbs that are processed by langmath.c*/
-
+
+typedef enum tymathtoken { // verbs that are processed by langmath.c
+
minfunc,
maxfunc,
sqrtfunc,
+ powerfunc, // 2007-11-12 dah: added powerfunc thru truncfunc
+
+ absfunc,
+
+ acosfunc,
+
+ asinfunc,
+
+ atanfunc,
+
+ ceilfunc,
+
+ cosfunc,
+
+ coshfunc,
+
+ expfunc,
+
+ floorfunc,
+
+ logfunc,
+
+ log10func,
+
+ sinfunc,
+
+ sinhfunc,
+
+ tanfunc,
+
+ tanhfunc,
+
+ modfunc,
+
+ rndfunc,
+
+ truncfunc,
+
cmathverbs
+
} tymathtoken;
+
static boolean mathfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
+ //
+ // 2007-11-06 dah: added absfunc, acosfunc, asinfunc, atanfunc, ceilfunc,
+ // cosfunc, coshfunc, expfunc, floorfunc, logfunc,
+ // log10func, sinfunc, sinhfunc, tanfunc, tanhfunc,
+ // truncfunc cases
+ //
+ // 2007-10-30 dah: added powerfunc, modfunc, rndfunc cases
+ //
hdltreenode hp1 = hparam1;
tyvaluerecord *v = vreturned;
short errornum = 0;
- setbooleanvalue (false, v); /*by default, math functions return false*/
+ setbooleanvalue (false, v); // by default, math functions return false
switch (token) {
- case minfunc: { /* 2004/12/29 smd */
-
+ case minfunc: { // 2004-12-29 smd
+
tyvaluerecord v1, v2;
tyvaluerecord v1copy, v2copy;
tyvaluerecord * vResult = NULL;
@@ -90,90 +141,107 @@
if (!copyvaluerecord (v2, &v2copy)) /* so that we don't coerce the original */
break;
- if (!coercetypes (&v1copy, &v2copy))
- {
+ if (!coercetypes (&v1copy, &v2copy)) {
+
disposevalues (&v1copy, &v2copy);
break;
- }
+
+ }
switch (v1copy.valuetype) {
- case novaluetype: { /* no test needed, nil is nil*/
+ case novaluetype: { // no test needed, nil is nil
+
initvalue (v, novaluetype);
fl = true;
break;
+
}
- case booleanvaluetype: /* if v2 is true, then return v1 (false < true) */
+ case booleanvaluetype: // if v2 is true, then return v1 (false < true)
+
vResult = v2copy.data.flvalue ? &v1 : &v2;
break;
- /* all the rest return the greater of the two values */
+ // all the rest return the greater of the two values
+
case charvaluetype:
+
vResult = ( v1copy.data.chvalue <= v2copy.data.chvalue ) ? &v1 : &v2;
break;
case intvaluetype:
+
vResult = ( v1copy.data.intvalue <= v2copy.data.intvalue ) ? &v1 : &v2;
break;
case longvaluetype:
case ostypevaluetype:
+
vResult = ( v1copy.data.longvalue <= v2copy.data.longvalue ) ? &v1 : &v2;
break;
case directionvaluetype:
+
vResult = ( (short) v1copy.data.dirvalue <= (short) v2copy.data.dirvalue ) ? &v1 : &v2;
break;
case datevaluetype:
+
vResult = timegreaterthan( v2copy.data.datevalue, v1copy.data.datevalue ) ? &v1 : &v2;
break;
case singlevaluetype:
+
vResult = ( v1copy.data.singlevalue <= v2copy.data.singlevalue ) ? &v1 : &v2;
break;
case doublevaluetype:
+
vResult = ( **v1copy.data.doublevalue <= **v2copy.data.doublevalue ) ? &v1 : &v2;
break;
case stringvaluetype:
+
vResult = ( comparehandles( v1copy.data.stringvalue, v2copy.data.stringvalue ) == 1 ) ? &v2 : &v1;
break;
default:
+
langerror (comparisonnotpossibleerror);
fl = false; /*operation is not defined*/
break;
- } /*switch*/
+
+ } // switch
- if ( vResult != NULL )
- {
+ if ( vResult != NULL ) {
+
if ( copyvaluerecord( *vResult, v ) )
fl = true;
disposevalues( &v1copy, &v2copy );
+
+ }
+
+ return ( fl );
+
}
-
- return ( fl );
- }
- case maxfunc: { /* 2004/12/29 smd */
+ case maxfunc: { // 2004-12-29 smd
tyvaluerecord v1, v2;
tyvaluerecord v1copy, v2copy;
@@ -194,90 +262,107 @@
if (!copyvaluerecord (v2, &v2copy)) /* so that we don't coerce the original */
break;
- if (!coercetypes (&v1copy, &v2copy))
- {
+ if (!coercetypes (&v1copy, &v2copy)) {
+
disposevalues (&v1, &v2);
break;
- }
-
+
+ }
+
switch (v1copy.valuetype) {
- case novaluetype: { /* no test needed, nil is nil*/
+ case novaluetype: { // no test needed, nil is nil
+
initvalue (v, novaluetype);
fl = true;
break;
+
}
- case booleanvaluetype: /* if v2 is true, then return v1 (false < true) */
+ case booleanvaluetype: // if v2 is true, then return v1 (false < true)
+
vResult = v1copy.data.flvalue ? &v1 : &v2;
break;
- /* all the rest return the greater of the two values */
+ // all the rest return the greater of the two values
+
case charvaluetype:
+
vResult = ( v1copy.data.chvalue >= v2copy.data.chvalue ) ? &v1 : &v2;
break;
case intvaluetype:
+
vResult = ( v1copy.data.intvalue >= v2copy.data.intvalue ) ? &v1 : &v2;
break;
case longvaluetype:
case ostypevaluetype:
+
vResult = ( v1copy.data.longvalue >= v2copy.data.longvalue ) ? &v1 : &v2;
break;
case directionvaluetype:
+
vResult = ( (short) v1copy.data.dirvalue >= (short) v2copy.data.dirvalue ) ? &v1 : &v2;
break;
case datevaluetype:
+
vResult = timegreaterthan( v1copy.data.datevalue, v2copy.data.datevalue ) ? &v1 : &v2;
break;
case singlevaluetype:
+
vResult = ( v1copy.data.singlevalue >= v2copy.data.singlevalue ) ? &v1 : &v2;
break;
case doublevaluetype:
+
vResult = ( **v1copy.data.doublevalue >= **v2copy.data.doublevalue ) ? &v1 : &v2;
break;
case stringvaluetype:
+
vResult = ( comparehandles( v1copy.data.stringvalue, v2copy.data.stringvalue ) != -1 ) ? &v1 : &v2;
break;
default:
+
langerror (comparisonnotpossibleerror);
fl = false; /*operation is not defined*/
break;
- } /*switch*/
+
+ } // switch
- if ( vResult != NULL )
- {
+ if ( vResult != NULL ) {
+
if ( copyvaluerecord( *vResult, v ) )
fl = true;
-
+
disposevalues( &v1copy, &v2copy );
- }
+
+ }
return ( fl );
- }
+
+ }
- case sqrtfunc: { /* 2004/12/29 smd */
+ case sqrtfunc: { // 2004-12-29 smd
tyvaluerecord v1;
double d;
@@ -290,28 +375,351 @@
d = sqrt (**v1.data.doublevalue);
return (setdoublevalue (d, v));
+
}
+ case powerfunc: {
+
+ tyvaluerecord v1, v2;
+ double d;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 2, &v2))
+ break;
+
+ d = pow (**v1.data.doublevalue, **v2.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case absfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = abs (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case acosfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = acos (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case asinfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = asin (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case atanfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = atan (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case ceilfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = ceil (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case cosfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = cos (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case coshfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = cosh (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case expfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = exp (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case floorfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = floor (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case logfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = log (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case log10func: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = log10 (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case sinfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = sin (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case sinhfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = sinh (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case tanfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = tan (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case tanhfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ d = tanh (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case modfunc: {
+
+ tyvaluerecord v1, v2;
+ double d;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 2, &v2))
+ break;
+
+ d = fmod (**v1.data.doublevalue, **v2.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case rndfunc: {
+
+ tyvaluerecord v1, v2;
+ double d, e;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 2, &v2))
+ break;
+
+ e = pow(10, **v2.data.doublevalue * -1);
+ d = floor((**v1.data.doublevalue * e) + 0.5) / e;
+
+ return (setdoublevalue (d, v));
+
+ }
+
+ case truncfunc: {
+
+ tyvaluerecord v1;
+ double d;
+
+ flnextparamislast = true;
+
+ if (!getdoubleparam (hp1, 1, &v1))
+ break;
+
+ if (**v1.data.doublevalue > 0)
+ d = floor (**v1.data.doublevalue);
+ else
+ d = ceil (**v1.data.doublevalue);
+
+ return (setdoublevalue (d, v));
+
+ }
+
default:
+
errornum = notimplementederror;
goto error;
- } /*switch*/
+
+ } // switch
error:
- if (errornum != 0) /*get error string*/
- getstringlist (matherrorlist, errornum, bserror);
-
- return (false);
- } /*langmathvalue*/
-
+ if (errornum != 0) // get error string
+ getstringlist (matherrorlist, errornum, bserror);
+
+ return (false);
+ } // langmathvalue
+
+
boolean mathinitverbs (void) {
- /*
- 2004-12-29 smd: new math verbs
- */
+ //
+ // 2004-12-29 smd: new math verbs
+ //
return (loadfunctionprocessor (idmathverbs, &mathfunctionvalue));
- } /*mathinitverbs*/
+
+ } // mathinitverbs
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-13 01:21:25
|
Revision: 1782
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1782&view=rev
Author: creecode
Date: 2007-11-12 17:21:29 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
deleting mysql branch
Removed Paths:
-------------
Frontier/branches/mysql/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-10 19:51:58
|
Revision: 1781
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1781&view=rev
Author: creecode
Date: 2007-11-10 11:51:56 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
Creating a branch of /Frontier/trunk for new math functions.
Added Paths:
-----------
Frontier/branches/math_functions/
Copied: Frontier/branches/math_functions (from rev 1780, Frontier/trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:45:28
|
Revision: 1780
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1780&view=rev
Author: creecode
Date: 2007-11-06 19:45:33 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
minor formatting tweaks
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/frontierwindows.c
Frontier/branches/IUDA_Desktop/Common/source/langhash.c
Frontier/branches/IUDA_Desktop/Common/source/langstartup.c
Frontier/branches/IUDA_Desktop/Common/source/menuverbs.c
Frontier/branches/IUDA_Desktop/Common/source/shell.c
Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/frontierwindows.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/frontierwindows.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/frontierwindows.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -872,4 +872,3 @@
} /*getwindowrefcon*/
-
Modified: Frontier/branches/IUDA_Desktop/Common/source/langhash.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langhash.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/langhash.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -3896,6 +3896,3 @@
} /*hashvaltostrings*/
-
-
-
Modified: Frontier/branches/IUDA_Desktop/Common/source/langstartup.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langstartup.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/langstartup.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -413,7 +413,7 @@
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
langassignbooleanvalue ( ht, str_isFrontier, false ); // 2005-04-06 dluebbert: system.environment.isFrontier
langassignbooleanvalue ( ht, str_isIudaDesktop, true ); // 2007-09-08 creedon: system.environment.isIudaDesktop
@@ -421,7 +421,7 @@
langassignbooleanvalue ( ht, str_isPike, false );
langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
@@ -431,9 +431,9 @@
langassignbooleanvalue ( ht, str_isPike, false );
langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
- #endif
+ #endif // OPMLEDITOR
- #else // Radio UserLand
+ #else
langassignbooleanvalue ( ht, str_isFrontier, false ); // 2005-04-06 dluebbert: system.environment.isFrontier
langassignbooleanvalue ( ht, str_isIudaDesktop, false ); // 2007-09-08 creedon: system.environment.isIudaDesktop
@@ -443,7 +443,7 @@
#endif
- #else
+ #else // !PIKE
langassignbooleanvalue ( ht, str_isFrontier, true ); // 2005-04-06 dluebbert: system.environment.isFrontier
langassignbooleanvalue ( ht, str_isIudaDesktop, false ); // 2007-09-08 creedon: system.environment.isIudaDesktop
@@ -451,7 +451,7 @@
langassignbooleanvalue ( ht, str_isPike, false );
langassignbooleanvalue ( ht, str_isRadio, false ); // 7.0b37 PBS: system.environment.isRadio
- #endif // #ifdef PIKE
+ #endif // !PIKE
return ( true );
Modified: Frontier/branches/IUDA_Desktop/Common/source/menuverbs.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/menuverbs.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/menuverbs.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -2356,5 +2356,3 @@
} /*menustart*/
-
-
Modified: Frontier/branches/IUDA_Desktop/Common/source/shell.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/shell.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/shell.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -1414,3 +1414,4 @@
}
#endif
+
Modified: Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c 2007-11-07 03:42:13 UTC (rev 1779)
+++ Frontier/branches/IUDA_Desktop/Common/source/shellmenu.c 2007-11-07 03:45:33 UTC (rev 1780)
@@ -342,7 +342,7 @@
if (!installmenu (idmenu))
return (false);
- for (idmenu = firsthiermenu; idmenu <= lasthiermenu; idmenu += hiermenuincrement)
+ for (idmenu = firsthiermenu; idmenu <= lasthiermenu; idmenu += hiermenuincrement)
if (!installhierarchicmenu (idmenu))
return (false);
@@ -2258,7 +2258,7 @@
break;
- #if ! ( defined ( IUDADESKTOP ) || defined ( OPMLEDITOR ) ) // 2007-10-27 creedon: IUDA Desktop
+ #if ! ( defined ( IUDADESKTOP ) || defined ( OPMLEDITOR ) )
case openmanilasiteitem: // 7.0b27 PBS
@@ -2458,7 +2458,7 @@
#ifdef PIKE
- #if ! ( defined ( IUDADESKTOP ) || defined ( OPMLEDITOR ) ) // 2007-10-27 creedon: IUDA Desktop
+ #if ! ( defined ( IUDADESKTOP ) || defined ( OPMLEDITOR ) )
case opennotepaditem:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:42:21
|
Revision: 1779
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1779&view=rev
Author: creecode
Date: 2007-11-06 19:42:13 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
Frontier/branches/IUDA_Desktop/Common/source/threads.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langhtml.c 2007-11-07 03:08:17 UTC (rev 1778)
+++ Frontier/branches/IUDA_Desktop/Common/source/langhtml.c 2007-11-07 03:42:13 UTC (rev 1779)
@@ -141,22 +141,21 @@
#define STR_P_flprocessmacrosintags BIGSTRING ("\x17" "processmacrosinhtmltags")
-
#ifdef PIKE
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
#define STR_P_SERVERSTRING BIGSTRING ("\x13" "IUDA Desktop/^0-^1X")
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR // 2005-04-06 dluebbert
#define STR_P_SERVERSTRING BIGSTRING ("\x0b" "OPML/^0-^1X")
- #endif
+ #endif // OPMLEDITOR
#else
@@ -164,13 +163,12 @@
#endif
-#else
+#else // !PIKE
#define STR_P_SERVERSTRING BIGSTRING ("\x0f" "Frontier/^0-^1X") // 2005-01-04 creedon - removed UserLand for open source release
-#endif // #ifdef PIKE
+#endif // !PIKE
-
#define STR_P_RESPONDERERROR BIGSTRING ("\x16" "Responder method error")
#define STR_P_LOGADD BIGSTRING ("\x16" "log.addToGuestDatabase")
#define STR_P_USERWEBSERVERCONFIG BIGSTRING ("\x15" "user.webserver.config")
Modified: Frontier/branches/IUDA_Desktop/Common/source/threads.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/threads.c 2007-11-07 03:08:17 UTC (rev 1778)
+++ Frontier/branches/IUDA_Desktop/Common/source/threads.c 2007-11-07 03:42:13 UTC (rev 1779)
@@ -195,17 +195,35 @@
#endif // MACVERSION
#ifdef WIN95VERSION
-
- #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
-
+
+ #ifdef PIKE
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-27 creedon
+
+ hsharedthreadglobals = CreateMutex (NULL, false, "IUDA Desktop Thread Globals");
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals");
+
+ #endif
+
+ #else // Radio UserLand
+
+ hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals");
+
+ #endif
+
+ #else // Frontier
+
+ hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals");
+
+ #endif // #ifdef PIKE
+
ixlocalthreadglobals = TlsAlloc ();
if (ixlocalthreadglobals == (DWORD) -1) {
@@ -234,7 +252,7 @@
return (true);
- #endif
+ #endif // WIN95VERSION
} // initmainthread
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:08:13
|
Revision: 1778
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1778&view=rev
Author: creecode
Date: 2007-11-06 19:08:17 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/FrontierWinMain.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/FrontierWinMain.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/FrontierWinMain.c 2007-11-07 03:06:32 UTC (rev 1777)
+++ Frontier/branches/IUDA_Desktop/Common/source/FrontierWinMain.c 2007-11-07 03:08:17 UTC (rev 1778)
@@ -1467,9 +1467,13 @@
style = 0;
//#ifdef PIKE
-#ifndef OPMLEDITOR /*2005-04-17 dluebbert*/
- nCmdShow = SW_HIDE; /* 9/24/01 RAB */
-#endif // OPMLEDITOR
+
+ #ifndef OPMLEDITOR /*2005-04-17 dluebbert*/
+
+ // nCmdShow = SW_HIDE; /* 9/24/01 RAB */
+
+ #endif // OPMLEDITOR
+
//#endif
style = style | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
@@ -3125,34 +3129,68 @@
InitCommonControls();
#endif
-#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");
-#endif
+ #ifdef PIKE // 7.0b26 PBS
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ wm_frontieropenfile = RegisterWindowMessage ("IudaDesktopOpenFile");
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ wm_frontieropenfile = RegisterWindowMessage ("OpmlOpenFile");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ wm_frontieropenfile = RegisterWindowMessage ("PikeOpenFile");
+
+ #endif
+
+ #else
+
+ wm_frontieropenfile = RegisterWindowMessage ("FrontierOpenFile");
+
+ #endif // PIKE
+
wm_findmsgstring = RegisterWindowMessage (FINDMSGSTRING);
wm_startreplace = RegisterWindowMessage (sz_frontierstartreplace);
wm_startsearch = RegisterWindowMessage (sz_frontierstartsearch);
-#ifdef PIKE
-
-#ifndef OPMLEDITOR
- frontiermutex = CreateMutex (NULL, true, "PikeInstance");
-#else //OPMLEDITOR
- frontiermutex = CreateMutex (NULL, true, "OpmlInstance");
-#endif // OPMLEDITOR
+ #ifdef PIKE
-#else
- frontiermutex = CreateMutex (NULL, true, "FrontierInstance");
-#endif
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ frontiermutex = CreateMutex (NULL, true, "IudaDesktopInstance");
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ frontiermutex = CreateMutex (NULL, true, "OpmlInstance");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ frontiermutex = CreateMutex (NULL, true, "PikeInstance");
+
+ #endif
+
+ #else
+
+ frontiermutex = CreateMutex (NULL, true, "FrontierInstance");
+
+ #endif
+
if (GetLastError () == ERROR_ALREADY_EXISTS) {
bigstring inputFile;
@@ -3201,16 +3239,34 @@
statusIconData.hWnd = shellframewindow;
statusIconData.uCallbackMessage = FWM_SYSTRAYICON;
-#ifdef PIKE
-#ifndef OPMLEDITOR
- strcpy (statusIconData.szTip, "Radio UserLand");
-#else // OPMLEDITOR
- strcpy (statusIconData.szTip, "OPML");
-#endif // OPMLEDITOR
-#else
- strcpy (statusIconData.szTip, "Frontier"); // 2005-04-02 creedon: removed UserLand
-#endif
+ #ifdef PIKE
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ strcpy ( statusIconData.szTip, "IUDA Desktop" );
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ strcpy (statusIconData.szTip, "OPML");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ strcpy (statusIconData.szTip, "Radio UserLand");
+
+ #endif
+
+ #else
+
+ strcpy (statusIconData.szTip, "Frontier"); // 2005-04-02 creedon: removed UserLand
+
+ #endif
+
Shell_NotifyIcon (NIM_ADD, &statusIconData);
//#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:06:32
|
Revision: 1777
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1777&view=rev
Author: creecode
Date: 2007-11-06 19:06:32 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
in pathtofilespec function, for Windows, call GetLongPathName to always store long path name
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/source/filepath.c
Modified: Frontier/branches/IUDA_Desktop/Common/source/filepath.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/filepath.c 2007-11-07 03:04:22 UTC (rev 1776)
+++ Frontier/branches/IUDA_Desktop/Common/source/filepath.c 2007-11-07 03:06:32 UTC (rev 1777)
@@ -270,6 +270,8 @@
boolean pathtofilespec ( bigstring bspath, ptrfilespec fs ) {
//
+ // 2007-11-05 creedon: for Windows, call GetLongPathName to always store long path name
+ //
// 2006-10-16 creedon: for Mac, FSRef-ized
//
// 5.0d8 dmb: clear fs first thing
@@ -288,7 +290,13 @@
//
bigstring bsfolder;
-
+
+ #ifdef WIN95VERSION
+
+ char fn [ 300 ];
+
+ #endif
+
clearbytes ( fs, sizeof ( *fs ) );
if ( isemptystring ( bspath ) )
@@ -526,6 +534,11 @@
#ifdef WIN95VERSION
+ nullterminate ( bspath );
+
+ if ( GetLongPathName ( stringbaseaddress ( bspath ), fn, 298 ) )
+ copyctopstring ( fn, bspath );
+
copystring (bspath, fsname (fs));
folderfrompath (bspath, bsfolder);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:04:18
|
Revision: 1776
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1776&view=rev
Author: creecode
Date: 2007-11-06 19:04:22 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/resources/Win32/WinLand.rc
Modified: Frontier/branches/IUDA_Desktop/Common/resources/Win32/WinLand.rc
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/resources/Win32/WinLand.rc 2007-11-07 03:01:20 UTC (rev 1775)
+++ Frontier/branches/IUDA_Desktop/Common/resources/Win32/WinLand.rc 2007-11-07 03:04:22 UTC (rev 1776)
@@ -65,21 +65,40 @@
259 CURSOR DISCARDABLE beachball_3.cur
260 CURSOR DISCARDABLE beachball_4.cur
+
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
-#ifdef PIKE /*7.0d8 PBS: new icon for Radio UserLand*/
-#ifndef OPMLEDITOR
-IDB_FRONTIER_BITMAP BITMAP DISCARDABLE radiobluedot.bmp
-#else
-IDB_FRONTIER_BITMAP BITMAP DISCARDABLE opmlapp.bmp
-#endif
-#else
-//IDB_FRONTIER_BITMAP BITMAP DISCARDABLE frontier.bmp
-IDB_FRONTIER_BITMAP BITMAP DISCARDABLE FrontierCactus.bmp
-#endif
+#ifdef PIKE
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-27 creedon
+
+ IDB_FRONTIER_BITMAP BITMAP DISCARDABLE black32x32.bmp
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ IDB_FRONTIER_BITMAP BITMAP DISCARDABLE opmlapp.bmp
+
+ #endif
+
+ #else // Radio UserLand
+
+ IDB_FRONTIER_BITMAP BITMAP DISCARDABLE radiobluedot.bmp // 7.0d8 PBS: new icon for Radio UserLand
+
+ #endif
+
+#else // Frontier
+
+ IDB_FRONTIER_BITMAP BITMAP DISCARDABLE FrontierCactus.bmp
+
+#endif // #ifdef PIKE
+
IDB_BITMAP1 BITMAP DISCARDABLE bitmap1.bmp
IDB_BITMAP2 BITMAP DISCARDABLE bitmap2.bmp
IDB_BITMAP3 BITMAP DISCARDABLE bitmap3.bmp
@@ -129,6 +148,7 @@
IDB_BITMAP47 BITMAP DISCARDABLE bitmap47.bmp
IDB_BITMAP48 BITMAP DISCARDABLE bitmap48.bmp
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -138,20 +158,39 @@
// remains consistent on all systems.
#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
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-24 creedon
+
+ ID_FRONTIER_ICON ICON DISCARDABLE Black16x16Tray.ico
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE Black16x16Tray.ico
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR
+
+ ID_FRONTIER_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
+
+ #endif // OPMLEDITOR
+
+ #else // Radio UserLand
+
+ //ID_FRONTIER_ICON ICON DISCARDABLE radio.ico
+ ID_FRONTIER_ICON ICON DISCARDABLE radiobluedot.ico
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE RadioTrayIcon.ico
+
+ #endif // Radio UserLand
+
+#else // Frontier
+
+ /* // ID_FRONTIER_ICON ICON DISCARDABLE Frontier.ico
ID_FRONTIER_ICON ICON DISCARDABLE FrontierCactus.ico
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico
-#endif
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico */
+#endif // Frontier
+
ID_FATPAGE_ICON ICON DISCARDABLE fatp.ico
ID_ROOT_ICON ICON DISCARDABLE root.ico
ID_2CLK_ICON ICON DISCARDABLE "2clk.ico"
@@ -207,137 +246,209 @@
END
#endif
+
#ifdef PIKE
-/* PBS 07/22/00: Pike's File menu has been revised. It's more
-like a standard File menu now that we're creating outlines
-and saving them to disk. No more What Is This? command.
-Now there's an Open command.
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
+ #ifdef IUDADESKTOP
+
+ filemenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New\tCtrl+N", filemenu+newitem
+ MENUITEM "&Open...\tCtrl+O", filemenu+openitem
+ MENUITEM "Open Recent", openrecentmenu
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM SEPARATOR
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save As...", filemenu+saveasitem
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+ END
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR
+
+ filemenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New\tCtrl+N", filemenu+newitem
+ MENUITEM "&Open...\tCtrl+O", filemenu+openitem
+ MENUITEM "Open URL...", filemenu+openurlitem /*7.0b17 PBS*/
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM SEPARATOR
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save As...", filemenu+saveasitem
+ MENUITEM "&Revert", filemenu+revertitem
+ MENUITEM SEPARATOR
+ MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
+ MENUITEM SEPARATOR
+ MENUITEM "Update Opml.root...", filemenu+updateradiorootitem
+ MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+ END
+
+ #endif // OPMLEDITOR
+
+ #else // Radio UserLand
+
+ /* PBS 07/22/00: Pike's File menu has been revised. It's more
+ like a standard File menu now that we're creating outlines
+ and saving them to disk. No more What Is This? command.
+ Now there's an Open command.
-filemenu MENU DISCARDABLE
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New\tCtrl+N", filemenu+newitem
- MENUITEM "&Open...\tCtrl+O", filemenu+openitem
- MENUITEM "Open URL...", filemenu+openurlitem /*7.0b17 PBS*/
-#ifndef OPMLEDITOR
- MENUITEM "Open Manila Site...", filemenu+openmanilasiteitem /*7.0b27 PBS*/
-#endif // !OPMLEDITOR
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM SEPARATOR
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save As...", filemenu+saveasitem
-#ifndef OPMLEDITOR
- MENUITEM "Save As HTML...", filemenu+saveashtmlitem /*7.0b32 PBS*/
- MENUITEM "Save As Plain Text...", filemenu+saveasplaintextitem /*7.0b32 PBS*/
-#endif // OPMLEDITOR
- MENUITEM "&Revert", filemenu+revertitem
- MENUITEM SEPARATOR
- MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
- MENUITEM SEPARATOR
-#ifndef OPMLEDITOR
- MENUITEM "Update Radio.root...", filemenu+updateradiorootitem
-#else
- MENUITEM "Update Opml.root...", filemenu+updateradiorootitem
-#endif // OPMLEDITOR
+ 7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
- MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
-END
+ filemenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New\tCtrl+N", filemenu+newitem
+ MENUITEM "&Open...\tCtrl+O", filemenu+openitem
+ MENUITEM "Open URL...", filemenu+openurlitem // 7.0b17 PBS
+ MENUITEM "Open Manila Site...", filemenu+openmanilasiteitem // 7.0b27 PBS
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM SEPARATOR
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save As...", filemenu+saveasitem
+ MENUITEM "Save As HTML...", filemenu+saveashtmlitem // 7.0b32 PBS
+ MENUITEM "Save As Plain Text...", filemenu+saveasplaintextitem // 7.0b32 PBS
+ MENUITEM "&Revert", filemenu+revertitem
+ MENUITEM SEPARATOR
+ MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
+ MENUITEM SEPARATOR
+ MENUITEM "Update Radio.root...", filemenu+updateradiorootitem
+ MENUITEM "Work Offline", filemenu+workofflineitem // 7.0b25 PBS
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+ END
-#else
+ #endif // Radio UserLand
+
+#else // Frontier
-filemenu MENU DISCARDABLE
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New", newobjectmenu
- MENUITEM "&Open... \tCtrl+O", filemenu+openitem
- MENUITEM "Open Recent", openrecentmenu /* 2006-02-11 aradke */
- MENUITEM SEPARATOR
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save as Runnable...", filemenu+saverunnableitem
- MENUITEM "Save &As...", filemenu+saveasitem /* 2005-10-26 creedon - changed to Save As*/
- MENUITEM "&Revert", filemenu+revertitem
- MENUITEM SEPARATOR
- // MENUITEM "Expert Mode", filemenu+expertitem
- // MENUITEM SEPARATOR
- MENUITEM "Page Set&up...", filemenu+pagesetupitem
- MENUITEM "&Print...\tCtrl+P", filemenu+printitem
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
-END
+ filemenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New", newobjectmenu
+ MENUITEM "&Open... \tCtrl+O", filemenu+openitem
+ MENUITEM "Open Recent", openrecentmenu // 2006-02-11 aradke
+ MENUITEM SEPARATOR
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save as Runnable...", filemenu+saverunnableitem
+ MENUITEM "Save &As...", filemenu+saveasitem // 2005-10-26 creedon - changed to Save As
+ MENUITEM "&Revert", filemenu+revertitem
+ MENUITEM SEPARATOR
+ // MENUITEM "Expert Mode", filemenu+expertitem
+ // MENUITEM SEPARATOR
+ MENUITEM "Page Set&up...", filemenu+pagesetupitem
+ MENUITEM "&Print...\tCtrl+P", filemenu+printitem
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+ END
-#endif
+#endif // Frontier
-#ifdef PIKE /*7.0b26 PBS: Edit menu differs from Frontier's.*/
-editmenu MENU DISCARDABLE
-BEGIN
- POPUP "&Edit"
- BEGIN
- MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
- MENUITEM SEPARATOR
- MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
- MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
- MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
- MENUITEM "Clear", editmenu+clearitem
- MENUITEM SEPARATOR
- MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
- MENUITEM SEPARATOR
- MENUITEM "Find and Replace", findandreplacemenu
- MENUITEM "Common Styles", commonstylesmenu
- MENUITEM SEPARATOR
- MENUITEM "&Font", fontmenu
- MENUITEM "&Size", sizemenu
- MENUITEM SEPARATOR
-#ifndef OPMLEDITOR
- MENUITEM "Open Notepad\tCtrl+Y", opennotepaditem
-#endif // OPMLEDITOR
- MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
- END
-END
+#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
-#else
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-editmenu MENU DISCARDABLE
+ editmenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&Edit"
+ BEGIN
+ MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
+ MENUITEM SEPARATOR
+ MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
+ MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
+ MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
+ MENUITEM "Clear", editmenu+clearitem
+ MENUITEM SEPARATOR
+ MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
+ MENUITEM SEPARATOR
+ MENUITEM "Find and Replace", findandreplacemenu
+ MENUITEM "Common Styles", commonstylesmenu
+ MENUITEM SEPARATOR
+ MENUITEM "&Font", fontmenu
+ MENUITEM "&Size", sizemenu
+ MENUITEM SEPARATOR
+ MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
+ END
+ END
-/* 2005-09-25 creedon: changed for edit menu items calling scripts */
+ #else // Radio UserLand
+
+ editmenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&Edit"
+ BEGIN
+ MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
+ MENUITEM SEPARATOR
+ MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
+ MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
+ MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
+ MENUITEM "Clear", editmenu+clearitem
+ MENUITEM SEPARATOR
+ MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
+ MENUITEM SEPARATOR
+ MENUITEM "Find and Replace", findandreplacemenu
+ MENUITEM "Common Styles", commonstylesmenu
+ MENUITEM SEPARATOR
+ MENUITEM "&Font", fontmenu
+ MENUITEM "&Size", sizemenu
+ MENUITEM SEPARATOR
+ MENUITEM "Open Notepad\tCtrl+Y", opennotepaditem
+ MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
+ END
+ END
-BEGIN
- POPUP "&Edit"
- BEGIN
- MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
- MENUITEM SEPARATOR
- MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
- MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
- MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
- MENUITEM "Clear", editmenu+clearitem
- MENUITEM SEPARATOR
- MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
- MENUITEM SEPARATOR
- MENUITEM "Find and Replace", findandreplacemenu
- MENUITEM SEPARATOR
- MENUITEM "&Font", fontmenu
- MENUITEM "&Size", sizemenu
- MENUITEM "St&yle", stylemenu
- MENUITEM "Leading", leadingmenu
- MENUITEM "Justify", justifymenu
- MENUITEM "Common Styles", commonstylesmenu
- MENUITEM SEPARATOR
- MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
- END
-END
+ #endif // Radio UserLand
+
+#else // Frontier
-#endif
+ // 2005-09-25 creedon: changed for edit menu items calling scripts
+ editmenu MENU DISCARDABLE
+ BEGIN
+ POPUP "&Edit"
+ BEGIN
+ MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
+ MENUITEM SEPARATOR
+ MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
+ MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
+ MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
+ MENUITEM "Clear", editmenu+clearitem
+ MENUITEM SEPARATOR
+ MENUITEM "Select A&ll\tCtrl+A" editmenu+selectallitem
+ MENUITEM SEPARATOR
+ MENUITEM "Find and Replace", findandreplacemenu
+ MENUITEM SEPARATOR
+ MENUITEM "&Font", fontmenu
+ MENUITEM "&Size", sizemenu
+ MENUITEM "St&yle", stylemenu
+ MENUITEM "Leading", leadingmenu
+ MENUITEM "Justify", justifymenu
+ MENUITEM "Common Styles", commonstylesmenu
+ MENUITEM SEPARATOR
+ MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
+ END
+ END
+
+#endif // Frontier
+
+
windowsmenu MENU DISCARDABLE
BEGIN
POPUP "&Window"
@@ -352,17 +463,37 @@
BEGIN
POPUP "&Help"
BEGIN
-#ifdef PIKE
-#ifndef OPMLEDITOR
+
+#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ MENUITEM "About IUDA Desktop", helpmenu+1
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ MENUITEM "OPML Editor Website", helpmenu+1
+
+ #endif
+
+ #else // Radio UserLand
+
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
- END
+
+ #endif // Radio UserLand
+
+#else // Frontier
+
+ MENUITEM "About Frontier", helpmenu+1
+
+#endif // Frontier
+
END
+END
#endif
#ifdef fontmenu
@@ -518,13 +649,24 @@
"O", filemenu+openitem, VIRTKEY, CONTROL, NOINVERT
"W", filemenu+closeitem, VIRTKEY, CONTROL, NOINVERT
"S", filemenu+saveitem, VIRTKEY, CONTROL, NOINVERT
-#ifdef PIKE
- "P", filemenu+viewinbrowseritem, VIRTKEY, CONTROL, NOINVERT
- "N", filemenu+newitem, VIRTKEY, CONTROL, NOINVERT
-#else
- "P", filemenu+printitem, VIRTKEY, CONTROL, NOINVERT
- "N", newobjectmenu+1, VIRTKEY, CONTROL, NOINVERT
-#endif
+
+ #ifdef PIKE
+
+ #ifndef IUDADESKTOP
+
+ "P", filemenu+viewinbrowseritem, VIRTKEY, CONTROL, NOINVERT
+
+ #endif
+
+ "N", filemenu+newitem, VIRTKEY, CONTROL, NOINVERT
+
+ #else
+
+ "P", filemenu+printitem, VIRTKEY, CONTROL, NOINVERT
+ "N", newobjectmenu+1, VIRTKEY, CONTROL, NOINVERT
+
+ #endif
+
"Q", filemenu+quititem, VIRTKEY, CONTROL, NOINVERT
"Z", editmenu+undoitem, VIRTKEY, CONTROL, NOINVERT
"X", editmenu+cutitem, VIRTKEY, CONTROL, NOINVERT
@@ -546,7 +688,6 @@
END
-
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
@@ -880,38 +1021,82 @@
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", APP_COPYRIGHT_HOLDER "\0"
-#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", "Frontier\0"
-#endif
+
+ #ifdef PIKE
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ VALUE "FileDescription", "IUDA Desktop\0" // 2007-10-23: creedon
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR
+
+ VALUE "FileDescription", "OPML\0" // 2005-04-06 dluebbert: name change
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ VALUE "FileDescription", "Radio AserLand\0" // 7.0d8 PBS: name change
+
+ #endif
+
+ #else
+
+ VALUE "FileDescription", "Frontier\0"
+
+ #endif
+
#ifdef fltrialsize
VALUE "FileVersion", "Trial " APP_VERSION_STRING "\0"
#else
VALUE "FileVersion", APP_VERSION_STRING "\0"
#endif
+
VALUE "InternalName", APPNAME "\0"
// VALUE "Language", "English (United States)\0"
VALUE "LegalCopyright", "\xA9 " APP_COPYRIGHT "\0"
-#ifdef PIKE /*7.0d8 PBS: name change*/
-#ifndef OPMLEDITOR
- VALUE "OriginalFilename", "Radio.exe\0"
- VALUE "ProductName", "Radio UserLand\0"
- VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0"
-#else // OPMLEDITOR
+
+#ifdef PIKE // 7.0d8 PBS: name change
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ VALUE "OriginalFilename", APPNAME ".exe\0"
+ VALUE "ProductName", APPNAME "\0"
+ VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR
+
VALUE "OriginalFilename", "opml.exe\0"
- VALUE "ProductName", "OPML\0"
+ VALUE "ProductName", APPNAME "\0"
VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
-#endif // OPMLEDITOR
-#else // !PIKE
- VALUE "OriginalFilename", "Frontier.exe\0"
- VALUE "ProductName", "Frontier\0"
- VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
-#endif // !PIKE
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ VALUE "OriginalFilename", APPNAME ".exe\0"
+ VALUE "ProductName", APPNAME " BserLand\0"
+ VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". All rights reserved. Permission and Use is Granted Subject to the UserLand End-User License Agreement.\0"
+
+ #endif
+
+#else
+
+ VALUE "OriginalFilename", APPNAME ".exe\0"
+ VALUE "ProductName", APPNAME "\0"
+ VALUE "Full Copyright", "\xA9 Copyright " APP_COPYRIGHT_HOLDER ". Released under the GNU General Public License.\0"
+
+#endif
+
+
#ifdef fltrialsize
VALUE "ProductVersion", "Trial " APP_VERSION_STRING "\0"
#else
@@ -947,37 +1132,61 @@
END
#ifdef PIKE
-#ifndef OPMLEDITOR
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CLIENTTITLE "Radio UserLand" //radio_version_string /*7.0d8 PBS: name change*/
- IDS_UNTITLED "Untitled"
- IDS_APPNAME "Radio UserLand"
- IDS_PRINTJOB "Radio UserLand - "
- IDS_PRINTERROR "Cannot print %s!"
-END
-#else // OPMLEDITOR
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ STRINGTABLE DISCARDABLE
+ BEGIN
+ IDS_CLIENTTITLE "IUDA Desktop" // iudadesktop_version_string // 2007-10-24 creedon
+ IDS_UNTITLED "Untitled"
+ IDS_APPNAME "IUDA Desktop"
+ IDS_PRINTJOB "IUDA Desktop - "
+ IDS_PRINTERROR "Cannot print %s!"
+ END
+
+ #endif // IUDADESKTOP
+
+ #ifdef 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
+
+ STRINGTABLE DISCARDABLE
+ BEGIN
+ IDS_CLIENTTITLE "Radio UserLand" // radio_version_string // 7.0d8 PBS: name change
+ IDS_UNTITLED "Untitled"
+ IDS_APPNAME "Radio UserLand"
+ IDS_PRINTJOB "Radio UserLand - "
+ IDS_PRINTERROR "Cannot print %s!"
+ END
+
+ #endif
+
+#else
+
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
+ BEGIN
+ IDS_CLIENTTITLE "Frontier" // frontier_version_string
+ IDS_UNTITLED "Untitled"
+ IDS_APPNAME "Frontier"
+ IDS_PRINTJOB "Frontier - "
+ IDS_PRINTERROR "Cannot print %s!"
+ END
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CLIENTTITLE "Frontier" //frontier_version_string
- IDS_UNTITLED "Untitled"
- IDS_APPNAME "Frontier"
- IDS_PRINTJOB "Frontier - "
- IDS_PRINTERROR "Cannot print %s!"
-END
+#endif
-#endif //!PIKE
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
@@ -1039,26 +1248,65 @@
#define configres cnfg
#ifdef PIKE
-#ifndef OPMLEDITOR
- 1 Defaults DISCARDABLE BEGIN "Radio UserLand\xAE\0" END /*7.0d8 PBS*/
-#else //OPMLEDITOR
- 1 Defaults DISCARDABLE BEGIN "OPML\0" END /*7.0d8 PBS*/
-#endif //OPMLEDITOR
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 1 Defaults DISCARDABLE BEGIN "IUDA Desktop\0" END // 2007-10-23: creedon
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ 1 Defaults DISCARDABLE BEGIN "OPML\0" END // 7.0d8 PBS
+
+ #endif
+
+ #else
+
+ 1 Defaults DISCARDABLE BEGIN "Radio UserLand\xAE\0" END // 7.0d8 PBS
+
+ #endif
+
#else
+
1 Defaults DISCARDABLE BEGIN "Frontier\0" END
+
#endif
+
2 Defaults DISCARDABLE BEGIN "Untitled\0" END
3 Defaults DISCARDABLE BEGIN "Untitled\0" END
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
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 6 Defaults DISCARDABLE BEGIN "IUDA Desktop.root\0" END
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ 6 Defaults DISCARDABLE BEGIN "opml.root\0" END
+
+ #endif
+
+ #else
+
+ 6 Defaults DISCARDABLE BEGIN "Radio.root\0" END
+
+ #endif
+
#else // !PIKE
+
6 Defaults DISCARDABLE BEGIN "Frontier.root\0" END
+
#endif //!PIKE
+
7 Defaults DISCARDABLE BEGIN "Open a file:\0" END
8 Defaults DISCARDABLE BEGIN APP_VERSION_STRING "\0" END
@@ -1069,11 +1317,27 @@
4 Interface DISCARDABLE BEGIN "Ctrl\0" END
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
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 7 Interface DISCARDABLE BEGIN "Internal error#^0. Please report to discussionArchive.imzUral.info support\0" END
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ 7 Interface DISCARDABLE BEGIN "Internal error#^0. Please report to Scripting.com support\0" END
+
+ #endif
+
+ #else
+
+ 7 Interface DISCARDABLE BEGIN "Internal error#^0. Please report to UserLand Technical Support\0" END
+
+ #endif
+
8 Interface DISCARDABLE BEGIN "; \0" END
9 Interface DISCARDABLE BEGIN "Cancel\0" END
10 Interface DISCARDABLE BEGIN "Script for \042^0\042\0" END
@@ -1086,11 +1350,27 @@
17 Interface DISCARDABLE BEGIN "&Save Database\tCtrl+S\0" END
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
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 20 Interface DISCARDABLE BEGIN "This database was created by an older version of IUDA Desktop and must be converted. Proceed?\0" END
+
+ #endif
+
+ #ifdef OPMLEDITOR
+
+ 20 Interface DISCARDABLE BEGIN "This database was created by an older version of OPML and must be converted. Proceed?\0" END
+
+ #endif
+
+ #else
+
+ 20 Interface DISCARDABLE BEGIN "This database was created by an older version of Frontier and must be converted. Proceed?\0" END
+
+ #endif
+
21 Interface DISCARDABLE BEGIN "Discard all changes made to \042^0\042?\0" END
#ifndef OPMLEDITOR
@@ -1236,31 +1516,71 @@
22 DB_Stats DISCARDABLE BEGIN "header/trailer info disagrees\0" END
23 DB_Stats DISCARDABLE BEGIN "free list shadow out of synch\0" END
-#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
-#endif
+ #ifdef PIKE
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of IUDA Desktop.\0" END // 2007-10-23: creedon
+
+ #endif
+
+ #ifdef 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
+
+ #else
+
+ 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Pike.\0" END
+
+ #endif
+
+ #else
+
+ 1 alerts DISCARDABLE BEGIN "The version number of this database file is not recognized by this version of Frontier.\0" END
+
+ #endif
+
2 alerts DISCARDABLE BEGIN "That name is too long. Item names can have up to 255 characters\0" END
3 alerts DISCARDABLE BEGIN "That name is already in use. Please use a different name\0" END
4 alerts DISCARDABLE BEGIN "A fresh copy of the file could not be opened.\0" END
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
- 7 alerts DISCARDABLE BEGIN "Frontier cannot run on systems older than System 7.0.\0" END
-#endif
+
+ #ifdef PIKE
+
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP
+
+ 6 alerts DISCARDABLE BEGIN "Not enough memory available to run IUDA Desktop.\0" END
+ 7 alerts DISCARDABLE BEGIN "IUDA Desktop cannot run on systems older than System 7.0.\0" END // this is a ref to Mac OS, what is it doing on Windows?
+
+ #endif
+
+ #ifdef 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
+
+ #else
+
+ 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*/
+
+ #endif
+
+ #else
+
+ 6 alerts DISCARDABLE BEGIN "Not enough memory available to run Frontier.\0" END
+ 7 alerts DISCARDABLE BEGIN "Frontier cannot run on systems older than System 7.0.\0" END
+
+ #endif
+
8 alerts DISCARDABLE BEGIN "The Thread Manager is not installed. Some features will be unavailable.\0" END
1 special_folder DISCARDABLE BEGIN "system\0" END
@@ -2226,4 +2546,3 @@
END
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 03:01:15
|
Revision: 1775
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1775&view=rev
Author: creecode
Date: 2007-11-06 19:01:20 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R
Modified: Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R 2007-11-07 02:57:34 UTC (rev 1774)
+++ Frontier/branches/IUDA_Desktop/Common/resources/Mac/SHELL.R 2007-11-07 03:01:20 UTC (rev 1775)
@@ -44,9 +44,8 @@
}
};
+#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
-#ifdef PIKE // File menu for IUDA Desktop, OPML Editor, or Radio UserLand
-
//
// PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File
// menu now.
@@ -54,7 +53,7 @@
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
resource 'MENU' (412, "File") { // Carbon File menu
2,
@@ -93,7 +92,7 @@
}
};
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
@@ -133,7 +132,7 @@
}
};
- #endif
+ #endif // OPMLEDITOR
#else // Radio UserLand
@@ -179,15 +178,13 @@
}
};
- #endif
+ #endif // Radio UserLand
#else // Frontier
- //
// Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
// This is the conditional menu for carbon. You do not need a quit item in
// carbon
- //
resource 'MENU' (412, "File") {
2,
@@ -229,19 +226,18 @@
"Print\xC9", noIcon, "P", noMark, plain
}
};
-
-#endif // #ifdef PIKE
+
+#endif // Frontier
+#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
-#ifdef PIKE // Edit menu for IUDA Desktop, OPML Editor, or Radio UserLand
-
//
// 7.0b26 PBS: Radio UserLand has a different Edit menu.
//
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
resource 'MENU' (3, "Edit") {
3,
@@ -301,7 +297,7 @@
}
};
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
@@ -347,7 +343,7 @@
}
};
- #endif
+ #endif // OPMLEDITOR
#else // Radio UserLand
@@ -395,7 +391,7 @@
}
};
- #endif
+ #endif // Radio UserLand
#else // Frontier
@@ -447,9 +443,8 @@
}
};
-#endif // #ifdef PIKE
+#endif // Frontier
-
resource 'MENU' (4, "Window") {
4,
textMenuProc,
@@ -629,13 +624,13 @@
"Replace & Find Next", noIcon, "H", noMark, plain
- #endif
+ #endif //
- #else
+ #else // Frontier
"Replace & Find Next", noIcon, "1", noMark, plain
- #endif
+ #endif // Frontier
}
};
@@ -766,17 +761,17 @@
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
"IUDA Desktop",
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
"OPML",
- #endif
+ #endif // OPMLEDITOR
#else
@@ -803,17 +798,17 @@
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
"IUDA Desktop.root",
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
"opml.root",
- #endif
+ #endif // OPMLEDITOR
#else
@@ -4514,13 +4509,13 @@
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
type 'IUDA' as 'STR ';
resource 'IUDA' ( 0, "Owner resource" )
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
@@ -4528,9 +4523,9 @@
resource 'OPML' (0, "Owner resource")
- #endif
+ #endif // OPMLEDITOR
- #else // Radio UserLand
+ #else
type 'PIKE' as 'STR ';
@@ -4538,13 +4533,13 @@
#endif
-#else // Frontier
+#else
type 'LAND' as 'STR ';
resource 'LAND' (0, "Owner resource")
-#endif // #ifdef PIKe
+#endif
{
"Copyright \xA9 " APP_COPYRIGHT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 02:57:30
|
Revision: 1774
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1774&view=rev
Author: creecode
Date: 2007-11-06 18:57:34 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
minor formatting tweaks
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/headers/WinLand.h
Modified: Frontier/branches/IUDA_Desktop/Common/headers/WinLand.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/WinLand.h 2007-11-07 02:55:48 UTC (rev 1773)
+++ Frontier/branches/IUDA_Desktop/Common/headers/WinLand.h 2007-11-07 02:57:34 UTC (rev 1774)
@@ -313,3 +313,5 @@
#define IDB_BITMAP46 46
#define IDB_BITMAP47 47
#define IDB_BITMAP48 48
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 02:55:44
|
Revision: 1773
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1773&view=rev
Author: creecode
Date: 2007-11-06 18:55:48 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs and bumped version for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/headers/versions.h
Modified: Frontier/branches/IUDA_Desktop/Common/headers/versions.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/versions.h 2007-11-07 02:52:29 UTC (rev 1772)
+++ Frontier/branches/IUDA_Desktop/Common/headers/versions.h 2007-11-07 02:55:48 UTC (rev 1773)
@@ -51,9 +51,11 @@
#ifdef PIKE
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+
+ #ifdef IUDADESKTOP
+ // version info for IUDADESKTOP targets
+
#define APPNAME "IUDA Desktop"
#define APP_COPYRIGHT_HOLDER "Thomas A. Creedon"
@@ -76,10 +78,12 @@
#define APP_VERSION_STRING "10.1a16"
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
+ // version info for OPMLEDITOR targets
+
#define APPNAME "OPML"
#define APP_COPYRIGHT_HOLDER "Scripting News, Inc"
@@ -102,10 +106,12 @@
#define APP_VERSION_STRING "10.1a15"
- #endif
+ #endif // OPMLEDITOR
- #else // Radio UserLand
+ #else
+ // version info for RADIO targets (formerly known as PIKE)
+
#define APPNAME "Radio"
#define APP_COPYRIGHT_HOLDER "UserLand Software, Inc"
@@ -122,15 +128,17 @@
#define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 15 /* for non-final releases only */
- #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 00 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 00 /* increment by one for every release, final or not */
#define APP_VERSION_STRING "10.1a15"
#endif
-#else // Frontier
+ #else
+ // version info for FRONTIER targets
+
#define APPNAME "Frontier"
#define APP_COPYRIGHT_HOLDER "Frontier Kernel Project"
@@ -140,21 +148,20 @@
#define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
#define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+ #define APP_MAJOR_VERSION_BCD 0x10 // major version in BCD notation
#define APP_SUB_VERSION 1
#define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+ #define APP_SUBMINOR_VERSION_BCD 0x10 // sub and minor version in BCD notation
- #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 15 /* for non-final releases only */
- #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
+ #define APP_STAGE_CODE 0x40 // dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
+ #define APP_REVISION_LEVEL 15 // for non-final releases only
+ #define APP_BUILD_NUMBER 15 // increment by one for every release, final or not
- #define APP_VERSION_STRING "10.1a15"
+ #define APP_VERSION_STRING "10.1a15" */
-#endif // #ifdef PIKE
+#endif
-
#define bs_APP_COPYRIGHT2 BIGSTRING ("\x22" "\xA9 1992-2004 UserLand Software, Inc")
#define APP_COPYRIGHT APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " " APP_COPYRIGHT_HOLDER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 02:52:24
|
Revision: 1772
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1772&view=rev
Author: creecode
Date: 2007-11-06 18:52:29 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h
Modified: Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h 2007-11-07 01:53:50 UTC (rev 1771)
+++ Frontier/branches/IUDA_Desktop/Common/headers/shellmenu.h 2007-11-07 02:52:29 UTC (rev 1772)
@@ -52,7 +52,7 @@
#define leadingmenu 131
#define justifymenu 132
#define findandreplacemenu 133
- #define commonstylesmenu 134
+ #define commonstylesmenu 134
#define newobjectmenu 135
#define virtualmenu 136 /* never appears in user interface -- used for extended keyboard */
#define openrecentmenu 137
@@ -85,21 +85,42 @@
#define lastmainmenu helpmenu
#ifdef PIKE
+
#undef stylemenu
#undef leadingmenu
#undef justifymenu
#undef newobjectmenu
- #undef openrecentmenu
- #define virtualmenu 5100 /* 2006-02-25 aradke: never actually displayed */
+ #define virtualmenu 5100 // 2006-02-25 aradke: never actually displayed
#define fontmenu 5200
#define sizemenu 5300
#define findandreplacemenu 5400
- #define commonstylesmenu 5500 /*7.0b26 PBS*/
+ #define commonstylesmenu 5500 // 7.0b26 PBS
+
+ #ifdef IUDADESKTOP
+
+ #define openrecentmenu 5600 // 2007-10-22 creedon
+
+ #else
+
+ #undef openrecentmenu
+ #endif
+
#define firsthiermenu fontmenu
- #define lasthiermenu commonstylesmenu
+
+ #ifdef IUDADESKTOP
+
+ #define lasthiermenu openrecentmenu // 2007-10-22 creedon
+
+ #else
+
+ #define lasthiermenu commonstylesmenu
+
+ #endif
+
#else //!PIKE
+
#define virtualmenu 5100 /* 2006-02-25 aradke: never actually displayed */
#define fontmenu 5200
#define stylemenu 5300
@@ -121,12 +142,11 @@
#define aboutitem 1
-
#ifdef PIKE
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
#define newitem 1
#define openitem 2
@@ -134,9 +154,10 @@
#define closeitem 4
#define saveitem 6
#define saveasitem 7
+ // #define updateradiorootitem 9
#define quititem 9
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR // OPMLEDITOR 2005-04-06 dluebbert
@@ -156,7 +177,7 @@
#define workofflineitem 13 // 7.0b25 PBS: Work Offline
#define quititem 15
- #endif
+ #endif // OPMLEDITOR
#else // Radio UserLand
@@ -186,7 +207,7 @@
#define workofflineitem 16 // 7.0b25 PBS: Work Offline
#define quititem 18
- #endif
+ #endif // Radio UserLand
#else // Frontier
@@ -207,19 +228,17 @@
#define printitem 12
#define quititem 14
-#endif // #ifdef PIKE
+#endif // Frontier
-
// #define editmenu (filemenu + mainmenuincrement)
#define windowsitem -1
-
#ifdef PIKE
#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
- #ifdef IUDADESKTOP // 2007-10-27 creedon
+ #ifdef IUDADESKTOP
#define undoitem 1
#define cutitem 3
@@ -233,7 +252,7 @@
#define commonstylesitem 14
#define insertdatetimeitem 16
- #endif
+ #endif // IUDADESKTOP
#ifdef OPMLEDITOR
@@ -253,7 +272,7 @@
#define leadingitem -1
#define justifyitem -1
- #endif
+ #endif // OPMLEDITOR
#else // Radio UserLand
@@ -274,7 +293,7 @@
#define leadingitem -1
#define justifyitem -1
- #endif
+ #endif // Radio UserLand
#else // Frontier
@@ -293,9 +312,8 @@
#define commonstylesitem 17
#define insertdatetimeitem 19
-#endif // #ifdef PIKE
+#endif // Frontier
-
// #define windowsmenu (editmenu + mainmenuincrement)
#define hidewindowitem 1
#if TARGET_API_MAC_CARBON == 1
@@ -434,3 +452,5 @@
#endif //!defined(REZ) && !defined(RC_INVOKED)
#endif //shellmenuinclude
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-07 01:53:47
|
Revision: 1771
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1771&view=rev
Author: creecode
Date: 2007-11-06 17:53:50 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
minor formatting tweaks no functional changes
Modified Paths:
--------------
Frontier/branches/IUDA_Desktop/Common/headers/frontierdefs.h
Modified: Frontier/branches/IUDA_Desktop/Common/headers/frontierdefs.h
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/headers/frontierdefs.h 2007-11-06 22:23:02 UTC (rev 1770)
+++ Frontier/branches/IUDA_Desktop/Common/headers/frontierdefs.h 2007-11-07 01:53:50 UTC (rev 1771)
@@ -34,24 +34,31 @@
#ifdef WIN95VERSION
+
#define FRONTIERCOM 1
- #ifndef OPMLEDITOR
+ #ifdef OPMLEDITOR
+
+ #define FRONTIERWEB 1 // 2006-02-05 aradke: enable HTML display in main window background
+
+ #else
+
#define FRONTIERWEB 0
- #else //OPMLEDITOR
- #define FRONTIERWEB 1 /* 2006-02-05 aradke: enable HTML display in main window background */
- #endif // OPMLEDITOR
+ #endif
+
#undef winhybrid
#define fljustpacking 0
#undef flcomponent
#define gray3Dlook 1
#define noextended 1
- #define NEWFILESPECTYPE 1
-#endif /* WIN95VERSION */
+ #define NEWFILESPECTYPE 1
+#endif // WIN95VERSION
+
#ifdef MACVERSION
+
#define flcomponent 1
#ifdef __powerc
#define noextended 1
@@ -60,6 +67,7 @@
#else
#define noextended 0
#endif
+
#endif /* MACVERSION */
@@ -87,6 +95,7 @@
#ifdef MACVERSION
+
#define macBirdRuntime 1
#undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/
#define iowaRuntimeInApp /*iowa code knows it's in an app*/
@@ -94,9 +103,11 @@
#define cmdPeriodKillsCard
#define IOAinsideApp /*all the IOA's are baked into the app*/
#undef coderesource /*we're not running inside a code resource*/
+
#endif
#ifdef WIN95VERSION
+
#undef macBirdRuntime
#undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/
#undef iowaRuntimeInApp /*iowa code knows it's in an app*/
@@ -104,6 +115,7 @@
#undef cmdPeriodKillsCard
#undef IOAinsideApp /*all the IOA's are baked into the app*/
#undef coderesource /*we're not running inside a code resource*/
+
#endif
@@ -115,3 +127,5 @@
#endif /*__FRONTIERDEFS_H__*/
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-11-06 22:23:05
|
Revision: 1770
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1770&view=rev
Author: creecode
Date: 2007-11-06 14:23:02 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
undoing changes committed in r1762:1769, somehow IUDA Desktop changes inadvertently got into the trunk
Modified Paths:
--------------
Frontier/trunk/Common/headers/WinLand.h
Frontier/trunk/Common/headers/frontierdefs.h
Frontier/trunk/Common/headers/shellmenu.h
Frontier/trunk/Common/headers/versions.h
Frontier/trunk/Common/resources/Mac/SHELL.R
Frontier/trunk/Common/resources/Win32/WinLand.rc
Frontier/trunk/Common/source/FrontierWinMain.c
Frontier/trunk/Common/source/filepath.c
Modified: Frontier/trunk/Common/headers/WinLand.h
===================================================================
--- Frontier/trunk/Common/headers/WinLand.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/WinLand.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -313,5 +313,3 @@
#define IDB_BITMAP46 46
#define IDB_BITMAP47 47
#define IDB_BITMAP48 48
-
-
Modified: Frontier/trunk/Common/headers/frontierdefs.h
===================================================================
--- Frontier/trunk/Common/headers/frontierdefs.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/frontierdefs.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -34,31 +34,24 @@
#ifdef WIN95VERSION
-
#define FRONTIERCOM 1
- #ifdef OPMLEDITOR
-
- #define FRONTIERWEB 1 // 2006-02-05 aradke: enable HTML display in main window background
-
- #else
-
+ #ifndef OPMLEDITOR
#define FRONTIERWEB 0
+ #else //OPMLEDITOR
+ #define FRONTIERWEB 1 /* 2006-02-05 aradke: enable HTML display in main window background */
+ #endif // OPMLEDITOR
- #endif
-
#undef winhybrid
#define fljustpacking 0
#undef flcomponent
#define gray3Dlook 1
#define noextended 1
- #define NEWFILESPECTYPE 1
+ #define NEWFILESPECTYPE 1
+#endif /* WIN95VERSION */
-#endif // WIN95VERSION
-
#ifdef MACVERSION
-
#define flcomponent 1
#ifdef __powerc
#define noextended 1
@@ -67,7 +60,6 @@
#else
#define noextended 0
#endif
-
#endif /* MACVERSION */
@@ -95,7 +87,6 @@
#ifdef MACVERSION
-
#define macBirdRuntime 1
#undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/
#define iowaRuntimeInApp /*iowa code knows it's in an app*/
@@ -103,11 +94,9 @@
#define cmdPeriodKillsCard
#define IOAinsideApp /*all the IOA's are baked into the app*/
#undef coderesource /*we're not running inside a code resource*/
-
#endif
#ifdef WIN95VERSION
-
#undef macBirdRuntime
#undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/
#undef iowaRuntimeInApp /*iowa code knows it's in an app*/
@@ -115,7 +104,6 @@
#undef cmdPeriodKillsCard
#undef IOAinsideApp /*all the IOA's are baked into the app*/
#undef coderesource /*we're not running inside a code resource*/
-
#endif
@@ -127,5 +115,3 @@
#endif /*__FRONTIERDEFS_H__*/
-
-
Modified: Frontier/trunk/Common/headers/shellmenu.h
===================================================================
--- Frontier/trunk/Common/headers/shellmenu.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/shellmenu.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -85,42 +85,21 @@
#define lastmainmenu helpmenu
#ifdef PIKE
-
#undef stylemenu
#undef leadingmenu
#undef justifymenu
#undef newobjectmenu
+ #undef openrecentmenu
- #define virtualmenu 5100 // 2006-02-25 aradke: never actually displayed
+ #define virtualmenu 5100 /* 2006-02-25 aradke: never actually displayed */
#define fontmenu 5200
#define sizemenu 5300
#define findandreplacemenu 5400
- #define commonstylesmenu 5500 // 7.0b26 PBS
-
- #ifdef IUDADESKTOP
-
- #define openrecentmenu 5600 // 2007-10-22 creedon
-
- #else
-
- #undef openrecentmenu
+ #define commonstylesmenu 5500 /*7.0b26 PBS*/
- #endif
-
#define firsthiermenu fontmenu
-
- #ifdef IUDADESKTOP
-
- #define lasthiermenu openrecentmenu // 2007-10-22 creedon
-
- #else
-
- #define lasthiermenu commonstylesmenu
-
- #endif
-
+ #define lasthiermenu commonstylesmenu
#else //!PIKE
-
#define virtualmenu 5100 /* 2006-02-25 aradke: never actually displayed */
#define fontmenu 5200
#define stylemenu 5300
@@ -143,82 +122,57 @@
#define aboutitem 1
#ifdef PIKE
+#ifndef OPMLEDITOR
+ // #define filemenu (applemenu + mainmenuincrement)
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- #define newitem 1
- #define openitem 2
- #define openrecentitem 3
- #define closeitem 4
- #define saveitem 6
- #define saveasitem 7
- // #define updateradiorootitem 9
- #define quititem 9
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR // OPMLEDITOR 2005-04-06 dluebbert
-
- #define newitem 1
- #define openitem 2
- #define openurlitem 3 // 7.0b17 PBS: Open URL... command
- // #define openmanilasiteitem 4
- #define closeitem 4
- #define saveitem 6
- #define saveasitem 7
- // #define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
- // #define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
- #define revertitem 8
- #define changetitleitem 5
- #define viewinbrowseritem 10
- #define updateradiorootitem 12
- #define workofflineitem 13 // 7.0b25 PBS: Work Offline
- #define quititem 15
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- //
- // 7.0d10 PBS: Radio UserLand has an Update Radio.root... command in the
- // File menu.
- //
- // PBS 07/22/00: Pike's File menu has been revised -- the number, order,
- // and names of items have changed.
- //
-
- // #define filemenu (applemenu + mainmenuincrement)
+ /*PBS 07/22/00: Pike's File menu has been revised --
+ the number, order, and names of items have changed.
- #define newitem 1
- #define openitem 2
- #define openurlitem 3 // 7.0b17 PBS: Open URL... command
- #define openmanilasiteitem 4
- #define closeitem 5
- #define saveitem 7
- #define saveasitem 8
- #define saveashtmlitem 9 // 7.0b32 PBS: Save As HTML... command
- #define saveasplaintextitem 10 // 7.0b32 PBS: Save As Plain Text... command
- #define revertitem 11
- #define changetitleitem 8
- #define viewinbrowseritem 13
- #define updateradiorootitem 15
- #define workofflineitem 16 // 7.0b25 PBS: Work Offline
- #define quititem 18
+ 7.0d10 PBS: Radio UserLand has an Update Radio.root...
+ command in the File menu.*/
- #endif // Radio UserLand
-
-#else // Frontier
+ #define newitem 1
+ #define openitem 2
+ #define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
+ #define openmanilasiteitem 4
+ #define closeitem 5
+ #define saveitem 7
+ #define saveasitem 8
+ #define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
+ #define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
+ #define revertitem 11
+ #define changetitleitem 8
+ #define viewinbrowseritem 13
+ #define updateradiorootitem 15
+ #define workofflineitem 16 /*7.0b25 PBS: Work Offline*/
+ #define quititem 18
+#else //OPMLEDITOR
+ #define newitem 1
+ #define openitem 2
+ #define openurlitem 3 /*7.0b17 PBS: Open URL... command*/
+// #define openmanilasiteitem 4
+ #define closeitem 4
+ #define saveitem 6
+ #define saveasitem 7
+// #define saveashtmlitem 9 /*7.0b32 PBS: Save As HTML... command*/
+// #define saveasplaintextitem 10 /*7.0b32 PBS: Save As Plain Text... command*/
+ #define revertitem 8
+ #define changetitleitem 5
+ #define viewinbrowseritem 10
+ #define updateradiorootitem 12
+ #define workofflineitem 13 /*7.0b25 PBS: Work Offline*/
+ #define quititem 15
+#endif // OPMLEDITOR
+#else
+
// #define filemenu (applemenu + mainmenuincrement)
-
#define newitem 1
#define openitem 2
#define openrecentitem 3
#define closeitem 5
#define saveitem 6
- #define saverunnableitem 7
+ #define saverunnableitem 7
#define saveasitem 8
#define revertitem 9
@@ -227,93 +181,56 @@
#define pagesetupitem 11
#define printitem 12
#define quititem 14
-
-#endif // Frontier
+#endif
+
// #define editmenu (filemenu + mainmenuincrement)
#define windowsitem -1
#ifdef PIKE
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- #define undoitem 1
- #define cutitem 3
- #define copyitem 4
- #define pasteitem 5
- #define clearitem 6
- #define selectallitem 8
- #define findandreplaceitem 10
- #define fontitem 12
- #define sizeitem 13
- #define commonstylesitem 14
- #define insertdatetimeitem 16
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- #define undoitem 1
- #define cutitem 3
- #define copyitem 4
- #define pasteitem 5
- #define clearitem 6
- #define selectallitem 8
- #define findandreplaceitem 10
- #define commonstylesitem 11
- #define fontitem 13
- #define sizeitem 14
- #define insertdatetimeitem 16
-
- #define styleitem -1
- #define leadingitem -1
- #define justifyitem -1
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- #define undoitem 1
- #define cutitem 3
- #define copyitem 4
- #define pasteitem 5
- #define clearitem 6
- #define selectallitem 8
- #define findandreplaceitem 10
- #define commonstylesitem 11
- #define fontitem 13
- #define sizeitem 14
- #define opennotepaditem 16
- #define insertdatetimeitem 17
-
- #define styleitem -1
- #define leadingitem -1
- #define justifyitem -1
-
- #endif // Radio UserLand
-
-#else // Frontier
+ #define undoitem 1
+ #define cutitem 3
+ #define copyitem 4
+ #define pasteitem 5
+ #define clearitem 6
+ #define selectallitem 8
+ #define findandreplaceitem 10
+ #define commonstylesitem 11
+ #define fontitem 13
+ #define sizeitem 14
+#ifndef OPMLEDITOR
+ #define opennotepaditem 16
+ #define insertdatetimeitem 17
+#else // OPMLEDITOR
+ #define insertdatetimeitem 16
+#endif //OPMLEDITOR
- #define undoitem 1
- #define cutitem 3
- #define copyitem 4
- #define pasteitem 5
- #define clearitem 6
- #define selectallitem 8
- #define findandreplaceitem 10
- #define fontitem 12
- #define sizeitem 13
- #define styleitem 14
- #define leadingitem 15
- #define justifyitem 16
- #define commonstylesitem 17
- #define insertdatetimeitem 19
-
-#endif // Frontier
+ #define styleitem -1
+ #define leadingitem -1
+ #define justifyitem -1
+#else
+
+ #define undoitem 1
+ #define cutitem 3
+ #define copyitem 4
+ #define pasteitem 5
+ #define clearitem 6
+ #define selectallitem 8
+ #define findandreplaceitem 10
+ #define fontitem 12
+ #define sizeitem 13
+ #define styleitem 14
+ #define leadingitem 15
+ #define justifyitem 16
+ #define commonstylesitem 17
+ #define insertdatetimeitem 19
+
+#endif
+
+
// #define windowsmenu (editmenu + mainmenuincrement)
#define hidewindowitem 1
#if TARGET_API_MAC_CARBON == 1
@@ -452,5 +369,3 @@
#endif //!defined(REZ) && !defined(RC_INVOKED)
#endif //shellmenuinclude
-
-
Modified: Frontier/trunk/Common/headers/versions.h
===================================================================
--- Frontier/trunk/Common/headers/versions.h 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/headers/versions.h 2007-11-06 22:23:02 UTC (rev 1770)
@@ -46,98 +46,64 @@
#define APP_COPYRIGHT_TILL "2007"
-// target-specific strings and version info
+/* target-specific strings and version info */
#ifdef PIKE
+#ifndef OPMLEDITOR
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- // version info for IUDADESKTOP targets
-
- #define APPNAME "IUDA Desktop"
-
- #define APP_COPYRIGHT_HOLDER "Thomas A. Creedon"
-
- #define bs_APP_NAME BIGSTRING ( "\x0c" "IUDA Desktop" )
- #define bs_APP_SLOGAN BIGSTRING ( "\x2b" "IMZ-Ural Dicsussion Archive on your desktop" )
- #define bs_APP_COPYRIGHT BIGSTRING ( "\x19" "\xA9 " APP_COPYRIGHT_TILL " Thomas A. Creedon." )
- #define bs_APP_URL BIGSTRING ( "\x26" "http://discussionArchive.imzUral.info/" )
-
- #define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 // major version in BCD notation
-
- #define APP_SUB_VERSION 1
- #define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 // sub and minor version in BCD notation
-
- #define APP_STAGE_CODE 0x40 // dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
- #define APP_REVISION_LEVEL 16 // for non-final releases only
- #define APP_BUILD_NUMBER 16 // increment by one for every release, final or not
-
- #define APP_VERSION_STRING "10.1a16"
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- // version info for OPMLEDITOR targets
-
- #define APPNAME "OPML"
-
- #define APP_COPYRIGHT_HOLDER "Scripting News, Inc"
-
- #define bs_APP_NAME BIGSTRING ("\x04" "OPML")
- #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
- #define bs_APP_COPYRIGHT BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
- #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/")
-
- #define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
-
- #define APP_SUB_VERSION 1
- #define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
-
- #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 15 /* for non-final releases only */
- #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
-
- #define APP_VERSION_STRING "10.1a15"
-
- #endif // OPMLEDITOR
-
- #else
+ /* version info for RADIO targets (formerly known as PIKE) */
- // version info for RADIO targets (formerly known as PIKE)
-
- #define APPNAME "Radio"
- #define APP_COPYRIGHT_HOLDER "UserLand Software, Inc"
-
- #define bs_APP_NAME BIGSTRING ("\x05" "Radio")
- #define bs_APP_SLOGAN BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
- #define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
- #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
-
- #define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
-
- #define APP_SUB_VERSION 1
- #define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
-
- #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 00 /* for non-final releases only */
- #define APP_BUILD_NUMBER 00 /* increment by one for every release, final or not */
-
- #define APP_VERSION_STRING "10.1a15"
+ #define APPNAME "Radio"
+ #define APP_COPYRIGHT_HOLDER "UserLand Software, Inc"
+
+ #define bs_APP_NAME BIGSTRING ("\x05" "Radio")
+ #define bs_APP_SLOGAN BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
+ #define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
+ #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
+
+ #define APP_MAJOR_VERSION 10
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+
+ #define APP_SUB_VERSION 1
+ #define APP_MINOR_VERSION 0
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+
+ #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+ #define APP_REVISION_LEVEL 15 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
+
+ #define APP_VERSION_STRING "10.1a15"
- #endif
+#else
+
+ /* version info for OPMLEDITOR targets */
- #else
+ #define APPNAME "OPML"
+
+ #define APP_COPYRIGHT_HOLDER "Scripting News, Inc"
+
+ #define bs_APP_NAME BIGSTRING ("\x04" "OPML")
+ #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
+ #define bs_APP_COPYRIGHT BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
+ #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/")
+
+ #define APP_MAJOR_VERSION 10
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+
+ #define APP_SUB_VERSION 1
+ #define APP_MINOR_VERSION 0
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+
+ #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+ #define APP_REVISION_LEVEL 15 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
+
+ #define APP_VERSION_STRING "10.1a15"
+
+#endif
+#else
- // version info for FRONTIER targets
+ /* version info for FRONTIER targets */
#define APPNAME "Frontier"
#define APP_COPYRIGHT_HOLDER "Frontier Kernel Project"
@@ -148,17 +114,17 @@
#define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
#define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 // major version in BCD notation
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
#define APP_SUB_VERSION 1
#define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 // sub and minor version in BCD notation
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
- #define APP_STAGE_CODE 0x40 // dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80
- #define APP_REVISION_LEVEL 15 // for non-final releases only
- #define APP_BUILD_NUMBER 15 // increment by one for every release, final or not
+ #define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
+ #define APP_REVISION_LEVEL 15 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 15 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a15" */
+ #define APP_VERSION_STRING "10.1a15"
#endif
Modified: Frontier/trunk/Common/resources/Mac/SHELL.R
===================================================================
--- Frontier/trunk/Common/resources/Mac/SHELL.R 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/resources/Mac/SHELL.R 2007-11-06 22:23:02 UTC (rev 1770)
@@ -44,407 +44,419 @@
}
};
-#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
+#ifdef PIKE
- //
- // PBS 7.0b1: File menu changes for Radio UserLand. It's a standard File
- // menu now.
- //
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- resource 'MENU' (412, "File") { // Carbon File menu
- 2,
- textMenuProc,
- 0x7FFFFE77,
- enabled,
- "File",
- { // array: 7 elements
-
- // [1]
- "New", noIcon, "N", noMark, plain,
-
- // [2]
- "Open\xC9", noIcon, "O", noMark, plain,
-
- // [3]
- "Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
-
- // [4]
- "Close", noIcon, "W", noMark, plain,
-
- // [5]
- "-", noIcon, noKey, noMark, plain,
-
- // [6]
- "Save", noIcon, "S", noMark, plain,
-
- // [7]
- "Save As\xC9", noIcon, noKey, noMark, plain,
-
- /* // [8]
- "-", noIcon, noKey, noMark, plain,
-
- // [9]
- "Update IUDA Desktop.root\xC9", noIcon, noKey, noMark, plain, */
- }
- };
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- resource 'MENU' (412, "File") { // Carbon File menu
- 2,
- textMenuProc,
- 0x7FFFFE77,
- enabled,
- "File",
- { // array: 13 elements
- /* [1] */
- "New", noIcon, "N", noMark, plain,
- /* [2] */
- "Open\xC9", noIcon, "O", noMark, plain,
- /* [3] */
- "Open URL\xC9", noIcon, noKey, noMark, plain, // 7.0b17 PBS
- /* [4] */
- "Close", noIcon, "W", noMark, plain,
- /* [5] */
- "-", noIcon, noKey, noMark, plain,
- /* [6] */
- "Save", noIcon, "S", noMark, plain,
- /* [7] */
- "Save As\xC9", noIcon, noKey, noMark, plain,
- /* [8] */
- "Revert", noIcon, noKey, noMark, plain,
- /* [9] */
- "-", noIcon, noKey, noMark, plain,
- /* [10] */
- "View in Browser", noIcon, "P", noMark, plain,
- /* [11] */
- "-", noIcon, noKey, noMark, plain,
- /* [12] */
- "Update opml.root\xC9", noIcon, noKey, noMark, plain,
- /* [13] */
- "Work Offline", noIcon, noKey, noMark, plain
- }
- };
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- resource 'MENU' (412, "File") { // Carbon File menu
- 2,
- textMenuProc,
- 0x7FFFFE77,
- enabled,
- "File",
- { /* array: 16 elements */
- /* [1] */
- "New", noIcon, "N", noMark, plain,
- /* [2] */
- "Open\xC9", noIcon, "O", noMark, plain,
- /* [3] */
- "Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
- /* [4] */
- "Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
- /* [5] */
- "Close", noIcon, "W", noMark, plain,
- /* [6] */
- "-", noIcon, noKey, noMark, plain,
- /* [7] */
- "Save", noIcon, "S", noMark, plain,
- /* [8] */
- "Save As\xC9", noIcon, noKey, noMark, plain,
- /* [9] */
- "Save As HTML\xC9", noIcon, noKey, noMark, plain,
- /* [10] */
- "Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
- /* [11] */
- "Revert", noIcon, noKey, noMark, plain,
- /* [12] */
- "-", noIcon, noKey, noMark, plain,
- /* [13] */
- "View in Browser", noIcon, "P", noMark, plain,
- /* [14] */
- "-", noIcon, noKey, noMark, plain,
- /* [15] */
- "Update Radio.root\xC9", noIcon, noKey, noMark, plain,
- /* [16] */
- "Work Offline", noIcon, noKey, noMark, plain
- }
- };
-
- #endif // Radio UserLand
-
-#else // Frontier
+/*PBS 7.0b1: File menu changes for Radio UserLand.
+It's a standard File menu now.*/
+#ifndef OPMLEDITOR
+resource 'MENU' (2, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 9 elements */
+ /* [1] */
+ "New", noIcon, "N", noMark, plain,
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+ /* [4] */
+ "Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
+ /* [5] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [6] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [7] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [8] */
+ "Save As\xC9", noIcon, noKey, noMark, plain,
+ /* [9] */
+ "Save As HTML\xC9", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
+ /* [11] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "View in Browser", noIcon, "P", noMark, plain,
+ /* [14] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [15] */
+ "Update Radio.root\xC9", noIcon, noKey, noMark, plain,
+ /* [16] */
+ "Work Offline", noIcon, noKey, noMark, plain,
+ /* [17] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [18] */
+ "Quit", noIcon, "Q", noMark, plain
+ }
+};
- // Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
- // This is the conditional menu for carbon. You do not need a quit item in
- // carbon
-
- resource 'MENU' (412, "File") {
- 2,
- textMenuProc,
- 0x7FFFFE77,
- enabled,
- "File",
- { /* array: 12 elements */
-
- #ifdef version42orgreater
- /* [1] */
- "New", noIcon, hierarchicalMenu, "\0d135", plain,
- #else
- /* [1] */
- "New", noIcon, noKey, noMark, plain,
- #endif
-
- /* [2] */
- "Open\xC9", noIcon, "O", noMark, plain,
- /* [3] */
- "Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
- /* [4] */
- "-", noIcon, noKey, noMark, plain,
- /* [5] */
- "Close", noIcon, "W", noMark, plain,
- /* [6] */
- "Save", noIcon, "S", noMark, plain,
- /* [7] */
- "Save as Runnable\xC9", noIcon, noKey, noMark, plain,
- /* [8] */
- "Save As\xC9", noIcon, noKey, noMark, plain, // 2005-11-01 creedon
- /* [9] */
- "Revert", noIcon, noKey, noMark, plain,
- /* [10] */
- "-", noIcon, noKey, noMark, plain,
- /* [11] */
- "Page Setup\xC9", noIcon, noKey, noMark, plain,
- /* [12] */
- "Print\xC9", noIcon, "P", noMark, plain
- }
- };
-
-#endif // Frontier
+/*Carbon File menu*/
-#ifdef PIKE // IUDA Desktop, OPML Editor, or Radio UserLand
+resource 'MENU' (412, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 9 elements */
+ /* [1] */
+ "New", noIcon, "N", noMark, plain,
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+ /* [4] */
+ "Open Manila Site\xC9", noIcon, noKey, noMark, plain, /*7.0b27 PBS*/
+ /* [5] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [6] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [7] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [8] */
+ "Save As\xC9", noIcon, noKey, noMark, plain,
+ /* [9] */
+ "Save As HTML\xC9", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "Save As Plain Text\xC9", noIcon, noKey, noMark, plain,
+ /* [11] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "View in Browser", noIcon, "P", noMark, plain,
+ /* [14] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [15] */
+ "Update Radio.root\xC9", noIcon, noKey, noMark, plain,
+ /* [16] */
+ "Work Offline", noIcon, noKey, noMark, plain
+ }
+};
+#else // OPMLEDITOR
- //
- // 7.0b26 PBS: Radio UserLand has a different Edit menu.
- //
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
+resource 'MENU' (2, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 9 elements */
+ /* [1] */
+ "New", noIcon, "N", noMark, plain,
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
- resource 'MENU' (3, "Edit") {
- 3,
- textMenuProc,
- 0x7FFFFF5D,
- enabled,
- "Edit",
- { // array: 16 elements
-
- // [1]
- "Undo", noIcon, "Z", noMark, plain,
-
- // [2]
- "-", noIcon, noKey, noMark, plain,
-
- // [3]
- "Cut", noIcon, "X", noMark, plain,
-
- // [4]
- "Copy", noIcon, "C", noMark, plain,
-
- // [5]
- "Paste", noIcon, "V", noMark, plain,
-
- // [6]
- "Clear", noIcon, noKey, noMark, plain,
-
- // [7]
- "-", noIcon, noKey, noMark, plain,
-
- // [8]
- "Select All", noIcon, "A", noMark, plain,
-
- // [9]
- "-", noIcon, noKey, noMark, plain,
-
- // [10]
- "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
-
- // [11]
- "-", noIcon, noKey, noMark, plain,
-
- // [12]
- "Font", noIcon, hierarchicalMenu, "\0d128", plain,
-
- // [13]
- "Size", noIcon, hierarchicalMenu, "\0d130", plain,
-
- // [14]
- "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
-
- // [15]
- "-", noIcon, noKey, noMark, plain,
-
- // [16]
- "Insert Date/Time", noIcon, "4", noMark, plain,
- }
- };
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- resource 'MENU' (3, "Edit") {
- 3,
- textMenuProc,
- 0x7FFFFF5D,
- enabled,
- "Edit",
- { /* array: 14 elements */
- /* [1] */
- "Undo", noIcon, "Z", noMark, plain,
- /* [2] */
- "-", noIcon, noKey, noMark, plain,
- /* [3] */
- "Cut", noIcon, "X", noMark, plain,
- /* [4] */
- "Copy", noIcon, "C", noMark, plain,
- /* [5] */
- "Paste", noIcon, "V", noMark, plain,
- /* [6] */
- "Clear", noIcon, noKey, noMark, plain,
- /* [7] */
- "-", noIcon, noKey, noMark, plain,
- /* [8] */
- "Select All", noIcon, "A", noMark, plain,
- /* [9] */
- "-", noIcon, noKey, noMark, plain,
- /* [10] */
- "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
- /* [11] */
- "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
- /* [12] */
- "-", noIcon, noKey, noMark, plain,
- /* [13] */
- "Font", noIcon, hierarchicalMenu, "\0d128", plain,
- /* [14] */
- "Size", noIcon, hierarchicalMenu, "\0d130", plain,
- /* [15] */
- "-", noIcon, noKey, noMark, plain,
- /* [16] */
- "Insert Date/Time", noIcon, "4", noMark, plain,
- }
- };
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- resource 'MENU' (3, "Edit") {
- 3,
- textMenuProc,
- 0x7FFFFF5D,
- enabled,
- "Edit",
- { /* array: 17 elements */
- /* [1] */
- "Undo", noIcon, "Z", noMark, plain,
- /* [2] */
- "-", noIcon, noKey, noMark, plain,
- /* [3] */
- "Cut", noIcon, "X", noMark, plain,
- /* [4] */
- "Copy", noIcon, "C", noMark, plain,
- /* [5] */
- "Paste", noIcon, "V", noMark, plain,
- /* [6] */
- "Clear", noIcon, noKey, noMark, plain,
- /* [7] */
- "-", noIcon, noKey, noMark, plain,
- /* [8] */
- "Select All", noIcon, "A", noMark, plain,
- /* [9] */
- "-", noIcon, noKey, noMark, plain,
- /* [10] */
- "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
- /* [11] */
- "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
- /* [12] */
- "-", noIcon, noKey, noMark, plain,
- /* [13] */
- "Font", noIcon, hierarchicalMenu, "\0d128", plain,
- /* [14] */
- "Size", noIcon, hierarchicalMenu, "\0d130", plain,
- /* [15] */
- "-", noIcon, noKey, noMark, plain,
- /* [16] */
- "Open Notepad", noIcon, "Y", noMark, plain,
- /* [17] */
- "Insert Date/Time", noIcon, "4", noMark, plain,
- }
- };
-
- #endif // Radio UserLand
-
-#else // Frontier
+ /* [4] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [5] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [6] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [7] */
+ "Save As\xC9", noIcon, noKey, noMark, plain,
+ /* [9] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [9] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "View in Browser", noIcon, "P", noMark, plain,
+ /* [11] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "Update opml.root\xC9", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "Work Offline", noIcon, noKey, noMark, plain,
+ /* [14] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [15] */
+ "Quit", noIcon, "Q", noMark, plain
+ }
+};
- resource 'MENU' (3, "Edit") {
- 3,
- textMenuProc,
- 0x7FFFFF5D,
- enabled,
- "Edit",
- { /* array: 19 elements */
- /* [1] */
- "Undo", noIcon, "Z", noMark, plain,
- /* [2] */
- "-", noIcon, noKey, noMark, plain,
- /* [3] */
- "Cut", noIcon, "X", noMark, plain,
- /* [4] */
- "Copy", noIcon, "C", noMark, plain,
- /* [5] */
- "Paste", noIcon, "V", noMark, plain,
- /* [6] */
- "Clear", noIcon, noKey, noMark, plain,
- /* [7] */
- "-", noIcon, noKey, noMark, plain,
- /* [8] */
- "Select All", noIcon, "A", noMark, plain,
- /* [9] */
- "-", noIcon, noKey, noMark, plain,
- /* [10] */
- "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
- /* [11] */
- "-", noIcon, noKey, noMark, plain,
- /* [12] */
- "Font", noIcon, hierarchicalMenu, "\0d128", plain,
- /* [13] */
- "Size", noIcon, hierarchicalMenu, "\0d130", plain,
- /* [14] */
- "Style", noIcon, hierarchicalMenu, "\0d129", plain,
- /* [15] */
- "Leading", noIcon, hierarchicalMenu, "\0d131", plain,
- /* [16] */
- "Justify", noIcon, hierarchicalMenu, "\0d132", plain,
- /* [17] */
- "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
- /* [18] */
- "-", noIcon, noKey, noMark, plain,
- /* [19] */
- "Insert Date/Time", noIcon, "4", noMark, plain
- }
- };
+/*Carbon File menu*/
+
+resource 'MENU' (412, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 9 elements */
+ /* [1] */
+ "New", noIcon, "N", noMark, plain,
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open URL\xC9", noIcon, noKey, noMark, plain, /*7.0b17 PBS*/
+ /* [4] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [5] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [6] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [7] */
+ "Save As\xC9", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [9] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "View in Browser", noIcon, "P", noMark, plain,
+ /* [11] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "Update opml.root\xC9", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "Work Offline", noIcon, noKey, noMark, plain
+ }
+};
+#endif // OPMLEDITOR
+#else
+
+resource 'MENU' (2, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 14 elements */
+#ifdef version42orgreater
+ /* [1] */
+ "New", noIcon, hierarchicalMenu, "\0d135", plain,
+#else
+ /* [1] */
+ "New", noIcon, noKey, noMark, plain,
+#endif
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+ /* [4] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [5] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [6] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [7] */
+ "Save as Runnable\xC9", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
+ /* [9] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "-", noIcon, noKey, noMark, plain,
+
+// /* [10] */
+// "Expert Mode", noIcon, noKey, noMark, plain,
+// /* [9] */
+// "-", noIcon, noKey, noMark, plain,
+
+ /* [11] */
+ "Page Setup\xC9", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "Print\xC9", noIcon, "P", noMark, plain,
+ /* [13] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [14] */
+ "Quit", noIcon, "Q", noMark, plain
+ }
+};
+
+//Code change by Timothy Paustian Saturday, July 22, 2000 10:22:52 PM
+//This is the conditional menu for carbon. You do not need a quit
+//item in carbon
+resource 'MENU' (412, "File") {
+ 2,
+ textMenuProc,
+ 0x7FFFFE77,
+ enabled,
+ "File",
+ { /* array: 12 elements */
+#ifdef version42orgreater
+ /* [1] */
+ "New", noIcon, hierarchicalMenu, "\0d135", plain,
+#else
+ /* [1] */
+ "New", noIcon, noKey, noMark, plain,
+#endif
+ /* [2] */
+ "Open\xC9", noIcon, "O", noMark, plain,
+ /* [3] */
+ "Open Recent", noIcon, hierarchicalMenu, "\0d137", plain,
+ /* [4] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [5] */
+ "Close", noIcon, "W", noMark, plain,
+ /* [6] */
+ "Save", noIcon, "S", noMark, plain,
+ /* [7] */
+ "Save as Runnable\xC9", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Save As\xC9", noIcon, noKey, noMark, plain, /* 2005-11-01 creedon */
+ /* [9] */
+ "Revert", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [11] */
+ "Page Setup\xC9", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "Print\xC9", noIcon, "P", noMark, plain
+ }
+};
+#endif
+
+#ifdef PIKE /*7.0b26 PBS: Radio UserLand has a different Edit menu.*/
+
+#ifndef OPMLEDITOR
+resource 'MENU' (3, "Edit") {
+ 3,
+ textMenuProc,
+ 0x7FFFFF5D,
+ enabled,
+ "Edit",
+ { /* array: 17 elements */
+ /* [1] */
+ "Undo", noIcon, "Z", noMark, plain,
+ /* [2] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [3] */
+ "Cut", noIcon, "X", noMark, plain,
+ /* [4] */
+ "Copy", noIcon, "C", noMark, plain,
+ /* [5] */
+ "Paste", noIcon, "V", noMark, plain,
+ /* [6] */
+ "Clear", noIcon, noKey, noMark, plain,
+ /* [7] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Select All", noIcon, "A", noMark, plain,
+ /* [9] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+ /* [11] */
+ "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+ /* [12] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "Font", noIcon, hierarchicalMenu, "\0d128", plain,
+ /* [14] */
+ "Size", noIcon, hierarchicalMenu, "\0d130", plain,
+ /* [15] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [16] */
+ "Open Notepad", noIcon, "Y", noMark, plain,
+ /* [17] */
+ "Insert Date/Time", noIcon, "4", noMark, plain,
+ }
+};
+#else //OPMLEDITOR
+resource 'MENU' (3, "Edit") {
+ 3,
+ textMenuProc,
+ 0x7FFFFF5D,
+ enabled,
+ "Edit",
+ { /* array: 14 elements */
+ /* [1] */
+ "Undo", noIcon, "Z", noMark, plain,
+ /* [2] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [3] */
+ "Cut", noIcon, "X", noMark, plain,
+ /* [4] */
+ "Copy", noIcon, "C", noMark, plain,
+ /* [5] */
+ "Paste", noIcon, "V", noMark, plain,
+ /* [6] */
+ "Clear", noIcon, noKey, noMark, plain,
+ /* [7] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Select All", noIcon, "A", noMark, plain,
+ /* [9] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+ /* [11] */
+ "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+ /* [12] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [13] */
+ "Font", noIcon, hierarchicalMenu, "\0d128", plain,
+ /* [14] */
+ "Size", noIcon, hierarchicalMenu, "\0d130", plain,
+ /* [15] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [16] */
+ "Insert Date/Time", noIcon, "4", noMark, plain,
-#endif // Frontier
+ }
+};
+#endif //OPMLEDITOR
+
+#else
+
+resource 'MENU' (3, "Edit") {
+ 3,
+ textMenuProc,
+ 0x7FFFFF5D,
+ enabled,
+ "Edit",
+ { /* array: 19 elements */
+ /* [1] */
+ "Undo", noIcon, "Z", noMark, plain,
+ /* [2] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [3] */
+ "Cut", noIcon, "X", noMark, plain,
+ /* [4] */
+ "Copy", noIcon, "C", noMark, plain,
+ /* [5] */
+ "Paste", noIcon, "V", noMark, plain,
+ /* [6] */
+ "Clear", noIcon, noKey, noMark, plain,
+ /* [7] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [8] */
+ "Select All", noIcon, "A", noMark, plain,
+ /* [9] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [10] */
+ "Find and Replace", noIcon, hierarchicalMenu, "\0d133", plain,
+ /* [11] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [12] */
+ "Font", noIcon, hierarchicalMenu, "\0d128", plain,
+ /* [13] */
+ "Size", noIcon, hierarchicalMenu, "\0d130", plain,
+ /* [14] */
+ "Style", noIcon, hierarchicalMenu, "\0d129", plain,
+ /* [15] */
+ "Leading", noIcon, hierarchicalMenu, "\0d131", plain,
+ /* [16] */
+ "Justify", noIcon, hierarchicalMenu, "\0d132", plain,
+ /* [17] */
+ "Common Styles", noIcon, hierarchicalMenu, "\0d134", plain,
+ /* [18] */
+ "-", noIcon, noKey, noMark, plain,
+ /* [19] */
+ "Insert Date/Time", noIcon, "4", noMark, plain
+ }
+};
+
+#endif
+
resource 'MENU' (4, "Window") {
4,
textMenuProc,
@@ -613,24 +625,15 @@
/* [3] */
"Find Next", noIcon, "G", noMark, plain,
/* [4] */
+ #ifdef PIKE /* 2005-09-25 creedon */
- #ifdef PIKE // 2005-09-25 creedon
+ "Replace & Find Next", noIcon, "H", noMark, plain
- #ifdef IUDADESKTOP // 2007-09-09 creedon
-
- "Replace & Find Next", noIcon, "1", noMark, plain
-
- #else // OPML Editor or Radio UserLand
-
- "Replace & Find Next", noIcon, "H", noMark, plain
-
- #endif //
-
- #else // Frontier
+ #else
- "Replace & Find Next", noIcon, "1", noMark, plain
+ "Replace & Find Next", noIcon, "1", noMark, plain
- #endif // Frontier
+ #endif
}
};
@@ -755,78 +758,41 @@
resource 'STR#' (129, "Defaults", purgeable) {
- { // array StringArray: 6 elements
-
- #ifdef PIKE // [1]
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- "IUDA Desktop",
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- "OPML",
-
- #endif // OPMLEDITOR
-
- #else
-
- "Radio UserLand\xAA", // PBS 7.0b1: name change to Radio UserLand.
-
- #endif
-
- #else
-
- "Frontier", // 2005-01-04 creedon - removed UserLand and (tm) for open source release
-
- #endif // [1]
-
- // [2]
+ { /* array StringArray: 6 elements */
+#ifdef PIKE
+#ifndef OPMLEDITOR
+ /* [1] */
+ "Radio UserLand\xAA", /*PBS 7.0b1: name change to Radio UserLand.*/
+#else // OPMLEDITOR
+ "OPML",
+#endif //OPMLEDITOR
+#else
+ /* [1] */
+ "Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */
+#endif
+ /* [2] */
"Untitled",
- // [3]
+ /* [3] */
"Untitled",
- // [4]
+ /* [4] */
"Select a database file:",
- // [5]
- "",
-
- #ifdef PIKE // [6] -- default DB name
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- "IUDA Desktop.root",
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- "opml.root",
-
- #endif // OPMLEDITOR
-
- #else
-
- "Radio.root", // PBS 7.0b1: changed from Pike.root to Radio.root.
-
- #endif
-
- #else
-
- "Frontier.root",
-
- #endif // [6]
-
- // [7]
+ /* [5] */
+ "",
+#ifdef PIKE
+#ifndef OPMLEDITOR
+ /* [6] -- default DB name*/ /*PBS 7.0b1: changed from Pike.root to Radio.root.*/
+ "Radio.root",
+#else // OPMLEDITOR
+ "opml.root",
+#endif //OPMLEDITOR
+#else
+ /* [6] */
+ "Frontier.root",
+#endif
+ /* [7] */
"Open a file:"
-
- }
- };
+ }
+};
resource 'STR#' (130, "Interface", locked, preload) {
{ /* array StringArray: 15 elements */
@@ -4506,41 +4472,22 @@
#ifdef PIKE
+#ifndef OPMLEDITOR
+type 'PIKE' as 'STR ';
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- type 'IUDA' as 'STR ';
+resource 'PIKE' (0, "Owner resource")
+#else //OPMLEDITOR
+type 'OPML' as 'STR ';
- resource 'IUDA' ( 0, "Owner resource" )
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- type 'OPML' as 'STR ';
+resource 'OPML' (0, "Owner resource")
+#endif // OPMLEDITOR
- resource 'OPML' (0, "Owner resource")
-
- #endif // OPMLEDITOR
-
- #else
-
- type 'PIKE' as 'STR ';
-
- resource 'PIKE' (0, "Owner resource")
-
- #endif
-
#else
- type 'LAND' as 'STR ';
+type 'LAND' as 'STR ';
- resource 'LAND' (0, "Owner resource")
-
+resource 'LAND' (0, "Owner resource")
#endif
-
{
"Copyright \xA9 " APP_COPYRIGHT
};
Modified: Frontier/trunk/Common/resources/Win32/WinLand.rc
===================================================================
--- Frontier/trunk/Common/resources/Win32/WinLand.rc 2007-11-05 21:24:00 UTC (rev 1769)
+++ Frontier/trunk/Common/resources/Win32/WinLand.rc 2007-11-06 22:23:02 UTC (rev 1770)
@@ -65,40 +65,21 @@
259 CURSOR DISCARDABLE beachball_3.cur
260 CURSOR DISCARDABLE beachball_4.cur
-
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
-#ifdef PIKE
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP // 2007-10-27 creedon
-
- IDB_FRONTIER_BITMAP BITMAP DISCARDABLE black32x32.bmp
-
- #endif
-
- #ifdef OPMLEDITOR
-
- IDB_FRONTIER_BITMAP BITMAP DISCARDABLE opmlapp.bmp
-
- #endif
-
- #else // Radio UserLand
-
- IDB_FRONTIER_BITMAP BITMAP DISCARDABLE radiobluedot.bmp // 7.0d8 PBS: new icon for Radio UserLand
-
- #endif
-
-#else // Frontier
-
- IDB_FRONTIER_BITMAP BITMAP DISCARDABLE FrontierCactus.bmp
-
-#endif // #ifdef PIKE
-
+#ifdef PIKE /*7.0d8 PBS: new icon for Radio UserLand*/
+#ifndef OPMLEDITOR
+IDB_FRONTIER_BITMAP BITMAP DISCARDABLE radiobluedot.bmp
+#else
+IDB_FRONTIER_BITMAP BITMAP DISCARDABLE opmlapp.bmp
+#endif
+#else
+//IDB_FRONTIER_BITMAP BITMAP DISCARDABLE frontier.bmp
+IDB_FRONTIER_BITMAP BITMAP DISCARDABLE FrontierCactus.bmp
+#endif
IDB_BITMAP1 BITMAP DISCARDABLE bitmap1.bmp
IDB_BITMAP2 BITMAP DISCARDABLE bitmap2.bmp
IDB_BITMAP3 BITMAP DISCARDABLE bitmap3.bmp
@@ -148,7 +129,6 @@
IDB_BITMAP47 BITMAP DISCARDABLE bitmap47.bmp
IDB_BITMAP48 BITMAP DISCARDABLE bitmap48.bmp
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -158,39 +138,20 @@
// remains consistent on all systems.
#ifdef PIKE
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP // 2007-10-24 creedon
-
- ID_FRONTIER_ICON ICON DISCARDABLE Black16x16Tray.ico
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE Black16x16Tray.ico
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- ID_FRONTIER_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- //ID_FRONTIER_ICON ICON DISCARDABLE radio.ico
- ID_FRONTIER_ICON ICON DISCARDABLE radiobluedot.ico
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE RadioTrayIcon.ico
-
- #endif // Radio UserLand
-
-#else // Frontier
-
- /* // ID_FRONTIER_ICON ICON DISCARDABLE Frontier.ico
+#ifndef OPMLEDITOR
+// ID_FRONTIER_ICON ICON DISCARDABLE radio.ico
+ ID_FRONTIER_ICON ICON DISCARDABLE radiobluedot.ico
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE RadioTrayIcon.ico
+#else // OPMLEDITOR
+ ID_FRONTIER_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE OPMLapp.ico /*2006-02-05 aradke*/
+#endif // OPMLEDITOR
+#else
+// ID_FRONTIER_ICON ICON DISCARDABLE Frontier.ico
ID_FRONTIER_ICON ICON DISCARDABLE FrontierCactus.ico
- ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico */
+ ID_FRONTIERTRAY_ICON ICON DISCARDABLE FrontierCactusTray.ico
+#endif
-#endif // Frontier
-
ID_FATPAGE_ICON ICON DISCARDABLE fatp.ico
ID_ROOT_ICON ICON DISCARDABLE root.ico
ID_2CLK_ICON ICON DISCARDABLE "2clk.ico"
@@ -246,209 +207,137 @@
END
#endif
-
#ifdef PIKE
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+/* PBS 07/22/00: Pike's File menu has been revised. It's more
+like a standard File menu now that we're creating outlines
+and saving them to disk. No more What Is This? command.
+Now there's an Open command.
- #ifdef IUDADESKTOP
-
- filemenu MENU DISCARDABLE
- BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New\tCtrl+N", filemenu+newitem
- MENUITEM "&Open...\tCtrl+O", filemenu+openitem
- MENUITEM "Open Recent", openrecentmenu
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM SEPARATOR
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save As...", filemenu+saveasitem
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
- END
-
- #endif // IUDADESKTOP
-
- #ifdef OPMLEDITOR
-
- filemenu MENU DISCARDABLE
- BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New\tCtrl+N", filemenu+newitem
- MENUITEM "&Open...\tCtrl+O", filemenu+openitem
- MENUITEM "Open URL...", filemenu+openurlitem /*7.0b17 PBS*/
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM SEPARATOR
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save As...", filemenu+saveasitem
- MENUITEM "&Revert", filemenu+revertitem
- MENUITEM SEPARATOR
- MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
- MENUITEM SEPARATOR
- MENUITEM "Update Opml.root...", filemenu+updateradiorootitem
- MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
- END
-
- #endif // OPMLEDITOR
-
- #else // Radio UserLand
-
- /* PBS 07/22/00: Pike's File menu has been revised. It's more
- like a standard File menu now that we're creating outlines
- and saving them to disk. No more What Is This? command.
- Now there's an Open command.
+7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
- 7.0d10 PBS: Update Radio.root... is now part of the File menu.*/
+filemenu MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New\tCtrl+N", filemenu+newitem
+ MENUITEM "&Open...\tCtrl+O", filemenu+openitem
+ MENUITEM "Open URL...", filemenu+openurlitem /*7.0b17 PBS*/
+#ifndef OPMLEDITOR
+ MENUITEM "Open Manila Site...", filemenu+openmanilasiteitem /*7.0b27 PBS*/
+#endif // !OPMLEDITOR
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM SEPARATOR
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save As...", filemenu+saveasitem
+#ifndef OPMLEDITOR
+ MENUITEM "Save As HTML...", filemenu+saveashtmlitem /*7.0b32 PBS*/
+ MENUITEM "Save As Plain Text...", filemenu+saveasplaintextitem /*7.0b32 PBS*/
+#endif // OPMLEDITOR
+ MENUITEM "&Revert", filemenu+revertitem
+ MENUITEM SEPARATOR
+ MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
+ MENUITEM SEPARATOR
+#ifndef OPMLEDITOR
+ MENUITEM "Update Radio.root...", filemenu+updateradiorootitem
+#else
+ MENUITEM "Update Opml.root...", filemenu+updateradiorootitem
+#endif // OPMLEDITOR
- filemenu MENU DISCARDABLE
- BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New\tCtrl+N", filemenu+newitem
- MENUITEM "&Open...\tCtrl+O", filemenu+openitem
- MENUITEM "Open URL...", filemenu+openurlitem // 7.0b17 PBS
- MENUITEM "Open Manila Site...", filemenu+openmanilasiteitem // 7.0b27 PBS
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM SEPARATOR
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save As...", filemenu+saveasitem
- MENUITEM "Save As HTML...", filemenu+saveashtmlitem // 7.0b32 PBS
- MENUITEM "Save As Plain Text...", filemenu+saveasplaintextitem // 7.0b32 PBS
- MENUITEM "&Revert", filemenu+revertitem
- MENUITEM SEPARATOR
- MENUITEM "&View in Browser\tCtrl+P", filemenu+viewinbrowseritem
- MENUITEM SEPARATOR
- MENUITEM "Update Radio.root...", filemenu+updateradiorootitem
- MENUITEM "Work Offline", filemenu+workofflineitem // 7.0b25 PBS
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
- END
+ MENUITEM "Work Offline", filemenu+workofflineitem /*7.0b25 PBS*/
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+END
- #endif // Radio UserLand
-
-#else // Frontier
+#else
- filemenu MENU DISCARDABLE
- BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New", newobjectmenu
- MENUITEM "&Open... \tCtrl+O", filemenu+openitem
- MENUITEM "Open Recent", openrecentmenu // 2006-02-11 aradke
- MENUITEM SEPARATOR
- MENUITEM "&Close\tCtrl+W", filemenu+closeitem
- MENUITEM "&Save\tCtrl+S", filemenu+saveitem
- MENUITEM "Save as Runnable...", filemenu+saverunnableitem
- MENUITEM "Save &As...", filemenu+saveasitem // 2005-10-26 creedon - changed to Save As
- MENUITEM "&Revert", filemenu+revertitem
- MENUITEM SEPARATOR
- // MENUITEM "Expert Mode", filemenu+expertitem
- // MENUITEM SEPARATOR
- MENUITEM "Page Set&up...", filemenu+pagesetupitem
- MENUITEM "&Print...\tCtrl+P", filemenu+printitem
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
- END
- END
+filemenu MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&New", newobjectmenu
+ MENUITEM "&Open... \tCtrl+O", filemenu+openitem
+ MENUITEM "Open Recent", openrecentmenu /* 2006-02-11 aradke */
+ MENUITEM SEPARATOR
+ MENUITEM "&Close\tCtrl+W", filemenu+closeitem
+ MENUITEM "&Save\tCtrl+S", filemenu+saveitem
+ MENUITEM "Save as Runnable...", filemenu+saverunnableitem
+ MENUITEM "Save &As...", filemenu+saveasitem /* 2005-10-26 creedon - changed to Save As*/
+ MENUITEM "&Revert", filemenu+revertitem
+ MENUITEM SEPARATOR
+ // MENUITEM "Expert Mode", filemenu+expertitem
+ // MENUITEM SEPARATOR
+ MENUITEM "Page Set&up...", filemenu+pagesetupitem
+ MENUITEM "&Print...\tCtrl+P", filemenu+printitem
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tCtrl+Q", filemenu+quititem
+ END
+END
-#endif // Frontier
+#endif
+#ifdef PIKE /*7.0b26 PBS: Edit menu differs from Frontier's.*/
-#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
+editmenu MENU DISCARDABLE
+BEGIN
+ POPUP "&Edit"
+ BEGIN
+ MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
+ MENUITEM SEPARATOR
+ MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
+ MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
+ MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
+ MENUITEM "Clear", editmenu+clearitem
+ MENUITEM SEPARATOR
+ MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
+ MENUITEM SEPARATOR
+ MENUITEM "Find and Replace", findandreplacemenu
+ MENUITEM "Common Styles", commonstylesmenu
+ MENUITEM SEPARATOR
+ MENUITEM "&Font", fontmenu
+ MENUITEM "&Size", sizemenu
+ MENUITEM SEPARATOR
+#ifndef OPMLEDITOR
+ MENUITEM "Open Notepad\tCtrl+Y", opennotepaditem
+#endif // OPMLEDITOR
+ MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
+ END
+END
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+#else
- editmenu MENU DISCARDABLE
- BEGIN
- POPUP "&Edit"
- BEGIN
- MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
- MENUITEM SEPARATOR
- MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
- MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
- MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
- MENUITEM "Clear", editmenu+clearitem
- MENUITEM SEPARATOR
- MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
- MENUITEM SEPARATOR
- MENUITEM "Find and Replace", findandreplacemenu
- MENUITEM "Common Styles", commonstylesmenu
- MENUITEM SEPARATOR
- MENUITEM "&Font", fontmenu
- MENUITEM "&Size", sizemenu
- MENUITEM SEPARATOR
- MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
- END
- END
+editmenu MENU DISCARDABLE
- #else // Radio UserLand
-
- editmenu MENU DISCARDABLE
- BEGIN
- POPUP "&Edit"
- BEGIN
- MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
- MENUITEM SEPARATOR
- MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
- MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
- MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
- MENUITEM "Clear", editmenu+clearitem
- MENUITEM SEPARATOR
- MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
- MENUITEM SEPARATOR
- MENUITEM "Find and Replace", findandreplacemenu
- MENUITEM "Common Styles", commonstylesmenu
- MENUITEM SEPARATOR
- MENUITEM "&Font", fontmenu
- MENUITEM "&Size", sizemenu
- MENUITEM SEPARATOR
- MENUITEM "Open Notepad\tCtrl+Y", opennotepaditem
- MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
- END
- END
+/* 2005-09-25 creedon: changed for edit menu items calling scripts */
- #endif // Radio UserLand
-
-#else // Frontier
+BEGIN
+ POPUP "&Edit"
+ BEGIN
+ MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
+ MENUITEM SEPARATOR
+ MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
+ MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
+ MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
+ MENUITEM "Clear", editmenu+clearitem
+ MENUITEM SEPARATOR
+ MENUITEM "Select A&ll\tCtrl+A", editmenu+selectallitem
+ MENUITEM SEPARATOR
+ MENUITEM "Find and Replace", findandreplacemenu
+ MENUITEM SEPARATOR
+ MENUITEM "&Font", fontmenu
+ MENUITEM "&Size", sizemenu
+ MENUITEM "St&yle", stylemenu
+ MENUITEM "Leading", leadingmenu
+ MENUITEM "Justify", justifymenu
+ MENUITEM "Common Styles", commonstylesmenu
+ MENUITEM SEPARATOR
+ MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
+ END
+END
- // 2005-09-25 creedon: changed for edit menu items calling scripts
+#endif
- editmenu MENU DISCARDABLE
- BEGIN
- POPUP "&Edit"
- BEGIN
- MENUITEM "&Undo\tCtrl+Z", editmenu+undoitem
- MENUITEM SEPARATOR
- MENUITEM "Cu&t\tCtrl+X", editmenu+cutitem
- MENUITEM "&Copy\tCtrl+C", editmenu+copyitem
- MENUITEM "&Paste\tCtrl+V", editmenu+pasteitem
- MENUITEM "Clear", editmenu+clearitem
- MENUITEM SEPARATOR
- MENUITEM "Select A&ll\tCtrl+A" editmenu+selectallitem
- MENUITEM SEPARATOR
- MENUITEM "Find and Replace", findandreplacemenu
- MENUITEM SEPARATOR
- MENUITEM "&Font", fontmenu
- MENUITEM "&Size", sizemenu
- MENUITEM "St&yle", stylemenu
- MENUITEM "Leading", leadingmenu
- MENUITEM "Justify", justifymenu
- MENUITEM "Common Styles", commonstylesmenu
- MENUITEM SEPARATOR
- MENUITEM "Insert Date/Time\tCtrl+4", insertdatetimeitem
- END
- END
-
-#endif // Frontier
-
-
windowsmenu MENU DISCARDABLE
BEGIN
POPUP "&Window"
@@ -463,37 +352,17 @@
BEGIN
POPUP "&Help"
BEGIN
-
-#ifdef PIKE // 7.0b26 PBS: Edit menu differs from Frontier's
-
- #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
-
- #ifdef IUDADESKTOP
-
- MENUITEM "About IUDA Desktop", helpmenu+1
-
- #endif
-
- #ifdef OPMLEDITOR
-
- MENUITEM "OPML Editor Website", helpmenu+1
-
- #endif
-
- #else // Radio UserLand
-
+#ifdef PIKE
+#ifndef OPMLEDITOR
MENUITEM "Radio Website", helpmenu+1 /*7.0d8 PBS: name change*/
-
- #endif // Radio UserLand
-
-#else // Frontier
-
- MENUITEM "About Frontier", helpmenu+1
-
-#endif // Frontier
-
+#else
+ MENUITEM "OPML Editor Website", helpmenu+1 /*7.0d8 PBS: name change*/
+#endif // OPMLEDITOR
+#else
+ MENUITEM "About Frontier", helpmenu+1
+#endif
+ END
END
-END
#endif
#ifdef fontmenu
@@ -649,24 +518,13 @@
"O", filemenu+openitem, VIRTKEY, CONTROL, NOINVERT
"W", filemenu+closeitem, VIRTKEY, CONTROL, NOINVERT
"S", filemenu+saveitem, VIRTKEY, CONTROL, NOINVERT
-
- #ifdef PIKE
-
- #ifndef IUDADESKTOP
-
- "P", filemenu+viewinbrowseritem, VIRTKEY, CONTROL, NOINVERT
-
- #endif
-
- "N", filemenu+newitem, VIRTKEY, CONTROL, NOINVERT
-
- #else
-
- "P", filemenu+printitem, VIRTKEY, CONTROL, NOINVERT
- "N", newobjectmenu+1, VIRTKEY, CONTROL, NOINVERT
-
- #endif
-
+#ifdef PIKE
+ "P", filemenu+viewinbrowseritem, VIRTKEY, CONTROL, NOINVERT
+ "N", filemenu+newitem, VIRTKEY, CONTROL, NOINVERT
+#else
+ "P", filemenu+printitem, VIRTKEY, CONTROL, NOINVERT
+ "N", newobjectmenu+1, VIRTKEY, CONTROL, NOINVERT
+#endif
"Q", filemenu+quititem, VIRTKEY, CONTROL, NOINVERT
"Z", editmenu+undoitem, VIRTKEY, CONTROL, NOINVERT
"X", editmenu+cutitem, VIR...
[truncated message content] |
|
From: <cre...@us...> - 2007-11-05 21:23:55
|
Revision: 1769
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1769&view=rev
Author: creecode
Date: 2007-11-05 13:24:00 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
added ifdefs for IUDA Desktop target
Modified Paths:
--------------
Frontier/trunk/Common/source/FrontierWinMain.c
Modified: Frontier/trunk/Common/source/FrontierWinMain.c
===================================================================
--- Frontier/trunk/Common/source/FrontierWinMain.c 2007-11-05 21:04:03 UTC (rev 1768)
+++ Frontier/trunk/Common/source/FrontierWinMain.c 2007-11-05 21:24:00 UTC (rev 1769)
@@ -1467,9 +1467,13 @@
style = 0;
//#ifdef PIKE
-#ifndef OPMLEDITOR /*2005-04-17 dluebbert*/
- nCmdShow = SW_HIDE; /* 9/24/01 RAB */
-#endif // OPMLEDITOR
+
+ #ifndef OPMLEDITOR /*2005-04-17 dluebbert*/
+
+ // nCmdShow = SW_HIDE; /* 9/24/01 RAB */
+
+ #endif // OPMLEDITOR
+
//#endif
style = style | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
@@ -3125,34 +3129,68 @@
InitCommonControls();
#endif
-#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");
-#endif
+ #ifdef PIKE // 7.0b26 PBS
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ wm_frontieropenfile = RegisterWindowMessage ("IudaDesktopOpenFile");
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ wm_frontieropenfile = RegisterWindowMessage ("OpmlOpenFile");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ wm_frontieropenfile = RegisterWindowMessage ("PikeOpenFile");
+
+ #endif
+
+ #else
+
+ wm_frontieropenfile = RegisterWindowMessage ("FrontierOpenFile");
+
+ #endif // PIKE
+
wm_findmsgstring = RegisterWindowMessage (FINDMSGSTRING);
wm_startreplace = RegisterWindowMessage (sz_frontierstartreplace);
wm_startsearch = RegisterWindowMessage (sz_frontierstartsearch);
-#ifdef PIKE
-
-#ifndef OPMLEDITOR
- frontiermutex = CreateMutex (NULL, true, "PikeInstance");
-#else //OPMLEDITOR
- frontiermutex = CreateMutex (NULL, true, "OpmlInstance");
-#endif // OPMLEDITOR
+ #ifdef PIKE
-#else
- frontiermutex = CreateMutex (NULL, true, "FrontierInstance");
-#endif
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ frontiermutex = CreateMutex (NULL, true, "IudaDesktopInstance");
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ frontiermutex = CreateMutex (NULL, true, "OpmlInstance");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ frontiermutex = CreateMutex (NULL, true, "PikeInstance");
+
+ #endif
+
+ #else
+
+ frontiermutex = CreateMutex (NULL, true, "FrontierInstance");
+
+ #endif
+
if (GetLastError () == ERROR_ALREADY_EXISTS) {
bigstring inputFile;
@@ -3201,16 +3239,34 @@
statusIconData.hWnd = shellframewindow;
statusIconData.uCallbackMessage = FWM_SYSTRAYICON;
-#ifdef PIKE
-#ifndef OPMLEDITOR
- strcpy (statusIconData.szTip, "Radio UserLand");
-#else // OPMLEDITOR
- strcpy (statusIconData.szTip, "OPML");
-#endif // OPMLEDITOR
-#else
- strcpy (statusIconData.szTip, "Frontier"); // 2005-04-02 creedon: removed UserLand
-#endif
+ #ifdef PIKE
+ #if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+ #ifdef IUDADESKTOP // 2007-10-22 creedon
+
+ strcpy ( statusIconData.szTip, "IUDA Desktop" );
+
+ #endif // IUDADESKTOP
+
+ #ifdef OPMLEDITOR // 2005-04-06 dluebbert
+
+ strcpy (statusIconData.szTip, "OPML");
+
+ #endif // OPMLEDITOR
+
+ #else
+
+ strcpy (statusIconData.szTip, "Radio UserLand");
+
+ #endif
+
+ #else
+
+ strcpy (statusIconData.szTip, "Frontier"); // 2005-04-02 creedon: removed UserLand
+
+ #endif
+
Shell_NotifyIcon (NIM_ADD, &statusIconData);
//#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
