From: znek Date: Tue, 10 Aug 2004 16:00:30 +0000 (+0000) Subject: Added "AnaisUI" bundle, new formatter for SOGoUI, various enhancements X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c94732f964481084a7a46ba99e03bd30eee2d184;p=scalable-opengroupware.org Added "AnaisUI" bundle, new formatter for SOGoUI, various enhancements git-svn-id: http://svn.opengroupware.org/SOGo/trunk@168 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index 723de465..1f8607d0 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,7 @@ +2004-08-10 Marcus Mueller + + * French.lproj/Locale: minor changes to capitalization (v0.9.5) + 2004-07-27 Marcus Mueller * sogod.m: added static SoRootURL to context (v0.9.4) diff --git a/SOGo/Main/French.lproj/Locale b/SOGo/Main/French.lproj/Locale index af3faccc..70b8a2f6 100644 --- a/SOGo/Main/French.lproj/Locale +++ b/SOGo/Main/French.lproj/Locale @@ -15,19 +15,19 @@ NSHourNameDesignations = ((0, minuit), (12, midi), (10, matin), (14, "après-midi"), (19, soir)); NSInternationalCurrencyString = EUR; /* ISO 4217 */ NSLaterTimeDesignations = (prochain, prochaine, prochains, prochaines); - NSMonthNameArray = (janvier, "février", mars, avril, mai, juin, juillet, "août", septembre, octobre, novembre, "décembre"); + NSMonthNameArray = (Janvier, "Février", Mars, Avril, Mai, Juin, Juillet, "Août", Septembre, Octobre, Novembre, "Décembre"); NSNextDayDesignations = (demain); NSNextNextDayDesignations = ("après-demain"); NSPriorDayDesignations = (hier); NSShortDateFormatString = "%e/%m/%y"; - NSShortMonthNameArray = (jan, "fév", mar, avr, mai, jun, jul, "aoû", sep, oct, nov, "déc"); + NSShortMonthNameArray = (Jan, "Fév", Mar, Avr, Mai, Jun, Jul, "Aoû", Sep, Oct, Nov, "Déc"); NSShortTimeDateFormatString = "%e/%m/%y %1H:%M"; NSShortWeekDayNameArray = (Dim, Lun, Mar, Mer, Jeu, Ven, Sam); NSThisDayDesignations = ("aujourd'hui"); NSThousandsSeparator = " "; /* space */ NSTimeDateFormatString = "%A %e %B %Y %1H:%M:%S %Z"; NSTimeFormatString = "%1H:%M:%S"; /* no space before and after colons*/ - NSWeekDayNameArray = (dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi); + NSWeekDayNameArray = (Dimanche, Lundi, Mardi, Mercredi, Jeudi, Vendredi, Samedi); NSYearMonthWeekDesignations = ("année", mois, semaine); NSAMPMDesignation = (AM, PM); NSPositiveCurrencyFormatString = "9,999.00$"; diff --git a/SOGo/Main/Version b/SOGo/Main/Version index 749d66dc..6b227f7e 100644 --- a/SOGo/Main/Version +++ b/SOGo/Main/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=4 +SUBMINOR_VERSION:=5 diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index d86474ff..5116ad7c 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -33,6 +33,151 @@ refType = 4; sourceTree = ""; }; + AD07123606C904C900A9EEF4 = { + children = ( + AD07137606C926BF00A9EEF4, + AD07123706C904C900A9EEF4, + AD07123C06C904C900A9EEF4, + AD07123D06C904C900A9EEF4, + AD07124306C904E500A9EEF4, + AD07124006C904DE00A9EEF4, + AD07124606C9050700A9EEF4, + ); + isa = PBXGroup; + path = Anais; + refType = 4; + sourceTree = ""; + }; + AD07123706C904C900A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.plist; + path = "bundle-info.plist"; + refType = 4; + sourceTree = ""; + }; + AD07123806C904C900A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = AnaisUIProduct.m; + refType = 4; + sourceTree = ""; + }; + AD07123906C904C900A9EEF4 = { + explicitFileType = sourcecode.make; + fileEncoding = 4; + isa = PBXFileReference; + path = GNUmakefile; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + AD07123A06C904C900A9EEF4 = { + explicitFileType = sourcecode.make; + fileEncoding = 4; + isa = PBXFileReference; + path = GNUmakefile.postamble; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + AD07123B06C904C900A9EEF4 = { + explicitFileType = sourcecode.make; + fileEncoding = 4; + isa = PBXFileReference; + path = GNUmakefile.preamble; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + AD07123C06C904C900A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.plist; + path = product.plist; + refType = 4; + sourceTree = ""; + }; + AD07123D06C904C900A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = Version; + refType = 4; + sourceTree = ""; + }; + AD07124006C904DE00A9EEF4 = { + children = ( + AD07123806C904C900A9EEF4, + ); + isa = PBXGroup; + name = Classes; + refType = 4; + sourceTree = ""; + }; + AD07124306C904E500A9EEF4 = { + children = ( + AD07123906C904C900A9EEF4, + AD07123B06C904C900A9EEF4, + AD07123A06C904C900A9EEF4, + ); + isa = PBXGroup; + name = Makefiles; + refType = 4; + sourceTree = ""; + }; + AD07124606C9050700A9EEF4 = { + children = ( + AD07124C06C9052700A9EEF4, + AD07124B06C9052700A9EEF4, + ); + isa = PBXGroup; + name = Components; + path = ""; + refType = 4; + sourceTree = ""; + }; + AD07124B06C9052700A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = AnaisSelector.wox; + refType = 4; + sourceTree = ""; + }; + AD07124C06C9052700A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = AnaisSelector.m; + refType = 4; + sourceTree = ""; + }; + AD0712CA06C917A600A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = SOGoDateFormatter.h; + refType = 4; + sourceTree = ""; + }; + AD0712CB06C917A600A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = SOGoDateFormatter.m; + refType = 4; + sourceTree = ""; + }; + AD07137606C926BF00A9EEF4 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text; + path = ChangeLog; + refType = 4; + sourceTree = ""; + }; AD152B6F06AC159A002375D2 = { fileEncoding = 4; isa = PBXFileReference; @@ -83,6 +228,8 @@ AD6BCF0F069D77E9003664CD, AD6BCF10069D77E9003664CD, AD6BCF11069D77E9003664CD, + AD0712CA06C917A600A9EEF4, + AD0712CB06C917A600A9EEF4, ); isa = PBXGroup; path = SOGoUI; @@ -100,20 +247,22 @@ usesTabs = 1; }; AD6BCF0E069D77E9003664CD = { + explicitFileType = sourcecode.make; fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; path = GNUmakefile; refType = 4; sourceTree = ""; + tabWidth = 8; }; AD6BCF0F069D77E9003664CD = { + explicitFileType = sourcecode.make; fileEncoding = 4; isa = PBXFileReference; - lastKnownFileType = text; path = GNUmakefile.preamble; refType = 4; sourceTree = ""; + tabWidth = 8; }; AD6BCF10069D77E9003664CD = { fileEncoding = 4; @@ -944,9 +1093,10 @@ E87207E90692E3D20099CBBD, E87206C20692E3D10099CBBD, E87207E80692E3D20099CBBD, + AD6BCEE5069D77E9003664CD, E87206C30692E3D10099CBBD, E87207EA0692E3D20099CBBD, - AD6BCEE5069D77E9003664CD, + AD07123606C904C900A9EEF4, ); isa = PBXGroup; path = UI; @@ -1720,8 +1870,8 @@ E8720A0C0692E4940099CBBD = { children = ( E87208930692E3D30099CBBD, - E87208940692E3D30099CBBD, E87208950692E3D30099CBBD, + E87208940692E3D30099CBBD, ); isa = PBXGroup; name = Makefiles; diff --git a/SOGo/UI/Anais/AnaisSelector.m b/SOGo/UI/Anais/AnaisSelector.m new file mode 100644 index 00000000..e12bb4e7 --- /dev/null +++ b/SOGo/UI/Anais/AnaisSelector.m @@ -0,0 +1,36 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + + +#include + + +@interface AnaisSelector : UIxComponent +{ +} + +@end + + +@implementation AnaisSelector + +@end diff --git a/SOGo/UI/Anais/AnaisSelector.wox b/SOGo/UI/Anais/AnaisSelector.wox new file mode 100644 index 00000000..edf773ec --- /dev/null +++ b/SOGo/UI/Anais/AnaisSelector.wox @@ -0,0 +1,20 @@ + + +
+

+ show tree +

+

+
+ +

+
diff --git a/SOGo/UI/Anais/AnaisUIProduct.m b/SOGo/UI/Anais/AnaisUIProduct.m new file mode 100644 index 00000000..0c1189d2 --- /dev/null +++ b/SOGo/UI/Anais/AnaisUIProduct.m @@ -0,0 +1,32 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + +#import + +@interface AnaisUIProduct : NSObject +{ +} + +@end + +@implementation AnaisUIProduct +@end /* AnaisUIProduct */ diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog new file mode 100644 index 00000000..f9f61cec --- /dev/null +++ b/SOGo/UI/Anais/ChangeLog @@ -0,0 +1,3 @@ +2004-08-10 Marcus Mueller + + * ChangeLog: created. diff --git a/SOGo/UI/Anais/GNUmakefile b/SOGo/UI/Anais/GNUmakefile new file mode 100644 index 00000000..a6d97f8e --- /dev/null +++ b/SOGo/UI/Anais/GNUmakefile @@ -0,0 +1,29 @@ +# $Id: GNUmakefile,v 1.2 2003/12/09 17:38:42 helge Exp $ + +include $(GNUSTEP_MAKEFILES)/common.make + +BUNDLE_NAME = AnaisUI +BUNDLE_EXTENSION = .SOGo +BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo + +AnaisUI_PRINCIPAL_CLASS = AnaisUIProduct + +AnaisUI_OBJC_FILES += \ + AnaisUIProduct.m \ + AnaisSelector.m \ + + +AnaisUI_RESOURCE_FILES += \ + Version \ + product.plist \ + AnaisSelector.wox \ + + +ADDITIONAL_INCLUDE_DIRS += \ + -I.. -I../.. -I../../.. + +# make + +-include GNUmakefile.preamble +include $(GNUSTEP_MAKEFILES)/bundle.make +-include GNUmakefile.postamble diff --git a/SOGo/UI/Anais/GNUmakefile.postamble b/SOGo/UI/Anais/GNUmakefile.postamble new file mode 100644 index 00000000..3986bcce --- /dev/null +++ b/SOGo/UI/Anais/GNUmakefile.postamble @@ -0,0 +1,17 @@ +# $Id: GNUmakefile.postamble,v 1.1 2004/05/12 14:45:56 helge Exp $ + +validate-wox: + xmllint --noout *.wox + +before-all :: validate-wox + + +ifneq ($(GNUSTEP_BUILD_DIR),) +after-all :: + @(cp bundle-info.plist \ + $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION)) +else +after-all :: + @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\ + cp ../bundle-info.plist .) +endif diff --git a/SOGo/UI/Anais/GNUmakefile.preamble b/SOGo/UI/Anais/GNUmakefile.preamble new file mode 100644 index 00000000..7ca06760 --- /dev/null +++ b/SOGo/UI/Anais/GNUmakefile.preamble @@ -0,0 +1,15 @@ +# $Id$ + +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libSOGoUI = \ + $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) +else + RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) +endif + +AnaisUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI) + +AnaisUI_BUNDLE_LIBS += \ + -lNGObjWeb -lNGScripting \ + -lNGMime -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC -lSOGoUI diff --git a/SOGo/UI/Anais/Version b/SOGo/UI/Anais/Version new file mode 100644 index 00000000..399c230a --- /dev/null +++ b/SOGo/UI/Anais/Version @@ -0,0 +1,3 @@ +# $Id: Version 165 2004-08-05 17:55:50Z znek $ + +SUBMINOR_VERSION:=0 diff --git a/SOGo/UI/Anais/bundle-info.plist b/SOGo/UI/Anais/bundle-info.plist new file mode 100644 index 00000000..050b134f --- /dev/null +++ b/SOGo/UI/Anais/bundle-info.plist @@ -0,0 +1,21 @@ +{ + "__cvs__" = "$Id: bundle-info.plist,v 1.1 2003/11/24 01:24:40 helge Exp $"; + + requires = { + bundleManagerVersion = 1; + classes = ( + { name = NSObject; } + ); + }; + + provides = { + classes = ( + { name = AnaisUIProduct; }, + { name = AnaisSelector; }, + ); + + WOComponents = ( + { name = AnaisSelector; }, + ); + }; +} diff --git a/SOGo/UI/Anais/product.plist b/SOGo/UI/Anais/product.plist new file mode 100644 index 00000000..f58025e9 --- /dev/null +++ b/SOGo/UI/Anais/product.plist @@ -0,0 +1,12 @@ +{ + requires = ( MAIN ); + + publicResources = ( + ); + + factories = { + }; + + categories = { + }; +} diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog index 0367a1a4..e4c06900 100644 --- a/SOGo/UI/ChangeLog +++ b/SOGo/UI/ChangeLog @@ -1,3 +1,7 @@ +2004-08-10 Marcus Mueller + + * Added "Anais" product. + 2004-07-07 Marcus Mueller * Replaced all occurrences of zidestoreui.css with uix.css diff --git a/SOGo/UI/GNUmakefile b/SOGo/UI/GNUmakefile index 23d300c5..182f4ffb 100644 --- a/SOGo/UI/GNUmakefile +++ b/SOGo/UI/GNUmakefile @@ -6,5 +6,6 @@ SUBPROJECTS = \ SOGoUI \ Common \ Scheduler \ + Anais \ include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog index 085bcd12..dd0e9c11 100644 --- a/SOGo/UI/SOGoUI/ChangeLog +++ b/SOGo/UI/SOGoUI/ChangeLog @@ -1,3 +1,11 @@ +2004-08-10 Marcus Mueller + + * v0.9.6 + + * SOGoDateFormatter.[hm]: added fast localizable date formatter. + + * GNUmakefile: added SOGoDateFormatter.[hm] + 2004-07-26 Marcus Mueller * UIxComponent.m: added "hm" queryParameter to add hour/minute part to diff --git a/SOGo/UI/SOGoUI/GNUmakefile b/SOGo/UI/SOGoUI/GNUmakefile index 32fddf93..860efb4f 100644 --- a/SOGo/UI/SOGoUI/GNUmakefile +++ b/SOGo/UI/SOGoUI/GNUmakefile @@ -7,11 +7,13 @@ LIBRARY_NAME = libSOGoUI libSOGoUI_HEADER_FILES_DIR = . libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI -libSOGoUI_HEADER_FILES += \ - UIxComponent.h \ +libSOGoUI_HEADER_FILES += \ + UIxComponent.h \ + SOGoDateFormatter.h \ -libSOGoUI_OBJC_FILES += \ - UIxComponent.m \ +libSOGoUI_OBJC_FILES += \ + UIxComponent.m \ + SOGoDateFormatter.m \ # make diff --git a/SOGo/UI/SOGoUI/SOGoDateFormatter.h b/SOGo/UI/SOGoUI/SOGoDateFormatter.h new file mode 100644 index 00000000..9ec86c32 --- /dev/null +++ b/SOGo/UI/SOGoUI/SOGoDateFormatter.h @@ -0,0 +1,46 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OGo + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + + +#ifndef __SOGoDateFormatter_H_ +#define __SOGoDateFormatter_H_ + + +#import + + +@interface SOGoDateFormatter : NSFormatter +{ + NSDictionary *locale; + SEL formatAction; +} + +- (id)initWithLocale:(NSDictionary *)_locale; + +- (void)setISODateFormat; +- (void)setFullWeekdayNameAndDetails; + +- (NSString *)stringForObjectValue:(id)_obj; + +@end + +#endif /* __SOGoDateFormatter_H_ */ diff --git a/SOGo/UI/SOGoUI/SOGoDateFormatter.m b/SOGo/UI/SOGoUI/SOGoDateFormatter.m new file mode 100644 index 00000000..ef1fe972 --- /dev/null +++ b/SOGo/UI/SOGoUI/SOGoDateFormatter.m @@ -0,0 +1,116 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OGo + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + + +#import "SOGoDateFormatter.h" +#import + + +@interface SOGoDateFormatter (PrivateAPI) +- (NSString *)shortDayOfWeek:(int)_day; +- (NSString *)fullDayOfWeek:(int)_day; +- (NSString *)shortMonthOfYear:(int)_month; +- (NSString *)fullMonthOfYear:(int)_month; + +- (NSString *)isoDateFormatForDate:(NSCalendarDate *)_date; +- (NSString *)fullWeekdayNameAndDetailsForDate:(NSCalendarDate *)_date; +@end + + +@implementation SOGoDateFormatter + +- (id)initWithLocale:(NSDictionary *)_locale { + self = [super init]; + if(self) { + ASSIGN(self->locale, _locale); + [self setISODateFormat]; + } + return self; +} + +- (void)dealloc { + [self->locale release]; + [super dealloc]; +} + +- (void)setISODateFormat { + self->formatAction = @selector(isoDateFormatForDate:); +} + +- (void)setFullWeekdayNameAndDetails { + self->formatAction = @selector(fullWeekdayNameAndDetailsForDate:); +} + +- (NSString *)stringForObjectValue:(id)_obj { + return [self performSelector:self->formatAction + withObject:_obj]; +} + + +/* Helpers */ + +- (NSString *)shortDayOfWeek:(int)_day { + return [[self->locale objectForKey:@"NSShortWeekDayNameArray"] + objectAtIndex:_day]; +} + +- (NSString *)fullDayOfWeek:(int)_day { + return [[self->locale objectForKey:@"NSWeekDayNameArray"] + objectAtIndex:_day]; +} + +- (NSString *)shortMonthOfYear:(int)_month { + return [[self->locale objectForKey:@"NSShortMonthNameArray"] + objectAtIndex:_month - 1]; +} + +- (NSString *)fullMonthOfYear:(int)_month { + return [[self->locale objectForKey:@"NSMonthNameArray"] + objectAtIndex:_month - 1]; +} + + +/* Private API */ + +- (NSString *)isoDateFormatForDate:(NSCalendarDate *)_date { + return [NSString stringWithFormat:@"%d-%02d-%02d", + [_date yearOfCommonEra], + [_date monthOfYear], + [_date dayOfMonth]]; +} + +- (NSString *)fullWeekdayNameAndDetailsForDate:(NSCalendarDate *)_date { + NSMutableString *desc; + + desc = [[NSMutableString alloc] init]; + [desc appendString:[self fullDayOfWeek:[_date dayOfWeek]]]; + [desc appendString:@", "]; + [desc appendString:[self isoDateFormatForDate:_date]]; + [desc appendString:@" "]; + [desc appendFormat:@"%02d:%02d ", + [_date hourOfDay], + [_date minuteOfHour]]; + [desc appendString:[[_date timeZone] name]]; + return [desc autorelease]; +} + +@end diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version index 86b0e4dd..0eb47da3 100644 --- a/SOGo/UI/SOGoUI/Version +++ b/SOGo/UI/SOGoUI/Version @@ -1,5 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=5 - -# 1.1.0 requires NGObjWeb 4.2.202 +SUBMINOR_VERSION:=6 diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index b72b6a7a..eb79c468 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,13 @@ +2004-08-10 Marcus Mueller + + * v0.9.16 + + * UIxAppointmentEditor.wox: pretty printing, use labels where appropriate. + + * UIxAppointmentEditor.m: uses SOGoDateFormatter now. + + * English.lproj/default.strings: added new labels. + 2004-08-09 Marcus Mueller * v0.9.15 diff --git a/SOGo/UI/Scheduler/English.lproj/default.strings b/SOGo/UI/Scheduler/English.lproj/default.strings index c80f6085..396ab895 100644 --- a/SOGo/UI/Scheduler/English.lproj/default.strings +++ b/SOGo/UI/Scheduler/English.lproj/default.strings @@ -68,6 +68,22 @@ "printview" = "printview"; "proposal" = "proposal"; "Calendar" = "Calendar"; +"Save" = "Save"; + + +/* Appointments */ + +"Appointment Editor" = "Appointment Editor"; +"Appointment on" = "Appointment on"; +"Start time" = "Start time"; +"End time" = "End time"; +"Title" = "Title"; +"Location" = "Location"; +"Search participants" = "Search participants"; +"Participants" = "Participants"; +"Search resources" = "Search resources"; +"Resources" = "Resources"; + /* calendar modes */ diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m index ab9e5196..4cb48e19 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m @@ -23,6 +23,7 @@ #include "common.h" #include +#include #include #include @@ -84,10 +85,16 @@ - (NSString *)formattedAptStartTime { NSCalendarDate *date; - + SOGoDateFormatter *fmt; + NSString *s; + date = [[[[self appointment] startDate] copy] autorelease]; [date setTimeZone:[self viewTimeZone]]; - return [date descriptionWithCalendarFormat:@"%A, %Y-%m-%d %H:%M %Z"]; + fmt = [[SOGoDateFormatter alloc] initWithLocale:[self locale]]; + [fmt setFullWeekdayNameAndDetails]; + s = [fmt stringForObjectValue:date]; + [fmt release]; + return s; } - (BOOL)isNewAppointment { diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox index 0aaaf19e..edf75198 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox @@ -3,115 +3,185 @@ xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" xmlns:uix="OGo:uix" + xmlns:label="OGo:label" className="UIxPageFrame" title="name" > -
- - - - - - -
- - - - - -
- Appointment Editor - -
-
- - - - - - -
- Appointment on - -
- Start time: - + + + + + + + + +
+ + + + + +
+ + + +
+
+ + + + + + + - - - - + + + + - - - - + + + + + + + + + +
+ + + +
+ + : + + -
- End time: - +
+ + : + + -
- Title: - +
+ + : + + + + + +
- + : + + + + + +
+
+ + + + + + +
+ + + +
+ + : + + + +