+2004-08-12 Helge Hess <helge.hess@skyrix.com>
+
+ * some code reorganizations, fixed some compile warnings (v0.9.20)
+
2004-08-11 Marcus Mueller <znek@mulle-kybernetik.com>
* v0.9.19
SchedulerUI_OBJC_FILES = \
SchedulerUIProduct.m \
UIxAppointmentFormatter.m \
- UIxCalView.m \
- UIxCalDayView.m \
- UIxCalWeekView.m \
- UIxCalMonthView.m \
- UIxAptTableView.m \
- \
- UIxCalDayOverview.m \
+ iCalPerson+UIx.m \
+ UIxCalView.m \
+ UIxCalDayView.m \
+ UIxCalWeekView.m \
+ UIxCalMonthView.m \
+ UIxAptTableView.m \
+ \
+ UIxCalDayOverview.m \
UIxCalDayChartview.m \
- UIxCalDayListview.m \
+ UIxCalDayListview.m \
UIxCalDayPrintview.m \
UIxCalWeekOverview.m \
UIxCalWeekChartview.m \
UIxCalInlineMonthOverview.m \
UIxAppointmentView.m \
UIxAppointmentEditor.m \
- UIxCalSelectTab.m \
- UIxCalDateLabel.m \
+ UIxCalSelectTab.m \
+ UIxCalDateLabel.m \
UIxCalBackForthNavView.m \
-SchedulerUI_RESOURCE_FILES += \
- Version \
- product.plist \
- \
- UIxAptTableView.wox \
+SchedulerUI_RESOURCE_FILES += \
+ Version \
+ product.plist \
+ \
+ UIxAptTableView.wox \
UIxCalDayOverview.wox \
UIxCalDayChartview.wox \
UIxCalDayListview.wox \
UIxCalMonthOverview.wox \
UIxCalMonthPrintview.wox \
UIxCalYearOverview.wox \
- UIxCalInlineMonthOverview.wox \
+ UIxCalInlineMonthOverview.wox \
UIxAppointmentView.wox \
UIxAppointmentEditor.wox \
- UIxCalSelectTab.wox \
- UIxCalDateLabel.wox \
+ UIxCalSelectTab.wox \
+ UIxCalDateLabel.wox \
UIxCalBackForthNavView.wox \
images/next_week.gif \
images/previous_week.gif \
- images/icon_view_overview.gif \
- images/icon_view_overview_inactive.gif \
+ images/icon_view_overview.gif \
+ images/icon_view_overview_inactive.gif \
images/icon_view_chart.gif \
- images/icon_view_chart_inactive.gif \
+ images/icon_view_chart_inactive.gif \
images/icon_view_list.gif \
- images/icon_view_list_inactive.gif \
- images/icon_view_columns.gif \
- images/icon_view_columns_inactive.gif \
+ images/icon_view_list_inactive.gif \
+ images/icon_view_columns.gif \
+ images/icon_view_columns_inactive.gif \
SchedulerUI_LOCALIZED_RESOURCE_FILES += \
default.strings
# $Id$
ADDITIONAL_INCLUDE_DIRS += \
- -I.. \
+ -I.. \
+ -I../.. \
+ -I../../.. \
-I../../SoObjects
ifneq ($(GNUSTEP_BUILD_DIR),)
*/
// $Id$
-
-#include "common.h"
#include <SOGoUI/UIxComponent.h>
+
+/* TODO: CLEAN UP */
+
+@class NSString;
+@class SOGoAppointment;
+
+@interface UIxAppointmentEditor : UIxComponent
+{
+ id appointment;
+ id participants;
+}
+
+- (SOGoAppointment *)appointment;
+- (NSString *)iCalStringTemplate;
+- (NSString *)iCalString;
+
+@end
+
#include <SOGoUI/SOGoDateFormatter.h>
#include <SOGoLogic/SOGoAppointment.h>
+#include <Appointments/SOGoAppointmentFolder.h>
+#include <Appointments/SOGoAppointmentObject.h>
+#include "iCalPerson+UIx.h"
+#include "common.h"
#include <NGiCal/NGiCal.h>
-
-/* TODO: CLEAN THIS MESS UP */
-
@interface NSDate(UsedPrivates)
- (NSString *)icalString; // TODO: this is in NGiCal
@end
}
@end
-@interface iCalPerson (Convenience)
-- (NSString *)rfc822Email;
-@end
-
-@implementation iCalPerson (Convenience)
-- (NSString *)rfc822Email {
- NSString *_email = [self email];
- NSRange colon = [_email rangeOfString:@":"];
- if(colon.location != NSNotFound) {
- return [_email substringFromIndex:colon.location + 1];
- }
- return _email;
-}
-@end
-
-@interface UIxAppointmentEditor : UIxComponent
-{
- id appointment;
- id participants;
-}
-
-- (SOGoAppointment *)appointment;
-- (NSString *)iCalStringTemplate;
-- (NSString *)iCalString;
-
-@end
-
@implementation UIxAppointmentEditor
- (void)dealloc {
- [self->appointment release];
- [self->participants release];
- [super dealloc];
+ [self->appointment release];
+ [self->participants release];
+ [super dealloc];
}
-
/* accessors */
-
- (NSString *)formattedAptStartTime {
- NSCalendarDate *date;
- SOGoDateFormatter *fmt;
- NSString *s;
-
- date = [[[[self appointment] startDate] copy] autorelease];
- [date setTimeZone:[self viewTimeZone]];
- fmt = [[SOGoDateFormatter alloc] initWithLocale:[self locale]];
- [fmt setFullWeekdayNameAndDetails];
- s = [fmt stringForObjectValue:date];
- [fmt release];
- return s;
+ NSCalendarDate *date;
+ SOGoDateFormatter *fmt;
+ NSString *s;
+
+ date = [[[[self appointment] startDate] copy] autorelease];
+ [date setTimeZone:[self viewTimeZone]];
+ fmt = [[SOGoDateFormatter alloc] initWithLocale:[self locale]];
+ [fmt setFullWeekdayNameAndDetails];
+ s = [fmt stringForObjectValue:date];
+ [fmt release];
+ return s;
}
- (BOOL)isNewAppointment {
- (NSString *)iCalString {
// TODO: improve check for new appointment
NSString *ical;
-
+
ical = [[self clientObject] valueForKey:@"iCalString"];
if ([ical length] == 0) /* a new appointment */
ical = [self iCalStringTemplate];
--- /dev/null
+/*
+ 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: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
--- /dev/null
+<?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"
+>
+ proposal
+</var:component>
*/
// $Id$
+#ifndef __UIxCalDayOverview_H__
+#define __UIxCalDayOverview_H__
#include "UIxCalDayView.h"
-#include "common.h"
+
+@className= NSArray;
@interface UIxCalDayOverview : UIxCalDayView
{
- NSArray *currentApts;
+ NSArray *currentApts;
}
- (void)setCurrentApts:(NSArray *)_apts;
- (int)minRequiredRowSpan;
@end
+
+#endif /* __UIxCalDayOverview_H__ */
xmlns:uix="OGo:uix"
className="UIxPageFrame"
title="name">
-
- <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
- <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%">
const:selection="week"
/></td>
<td width="36" align="right" valign="center">
- <var:component className="UIxWinClose" />
+ <var:component className="UIxWinClose" />
</td>
</tr>
</table>
</var:component>
</td>
</tr>
- <tr bgcolor="#F5F5E9">
+ <tr bgcolor="#F5F5E9"> <!-- use CSS -->
<td align="left" width="10"><var:entity const:name="nbsp"/></td>
<td align="right"><img
border="0" alt=""
src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif" /></td>
</tr>
<tr>
- <td colspan="2" bgcolor="#F5F5E9">
+ <td colspan="2" bgcolor="#F5F5E9"> <!-- use CSS -->
<table border="0" width="100%" cellpadding="10" cellspacing="0">
<tr />
</table>
<var:component className="UIxAptTableView" appointments="appointments"/>
-->
<!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
-
</var:component>
# $Id$
-SUBMINOR_VERSION:=19
+SUBMINOR_VERSION:=20
--- /dev/null
+/*
+ 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: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
+
+#ifndef __iCalPerson_UIx_H__
+#define __iCalPerson_UIx_H__
+
+#include <NGiCal/NGiCal.h>
+
+@class NSString;
+
+@interface iCalPerson(Convenience)
+- (NSString *)rfc822Email;
+@end
+
+#endif /* __iCalPerson_UIx_H__ */
--- /dev/null
+/*
+ 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: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
+
+#include "iCalPerson+UIx.h"
+#include "common.h"
+
+@implementation iCalPerson(Convenience)
+
+- (NSString *)rfc822Email {
+ NSString *_email;
+ NSRange colon;
+
+ _email = [self email];
+ colon = [_email rangeOfString:@":"];
+
+ if (colon.length > 0)
+ return [_email substringFromIndex:(colon.location + colon.length)];
+
+ return _email;
+}
+
+@end /* iCalPerson(Convenience) */
+2004-08-12 Helge Hess <helge.hess@skyrix.com>
+
+ * SOGoAppointment.h: added -iCalString prototype (v0.9.2)
+
2004-06-30 Marcus Mueller <znek@mulle-kybernetik.com>
* SOGoAppointment.[hm]: new cover methods. also added hackish
- (void)addToAttendees:(iCalPerson *)_person;
- (NSArray *)attendees;
+/* generating iCal */
+
+- (NSString *)iCalString;
/* do we really need these? */
# $Id$
-SUBMINOR_VERSION:=1
+SUBMINOR_VERSION:=2
projects / scalable-opengroupware.org / commitdiff