+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed compilation on MacOSX (v0.9.10)
+
2004-09-10 Helge Hess <helge.hess@skyrix.com>
* v0.9.9
MAJOR_VERSION=0
MINOR_VERSION=9
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10
# v0.9.7 requires libGDLAccess v1.1.35
+/*
+ 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 <Foundation/NSObject.h>
-@class NSUserDefaults;
+@class NSUserDefaults, NSArray;
@class OCSFolderManager;
@interface Tool : NSObject
+/*
+ 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 <Foundation/NSObject.h>
-@class NSUserDefaults;
+@class NSUserDefaults, NSArray;
@class OCSFolderManager;
@interface Tool : NSObject
+/*
+ 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 <Foundation/NSObject.h>
-@class NSUserDefaults;
+@class NSUserDefaults, NSArray;
@class OCSFolderManager;
@interface Tool : NSObject
+/*
+ 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 <Foundation/NSObject.h>
-@class NSUserDefaults;
+@class NSUserDefaults, NSArray;
@class OCSFolderManager;
@interface Tool : NSObject
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * sogod.m: fixed a compile warning on OSX (v0.9.11)
+
2004-09-20 Helge Hess <helge.hess@skyrix.com>
* SOGoUserHomePage.wox: added link to Mail (v0.9.10)
-lSOGo \
-lSOGoLogic \
-lOGoContentStore \
- -lGDLAccess
+ -lGDLAccess \
+ -lNGiCal -lNGLdap
NSArray *langs;
NSDictionary *locale;
- langs = [[_ctx request] browserLanguages];
+ langs = [[(WOContext *)_ctx request] browserLanguages];
locale = [self currentLocaleConsideringLanguages:langs];
[_ctx takeValue:locale forKey:@"locale"];
}
-2004-09-08 <helge@agenor.opengroupware.org>
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed compilation on MacOSX (v0.9.12)
+
+2004-09-08 Helge Hess <helge.hess@opengroupware.org>
* SOGoGroupAppointmentFolder.m: do not call -sleep in fetch method
(disconnects the folder from the parent folder), instead added a
# $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
-# $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
# $Id: Version,v 1.9 2004/05/19 14:30:45 helge Exp $
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed compilation on MacOSX (v0.9.4)
+
2004-08-27 Helge Hess <helge.hess@skyrix.com>
* v0.9.3
# $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
-# $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
# $Id$
-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed compilation on MacOSX (v0.9.4)
+
2004-09-20 Helge Hess <helge.hess@skyrix.com>
* SOGoMailAccounts.m: added hardcoded mail-account key (v0.9.3)
# $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
-# $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
# $Id$
-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4
--- /dev/null
+# 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
# $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
AnaisUI_LOCALIZED_RESOURCE_FILES += \
default.strings \
-ADDITIONAL_INCLUDE_DIRS += \
- -I.. -I../.. -I../../..
-
# make
-include GNUmakefile.preamble
-# $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
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * added rsrc namespace declaration to templates (v0.9.3)
+
2004-09-20 Helge Hess <helge.hess@skyrix.com>
* work on mailer (v0.9.2)
<?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
- 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="UIxMailMainFrame"
- title="name"
+<var:component
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:var="http://www.skyrix.com/od/binding"
+ xmlns:const="http://www.skyrix.com/od/constant"
+ xmlns:uix="OGo:uix"
+ xmlns:label="OGo:label"
+ xmlns:rsrc="OGo:url"
+ className="UIxMailMainFrame"
+ title="name"
>
<h4>Account Settings Page</h4>
<a rsrc:href="tbird_073_accountview.png">screenshot</a>
<?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
- 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"
+<var:component
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:var="http://www.skyrix.com/od/binding"
+ xmlns:const="http://www.skyrix.com/od/constant"
+ xmlns:uix="OGo:uix"
+ xmlns:rsrc="OGo:url"
+ xmlns:label="OGo:label"
+ className="UIxPageFrame"
+ title="name"
>
<h4>Mail Compose</h4>
<a rsrc:href="tbird_073_compose.png">screenshot</a>
<?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
- 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"
+<var:component
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:var="http://www.skyrix.com/od/binding"
+ xmlns:const="http://www.skyrix.com/od/constant"
+ xmlns:uix="OGo:uix"
+ xmlns:rsrc="OGo:url"
+ xmlns:label="OGo:label"
+ className="UIxPageFrame"
+ title="name"
>
<h4>Mail View</h4>
<a rsrc:href="tbird_073_viewer.png">screenshot</a>
# $Id$
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * 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 <helge.hess@skyrix.com>
* v0.9.11
RELBUILD_DIR_libSOGoCommonUI = $(GNUSTEP_OBJ_DIR)
endif
-libSOGoCommonUI_LIBRARIES_DEPEND_UPON += -lNGObjWeb
+libSOGoUI_LIBRARIES_DEPEND_UPON += \
+ -lNGObjWeb \
+ -lNGMime \
+ -lNGStreams -lNGExtensions -lEOControl \
+ -lXmlRpc -lDOM -lSaxObjC
+
/*
- 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
*/
// $Id$
+#include "SOGoAptFormatter.h"
+#include "common.h"
-#import "SOGoAptFormatter.h"
-
-
-@interface SOGoAptFormatter (PrivateAPI)
+@interface SOGoAptFormatter(PrivateAPI)
- (NSString *)shortTitleForApt:(id)_apt;
- (NSTimeZone *)displayTZ;
@end
@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:@"<br />%@",
- [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:@"<br />%@", [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 */
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * UIxCalDateLabel.m: minor code cleanups, fixed compilation on MacOSX
+ (v0.9.83)
+
2004-09-13 Marcus Mueller <znek@mulle-kybernetik.com>
* English.lproj/default.strings: fixed a missing ';' (v0.9.82)
/*
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
*/
// $Id$
-
#include <SOGoUI/UIxComponent.h>
-#include <Foundation/Foundation.h>
@interface UIxCalDateLabel : UIxComponent
{
- NSString *selection;
- NSCalendarDate *startDate;
- NSCalendarDate *endDate;
+ NSString *selection;
+ NSCalendarDate *startDate;
+ NSCalendarDate *endDate;
}
- (NSString *)dayLabel;
@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:@"<nobr>%@ / %@ %d</nobr>",
- 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:@"<nobr>%@ / %@ %d</nobr>",
+ 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 */
className="UIxPageFrame"
title="name"
>
- <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
+ <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
+ width="100%">
<tr>
<td class="wintitle">
<table cellpadding="0" cellspacing="0" width="100%">
# $Id$
-SUBMINOR_VERSION:=82
+SUBMINOR_VERSION:=83
# v0.9.70 requires libNGExtensions v4.3.107
# v0.9.67 requires SOPE 4.3
--- /dev/null
+# 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
+2004-09-25 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed compilation on MacOSX (v0.9.11)
+
2004-08-15 Helge Hess <helge.hess@skyrix.com>
* SOGoAppointment.m: fixed -setAttendees: method (v0.9.10)
libSOGoLogic_LIBRARIES_DEPEND_UPON += \
-lNGiCal \
-lNGLdap \
- -lSaxObjC
+ -lNGExtensions -lEOControl \
+ -lDOM -lSaxObjC
ADDITIONAL_LIB_DIRS += \
-L/usr/local/lib -L/usr/lib
OGoContentStore.
*/
-@class NSString, NSArray;
+@class NSString, NSArray, NSCalendarDate;
@class iCalPerson;
@interface SOGoAppointment : NSObject
/*
- Copyright (C) 2000-2004 SKYRIX Software AG
+ Copyright (C) 2004 SKYRIX Software AG
This file is part of OpenGroupware.org.
# $Id$
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11
projects / scalable-opengroupware.org / commitdiff