+2004-06-22 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * Refactoring: Renamed everything from OGo to UIx in order to avoid
+ nameclashes (happens on OSX related to NGBundleManager)
+
+ * Refactoring 2: Moved methods from UIxWeekOverview to UIxCalView.
+
+ * Highlighting in UIxWeekOverview works now.
+
2004-06-22 Helge Hess <helge.hess@skyrix.com>
* Common/GNUmakefile.preamble: fixed linking for OGo gstep-make
libZideStoreCommonUI_HEADER_FILES_INSTALL_DIR = $(ZIDESTORE)/Common
libZideStoreCommonUI_HEADER_FILES = \
- OGoComponent.h \
+ UIxComponent.h \
libZideStoreCommonUI_OBJC_FILES = \
- OGoComponent.m \
+ UIxComponent.m \
CommonUI_PRINCIPAL_CLASS = CommonUIProduct
CommonUI_OBJC_FILES = \
CommonUIProduct.m \
- OGoPageFrame.m \
- OGoAppFrame.m \
- OGoAppHeader.m \
- OGoAppNavigation.m \
- OGoWinClose.m \
- OGoAppNavView.m \
+ UIxPageFrame.m \
+ UIxAppFrame.m \
+ UIxAppHeader.m \
+ UIxAppNavigation.m \
+ UIxWinClose.m \
+ UIxAppNavView.m \
\
UIxElemBuilder.m \
UIxTabView.m \
CommonUI_RESOURCE_FILES += \
Version \
product.plist \
- OGoPageFrame.wox \
- OGoAppFrame.wox \
- OGoAppHeader.wox \
- OGoAppNavigation.wox \
- OGoWinClose.wox \
- OGoAppNavView.wox \
+ UIxPageFrame.wox \
+ UIxAppFrame.wox \
+ UIxAppHeader.wox \
+ UIxAppNavigation.wox \
+ UIxWinClose.wox \
+ UIxAppNavView.wox \
\
zidestoreui.css \
calendar.css \
+++ /dev/null
-// $Id: OGoAppFrame.m,v 1.1 2003/12/09 17:38:42 helge Exp $
-
-#include <NGObjWeb/SoComponent.h>
-
-@interface OGoAppFrame : SoComponent
-@end
-
-#include "common.h"
-
-@implementation OGoAppFrame
-@end /* OGoAppFrame */
+++ /dev/null
-// $Id: OGoAppHeader.m,v 1.1 2003/12/09 17:38:42 helge Exp $
-
-#include <NGObjWeb/SoComponent.h>
-
-@interface OGoAppHeader : SoComponent
-@end
-
-#include "common.h"
-
-@implementation OGoAppHeader
-@end /* OGoAppHeader */
+++ /dev/null
-// $Id: OGoAppNavigation.m,v 1.1 2003/12/09 17:38:42 helge Exp $
-
-#include <NGObjWeb/SoComponent.h>
-
-@interface OGoAppNavigation : SoComponent
-@end
-
-#include "common.h"
-
-@implementation OGoAppNavigation
-@end /* OGoAppNavigation */
--- /dev/null
+// $Id$
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface UIxAppFrame : SoComponent
+@end
+
+#include "common.h"
+
+@implementation UIxAppFrame
+@end /* UIxAppFrame */
--- /dev/null
+// $Id$
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface UIxAppHeader : SoComponent
+@end
+
+#include "common.h"
+
+@implementation UIxAppHeader
+@end /* UIxAppHeader */
#import <Foundation/Foundation.h>
-@interface OGoAppNavView : WOComponent
+@interface UIxAppNavView : WOComponent
{
id element;
id lastElement;
@end
-@implementation OGoAppNavView
+@implementation UIxAppNavView
- (void)dealloc {
[self->element release];
--- /dev/null
+// $Id$
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface UIxAppNavigation : SoComponent
+@end
+
+#include "common.h"
+
+@implementation UIxAppNavigation
+@end /* UIxAppNavigation */
// $Id$
-#ifndef __OGoComponent_H_
-#define __OGoComponent_H_
+#ifndef __UIxComponent_H_
+#define __UIxComponent_H_
#include <NGObjWeb/SoComponent.h>
-@interface OGoComponent : SoComponent
+@interface UIxComponent : SoComponent
{
NSMutableDictionary *queryParameters;
}
@end
-#endif /* __OGoComponent_H_ */
+#endif /* __UIxComponent_H_ */
// $Id$
-#include "OGoComponent.h"
+#include "UIxComponent.h"
#include <Foundation/Foundation.h>
#include <NGObjWeb/NGObjWeb.h>
#include <NGExtensions/NGExtensions.h>
-@interface OGoComponent (PrivateAPI)
+@interface UIxComponent (PrivateAPI)
- (void)_parseQueryString:(NSString *)_s;
@end
-@implementation OGoComponent
+@implementation UIxComponent
- (id)init {
if ((self = [super init])) {
-// $Id: OGoPageFrame.m,v 1.2 2003/12/11 22:16:36 helge Exp $
+// $Id$
#include <NGObjWeb/SoComponent.h>
#include <NGObjWeb/SoHTTPAuthenticator.h>
#include <NGObjWeb/SoUser.h>
-@interface OGoPageFrame : SoComponent
+@interface UIxPageFrame : SoComponent
{
NSString *title;
}
#include "common.h"
-@implementation OGoPageFrame
+@implementation UIxPageFrame
- (void)dealloc {
[self->title release];
return [user login];
}
-@end /* OGoPageFrame */
+@end /* UIxPageFrame */
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td valign="bottom">
- <var:component className="OGoAppNavView" />
+ <var:component className="UIxAppNavView" />
</td>
<td align="right">
<a href="http://www.opengroupware.org:80/" target="OGo">
#include <NGObjWeb/NGObjWeb.h>
-@interface OGoWinClose : WOComponent
+@interface UIxWinClose : WOComponent
{
}
@end
-@implementation OGoWinClose
+@implementation UIxWinClose
@end
classes = (
{ name = CommonUIProduct; },
- { name = OGoComponent; },
- { name = OGoPageFrame; },
- { name = OGoWinClose; },
- { name = OGoAppNavView; },
+ { name = UIxComponent; },
+ { name = UIxPageFrame; },
+ { name = UIxWinClose; },
+ { name = UIxAppNavView; },
{ name = "UIxElemBuilder"; },
{ name = "UIxTabView"; },
{ name = "UIxTabItem"; },
);
WOComponents = (
- { name = OGoPageFrame; },
- { name = OGoWinClose; },
- { name = OGoAppNavView; },
+ { name = UIxPageFrame; },
+ { name = UIxWinClose; },
+ { name = UIxAppNavView; },
);
WOxElemBuilder = (
methods = {
"app" = {
protectedBy = "View";
- pageName = "OGoAppFrame";
+ pageName = "UIxAppFrame";
};
"appheader" = {
protectedBy = "View";
- pageName = "OGoAppHeader";
+ pageName = "UIxAppHeader";
};
"appnavigation" = {
protectedBy = "View";
- pageName = "OGoAppNavigation";
+ pageName = "UIxAppNavigation";
};
};
};
SchedulerUI_OBJC_FILES = \
SchedulerUIProduct.m \
- OGoAppointmentFormatter.m \
- OGoCalView.m \
- OGoCalWeekView.m \
- OGoCalMonthView.m \
- OGoAptTableView.m \
+ UIxAppointmentFormatter.m \
+ UIxCalView.m \
+ UIxCalWeekView.m \
+ UIxCalMonthView.m \
+ UIxAptTableView.m \
\
- OGoCalWeekOverview.m \
- OGoCalMonthOverview.m \
- OGoAppointmentView.m \
- OGoCalSelectTab.m \
- OGoCalDateLabel.m \
- OGoCalBackForthNavView.m \
+ UIxCalWeekOverview.m \
+ UIxCalMonthOverview.m \
+ UIxAppointmentView.m \
+ UIxCalSelectTab.m \
+ UIxCalDateLabel.m \
+ UIxCalBackForthNavView.m \
SchedulerUI_RESOURCE_FILES += \
Version \
product.plist \
\
- OGoAptTableView.wox \
- OGoCalWeekOverview.wox \
- OGoCalMonthOverview.wox \
- OGoAppointmentView.wox \
- OGoCalSelectTab.wox \
- OGoCalDateLabel.wox \
- OGoCalBackForthNavView.wox \
+ UIxAptTableView.wox \
+ UIxCalWeekOverview.wox \
+ UIxCalMonthOverview.wox \
+ UIxAppointmentView.wox \
+ UIxCalSelectTab.wox \
+ UIxCalDateLabel.wox \
+ UIxCalBackForthNavView.wox \
images/next_week.gif \
images/previous_week.gif \
images/icon_apt_chart.gif \
[WOComponent]
[SoComponent]
- OGoAppointmentView
- OGoCalView
- OGoCalMonthView
- OGoCalMonthOverview
- OGoCalWeekView
- OGoCalWeekOverview
- OGoAptTableView
+ UIxAppointmentView
+ UIxCalView
+ UIxCalMonthView
+ UIxCalMonthOverview
+ UIxCalWeekView
+ UIxCalWeekOverview
+ UIxAptTableView
SchedulerUIProduct
TBD:
- OGoCalDayView
- OGoCalDayOverview
- OGoCalDayChart
- OGoCalDayHChart
- [OGoCalWeekView]
- OGoCalWeekColumnView
- OGoCalWeekChart
- OGoCalWeekHChart
+ UIxCalDayView
+ UIxCalDayOverview
+ UIxCalDayChart
+ UIxCalDayHChart
+ [UIxCalWeekView]
+ UIxCalWeekColumnView
+ UIxCalWeekChart
+ UIxCalWeekHChart
OGoYearOverview - should use aggressive caching in the long run
- editor page (which comes up in a new window)
+++ /dev/null
-// $Id: OGoAppointmentView.h,v 1.1 2003/11/24 01:24:40 helge Exp $
-
-#ifndef __ZideStoreUI_OGoAppointmentView_H__
-#define __ZideStoreUI_OGoAppointmentView_H__
-
-#include <NGObjWeb/SoComponent.h>
-
-@interface OGoAppointmentView : SoComponent
-{
-}
-
-@end
-
-#endif /* __ZideStoreUI_OGoAppointmentView_H__ */
+++ /dev/null
-// $Id: OGoCalMonthOverview.m,v 1.1 2003/11/24 01:24:40 helge Exp $
-
-#include "OGoCalMonthView.h"
-
-@interface OGoCalMonthOverview : OGoCalMonthView
-{
-}
-
-@end
-
-#include "common.h"
-
-@implementation OGoCalMonthOverview
-
-- (NSArray *)appointments {
- return [self fetchCoreInfos];
-}
-
-@end /* OGoCalMonthOverview */
+++ /dev/null
-// $Id: OGoCalMonthView.h,v 1.2 2004/06/03 21:56:44 helge Exp $
-
-#ifndef __ZideStoreUI_OGoCalMonthView_H__
-#define __ZideStoreUI_OGoCalMonthView_H__
-
-#include "OGoCalView.h"
-
-/*
- OGoCalMonthView
-
- Abstract superclass for views which display months.
-*/
-
-@interface OGoCalMonthView : OGoCalView
-{
-}
-
-- (NSDictionary *)prevMonthQueryParameters;
-- (NSDictionary *)nextMonthQueryParameters;
-
-@end
-
-#endif /* __ZideStoreUI_OGoCalMonthView_H__ */
+++ /dev/null
-// $Id: OGoCalWeekView.h,v 1.2 2004/06/03 21:56:44 helge Exp $
-
-#ifndef __ZideStoreUI_OGoCalWeekView_H__
-#define __ZideStoreUI_OGoCalWeekView_H__
-
-#include "OGoCalView.h"
-
-@interface OGoCalWeekView : OGoCalView
-{
-}
-
-/* Query Parameters */
-
-- (NSDictionary *)prevWeekQueryParameters;
-- (NSDictionary *)nextWeekQueryParameters;
-
-@end
-
-#endif /* __ZideStoreUI_OGoCalWeekView_H__ */
*/
// $Id$
-#ifndef __OGoAppointmentFormatter_H__
-#define __OGoAppointmentFormatter_H__
+#ifndef __UIxAppointmentFormatter_H__
+#define __UIxAppointmentFormatter_H__
#import <Foundation/NSFormatter.h>
@class NSCalendarDate;
-@interface OGoAppointmentFormatter : NSFormatter
+@interface UIxAppointmentFormatter : NSFormatter
{
@protected
NSString *formatString; // default: @"%S - %E, \n%T"
//init
- (id)initWithFormat:(NSString *)_format;
-+ (OGoAppointmentFormatter *)formatterWithFormat:(NSString *)_format;
-+ (OGoAppointmentFormatter *)formatter;
++ (UIxAppointmentFormatter *)formatterWithFormat:(NSString *)_format;
++ (UIxAppointmentFormatter *)formatter;
//accessors
- (void)setFormat:(NSString *)_format;
*/
// $Id$
-#include "OGoAppointmentFormatter.h"
+#include "UIxAppointmentFormatter.h"
#import <Foundation/Foundation.h>
#import <NGExtensions/NGExtensions.h>
#import <EOControl/EOControl.h>
-@implementation OGoAppointmentFormatter
+@implementation UIxAppointmentFormatter
- (id)init {
if ((self = [super init])) {
return self;
}
-+ (OGoAppointmentFormatter *)formatterWithFormat:(NSString *)_format {
- return AUTORELEASE([(OGoAppointmentFormatter *)[OGoAppointmentFormatter alloc]
++ (UIxAppointmentFormatter *)formatterWithFormat:(NSString *)_format {
+ return AUTORELEASE([(UIxAppointmentFormatter *)[UIxAppointmentFormatter alloc]
initWithFormat:_format]);
}
-+ (OGoAppointmentFormatter *)formatter {
- return AUTORELEASE([[OGoAppointmentFormatter alloc] init]);
++ (UIxAppointmentFormatter *)formatter {
+ return AUTORELEASE([[UIxAppointmentFormatter alloc] init]);
}
#if !LIB_FOUNDATION_BOEHM_GC
--- /dev/null
+// $Id$
+
+#ifndef __ZideStoreUI_UIxAppointmentView_H__
+#define __ZideStoreUI_UIxAppointmentView_H__
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface UIxAppointmentView : SoComponent
+{
+}
+
+@end
+
+#endif /* __ZideStoreUI_UIxAppointmentView_H__ */
-// $Id: OGoAppointmentView.m,v 1.2 2004/06/03 16:42:38 znek Exp $
+// $Id$
-#include "OGoAppointmentView.h"
+#include "UIxAppointmentView.h"
#include "common.h"
#include <Backend/SxAptManager.h>
- (SxAptManager *)aptManagerInContext:(id)_ctx;
@end
-@implementation OGoAppointmentView
+@implementation UIxAppointmentView
- (void)dealloc {
[super dealloc];
return [[self clientObject] aptManagerInContext:[self context]];
}
-@end /* OGoAppointmentView */
+@end /* UIxAppointmentView */
<?xml version='1.0' standalone='yes'?>
-<var:component className="OGoPageFrame" title="name"
+<var:component className="UIxPageFrame" title="name"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
-// $Id: OGoAptTableView.m,v 1.1 2003/11/24 01:37:06 helge Exp $
+// $Id$
#include <NGObjWeb/SoComponent.h>
@class NSArray, NSCalendarDate;
-@interface OGoAptTableView : SoComponent
+@interface UIxAptTableView : SoComponent
{
NSArray *appointments;
id appointment;
#include "common.h"
-@implementation OGoAptTableView
+@implementation UIxAptTableView
- (void)dealloc {
[self->appointment release];
return [NSString stringWithFormat:@"%@/view", pkey];
}
-@end /* OGoAptTableView */
+@end /* UIxAptTableView */
label -> user presentable name to display for "this"
*/
-@interface OGoCalBackForthNavView : WOComponent
+@interface UIxCalBackForthNavView : WOComponent
{
}
@end
-@implementation OGoCalBackForthNavView
+@implementation UIxCalBackForthNavView
- (BOOL)synchronizesVariablesWithBindings {
return NO;
#include <NGObjWeb/NGObjWeb.h>
-@interface OGoCalDateLabel : WOComponent
+@interface UIxCalDateLabel : WOComponent
{
NSString *selection;
NSCalendarDate *startDate;
@end
-@implementation OGoCalDateLabel
+@implementation UIxCalDateLabel
- (void)dealloc {
[self->selection release];
--- /dev/null
+// $Id$
+
+#include "UIxCalMonthView.h"
+
+@interface UIxCalMonthOverview : UIxCalMonthView
+{
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxCalMonthOverview
+
+- (NSArray *)appointments {
+ return [self fetchCoreInfos];
+}
+
+@end /* UIxCalMonthOverview */
<?xml version='1.0' standalone='yes'?>
-<var:component className="OGoPageFrame" title="name"
+<var:component className="UIxPageFrame" title="name"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="5"/>
- <td class="wintitle"><var:component className="OGoCalDateLabel" startDate="startDate" endDate="endDate" const:selection="month" /></td>
+ <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="month" /></td>
<td width="36" align="right" valign="center">
- <var:component className="OGoWinClose" />
+ <var:component className="UIxWinClose" />
</td>
</tr>
</table>
<tr bgcolor="#e8e8e0">
<td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
<td align="right">
- <var:component className="OGoCalBackForthNavView"
+ <var:component className="UIxCalBackForthNavView"
methodName="ownMethodName"
prevQueryParameters="prevMonthQueryParameters"
currentQueryParameters="todayQueryParameters"
<table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <var:component className="OGoCalSelectTab"
+ <var:component className="UIxCalSelectTab"
const:selection="month"
currentDate="selectedDate"
>
<var:month-overview
list="appointments"
item="appointment"
- weekStart="weekStart"
+ index="index"
+ currentDay="selectedDate"
+
const:startDateKey = "startDate"
const:endDateKey = "endDate"
+
const:titleColor = "#7799FF"
const:contentColor = "#5577FF"
>
<var:month>
- <a var:href="appointmentViewURL"
- ><var:string value="appointment.title" /></a>
+ <a var:href="appointmentViewURL"><var:string value="appointment.title" /></a>
</var:month>
</var:month-overview>
<hr />
Appointments:
- <var:component className="OGoAptTableView" appointments="appointments"/>
+ <var:component className="UIxAptTableView" appointments="appointments"/>
-->
<!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
</var:component>
--- /dev/null
+// $Id$
+
+#ifndef __ZideStoreUI_UIxCalMonthView_H__
+#define __ZideStoreUI_UIxCalMonthView_H__
+
+#include "UIxCalView.h"
+
+/*
+ UIxCalMonthView
+
+ Abstract superclass for views which display months.
+*/
+
+@interface UIxCalMonthView : UIxCalView
+{
+}
+
+- (NSDictionary *)prevMonthQueryParameters;
+- (NSDictionary *)nextMonthQueryParameters;
+
+@end
+
+#endif /* __ZideStoreUI_UIxCalMonthView_H__ */
-// $Id: OGoCalMonthView.m,v 1.2 2004/06/03 21:56:44 helge Exp $
+// $Id$
-#include "OGoCalMonthView.h"
+#include "UIxCalMonthView.h"
#include "common.h"
-@implementation OGoCalMonthView
+@implementation UIxCalMonthView
- (NSCalendarDate *)startDate {
return [[super startDate] firstDayOfMonth];
return [self queryParametersBySettingSelectedDate:date];
}
-@end /* OGoCalMonthView */
+@end /* UIxCalMonthView */
// $Id$
-#include <Common/OGoComponent.h>
+#include <Common/UIxComponent.h>
#include <NGObjWeb/NGObjWeb.h>
#include <NGExtensions/NGExtensions.h>
-@interface OGoCalSelectTab : OGoComponent
+@interface UIxCalSelectTab : UIxComponent
{
NSString *selection;
NSCalendarDate *currentDate;
@end
-@implementation OGoCalSelectTab
+@implementation UIxCalSelectTab
- (void)dealloc {
[self->selection release];
-// $Id: OGoCalView.h,v 1.3 2004/06/03 21:56:44 helge Exp $
+// $Id$
-#ifndef __ZideStoreUI_OGoCalView_H__
-#define __ZideStoreUI_OGoCalView_H__
+#ifndef __ZideStoreUI_UIxCalView_H__
+#define __ZideStoreUI_UIxCalView_H__
-#include <Common/OGoComponent.h>
+#include <Common/UIxComponent.h>
@class NSArray, NSCalendarDate;
@class SxAptManager, SxAptSetIdentifier;
-@interface OGoCalView : OGoComponent
+@interface UIxCalView : UIxComponent
{
NSArray *appointments;
id appointment;
+ NSCalendarDate *currentDay;
}
/* accessors */
- (NSArray *)appointments;
- (id)appointment;
+
+- (NSDictionary *)aptTypeDict;
+- (NSString *)aptTypeLabel;
+- (NSString *)aptTypeIcon;
+- (NSString *)shortTextForApt;
+
+/* related to current day */
+- (void)setCurrentDay:(NSCalendarDate *)_day;
+- (NSCalendarDate *)currentDay;
+- (NSString *)currentDayName;
+- (NSArray *)allDayApts;
+- (BOOL)hasDayInfo;
+- (BOOL)hasHoldidayInfo;
+
+
- (BOOL)showFullNames;
- (BOOL)showAMPMDates;
- (NSCalendarDate *)referenceDateForFormatter;
- (NSArray *)fetchCoreInfos;
/* date selection */
+- (NSDictionary *)todayQueryParameters;
+- (NSDictionary *)currentDayQueryParameters;
- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date;
- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
inDictionary:(NSMutableDictionary *)_qp;
+
- (NSString *)dateStringForDate:(NSCalendarDate *)_date;
- (NSCalendarDate *)dateForDateString:(NSString *)_dateString;
@end
-#endif /* __ZideStoreUI_OGoCalView_H__ */
+#endif /* __ZideStoreUI_UIxCalView_H__ */
-// $Id: OGoCalView.m,v 1.3 2004/06/03 21:56:44 helge Exp $
+// $Id$
-#include "OGoCalView.h"
+#include "UIxCalView.h"
#include "common.h"
#include <Backend/SxAptManager.h>
+#include "UIxAppointmentFormatter.h"
@interface NSObject(UsedPrivates)
- (SxAptManager *)aptManagerInContext:(id)_ctx;
@end
-@implementation OGoCalView
+@implementation UIxCalView
- (void)dealloc {
[self->appointment release];
[self->appointments release];
+ [self->currentDay release];
[super dealloc];
}
/* accessors */
+
- (void)setAppointments:(NSArray *)_apts {
ASSIGN(self->appointments, _apts);
}
return self->appointment;
}
-- (BOOL)showFullNames {
- return YES;
+- (NSDictionary *)aptTypeDict {
+ return nil;
}
-- (BOOL)showAMPMDates {
- return NO;
+- (NSString *)aptTypeLabel {
+ return @"aptLabel";
+}
+
+- (NSString *)aptTypeIcon {
+ return @"";
+}
+
+- (NSString *)shortTextForApt {
+ UIxAppointmentFormatter *f;
+
+ f = [UIxAppointmentFormatter formatterWithFormat:
+ @"%S - %E;\n%T;\n%L;\n%5P;\n%50R"];
+ [f setRelationDate:[self referenceDateForFormatter]];
+ [f setShowFullNames:[self showFullNames]];
+ if([self showAMPMDates])
+ [f switchToAMPMTimes:YES];
+
+ return [NSString stringWithFormat:@"%@:\n%@",
+ [self aptTypeLabel],
+ [f stringForObjectValue:self->appointment]];
}
- (NSCalendarDate *)referenceDateForFormatter {
return [self selectedDate];
}
+/* current day related */
+
+- (void)setCurrentDay:(NSCalendarDate *)_day {
+ ASSIGN(self->currentDay, _day);
+}
+- (NSCalendarDate *)currentDay {
+ return self->currentDay;
+}
+
+- (NSString *)currentDayName {
+ // TODO: this is slow, use locale dictionary to speed this up
+ return [self->currentDay descriptionWithCalendarFormat:@"%A"];
+}
+
+- (BOOL)hasDayInfo {
+ return [self hasHoldidayInfo] || ([[self allDayApts] count] != 0);
+}
+
+- (BOOL)hasHoldidayInfo {
+ return NO;
+}
+
+- (NSArray *)allDayApts {
+ return [NSArray array];
+}
+
+
+/* defaults */
+
+
+- (BOOL)showFullNames {
+ return YES;
+}
+
+- (BOOL)showAMPMDates {
+ return NO;
+}
+
/* URLs */
return [self queryParametersBySettingSelectedDate:date];
}
+- (NSDictionary *)currentDayQueryParameters {
+ return [self queryParametersBySettingSelectedDate:self->currentDay];
+}
+
- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date {
NSMutableDictionary *qp;
return [NSCalendarDate dateWithString:_dateString calendarFormat:@"%Y%m%d"];
}
-@end /* OGoCalView */
+@end /* UIxCalView */
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
-// $Id: OGoCalWeekOverview.m,v 1.3 2004/06/03 21:56:44 helge Exp $
+// $Id$
-#include "OGoCalWeekView.h"
+#include "UIxCalWeekView.h"
-@interface OGoCalWeekOverview : OGoCalWeekView
+@interface UIxCalWeekOverview : UIxCalWeekView
{
int dayIndex;
- NSCalendarDate *currentDay;
}
@end
#include "common.h"
#include <Backend/SxAptManager.h>
-#include "OGoAppointmentFormatter.h"
-@implementation OGoCalWeekOverview
+@implementation UIxCalWeekOverview
- (NSArray *)appointments {
return [self fetchCoreInfos];
}
-- (void)setCurrentDay:(NSCalendarDate *)_day {
- ASSIGN(self->currentDay, _day);
-}
-
-- (NSCalendarDate *)currentDay {
- return self->currentDay;
-}
-
-- (NSString *)currentDayName {
- return [self->currentDay descriptionWithCalendarFormat:@"%A"];
-}
-
- (void)setDayIndex:(char)_idx {
NSCalendarDate *d;
return self->dayIndex;
}
-- (NSDictionary *)currentDayQueryParameters {
- return [self queryParametersBySettingSelectedDate:self->currentDay];
-}
-
/* style sheet */
- (NSString *)titleStyle {
return @"weekoverview_content";
}
-- (NSDictionary *)aptTypeDict {
- return nil;
-}
-
-- (NSString *)aptTypeLabel {
- return @"aptLabel";
-}
-
-- (NSString *)aptTypeIcon {
- return @"";
-}
-
-- (NSString *)shortTextForApt {
- OGoAppointmentFormatter *f;
-
- f = [OGoAppointmentFormatter formatterWithFormat:
- @"%S - %E;\n%T;\n%L;\n%5P;\n%50R"];
- [f setRelationDate:[self referenceDateForFormatter]];
- [f setShowFullNames:[self showFullNames]];
- if([self showAMPMDates])
- [f switchToAMPMTimes:YES];
-
- return [NSString stringWithFormat:@"%@:\n%@",
- [self aptTypeLabel],
- [f stringForObjectValue:self->appointment]];
-}
-
-- (BOOL)hasDayInfo {
- return YES;
-}
-
-- (BOOL)hasHoldidayInfo {
- return NO;
-}
-
-- (NSArray *)allDayApts {
- return nil;
-}
-
-@end /* OGoCalWeekOverview */
+@end /* UIxCalWeekOverview */
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url"
xmlns:uix="OGo:uix"
- className="OGoPageFrame"
+ className="UIxPageFrame"
title="name">
<!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="5"/>
- <td class="wintitle"><var:component className="OGoCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
+ <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
<td width="36" align="right" valign="center">
- <var:component className="OGoWinClose" />
+ <var:component className="UIxWinClose" />
</td>
</tr>
</table>
<tr bgcolor="#e8e8e0">
<td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
<td align="right">
- <var:component className="OGoCalBackForthNavView"
+ <var:component className="UIxCalBackForthNavView"
methodName="ownMethodName"
prevQueryParameters="prevWeekQueryParameters"
currentQueryParameters="todayQueryParameters"
<table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <var:component className="OGoCalSelectTab" const:selection="week" currentDate="selectedDate">
+ <var:component className="UIxCalSelectTab" const:selection="week" currentDate="selectedDate">
<table border="0" cellpadding="4" width="100%" cellspacing="2">
<tr>
<hr/>
Appointments:
- <var:component className="OGoAptTableView" appointments="appointments"/>
+ <var:component className="UIxAptTableView" appointments="appointments"/>
-->
<!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
--- /dev/null
+// $Id$
+
+#ifndef __ZideStoreUI_UIxCalWeekView_H__
+#define __ZideStoreUI_UIxCalWeekView_H__
+
+#include "UIxCalView.h"
+
+@interface UIxCalWeekView : UIxCalView
+{
+}
+
+/* Query Parameters */
+
+- (NSDictionary *)prevWeekQueryParameters;
+- (NSDictionary *)nextWeekQueryParameters;
+
+@end
+
+#endif /* __ZideStoreUI_UIxCalWeekView_H__ */
-// $Id: OGoCalWeekView.m,v 1.3 2004/06/03 21:56:44 helge Exp $
+// $Id$
-#include "OGoCalWeekView.h"
+#include "UIxCalWeekView.h"
#include "common.h"
-@implementation OGoCalWeekView
+@implementation UIxCalWeekView
- (NSCalendarDate *)startDate {
return [[super startDate] mondayOfWeek];
return [self queryParametersBySettingSelectedDate:date];
}
-@end /* OGoCalWeekView */
+@end /* UIxCalWeekView */
methods = {
"weekoverview" = {
protectedBy = "View";
- pageName = "OGoCalWeekOverview";
+ pageName = "UIxCalWeekOverview";
};
"weekchartview" = {
protectedBy = "View";
- pageName = "OGoCalWeekOverview";
+ pageName = "UIxCalWeekOverview";
};
"weeklistview" = {
protectedBy = "View";
- pageName = "OGoCalWeekOverview";
+ pageName = "UIxCalWeekOverview";
};
"weekcolumnview" = {
protectedBy = "View";
- pageName = "OGoCalWeekOverview";
+ pageName = "UIxCalWeekOverview";
};
"weekprintview" = {
protectedBy = "View";
- pageName = "OGoCalWeekOverview";
+ pageName = "UIxCalWeekOverview";
};
"monthoverview" = {
protectedBy = "View";
- pageName = "OGoCalMonthOverview";
+ pageName = "UIxCalMonthOverview";
};
};
};
methods = {
"view" = {
protectedBy = "View";
- pageName = "OGoAppointmentView";
+ pageName = "UIxAppointmentView";
};
};
};
projects / scalable-opengroupware.org / commitdiff