From: znek Date: Mon, 19 Jul 2004 15:04:59 +0000 (+0000) Subject: Locales and some code for dealing with them. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bd276c21292493c8e735cc4f6a75d6eb921a1dc;p=scalable-opengroupware.org Locales and some code for dealing with them. git-svn-id: http://svn.opengroupware.org/SOGo/trunk@145 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog new file mode 100644 index 00000000..985d128b --- /dev/null +++ b/SOGo/Main/ChangeLog @@ -0,0 +1,15 @@ +2004-07-19 Marcus Mueller + + * v0.9.2 + + * sogod.m: added localization methods. Current locale is put into WOContext + upon first request. All locales are cached in the application object. + + * [English,French].lproj: created. Put appropriate Locale representations + here. + + * GNUmakefile: added LANGUAGES and LOCALIZED_RESOURCES. + + * SOGoRootPage.wox: some debug code (for locales). + + * created ChangeLog. \ No newline at end of file diff --git a/SOGo/Main/English.lproj/Locale b/SOGo/Main/English.lproj/Locale new file mode 100644 index 00000000..09b1125a Binary files /dev/null and b/SOGo/Main/English.lproj/Locale differ diff --git a/SOGo/Main/French.lproj/Locale b/SOGo/Main/French.lproj/Locale new file mode 100644 index 00000000..147c098a Binary files /dev/null and b/SOGo/Main/French.lproj/Locale differ diff --git a/SOGo/Main/GNUmakefile b/SOGo/Main/GNUmakefile index d55e93b7..f2949980 100644 --- a/SOGo/Main/GNUmakefile +++ b/SOGo/Main/GNUmakefile @@ -4,6 +4,8 @@ include $(GNUSTEP_MAKEFILES)/common.make WOAPP_NAME = sogod +sogod_LANGUAGES = English French + sogod_OBJC_FILES += \ sogod.m \ SOGoProductLoader.m \ @@ -19,6 +21,9 @@ sogod_RESOURCE_FILES += \ SOGoRootPage.wox \ SOGoUserHomePage.wox \ +sogod_LOCALIZED_RESOURCE_FILES += \ + Locale + sogod_WEBSERVER_RESOURCE_FILES += -include GNUmakefile.preamble diff --git a/SOGo/Main/README b/SOGo/Main/README index e228602f..ec1f05d1 100644 --- a/SOGo/Main/README +++ b/SOGo/Main/README @@ -15,4 +15,5 @@ Setup Defaults ======== - SOGoCrashOnSessionCreate - bool - crash the server is a session is created + SOGoCrashOnSessionCreate - bool - crash the server if a session is created + => useful for debugging diff --git a/SOGo/Main/SOGoRootPage.wox b/SOGo/Main/SOGoRootPage.wox index 771354cc..af5e8e38 100644 --- a/SOGo/Main/SOGoRootPage.wox +++ b/SOGo/Main/SOGoRootPage.wox @@ -16,5 +16,9 @@ + diff --git a/SOGo/Main/Version b/SOGo/Main/Version index 1b77c541..46fb72d5 100644 --- a/SOGo/Main/Version +++ b/SOGo/Main/Version @@ -1,3 +1,3 @@ # $Id: Version,v 1.1 2003/11/24 01:24:40 helge Exp $ -SUBMINOR_VERSION:=1 +SUBMINOR_VERSION:=2 diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m index c1ff3ae8..c63b6419 100644 --- a/SOGo/Main/sogod.m +++ b/SOGo/Main/sogod.m @@ -24,8 +24,12 @@ @interface SOGo : SoApplication { + NSMutableDictionary *localeLUT; } +- (NSDictionary *)currentLocaleConsideringLanguages:(NSArray *)_langs; +- (NSDictionary *)localeForLanguageNamed:(NSString *)_name; + @end #include "SOGoAuthenticator.h" @@ -58,6 +62,7 @@ static BOOL doCrashOnSessionCreate = NO; - (id)init { if ((self = [super init])) { + self->localeLUT = [[NSMutableDictionary alloc] initWithCapacity:2]; [[SOGoProductLoader productLoader] loadProducts]; #if 0 /* enable, if we added the value class */ @@ -72,6 +77,11 @@ static BOOL doCrashOnSessionCreate = NO; return self; } +- (void)dealloc { + [self->localeLUT release]; + [super dealloc]; +} + /* authenticator */ - (id)authenticatorInContext:(WOContext *)_ctx { @@ -97,7 +107,16 @@ static BOOL doCrashOnSessionCreate = NO; - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag { id obj; - + + /* put locale info into the context in case it's not there */ + if(![_ctx valueForKey:@"locale"]) { + NSArray *langs; + NSDictionary *locale; + + langs = [[_ctx request] browserLanguages]; + locale = [self currentLocaleConsideringLanguages:langs]; + [_ctx takeValue:locale forKey:@"locale"]; + } /* first check attributes directly bound to the application */ if ((obj = [super lookupName:_key inContext:_ctx acquire:_flag])) return obj; @@ -184,6 +203,49 @@ static BOOL doCrashOnSessionCreate = NO; return [super createSessionForRequest:_request]; } +/* localization */ + +- (NSDictionary *)currentLocaleConsideringLanguages:(NSArray *)_langs { + unsigned i, count; + + // assume _langs is ordered by priority + count = [_langs count]; + for(i = 0; i < count; i++) { + NSString *lname; + NSDictionary *locale; + + lname = [_langs objectAtIndex:i]; + locale = [self localeForLanguageNamed:lname]; + if(locale) + return locale; + } + // no appropriate language, fallback to default + return [self localeForLanguageNamed:@"English"]; +} + +- (NSDictionary *)localeForLanguageNamed:(NSString *)_name { + NSString *lpath; + NSDictionary *locale; + + NSAssert(_name != nil, @"_name MUST NOT be nil!"); + if((locale = [self->localeLUT objectForKey:_name]) != nil) + return locale; + lpath = [[self resourceManager] + pathForResourceNamed:@"Locale" + inFramework:nil + languages:[NSArray arrayWithObject:_name]]; + locale = [[NSString stringWithContentsOfFile:lpath] + propertyList]; + if(locale == nil) { + NSLog(@"%s didn't find locale with name:%@", + __PRETTY_FUNCTION__, + _name); + return nil; + } + [self->localeLUT setObject:locale forKey:_name]; + return locale; +} + @end /* SOGo */ diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index 490849df..82e9800b 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -5,6 +5,88 @@ }; objectVersion = 39; objects = { + AD152B6F06AC159A002375D2 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = ChangeLog; + refType = 4; + sourceTree = ""; + tabWidth = 4; + usesTabs = 1; + }; + AD6BCEE5069D77E9003664CD = { + children = ( + AD6BCF0D069D77E9003664CD, + AD6BCF12069D77E9003664CD, + AD6BCF0E069D77E9003664CD, + AD6BCF0F069D77E9003664CD, + AD6BCF10069D77E9003664CD, + AD6BCF11069D77E9003664CD, + ); + isa = PBXGroup; + path = SOGoUI; + refType = 4; + sourceTree = ""; + }; + AD6BCF0D069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = ChangeLog; + refType = 4; + sourceTree = ""; + }; + AD6BCF0E069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = GNUmakefile; + refType = 4; + sourceTree = ""; + }; + AD6BCF0F069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = GNUmakefile.preamble; + refType = 4; + sourceTree = ""; + }; + AD6BCF10069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = UIxComponent.h; + refType = 4; + sourceTree = ""; + }; + AD6BCF11069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxComponent.m; + refType = 4; + sourceTree = ""; + }; + AD6BCF12069D77E9003664CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = Version; + refType = 4; + sourceTree = ""; + }; +//AD0 +//AD1 +//AD2 +//AD3 +//AD4 +//E80 +//E81 +//E82 +//E83 +//E84 E87205850692E3B40099CBBD = { children = ( E87205F40692E3D00099CBBD, @@ -18,8 +100,6 @@ sourceTree = ""; }; E87205870692E3B40099CBBD = { - buildRules = ( - ); buildSettings = { COPY_PHASE_STRIP = NO; }; @@ -27,8 +107,6 @@ name = Development; }; E87205880692E3B40099CBBD = { - buildRules = ( - ); buildSettings = { COPY_PHASE_STRIP = YES; }; @@ -60,11 +138,13 @@ }; E872058F0692E3D00099CBBD = { children = ( - E87205CE0692E3D00099CBBD, E87205CF0692E3D00099CBBD, E87205D00692E3D00099CBBD, - E87205D70692E3D00099CBBD, E87205D80692E3D00099CBBD, + AD152B6F06AC159A002375D2, + E87205F30692E3D00099CBBD, + E87205D70692E3D00099CBBD, + E87205CE0692E3D00099CBBD, E87205DF0692E3D00099CBBD, E87205E00692E3D00099CBBD, E87205E10692E3D00099CBBD, @@ -74,7 +154,6 @@ E87205F00692E3D00099CBBD, E87205F10692E3D00099CBBD, E87205F20692E3D00099CBBD, - E87205F30692E3D00099CBBD, ); isa = PBXGroup; path = Main; @@ -90,17 +169,17 @@ sourceTree = ""; }; E87205CF0692E3D00099CBBD = { + explicitFileType = sourcecode.make; fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; path = GNUmakefile; refType = 4; sourceTree = ""; }; E87205D00692E3D00099CBBD = { + explicitFileType = sourcecode.make; fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; path = GNUmakefile.preamble; refType = 4; sourceTree = ""; @@ -172,7 +251,7 @@ E87205F00692E3D00099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = SOGoRootPage.wox; refType = 4; sourceTree = ""; @@ -188,7 +267,7 @@ E87205F20692E3D00099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = SOGoUserHomePage.wox; refType = 4; sourceTree = ""; @@ -458,6 +537,7 @@ E87207E80692E3D20099CBBD, E87206C30692E3D10099CBBD, E87207EA0692E3D20099CBBD, + AD6BCEE5069D77E9003664CD, ); isa = PBXGroup; path = UI; @@ -471,6 +551,8 @@ path = ChangeLog; refType = 4; sourceTree = ""; + tabWidth = 4; + usesTabs = 1; }; E87206C30692E3D10099CBBD = { children = ( @@ -556,7 +638,6 @@ }; E87207500692E3D20099CBBD = { children = ( - E87207510692E3D20099CBBD, E87207A40692E3D20099CBBD, E87207A50692E3D20099CBBD, E87207A60692E3D20099CBBD, @@ -580,942 +661,197 @@ refType = 4; sourceTree = ""; }; - E87207510692E3D20099CBBD = { - children = ( - E87207520692E3D20099CBBD, - E87207530692E3D20099CBBD, - E87207540692E3D20099CBBD, - E87207550692E3D20099CBBD, - E87207560692E3D20099CBBD, - E87207680692E3D20099CBBD, - E872077A0692E3D20099CBBD, - E872077B0692E3D20099CBBD, - E872078D0692E3D20099CBBD, - E87207920692E3D20099CBBD, - ); - isa = PBXGroup; - path = .svn; - refType = 4; - sourceTree = ""; - }; - E87207520692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "dir-wcprops"; - refType = 4; - sourceTree = ""; - }; - E87207530692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "empty-file"; - refType = 4; - sourceTree = ""; - }; - E87207540692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.xml; - path = entries; - refType = 4; - sourceTree = ""; - }; - E87207550692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = format; - refType = 4; - sourceTree = ""; - }; - E87207560692E3D20099CBBD = { - children = ( - E87207570692E3D20099CBBD, - E87207580692E3D20099CBBD, - E87207590692E3D20099CBBD, - E872075A0692E3D20099CBBD, - E872075B0692E3D20099CBBD, - E872075C0692E3D20099CBBD, - E872075D0692E3D20099CBBD, - E872075E0692E3D20099CBBD, - E872075F0692E3D20099CBBD, - E87207600692E3D20099CBBD, - E87207610692E3D20099CBBD, - E87207620692E3D20099CBBD, - E87207630692E3D20099CBBD, - E87207640692E3D20099CBBD, - E87207650692E3D20099CBBD, - E87207660692E3D20099CBBD, - E87207670692E3D20099CBBD, - ); - isa = PBXGroup; - path = "prop-base"; - refType = 4; - sourceTree = ""; - }; - E87207570692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botleft.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207580692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botright.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207590692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_bottom.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872075A0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_left.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872075B0692E3D20099CBBD = { - fileEncoding = 4; + E87207A40692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_right.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_botleft.gif; refType = 4; sourceTree = ""; }; - E872075C0692E3D20099CBBD = { - fileEncoding = 4; + E87207A50692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_top.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_botright.gif; refType = 4; sourceTree = ""; }; - E872075D0692E3D20099CBBD = { - fileEncoding = 4; + E87207A60692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topleft.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_bottom.gif; refType = 4; sourceTree = ""; }; - E872075E0692E3D20099CBBD = { - fileEncoding = 4; + E87207A70692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topright.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_left.gif; refType = 4; sourceTree = ""; }; - E872075F0692E3D20099CBBD = { - fileEncoding = 4; + E87207A80692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "closewindow.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_right.gif; refType = 4; sourceTree = ""; }; - E87207600692E3D20099CBBD = { - fileEncoding = 4; + E87207A90692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "corner_right.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_top.gif; refType = 4; sourceTree = ""; }; - E87207610692E3D20099CBBD = { - fileEncoding = 4; + E87207AA0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "line_left.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_topleft.gif; refType = 4; sourceTree = ""; }; - E87207620692E3D20099CBBD = { - fileEncoding = 4; + E87207AB0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "line_right.gif.svn-base"; + lastKnownFileType = image.gif; + path = box_topright.gif; refType = 4; sourceTree = ""; }; - E87207630692E3D20099CBBD = { - fileEncoding = 4; + E87207AC0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "line_stretch.gif.svn-base"; + lastKnownFileType = image.gif; + path = closewindow.gif; refType = 4; sourceTree = ""; }; - E87207640692E3D20099CBBD = { - fileEncoding = 4; + E87207AD0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "menu_logo_top.gif.svn-base"; + lastKnownFileType = image.gif; + path = corner_right.gif; refType = 4; sourceTree = ""; }; - E87207650692E3D20099CBBD = { - fileEncoding = 4; + E87207AE0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "OGoLogo.gif.svn-base"; + lastKnownFileType = image.gif; + path = line_left.gif; refType = 4; sourceTree = ""; }; - E87207660692E3D20099CBBD = { - fileEncoding = 4; + E87207AF0692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_.gif.svn-base"; + lastKnownFileType = image.gif; + path = line_right.gif; refType = 4; sourceTree = ""; }; - E87207670692E3D20099CBBD = { - fileEncoding = 4; + E87207B00692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_selected.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207680692E3D20099CBBD = { - children = ( - E87207690692E3D20099CBBD, - E872076A0692E3D20099CBBD, - E872076B0692E3D20099CBBD, - E872076C0692E3D20099CBBD, - E872076D0692E3D20099CBBD, - E872076E0692E3D20099CBBD, - E872076F0692E3D20099CBBD, - E87207700692E3D20099CBBD, - E87207710692E3D20099CBBD, - E87207720692E3D20099CBBD, - E87207730692E3D20099CBBD, - E87207740692E3D20099CBBD, - E87207750692E3D20099CBBD, - E87207760692E3D20099CBBD, - E87207770692E3D20099CBBD, - E87207780692E3D20099CBBD, - E87207790692E3D20099CBBD, - ); - isa = PBXGroup; - path = props; + lastKnownFileType = image.gif; + path = line_stretch.gif; refType = 4; sourceTree = ""; }; - E87207690692E3D20099CBBD = { - fileEncoding = 4; + E87207B10692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botleft.gif.svn-work"; + lastKnownFileType = image.gif; + path = menu_logo_top.gif; refType = 4; sourceTree = ""; }; - E872076A0692E3D20099CBBD = { - fileEncoding = 4; + E87207B20692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botright.gif.svn-work"; + lastKnownFileType = image.gif; + path = OGoLogo.gif; refType = 4; sourceTree = ""; }; - E872076B0692E3D20099CBBD = { - fileEncoding = 4; + E87207B30692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_bottom.gif.svn-work"; + lastKnownFileType = image.gif; + path = tab_.gif; refType = 4; sourceTree = ""; }; - E872076C0692E3D20099CBBD = { - fileEncoding = 4; + E87207B40692E3D20099CBBD = { isa = PBXFileReference; - lastKnownFileType = text; - path = "box_left.gif.svn-work"; + lastKnownFileType = image.gif; + path = tab_selected.gif; refType = 4; sourceTree = ""; }; - E872076D0692E3D20099CBBD = { + E87207C40692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "box_right.gif.svn-work"; + lastKnownFileType = text.plist; + path = product.plist; refType = 4; sourceTree = ""; }; - E872076E0692E3D20099CBBD = { + E87207D40692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "box_top.gif.svn-work"; + lastKnownFileType = sourcecode.c.objc; + path = UIxAppFrame.m; refType = 4; sourceTree = ""; }; - E872076F0692E3D20099CBBD = { + E87207D50692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topleft.gif.svn-work"; + lastKnownFileType = text.xml; + path = UIxAppFrame.wox; refType = 4; sourceTree = ""; }; - E87207700692E3D20099CBBD = { + E87207D60692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topright.gif.svn-work"; + lastKnownFileType = sourcecode.c.objc; + path = UIxAppHeader.m; refType = 4; sourceTree = ""; }; - E87207710692E3D20099CBBD = { + E87207D70692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "closewindow.gif.svn-work"; + lastKnownFileType = text.xml; + path = UIxAppHeader.wox; refType = 4; sourceTree = ""; }; - E87207720692E3D20099CBBD = { + E87207D80692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "corner_right.gif.svn-work"; + lastKnownFileType = sourcecode.c.objc; + path = UIxAppNavigation.m; refType = 4; sourceTree = ""; }; - E87207730692E3D20099CBBD = { + E87207D90692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "line_left.gif.svn-work"; + lastKnownFileType = text.xml; + path = UIxAppNavigation.wox; refType = 4; sourceTree = ""; }; - E87207740692E3D20099CBBD = { + E87207DA0692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "line_right.gif.svn-work"; + lastKnownFileType = sourcecode.c.objc; + path = UIxAppNavView.m; refType = 4; sourceTree = ""; }; - E87207750692E3D20099CBBD = { + E87207DB0692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; - path = "line_stretch.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207760692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "menu_logo_top.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207770692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "OGoLogo.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207780692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207790692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_selected.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872077A0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = README.txt; - refType = 4; - sourceTree = ""; - }; - E872077B0692E3D20099CBBD = { - children = ( - E872077C0692E3D20099CBBD, - E872077D0692E3D20099CBBD, - E872077E0692E3D20099CBBD, - E872077F0692E3D20099CBBD, - E87207800692E3D20099CBBD, - E87207810692E3D20099CBBD, - E87207820692E3D20099CBBD, - E87207830692E3D20099CBBD, - E87207840692E3D20099CBBD, - E87207850692E3D20099CBBD, - E87207860692E3D20099CBBD, - E87207870692E3D20099CBBD, - E87207880692E3D20099CBBD, - E87207890692E3D20099CBBD, - E872078A0692E3D20099CBBD, - E872078B0692E3D20099CBBD, - E872078C0692E3D20099CBBD, - ); - isa = PBXGroup; - path = "text-base"; - refType = 4; - sourceTree = ""; - }; - E872077C0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_botleft.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872077D0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_botright.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872077E0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_bottom.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872077F0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_left.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207800692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_right.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207810692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_top.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207820692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_topleft.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207830692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "box_topright.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207840692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "closewindow.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207850692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "corner_right.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207860692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "line_left.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207870692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "line_right.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207880692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "line_stretch.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E87207890692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "menu_logo_top.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872078A0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "OGoLogo.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872078B0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "tab_.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872078C0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = file; - path = "tab_selected.gif.svn-base"; - refType = 4; - sourceTree = ""; - }; - E872078D0692E3D20099CBBD = { - children = ( - E872078E0692E3D20099CBBD, - E872078F0692E3D20099CBBD, - E87207900692E3D20099CBBD, - E87207910692E3D20099CBBD, - ); - isa = PBXGroup; - path = tmp; - refType = 4; - sourceTree = ""; - }; - E872078E0692E3D20099CBBD = { - children = ( - ); - isa = PBXGroup; - path = "prop-base"; - refType = 4; - sourceTree = ""; - }; - E872078F0692E3D20099CBBD = { - children = ( - ); - isa = PBXGroup; - path = props; - refType = 4; - sourceTree = ""; - }; - E87207900692E3D20099CBBD = { - children = ( - ); - isa = PBXGroup; - path = "text-base"; - refType = 4; - sourceTree = ""; - }; - E87207910692E3D20099CBBD = { - children = ( - ); - isa = PBXGroup; - path = wcprops; - refType = 4; - sourceTree = ""; - }; - E87207920692E3D20099CBBD = { - children = ( - E87207930692E3D20099CBBD, - E87207940692E3D20099CBBD, - E87207950692E3D20099CBBD, - E87207960692E3D20099CBBD, - E87207970692E3D20099CBBD, - E87207980692E3D20099CBBD, - E87207990692E3D20099CBBD, - E872079A0692E3D20099CBBD, - E872079B0692E3D20099CBBD, - E872079C0692E3D20099CBBD, - E872079D0692E3D20099CBBD, - E872079E0692E3D20099CBBD, - E872079F0692E3D20099CBBD, - E87207A00692E3D20099CBBD, - E87207A10692E3D20099CBBD, - E87207A20692E3D20099CBBD, - E87207A30692E3D20099CBBD, - ); - isa = PBXGroup; - path = wcprops; - refType = 4; - sourceTree = ""; - }; - E87207930692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botleft.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207940692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_botright.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207950692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_bottom.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207960692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_left.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207970692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_right.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207980692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_top.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207990692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topleft.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079A0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "box_topright.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079B0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "closewindow.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079C0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "corner_right.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079D0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "line_left.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079E0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "line_right.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E872079F0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "line_stretch.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207A00692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "menu_logo_top.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207A10692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "OGoLogo.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207A20692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207A30692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text; - path = "tab_selected.gif.svn-work"; - refType = 4; - sourceTree = ""; - }; - E87207A40692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_botleft.gif; - refType = 4; - sourceTree = ""; - }; - E87207A50692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_botright.gif; - refType = 4; - sourceTree = ""; - }; - E87207A60692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_bottom.gif; - refType = 4; - sourceTree = ""; - }; - E87207A70692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_left.gif; - refType = 4; - sourceTree = ""; - }; - E87207A80692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_right.gif; - refType = 4; - sourceTree = ""; - }; - E87207A90692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_top.gif; - refType = 4; - sourceTree = ""; - }; - E87207AA0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_topleft.gif; - refType = 4; - sourceTree = ""; - }; - E87207AB0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = box_topright.gif; - refType = 4; - sourceTree = ""; - }; - E87207AC0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = closewindow.gif; - refType = 4; - sourceTree = ""; - }; - E87207AD0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = corner_right.gif; - refType = 4; - sourceTree = ""; - }; - E87207AE0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = line_left.gif; - refType = 4; - sourceTree = ""; - }; - E87207AF0692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = line_right.gif; - refType = 4; - sourceTree = ""; - }; - E87207B00692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = line_stretch.gif; - refType = 4; - sourceTree = ""; - }; - E87207B10692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = menu_logo_top.gif; - refType = 4; - sourceTree = ""; - }; - E87207B20692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = OGoLogo.gif; - refType = 4; - sourceTree = ""; - }; - E87207B30692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = tab_.gif; - refType = 4; - sourceTree = ""; - }; - E87207B40692E3D20099CBBD = { - isa = PBXFileReference; - lastKnownFileType = image.gif; - path = tab_selected.gif; - refType = 4; - sourceTree = ""; - }; - E87207C40692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = product.plist; - refType = 4; - sourceTree = ""; - }; - E87207D40692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = UIxAppFrame.m; - refType = 4; - sourceTree = ""; - }; - E87207D50692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.xml; - path = UIxAppFrame.wox; - refType = 4; - sourceTree = ""; - }; - E87207D60692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = UIxAppHeader.m; - refType = 4; - sourceTree = ""; - }; - E87207D70692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.xml; - path = UIxAppHeader.wox; - refType = 4; - sourceTree = ""; - }; - E87207D80692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = UIxAppNavigation.m; - refType = 4; - sourceTree = ""; - }; - E87207D90692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.xml; - path = UIxAppNavigation.wox; - refType = 4; - sourceTree = ""; - }; - E87207DA0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = UIxAppNavView.m; - refType = 4; - sourceTree = ""; - }; - E87207DB0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxAppNavView.wox; refType = 4; sourceTree = ""; }; - E87207DC0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = UIxComponent.h; - refType = 4; - sourceTree = ""; - }; - E87207DD0692E3D20099CBBD = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = UIxComponent.m; - refType = 4; - sourceTree = ""; - }; E87207DE0692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; @@ -1535,7 +871,7 @@ E87207E00692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxPageFrame.wox; refType = 4; sourceTree = ""; @@ -1575,7 +911,7 @@ E87207E50692E3D20099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxWinClose.wox; refType = 4; sourceTree = ""; @@ -1592,7 +928,7 @@ fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = text; - path = zidestoreui.css; + path = uix.css; refType = 4; sourceTree = ""; }; @@ -1750,7 +1086,7 @@ E872089A0692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = entries; refType = 4; sourceTree = ""; @@ -2260,7 +1596,7 @@ E87208F40692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxAppointmentEditor.wox; refType = 4; sourceTree = ""; @@ -2300,7 +1636,7 @@ E87208F90692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxAppointmentView.wox; refType = 4; sourceTree = ""; @@ -2316,7 +1652,7 @@ E87208FB0692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxAptTableView.wox; refType = 4; sourceTree = ""; @@ -2332,7 +1668,7 @@ E87208FD0692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxCalBackForthNavView.wox; refType = 4; sourceTree = ""; @@ -2348,7 +1684,7 @@ E87208FF0692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxCalDateLabel.wox; refType = 4; sourceTree = ""; @@ -2364,7 +1700,7 @@ E87209010692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxCalMonthOverview.wox; refType = 4; sourceTree = ""; @@ -2396,7 +1732,7 @@ E87209050692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxCalSelectTab.wox; refType = 4; sourceTree = ""; @@ -2428,7 +1764,7 @@ E87209090692E3D30099CBBD = { fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text.plist.xml; + lastKnownFileType = text.xml; path = UIxCalWeekOverview.wox; refType = 4; sourceTree = ""; @@ -2546,8 +1882,6 @@ children = ( E872074A0692E3D20099CBBD, E872074C0692E3D20099CBBD, - E87207DC0692E3D20099CBBD, - E87207DD0692E3D20099CBBD, E87207DE0692E3D20099CBBD, E87207E10692E3D20099CBBD, E87207E20692E3D20099CBBD, @@ -2563,7 +1897,6 @@ buildPhases = ( ); buildSettings = { - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; diff --git a/SOGo/Version b/SOGo/Version new file mode 100644 index 00000000..398c99c9 --- /dev/null +++ b/SOGo/Version @@ -0,0 +1,7 @@ +# $Id$ +# +# This file is included by library makefiles to set the version information +# of the executable. + +MAJOR_VERSION=0 +MINOR_VERSION=9