From: helge Date: Sat, 25 Sep 2004 16:51:37 +0000 (+0000) Subject: fixed compilation on MacOSX X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f2f4611bf0f4083b7277c8167b53fcd7f835f2f;p=scalable-opengroupware.org fixed compilation on MacOSX git-svn-id: http://svn.opengroupware.org/SOGo/trunk@315 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog index 9e3f4287..3a79d72d 100644 --- a/OGoContentStore/ChangeLog +++ b/OGoContentStore/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * fixed compilation on MacOSX (v0.9.10) + 2004-09-10 Helge Hess * v0.9.9 diff --git a/OGoContentStore/Version b/OGoContentStore/Version index b99f57a4..49e22761 100644 --- a/OGoContentStore/Version +++ b/OGoContentStore/Version @@ -2,6 +2,6 @@ MAJOR_VERSION=0 MINOR_VERSION=9 -SUBMINOR_VERSION:=9 +SUBMINOR_VERSION:=10 # v0.9.7 requires libGDLAccess v1.1.35 diff --git a/OGoContentStore/ocs_cat.m b/OGoContentStore/ocs_cat.m index fde7f731..4e76111a 100644 --- a/OGoContentStore/ocs_cat.m +++ b/OGoContentStore/ocs_cat.m @@ -1,8 +1,28 @@ +/* + Copyright (C) 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 -@class NSUserDefaults; +@class NSUserDefaults, NSArray; @class OCSFolderManager; @interface Tool : NSObject diff --git a/OGoContentStore/ocs_ls.m b/OGoContentStore/ocs_ls.m index 7d08bfe0..7e56daaa 100644 --- a/OGoContentStore/ocs_ls.m +++ b/OGoContentStore/ocs_ls.m @@ -1,8 +1,28 @@ +/* + Copyright (C) 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 -@class NSUserDefaults; +@class NSUserDefaults, NSArray; @class OCSFolderManager; @interface Tool : NSObject diff --git a/OGoContentStore/ocs_mkdir.m b/OGoContentStore/ocs_mkdir.m index ec4fcb70..ffffac8d 100644 --- a/OGoContentStore/ocs_mkdir.m +++ b/OGoContentStore/ocs_mkdir.m @@ -1,8 +1,28 @@ +/* + Copyright (C) 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 -@class NSUserDefaults; +@class NSUserDefaults, NSArray; @class OCSFolderManager; @interface Tool : NSObject diff --git a/OGoContentStore/ocs_recreatequick.m b/OGoContentStore/ocs_recreatequick.m index 75769354..f3889e95 100644 --- a/OGoContentStore/ocs_recreatequick.m +++ b/OGoContentStore/ocs_recreatequick.m @@ -1,8 +1,28 @@ +/* + Copyright (C) 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: ocs_mkdir.m 113 2004-06-30 11:26:54Z znek $ #import -@class NSUserDefaults; +@class NSUserDefaults, NSArray; @class OCSFolderManager; @interface Tool : NSObject diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index 5e9171f9..413a2264 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * sogod.m: fixed a compile warning on OSX (v0.9.11) + 2004-09-20 Helge Hess * SOGoUserHomePage.wox: added link to Mail (v0.9.10) diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble index 6d5bb9ac..dcfdd9ed 100644 --- a/SOGo/Main/GNUmakefile.preamble +++ b/SOGo/Main/GNUmakefile.preamble @@ -14,4 +14,5 @@ ADDITIONAL_TOOL_LIBS += \ -lSOGo \ -lSOGoLogic \ -lOGoContentStore \ - -lGDLAccess + -lGDLAccess \ + -lNGiCal -lNGLdap diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m index 9bfd795d..8088e2dc 100644 --- a/SOGo/Main/sogod.m +++ b/SOGo/Main/sogod.m @@ -113,7 +113,7 @@ static BOOL doCrashOnSessionCreate = NO; NSArray *langs; NSDictionary *locale; - langs = [[_ctx request] browserLanguages]; + langs = [[(WOContext *)_ctx request] browserLanguages]; locale = [self currentLocaleConsideringLanguages:langs]; [_ctx takeValue:locale forKey:@"locale"]; } diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog index 980fea38..1853d2ac 100644 --- a/SOGo/SoObjects/Appointments/ChangeLog +++ b/SOGo/SoObjects/Appointments/ChangeLog @@ -1,4 +1,8 @@ -2004-09-08 +2004-09-25 Helge Hess + + * fixed compilation on MacOSX (v0.9.12) + +2004-09-08 Helge Hess * SOGoGroupAppointmentFolder.m: do not call -sleep in fetch method (disconnects the folder from the parent folder), instead added a diff --git a/SOGo/SoObjects/Appointments/GNUmakefile b/SOGo/SoObjects/Appointments/GNUmakefile index fb184a26..feac2367 100644 --- a/SOGo/SoObjects/Appointments/GNUmakefile +++ b/SOGo/SoObjects/Appointments/GNUmakefile @@ -1,10 +1,8 @@ # $Id: GNUmakefile,v 1.3 2004/04/06 13:01:10 helge Exp $ -include $(GNUSTEP_MAKEFILES)/common.make +include ../common.make -BUNDLE_NAME = Appointments -BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo +BUNDLE_NAME = Appointments Appointments_PRINCIPAL_CLASS = SOGoAppointmentsProduct diff --git a/SOGo/SoObjects/Appointments/GNUmakefile.preamble b/SOGo/SoObjects/Appointments/GNUmakefile.preamble index bdd52fe0..c302ad8b 100644 --- a/SOGo/SoObjects/Appointments/GNUmakefile.preamble +++ b/SOGo/SoObjects/Appointments/GNUmakefile.preamble @@ -1,19 +1 @@ -# $Id$ - -ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../../.. - -ADDITIONAL_LIB_DIRS += \ - -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/ \ - -L/usr/local/lib -L/usr/lib - -Appointments_BUNDLE_LIBS += \ - -lSOGo -lSOGoLogic \ - -lOGoContentStore \ - -lGDLAccess \ - -lEOControl \ - -lSaxObjC - +# compilation settings diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version index 49c9516f..171da9b3 100644 --- a/SOGo/SoObjects/Appointments/Version +++ b/SOGo/SoObjects/Appointments/Version @@ -1,3 +1,3 @@ # $Id: Version,v 1.9 2004/05/19 14:30:45 helge Exp $ -SUBMINOR_VERSION:=11 +SUBMINOR_VERSION:=12 diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog index 6ce174c0..5e20142d 100644 --- a/SOGo/SoObjects/Contacts/ChangeLog +++ b/SOGo/SoObjects/Contacts/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * fixed compilation on MacOSX (v0.9.4) + 2004-08-27 Helge Hess * v0.9.3 diff --git a/SOGo/SoObjects/Contacts/GNUmakefile b/SOGo/SoObjects/Contacts/GNUmakefile index caadc6d8..e737ed7e 100644 --- a/SOGo/SoObjects/Contacts/GNUmakefile +++ b/SOGo/SoObjects/Contacts/GNUmakefile @@ -1,10 +1,8 @@ # $Id$ -include $(GNUSTEP_MAKEFILES)/common.make +include ../common.make -BUNDLE_NAME = Contacts -BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo +BUNDLE_NAME = Contacts Contacts_PRINCIPAL_CLASS = SOGoContactsProduct diff --git a/SOGo/SoObjects/Contacts/GNUmakefile.preamble b/SOGo/SoObjects/Contacts/GNUmakefile.preamble index f5fdadee..c302ad8b 100644 --- a/SOGo/SoObjects/Contacts/GNUmakefile.preamble +++ b/SOGo/SoObjects/Contacts/GNUmakefile.preamble @@ -1,18 +1 @@ -# $Id$ - -ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../../.. - -ADDITIONAL_LIB_DIRS += \ - -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/ - -Appointments_BUNDLE_LIBS += \ - -lSOGo -lSOGoLogic \ - -lOGoContentStore \ - -lGDLAccess \ - -lEOControl \ - -lSaxObjC - +# compilation settings diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version index fc795f55..749d66dc 100644 --- a/SOGo/SoObjects/Contacts/Version +++ b/SOGo/SoObjects/Contacts/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=3 +SUBMINOR_VERSION:=4 diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index 7080dcf7..3ab5e637 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * fixed compilation on MacOSX (v0.9.4) + 2004-09-20 Helge Hess * SOGoMailAccounts.m: added hardcoded mail-account key (v0.9.3) diff --git a/SOGo/SoObjects/Mailer/GNUmakefile b/SOGo/SoObjects/Mailer/GNUmakefile index 5dcbc058..99c8af81 100644 --- a/SOGo/SoObjects/Mailer/GNUmakefile +++ b/SOGo/SoObjects/Mailer/GNUmakefile @@ -1,10 +1,8 @@ # $Id$ -include $(GNUSTEP_MAKEFILES)/common.make +include ../common.make -BUNDLE_NAME = Mailer -BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo +BUNDLE_NAME = Mailer Mailer_PRINCIPAL_CLASS = SOGoMailerProduct diff --git a/SOGo/SoObjects/Mailer/GNUmakefile.preamble b/SOGo/SoObjects/Mailer/GNUmakefile.preamble index f5fdadee..c302ad8b 100644 --- a/SOGo/SoObjects/Mailer/GNUmakefile.preamble +++ b/SOGo/SoObjects/Mailer/GNUmakefile.preamble @@ -1,18 +1 @@ -# $Id$ - -ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../../.. - -ADDITIONAL_LIB_DIRS += \ - -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ - -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/ - -Appointments_BUNDLE_LIBS += \ - -lSOGo -lSOGoLogic \ - -lOGoContentStore \ - -lGDLAccess \ - -lEOControl \ - -lSaxObjC - +# compilation settings diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index fc795f55..749d66dc 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=3 +SUBMINOR_VERSION:=4 diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make new file mode 100644 index 00000000..384a6aa8 --- /dev/null +++ b/SOGo/SoObjects/common.make @@ -0,0 +1,25 @@ +# common make file for SoObject bundles + +include $(GNUSTEP_MAKEFILES)/common.make + +BUNDLE_EXTENSION = .SOGo +BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo + +ADDITIONAL_INCLUDE_DIRS += \ + -I.. \ + -I../../.. + +ADDITIONAL_LIB_DIRS += \ + -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ + -L../../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ + -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/ \ + -L/usr/local/lib -L/usr/lib + +BUNDLE_LIBS += \ + -lSOGo -lSOGoLogic \ + -lOGoContentStore \ + -lGDLAccess \ + -lNGObjWeb \ + -lNGiCal -lNGMime -lNGLdap \ + -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC diff --git a/SOGo/UI/Anais/GNUmakefile b/SOGo/UI/Anais/GNUmakefile index 3e4f1067..1fd42372 100644 --- a/SOGo/UI/Anais/GNUmakefile +++ b/SOGo/UI/Anais/GNUmakefile @@ -1,10 +1,8 @@ # $Id: GNUmakefile,v 1.2 2003/12/09 17:38:42 helge Exp $ -include $(GNUSTEP_MAKEFILES)/common.make +include ../common.make -BUNDLE_NAME = AnaisUI -BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo +BUNDLE_NAME = AnaisUI AnaisUI_PRINCIPAL_CLASS = AnaisUIProduct @@ -26,9 +24,6 @@ AnaisUI_RESOURCE_FILES += \ AnaisUI_LOCALIZED_RESOURCE_FILES += \ default.strings \ -ADDITIONAL_INCLUDE_DIRS += \ - -I.. -I../.. -I../../.. - # make -include GNUmakefile.preamble diff --git a/SOGo/UI/Anais/GNUmakefile.preamble b/SOGo/UI/Anais/GNUmakefile.preamble index 662984f1..e6b8f7a1 100644 --- a/SOGo/UI/Anais/GNUmakefile.preamble +++ b/SOGo/UI/Anais/GNUmakefile.preamble @@ -1,19 +1 @@ -# $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) - -ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib - -AnaisUI_BUNDLE_LIBS += \ - -lSOGoUI \ - -lNGObjWeb \ - -lNGMime \ - -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC +# compilation flags diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 6a613fc5..3141e13b 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * added rsrc namespace declaration to templates (v0.9.3) + 2004-09-20 Helge Hess * work on mailer (v0.9.2) diff --git a/SOGo/UI/Mailer/UIxMailAccountsView.wox b/SOGo/UI/Mailer/UIxMailAccountsView.wox index 0cc5de5a..067c953f 100644 --- a/SOGo/UI/Mailer/UIxMailAccountsView.wox +++ b/SOGo/UI/Mailer/UIxMailAccountsView.wox @@ -1,11 +1,13 @@ -

Account Settings Page

screenshot diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox index 1ec087db..715a322c 100644 --- a/SOGo/UI/Mailer/UIxMailEditor.wox +++ b/SOGo/UI/Mailer/UIxMailEditor.wox @@ -1,11 +1,13 @@ -

Mail Compose

screenshot diff --git a/SOGo/UI/Mailer/UIxMailView.wox b/SOGo/UI/Mailer/UIxMailView.wox index 33fa9bed..3ef7f9ec 100644 --- a/SOGo/UI/Mailer/UIxMailView.wox +++ b/SOGo/UI/Mailer/UIxMailView.wox @@ -1,11 +1,13 @@ -

Mail View

screenshot diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version index 1bf86739..fc795f55 100644 --- a/SOGo/UI/Mailer/Version +++ b/SOGo/UI/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=2 +SUBMINOR_VERSION:=3 diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog index d61fb7e4..f9aac34e 100644 --- a/SOGo/UI/SOGoUI/ChangeLog +++ b/SOGo/UI/SOGoUI/ChangeLog @@ -1,3 +1,12 @@ +2004-09-25 Helge Hess + + * v0.9.12 + + * GNUmakefile.preamble: fixed library dependencies (used wrong project + name) + + * SOGoAptFormatter.m: minor code cleanups, fixed issue on MacOSX + 2004-08-26 Helge Hess * v0.9.11 diff --git a/SOGo/UI/SOGoUI/GNUmakefile.preamble b/SOGo/UI/SOGoUI/GNUmakefile.preamble index 136d5396..90285bcd 100644 --- a/SOGo/UI/SOGoUI/GNUmakefile.preamble +++ b/SOGo/UI/SOGoUI/GNUmakefile.preamble @@ -6,4 +6,9 @@ else RELBUILD_DIR_libSOGoCommonUI = $(GNUSTEP_OBJ_DIR) endif -libSOGoCommonUI_LIBRARIES_DEPEND_UPON += -lNGObjWeb +libSOGoUI_LIBRARIES_DEPEND_UPON += \ + -lNGObjWeb \ + -lNGMime \ + -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC + diff --git a/SOGo/UI/SOGoUI/SOGoAptFormatter.m b/SOGo/UI/SOGoUI/SOGoAptFormatter.m index 71cd80aa..da72100f 100644 --- a/SOGo/UI/SOGoUI/SOGoAptFormatter.m +++ b/SOGo/UI/SOGoUI/SOGoAptFormatter.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2004 SKYRIX Software AG - This file is part of OGo + 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 @@ -20,11 +20,10 @@ */ // $Id$ +#include "SOGoAptFormatter.h" +#include "common.h" -#import "SOGoAptFormatter.h" - - -@interface SOGoAptFormatter (PrivateAPI) +@interface SOGoAptFormatter(PrivateAPI) - (NSString *)shortTitleForApt:(id)_apt; - (NSTimeZone *)displayTZ; @end @@ -32,123 +31,116 @@ @implementation SOGoAptFormatter - (id)initWithDisplayTimeZone:(NSTimeZone *)_tz { - self = [super init]; - if(self) { - ASSIGN(self->tz, _tz); - [self setFullDetails]; - } - return self; + if ((self = [super init])) { + self->tz = [_tz retain]; + [self setFullDetails]; + } + return self; } - (void)dealloc { - [self->tz release]; - [super dealloc]; + [self->tz release]; + [super dealloc]; } +/* accessors */ + - (void)setTooltip { - self->formatAction = @selector(tooltipForApt:); + self->formatAction = @selector(tooltipForApt:); } - (void)setFullDetails { - self->formatAction = @selector(fullDetailsForApt:); + self->formatAction = @selector(fullDetailsForApt:); } - (NSString *)stringForObjectValue:(id)_obj { - return [self performSelector:self->formatAction - withObject:_obj]; + return [self performSelector:self->formatAction withObject:_obj]; } - /* Helpers */ - (NSString *)shortTitleForApt:(id)_apt { - NSString *title; - - title = [_apt valueForKey:@"title"]; - if ([title length] > 12) - title = [[title substringToIndex:11] stringByAppendingString:@"..."]; - - return title; + NSString *title; + + title = [_apt valueForKey:@"title"]; + if ([title length] > 12) + title = [[title substringToIndex:11] stringByAppendingString:@"..."]; + + return title; } /* Private */ - (NSTimeZone *)displayTZ { - return self->tz; + return self->tz; } - (NSString *)fullDetailsForApt:(id)_apt { - NSCalendarDate *startDate, *endDate; - NSMutableString *aptDescr; - NSString *s; - BOOL spansRange; + NSCalendarDate *startDate, *endDate; + NSMutableString *aptDescr; + NSString *s; + BOOL spansRange; - spansRange = NO; - startDate = [_apt valueForKey:@"startDate"]; - [startDate setTimeZone:[self displayTZ]]; - endDate = [_apt valueForKey:@"endDate"]; - if(endDate != nil) { - [endDate setTimeZone:[self displayTZ]]; - spansRange = ![endDate isEqualToDate:startDate]; - } - aptDescr = [[NSMutableString alloc] init]; - [aptDescr appendFormat:@"%02i:%02i", - [startDate hourOfDay], - [startDate minuteOfHour]]; - if(spansRange) { - [aptDescr appendFormat:@", %02i:%02i", - [endDate hourOfDay], - [endDate minuteOfHour]]; - } - s = [_apt valueForKey:@"location"]; - if(s) { - if([s length] > 12) { - s = [NSString stringWithFormat:@"%@...", - [s substringToIndex:11]]; - } - [aptDescr appendFormat:@" (%@)", s]; - } - s = [_apt valueForKey:@"title"]; - if(s) { - [aptDescr appendFormat:@"
%@", - [self shortTitleForApt:_apt]]; - } - return [aptDescr autorelease]; + spansRange = NO; + startDate = [_apt valueForKey:@"startDate"]; + [startDate setTimeZone:[self displayTZ]]; + endDate = [_apt valueForKey:@"endDate"]; + if(endDate != nil) { + [endDate setTimeZone:[self displayTZ]]; + spansRange = ![endDate isEqualToDate:startDate]; + } + aptDescr = [[NSMutableString alloc] init]; + [aptDescr appendFormat:@"%02i:%02i", + [startDate hourOfDay], + [startDate minuteOfHour]]; + if(spansRange) { + [aptDescr appendFormat:@", %02i:%02i", + [endDate hourOfDay], + [endDate minuteOfHour]]; + } + + if ((s = [_apt valueForKey:@"location"]) != nil) { + if([s length] > 12) + s = [[s substringToIndex:11] stringByAppendingString:@"..."]; + [aptDescr appendFormat:@" (%@)", s]; + } + if ((s = [_apt valueForKey:@"title"]) != nil) + [aptDescr appendFormat:@"
%@", [self shortTitleForApt:_apt]]; + + return [aptDescr autorelease]; } - (NSString *)tooltipForApt:(id)_apt { - NSCalendarDate *startDate, *endDate; - NSMutableString *aptDescr; - NSString *s; - BOOL spansRange; + NSCalendarDate *startDate, *endDate; + NSMutableString *aptDescr; + NSString *s; + BOOL spansRange; + + spansRange = NO; + startDate = [_apt valueForKey:@"startDate"]; + [startDate setTimeZone:[self displayTZ]]; + endDate = [_apt valueForKey:@"endDate"]; + if(endDate != nil) { + [endDate setTimeZone:[self displayTZ]]; + spansRange = ![endDate isEqualToDate:startDate]; + } + aptDescr = [[NSMutableString alloc] init]; + [aptDescr appendString:@"appointment"]; + [aptDescr appendFormat:@"\n%02i:%02i", + [startDate hourOfDay], + [startDate minuteOfHour]]; + if (spansRange) { + [aptDescr appendFormat:@" - %02i:%02i", + [endDate hourOfDay], + [endDate minuteOfHour]]; + } - spansRange = NO; - startDate = [_apt valueForKey:@"startDate"]; - [startDate setTimeZone:[self displayTZ]]; - endDate = [_apt valueForKey:@"endDate"]; - if(endDate != nil) { - [endDate setTimeZone:[self displayTZ]]; - spansRange = ![endDate isEqualToDate:startDate]; - } - aptDescr = [[NSMutableString alloc] init]; - [aptDescr appendString:@"appointment"]; - [aptDescr appendFormat:@"\n%02i:%02i", - [startDate hourOfDay], - [startDate minuteOfHour]]; - if(spansRange) { - [aptDescr appendFormat:@" - %02i:%02i", - [endDate hourOfDay], - [endDate minuteOfHour]]; - } - s = [_apt valueForKey:@"title"]; - if(s) { - [aptDescr appendFormat:@"\n%@", s]; - } - s = [_apt valueForKey:@"location"]; - if(s) { - [aptDescr appendFormat:@"\n%@", s]; - } - return [aptDescr autorelease]; + if ((s = [_apt valueForKey:@"title"]) != nil) + [aptDescr appendFormat:@"\n%@", s]; + if ((s = [_apt valueForKey:@"location"]) != nil) + [aptDescr appendFormat:@"\n%@", s]; + + return [aptDescr autorelease]; } -@end +@end /* SOGoAptFormatter */ diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index cfb9831d..1558699b 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,8 @@ +2004-09-25 Helge Hess + + * UIxCalDateLabel.m: minor code cleanups, fixed compilation on MacOSX + (v0.9.83) + 2004-09-13 Marcus Mueller * English.lproj/default.strings: fixed a missing ';' (v0.9.82) diff --git a/SOGo/UI/Scheduler/UIxCalDateLabel.m b/SOGo/UI/Scheduler/UIxCalDateLabel.m index 462472cf..3e31cec5 100644 --- a/SOGo/UI/Scheduler/UIxCalDateLabel.m +++ b/SOGo/UI/Scheduler/UIxCalDateLabel.m @@ -1,7 +1,7 @@ /* Copyright (C) 2004 SKYRIX Software AG - This file is part of OGo + 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 @@ -20,15 +20,13 @@ */ // $Id$ - #include -#include @interface UIxCalDateLabel : UIxComponent { - NSString *selection; - NSCalendarDate *startDate; - NSCalendarDate *endDate; + NSString *selection; + NSCalendarDate *startDate; + NSCalendarDate *endDate; } - (NSString *)dayLabel; @@ -38,82 +36,88 @@ @end +#include "common.h" @implementation UIxCalDateLabel - (void)dealloc { - [self->selection release]; - [self->startDate release]; - [self->endDate release]; - [super dealloc]; + [self->selection release]; + [self->startDate release]; + [self->endDate release]; + [super dealloc]; } +/* accessors */ + - (void)setSelection:(NSString *)_selection { - ASSIGN(self->selection, _selection); + ASSIGNCOPY(self->selection, _selection); } - - (NSString *)selection { - return self->selection; + return self->selection; } - (void)setStartDate:(NSCalendarDate *)_date { - ASSIGN(self->startDate, _date); + ASSIGN(self->startDate, _date); } - - (NSCalendarDate *)startDate { - return self->startDate; + return self->startDate; } - (void)setEndDate:(NSCalendarDate *)_date { - ASSIGN(self->endDate, _date); + ASSIGN(self->endDate, _date); } - - (NSCalendarDate *)endDate { - return self->endDate; + return self->endDate; } - (NSString *)label { - NSString *key = [self selection]; - if([key isEqualToString:@"day"]) - return [self dayLabel]; - else if([key isEqualToString:@"week"]) - return [self weekLabel]; - else if([key isEqualToString:@"month"]) - return [self monthLabel]; - return [self yearLabel]; + NSString *key = [self selection]; + + if([key isEqualToString:@"day"]) + return [self dayLabel]; + if ([key isEqualToString:@"week"]) + return [self weekLabel]; + if ([key isEqualToString:@"month"]) + return [self monthLabel]; + return [self yearLabel]; } - (NSString *)dayLabel { - NSString *fmt; - - fmt = [self labelForKey:@"dayLabelFormat"]; - return [self->startDate descriptionWithCalendarFormat:fmt]; + NSString *fmt; + + fmt = [self labelForKey:@"dayLabelFormat"]; + return [self->startDate descriptionWithCalendarFormat:fmt]; } - (NSString *)weekLabel { - NSString *label; - - label = [NSString stringWithFormat:@"%@ %d", - [self localizedNameForMonthOfYear:[self->startDate monthOfYear]], - [self->startDate yearOfCommonEra]]; - if([self->startDate monthOfYear] != [self->endDate monthOfYear]) { - label = [NSString stringWithFormat:@"%@ / %@ %d", - label, - [self localizedNameForMonthOfYear:[self->endDate monthOfYear]], - [self->endDate yearOfCommonEra]]; - } - return label; + NSString *label; + + label = [self localizedNameForMonthOfYear:[self->startDate monthOfYear]]; + label = [NSString stringWithFormat:@"%@ %d", + label, + [self->startDate yearOfCommonEra]]; + if ([self->startDate monthOfYear] != [self->endDate monthOfYear]) { + NSString *le; + + le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]]; + label = [NSString stringWithFormat:@"%@ / %@ %d", + label, le, + [self->endDate yearOfCommonEra]]; + } + return label; } - (NSString *)monthLabel { - return [NSString stringWithFormat:@"%@ %d", - [self localizedNameForMonthOfYear:[self->startDate monthOfYear]], - [self->startDate yearOfCommonEra]]; + NSString *l; + + l = [self localizedNameForMonthOfYear:[self->startDate monthOfYear]]; + return [NSString stringWithFormat:@"%@ %d", + l, [self->startDate yearOfCommonEra]]; } - (NSString *)yearLabel { - return [NSString stringWithFormat:@"%d", - [self->startDate yearOfCommonEra]]; + return [NSString stringWithFormat:@"%d", + [self->startDate yearOfCommonEra]]; } -@end +@end /* UIxCalDateLabel */ diff --git a/SOGo/UI/Scheduler/UIxCalYearOverview.wox b/SOGo/UI/Scheduler/UIxCalYearOverview.wox index 7c4df342..62f56870 100644 --- a/SOGo/UI/Scheduler/UIxCalYearOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalYearOverview.wox @@ -7,7 +7,8 @@ className="UIxPageFrame" title="name" > - +
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 2fbc143c..a8f389c1 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=82 +SUBMINOR_VERSION:=83 # v0.9.70 requires libNGExtensions v4.3.107 # v0.9.67 requires SOPE 4.3 diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make new file mode 100644 index 00000000..24614f4f --- /dev/null +++ b/SOGo/UI/common.make @@ -0,0 +1,27 @@ +# common make file for UI bundles + +include $(GNUSTEP_MAKEFILES)/common.make + +BUNDLE_EXTENSION = .SOGo +BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo + +ADDITIONAL_INCLUDE_DIRS += \ + -I.. -I../.. -I../../.. + +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libSOGoUI = \ + $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) +else + RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) +endif + +ADDITIONAL_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI) +ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib + +BUNDLE_LIBS += \ + -lSOGoUI \ + -lSOGo -lSOGoLogic \ + -lNGObjWeb \ + -lNGMime -lNGiCal \ + -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog index 8b749bd7..957d7981 100644 --- a/SOGoLogic/ChangeLog +++ b/SOGoLogic/ChangeLog @@ -1,3 +1,7 @@ +2004-09-25 Helge Hess + + * fixed compilation on MacOSX (v0.9.11) + 2004-08-15 Helge Hess * SOGoAppointment.m: fixed -setAttendees: method (v0.9.10) diff --git a/SOGoLogic/GNUmakefile.preamble b/SOGoLogic/GNUmakefile.preamble index 24c4f33e..b34cafce 100644 --- a/SOGoLogic/GNUmakefile.preamble +++ b/SOGoLogic/GNUmakefile.preamble @@ -3,7 +3,8 @@ libSOGoLogic_LIBRARIES_DEPEND_UPON += \ -lNGiCal \ -lNGLdap \ - -lSaxObjC + -lNGExtensions -lEOControl \ + -lDOM -lSaxObjC ADDITIONAL_LIB_DIRS += \ -L/usr/local/lib -L/usr/lib diff --git a/SOGoLogic/SOGoAppointment.h b/SOGoLogic/SOGoAppointment.h index 827b5f87..2ab0dbe0 100644 --- a/SOGoLogic/SOGoAppointment.h +++ b/SOGoLogic/SOGoAppointment.h @@ -33,7 +33,7 @@ OGoContentStore. */ -@class NSString, NSArray; +@class NSString, NSArray, NSCalendarDate; @class iCalPerson; @interface SOGoAppointment : NSObject diff --git a/SOGoLogic/SOGoAppointment.m b/SOGoLogic/SOGoAppointment.m index f556c71e..6785ea52 100644 --- a/SOGoLogic/SOGoAppointment.m +++ b/SOGoLogic/SOGoAppointment.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2004 SKYRIX Software AG This file is part of OpenGroupware.org. diff --git a/SOGoLogic/Version b/SOGoLogic/Version index 317960a7..c351558f 100644 --- a/SOGoLogic/Version +++ b/SOGoLogic/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=10 +SUBMINOR_VERSION:=11