From: znek Date: Tue, 22 Jun 2004 13:40:19 +0000 (+0000) Subject: Refactoring: OGo -> UIx X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebf5f71bd6c7c92e61c2628cf92cf10f6413578;p=scalable-opengroupware.org Refactoring: OGo -> UIx git-svn-id: http://svn.opengroupware.org/SOGo/trunk@59 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog index 822f9b7d..6d4b7a55 100644 --- a/ZideStore/UI-X/ChangeLog +++ b/ZideStore/UI-X/ChangeLog @@ -1,3 +1,12 @@ +2004-06-22 Marcus Mueller + + * 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 * Common/GNUmakefile.preamble: fixed linking for OGo gstep-make diff --git a/ZideStore/UI-X/Common/GNUmakefile b/ZideStore/UI-X/Common/GNUmakefile index e4124d05..916326f9 100644 --- a/ZideStore/UI-X/Common/GNUmakefile +++ b/ZideStore/UI-X/Common/GNUmakefile @@ -16,22 +16,22 @@ libZideStoreCommonUI_HEADER_FILES_DIR = . 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 \ @@ -41,12 +41,12 @@ CommonUI_OBJC_FILES = \ 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 \ diff --git a/ZideStore/UI-X/Common/OGoAppFrame.m b/ZideStore/UI-X/Common/OGoAppFrame.m deleted file mode 100644 index 789558fb..00000000 --- a/ZideStore/UI-X/Common/OGoAppFrame.m +++ /dev/null @@ -1,11 +0,0 @@ -// $Id: OGoAppFrame.m,v 1.1 2003/12/09 17:38:42 helge Exp $ - -#include - -@interface OGoAppFrame : SoComponent -@end - -#include "common.h" - -@implementation OGoAppFrame -@end /* OGoAppFrame */ diff --git a/ZideStore/UI-X/Common/OGoAppHeader.m b/ZideStore/UI-X/Common/OGoAppHeader.m deleted file mode 100644 index f748f88e..00000000 --- a/ZideStore/UI-X/Common/OGoAppHeader.m +++ /dev/null @@ -1,11 +0,0 @@ -// $Id: OGoAppHeader.m,v 1.1 2003/12/09 17:38:42 helge Exp $ - -#include - -@interface OGoAppHeader : SoComponent -@end - -#include "common.h" - -@implementation OGoAppHeader -@end /* OGoAppHeader */ diff --git a/ZideStore/UI-X/Common/OGoAppNavigation.m b/ZideStore/UI-X/Common/OGoAppNavigation.m deleted file mode 100644 index e765fb10..00000000 --- a/ZideStore/UI-X/Common/OGoAppNavigation.m +++ /dev/null @@ -1,11 +0,0 @@ -// $Id: OGoAppNavigation.m,v 1.1 2003/12/09 17:38:42 helge Exp $ - -#include - -@interface OGoAppNavigation : SoComponent -@end - -#include "common.h" - -@implementation OGoAppNavigation -@end /* OGoAppNavigation */ diff --git a/ZideStore/UI-X/Common/UIxAppFrame.m b/ZideStore/UI-X/Common/UIxAppFrame.m new file mode 100644 index 00000000..8d9553fb --- /dev/null +++ b/ZideStore/UI-X/Common/UIxAppFrame.m @@ -0,0 +1,11 @@ +// $Id$ + +#include + +@interface UIxAppFrame : SoComponent +@end + +#include "common.h" + +@implementation UIxAppFrame +@end /* UIxAppFrame */ diff --git a/ZideStore/UI-X/Common/OGoAppFrame.wox b/ZideStore/UI-X/Common/UIxAppFrame.wox similarity index 100% rename from ZideStore/UI-X/Common/OGoAppFrame.wox rename to ZideStore/UI-X/Common/UIxAppFrame.wox diff --git a/ZideStore/UI-X/Common/UIxAppHeader.m b/ZideStore/UI-X/Common/UIxAppHeader.m new file mode 100644 index 00000000..5a4db92f --- /dev/null +++ b/ZideStore/UI-X/Common/UIxAppHeader.m @@ -0,0 +1,11 @@ +// $Id$ + +#include + +@interface UIxAppHeader : SoComponent +@end + +#include "common.h" + +@implementation UIxAppHeader +@end /* UIxAppHeader */ diff --git a/ZideStore/UI-X/Common/OGoAppHeader.wox b/ZideStore/UI-X/Common/UIxAppHeader.wox similarity index 100% rename from ZideStore/UI-X/Common/OGoAppHeader.wox rename to ZideStore/UI-X/Common/UIxAppHeader.wox diff --git a/ZideStore/UI-X/Common/OGoAppNavView.m b/ZideStore/UI-X/Common/UIxAppNavView.m similarity index 97% rename from ZideStore/UI-X/Common/OGoAppNavView.m rename to ZideStore/UI-X/Common/UIxAppNavView.m index fa6c23c8..8bf1ff12 100644 --- a/ZideStore/UI-X/Common/OGoAppNavView.m +++ b/ZideStore/UI-X/Common/UIxAppNavView.m @@ -27,7 +27,7 @@ #import -@interface OGoAppNavView : WOComponent +@interface UIxAppNavView : WOComponent { id element; id lastElement; @@ -36,7 +36,7 @@ @end -@implementation OGoAppNavView +@implementation UIxAppNavView - (void)dealloc { [self->element release]; diff --git a/ZideStore/UI-X/Common/OGoAppNavView.wox b/ZideStore/UI-X/Common/UIxAppNavView.wox similarity index 100% rename from ZideStore/UI-X/Common/OGoAppNavView.wox rename to ZideStore/UI-X/Common/UIxAppNavView.wox diff --git a/ZideStore/UI-X/Common/UIxAppNavigation.m b/ZideStore/UI-X/Common/UIxAppNavigation.m new file mode 100644 index 00000000..529127de --- /dev/null +++ b/ZideStore/UI-X/Common/UIxAppNavigation.m @@ -0,0 +1,11 @@ +// $Id$ + +#include + +@interface UIxAppNavigation : SoComponent +@end + +#include "common.h" + +@implementation UIxAppNavigation +@end /* UIxAppNavigation */ diff --git a/ZideStore/UI-X/Common/OGoAppNavigation.wox b/ZideStore/UI-X/Common/UIxAppNavigation.wox similarity index 100% rename from ZideStore/UI-X/Common/OGoAppNavigation.wox rename to ZideStore/UI-X/Common/UIxAppNavigation.wox diff --git a/ZideStore/UI-X/Common/OGoComponent.h b/ZideStore/UI-X/Common/UIxComponent.h similarity index 90% rename from ZideStore/UI-X/Common/OGoComponent.h rename to ZideStore/UI-X/Common/UIxComponent.h index e5323457..eab1b730 100644 --- a/ZideStore/UI-X/Common/OGoComponent.h +++ b/ZideStore/UI-X/Common/UIxComponent.h @@ -21,13 +21,13 @@ // $Id$ -#ifndef __OGoComponent_H_ -#define __OGoComponent_H_ +#ifndef __UIxComponent_H_ +#define __UIxComponent_H_ #include -@interface OGoComponent : SoComponent +@interface UIxComponent : SoComponent { NSMutableDictionary *queryParameters; } @@ -43,4 +43,4 @@ @end -#endif /* __OGoComponent_H_ */ +#endif /* __UIxComponent_H_ */ diff --git a/ZideStore/UI-X/Common/OGoComponent.m b/ZideStore/UI-X/Common/UIxComponent.m similarity index 97% rename from ZideStore/UI-X/Common/OGoComponent.m rename to ZideStore/UI-X/Common/UIxComponent.m index 9e422ae6..43534f0e 100644 --- a/ZideStore/UI-X/Common/OGoComponent.m +++ b/ZideStore/UI-X/Common/UIxComponent.m @@ -21,18 +21,18 @@ // $Id$ -#include "OGoComponent.h" +#include "UIxComponent.h" #include #include #include -@interface OGoComponent (PrivateAPI) +@interface UIxComponent (PrivateAPI) - (void)_parseQueryString:(NSString *)_s; @end -@implementation OGoComponent +@implementation UIxComponent - (id)init { if ((self = [super init])) { diff --git a/ZideStore/UI-X/Common/OGoPageFrame.m b/ZideStore/UI-X/Common/UIxPageFrame.m similarity index 79% rename from ZideStore/UI-X/Common/OGoPageFrame.m rename to ZideStore/UI-X/Common/UIxPageFrame.m index 13a8da99..ba39e5f4 100644 --- a/ZideStore/UI-X/Common/OGoPageFrame.m +++ b/ZideStore/UI-X/Common/UIxPageFrame.m @@ -1,11 +1,11 @@ -// $Id: OGoPageFrame.m,v 1.2 2003/12/11 22:16:36 helge Exp $ +// $Id$ #include #include #include -@interface OGoPageFrame : SoComponent +@interface UIxPageFrame : SoComponent { NSString *title; } @@ -14,7 +14,7 @@ #include "common.h" -@implementation OGoPageFrame +@implementation UIxPageFrame - (void)dealloc { [self->title release]; @@ -41,4 +41,4 @@ return [user login]; } -@end /* OGoPageFrame */ +@end /* UIxPageFrame */ diff --git a/ZideStore/UI-X/Common/OGoPageFrame.wox b/ZideStore/UI-X/Common/UIxPageFrame.wox similarity index 99% rename from ZideStore/UI-X/Common/OGoPageFrame.wox rename to ZideStore/UI-X/Common/UIxPageFrame.wox index 7714442b..8a7f9d6d 100644 --- a/ZideStore/UI-X/Common/OGoPageFrame.wox +++ b/ZideStore/UI-X/Common/UIxPageFrame.wox @@ -27,7 +27,7 @@ +
- + diff --git a/ZideStore/UI-X/Common/OGoWinClose.m b/ZideStore/UI-X/Common/UIxWinClose.m similarity index 92% rename from ZideStore/UI-X/Common/OGoWinClose.m rename to ZideStore/UI-X/Common/UIxWinClose.m index eabfc9ef..e8320e69 100644 --- a/ZideStore/UI-X/Common/OGoWinClose.m +++ b/ZideStore/UI-X/Common/UIxWinClose.m @@ -24,7 +24,7 @@ #include -@interface OGoWinClose : WOComponent +@interface UIxWinClose : WOComponent { } @@ -32,6 +32,6 @@ @end -@implementation OGoWinClose +@implementation UIxWinClose @end diff --git a/ZideStore/UI-X/Common/OGoWinClose.wox b/ZideStore/UI-X/Common/UIxWinClose.wox similarity index 100% rename from ZideStore/UI-X/Common/OGoWinClose.wox rename to ZideStore/UI-X/Common/UIxWinClose.wox diff --git a/ZideStore/UI-X/Common/bundle-info.plist b/ZideStore/UI-X/Common/bundle-info.plist index 2ccc1b8c..c7081c18 100644 --- a/ZideStore/UI-X/Common/bundle-info.plist +++ b/ZideStore/UI-X/Common/bundle-info.plist @@ -13,19 +13,19 @@ 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 = ( diff --git a/ZideStore/UI-X/Common/product.plist b/ZideStore/UI-X/Common/product.plist index 8f826d2d..1636c420 100644 --- a/ZideStore/UI-X/Common/product.plist +++ b/ZideStore/UI-X/Common/product.plist @@ -31,15 +31,15 @@ methods = { "app" = { protectedBy = "View"; - pageName = "OGoAppFrame"; + pageName = "UIxAppFrame"; }; "appheader" = { protectedBy = "View"; - pageName = "OGoAppHeader"; + pageName = "UIxAppHeader"; }; "appnavigation" = { protectedBy = "View"; - pageName = "OGoAppNavigation"; + pageName = "UIxAppNavigation"; }; }; }; diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile index 1e713eb9..fa5ee05a 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile +++ b/ZideStore/UI-X/Scheduler/GNUmakefile @@ -10,30 +10,30 @@ SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct 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 \ diff --git a/ZideStore/UI-X/Scheduler/NOTES b/ZideStore/UI-X/Scheduler/NOTES index 8fb70d6d..35c83b1b 100644 --- a/ZideStore/UI-X/Scheduler/NOTES +++ b/ZideStore/UI-X/Scheduler/NOTES @@ -10,24 +10,24 @@ Class Hierarchy [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) diff --git a/ZideStore/UI-X/Scheduler/OGoAppointmentView.h b/ZideStore/UI-X/Scheduler/OGoAppointmentView.h deleted file mode 100644 index b4a220d0..00000000 --- a/ZideStore/UI-X/Scheduler/OGoAppointmentView.h +++ /dev/null @@ -1,14 +0,0 @@ -// $Id: OGoAppointmentView.h,v 1.1 2003/11/24 01:24:40 helge Exp $ - -#ifndef __ZideStoreUI_OGoAppointmentView_H__ -#define __ZideStoreUI_OGoAppointmentView_H__ - -#include - -@interface OGoAppointmentView : SoComponent -{ -} - -@end - -#endif /* __ZideStoreUI_OGoAppointmentView_H__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.m b/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.m deleted file mode 100644 index d2146a7e..00000000 --- a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.m +++ /dev/null @@ -1,19 +0,0 @@ -// $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 */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthView.h b/ZideStore/UI-X/Scheduler/OGoCalMonthView.h deleted file mode 100644 index 59fde93f..00000000 --- a/ZideStore/UI-X/Scheduler/OGoCalMonthView.h +++ /dev/null @@ -1,23 +0,0 @@ -// $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__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekView.h b/ZideStore/UI-X/Scheduler/OGoCalWeekView.h deleted file mode 100644 index c1fde865..00000000 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekView.h +++ /dev/null @@ -1,19 +0,0 @@ -// $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__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.h b/ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.h similarity index 93% rename from ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.h rename to ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.h index 77f552b5..4202e770 100644 --- a/ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.h +++ b/ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.h @@ -20,8 +20,8 @@ */ // $Id$ -#ifndef __OGoAppointmentFormatter_H__ -#define __OGoAppointmentFormatter_H__ +#ifndef __UIxAppointmentFormatter_H__ +#define __UIxAppointmentFormatter_H__ #import @@ -58,7 +58,7 @@ @class NSCalendarDate; -@interface OGoAppointmentFormatter : NSFormatter +@interface UIxAppointmentFormatter : NSFormatter { @protected NSString *formatString; // default: @"%S - %E, \n%T" @@ -79,8 +79,8 @@ //init - (id)initWithFormat:(NSString *)_format; -+ (OGoAppointmentFormatter *)formatterWithFormat:(NSString *)_format; -+ (OGoAppointmentFormatter *)formatter; ++ (UIxAppointmentFormatter *)formatterWithFormat:(NSString *)_format; ++ (UIxAppointmentFormatter *)formatter; //accessors - (void)setFormat:(NSString *)_format; diff --git a/ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.m b/ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.m similarity index 97% rename from ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.m rename to ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.m index 4596cf27..13804487 100644 --- a/ZideStore/UI-X/Scheduler/OGoAppointmentFormatter.m +++ b/ZideStore/UI-X/Scheduler/UIxAppointmentFormatter.m @@ -20,12 +20,12 @@ */ // $Id$ -#include "OGoAppointmentFormatter.h" +#include "UIxAppointmentFormatter.h" #import #import #import -@implementation OGoAppointmentFormatter +@implementation UIxAppointmentFormatter - (id)init { if ((self = [super init])) { @@ -49,13 +49,13 @@ 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 diff --git a/ZideStore/UI-X/Scheduler/UIxAppointmentView.h b/ZideStore/UI-X/Scheduler/UIxAppointmentView.h new file mode 100644 index 00000000..2cf50057 --- /dev/null +++ b/ZideStore/UI-X/Scheduler/UIxAppointmentView.h @@ -0,0 +1,14 @@ +// $Id$ + +#ifndef __ZideStoreUI_UIxAppointmentView_H__ +#define __ZideStoreUI_UIxAppointmentView_H__ + +#include + +@interface UIxAppointmentView : SoComponent +{ +} + +@end + +#endif /* __ZideStoreUI_UIxAppointmentView_H__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoAppointmentView.m b/ZideStore/UI-X/Scheduler/UIxAppointmentView.m similarity index 64% rename from ZideStore/UI-X/Scheduler/OGoAppointmentView.m rename to ZideStore/UI-X/Scheduler/UIxAppointmentView.m index 23f5b342..8fb761af 100644 --- a/ZideStore/UI-X/Scheduler/OGoAppointmentView.m +++ b/ZideStore/UI-X/Scheduler/UIxAppointmentView.m @@ -1,6 +1,6 @@ -// $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 @@ -8,7 +8,7 @@ - (SxAptManager *)aptManagerInContext:(id)_ctx; @end -@implementation OGoAppointmentView +@implementation UIxAppointmentView - (void)dealloc { [super dealloc]; @@ -20,4 +20,4 @@ return [[self clientObject] aptManagerInContext:[self context]]; } -@end /* OGoAppointmentView */ +@end /* UIxAppointmentView */ diff --git a/ZideStore/UI-X/Scheduler/OGoAppointmentView.wox b/ZideStore/UI-X/Scheduler/UIxAppointmentView.wox similarity index 94% rename from ZideStore/UI-X/Scheduler/OGoAppointmentView.wox rename to ZideStore/UI-X/Scheduler/UIxAppointmentView.wox index 8599707a..171cb947 100644 --- a/ZideStore/UI-X/Scheduler/OGoAppointmentView.wox +++ b/ZideStore/UI-X/Scheduler/UIxAppointmentView.wox @@ -1,5 +1,5 @@ - @class NSArray, NSCalendarDate; -@interface OGoAptTableView : SoComponent +@interface UIxAptTableView : SoComponent { NSArray *appointments; id appointment; @@ -39,7 +39,7 @@ #include "common.h" -@implementation OGoAptTableView +@implementation UIxAptTableView - (void)dealloc { [self->appointment release]; @@ -72,4 +72,4 @@ return [NSString stringWithFormat:@"%@/view", pkey]; } -@end /* OGoAptTableView */ +@end /* UIxAptTableView */ diff --git a/ZideStore/UI-X/Scheduler/OGoAptTableView.wox b/ZideStore/UI-X/Scheduler/UIxAptTableView.wox similarity index 100% rename from ZideStore/UI-X/Scheduler/OGoAptTableView.wox rename to ZideStore/UI-X/Scheduler/UIxAptTableView.wox diff --git a/ZideStore/UI-X/Scheduler/OGoCalBackForthNavView.m b/ZideStore/UI-X/Scheduler/UIxCalBackForthNavView.m similarity index 93% rename from ZideStore/UI-X/Scheduler/OGoCalBackForthNavView.m rename to ZideStore/UI-X/Scheduler/UIxCalBackForthNavView.m index 56edc051..41942462 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalBackForthNavView.m +++ b/ZideStore/UI-X/Scheduler/UIxCalBackForthNavView.m @@ -33,14 +33,14 @@ label -> user presentable name to display for "this" */ -@interface OGoCalBackForthNavView : WOComponent +@interface UIxCalBackForthNavView : WOComponent { } @end -@implementation OGoCalBackForthNavView +@implementation UIxCalBackForthNavView - (BOOL)synchronizesVariablesWithBindings { return NO; diff --git a/ZideStore/UI-X/Scheduler/OGoCalBackForthNavView.wox b/ZideStore/UI-X/Scheduler/UIxCalBackForthNavView.wox similarity index 100% rename from ZideStore/UI-X/Scheduler/OGoCalBackForthNavView.wox rename to ZideStore/UI-X/Scheduler/UIxCalBackForthNavView.wox diff --git a/ZideStore/UI-X/Scheduler/OGoCalDateLabel.m b/ZideStore/UI-X/Scheduler/UIxCalDateLabel.m similarity index 97% rename from ZideStore/UI-X/Scheduler/OGoCalDateLabel.m rename to ZideStore/UI-X/Scheduler/UIxCalDateLabel.m index 46c7191b..5e7fa489 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalDateLabel.m +++ b/ZideStore/UI-X/Scheduler/UIxCalDateLabel.m @@ -24,7 +24,7 @@ #include -@interface OGoCalDateLabel : WOComponent +@interface UIxCalDateLabel : WOComponent { NSString *selection; NSCalendarDate *startDate; @@ -39,7 +39,7 @@ @end -@implementation OGoCalDateLabel +@implementation UIxCalDateLabel - (void)dealloc { [self->selection release]; diff --git a/ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox b/ZideStore/UI-X/Scheduler/UIxCalDateLabel.wox similarity index 100% rename from ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox rename to ZideStore/UI-X/Scheduler/UIxCalDateLabel.wox diff --git a/ZideStore/UI-X/Scheduler/UIxCalMonthOverview.m b/ZideStore/UI-X/Scheduler/UIxCalMonthOverview.m new file mode 100644 index 00000000..ea2d061f --- /dev/null +++ b/ZideStore/UI-X/Scheduler/UIxCalMonthOverview.m @@ -0,0 +1,19 @@ +// $Id$ + +#include "UIxCalMonthView.h" + +@interface UIxCalMonthOverview : UIxCalMonthView +{ +} + +@end + +#include "common.h" + +@implementation UIxCalMonthOverview + +- (NSArray *)appointments { + return [self fetchCoreInfos]; +} + +@end /* UIxCalMonthOverview */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox b/ZideStore/UI-X/Scheduler/UIxCalMonthOverview.wox similarity index 85% rename from ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox rename to ZideStore/UI-X/Scheduler/UIxCalMonthOverview.wox index b863898c..ebdd9630 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox +++ b/ZideStore/UI-X/Scheduler/UIxCalMonthOverview.wox @@ -1,5 +1,5 @@ -
- - +
@@ -27,7 +27,7 @@ TODO: controls - - @@ -53,15 +53,17 @@ - + @@ -99,7 +101,7 @@
Appointments: - + --> diff --git a/ZideStore/UI-X/Scheduler/UIxCalMonthView.h b/ZideStore/UI-X/Scheduler/UIxCalMonthView.h new file mode 100644 index 00000000..5caf1d4c --- /dev/null +++ b/ZideStore/UI-X/Scheduler/UIxCalMonthView.h @@ -0,0 +1,23 @@ +// $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__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthView.m b/ZideStore/UI-X/Scheduler/UIxCalMonthView.m similarity index 89% rename from ZideStore/UI-X/Scheduler/OGoCalMonthView.m rename to ZideStore/UI-X/Scheduler/UIxCalMonthView.m index a0432716..7544aaac 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalMonthView.m +++ b/ZideStore/UI-X/Scheduler/UIxCalMonthView.m @@ -1,9 +1,9 @@ -// $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]; @@ -44,4 +44,4 @@ return [self queryParametersBySettingSelectedDate:date]; } -@end /* OGoCalMonthView */ +@end /* UIxCalMonthView */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m b/ZideStore/UI-X/Scheduler/UIxCalSelectTab.m similarity index 95% rename from ZideStore/UI-X/Scheduler/OGoCalSelectTab.m rename to ZideStore/UI-X/Scheduler/UIxCalSelectTab.m index 21dfb3f3..adacf043 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m +++ b/ZideStore/UI-X/Scheduler/UIxCalSelectTab.m @@ -21,12 +21,12 @@ // $Id$ -#include +#include #include #include -@interface OGoCalSelectTab : OGoComponent +@interface UIxCalSelectTab : UIxComponent { NSString *selection; NSCalendarDate *currentDate; @@ -35,7 +35,7 @@ @end -@implementation OGoCalSelectTab +@implementation UIxCalSelectTab - (void)dealloc { [self->selection release]; diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox b/ZideStore/UI-X/Scheduler/UIxCalSelectTab.wox similarity index 100% rename from ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox rename to ZideStore/UI-X/Scheduler/UIxCalSelectTab.wox diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.h b/ZideStore/UI-X/Scheduler/UIxCalView.h similarity index 59% rename from ZideStore/UI-X/Scheduler/OGoCalView.h rename to ZideStore/UI-X/Scheduler/UIxCalView.h index c65246eb..aed11e77 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.h +++ b/ZideStore/UI-X/Scheduler/UIxCalView.h @@ -1,23 +1,39 @@ -// $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 +#include @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; @@ -41,12 +57,15 @@ - (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__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/UIxCalView.m similarity index 75% rename from ZideStore/UI-X/Scheduler/OGoCalView.m rename to ZideStore/UI-X/Scheduler/UIxCalView.m index ebaeffaf..a3f04fd1 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.m +++ b/ZideStore/UI-X/Scheduler/UIxCalView.m @@ -1,23 +1,26 @@ -// $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 +#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); } @@ -32,18 +35,75 @@ 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 */ @@ -176,6 +236,10 @@ return [self queryParametersBySettingSelectedDate:date]; } +- (NSDictionary *)currentDayQueryParameters { + return [self queryParametersBySettingSelectedDate:self->currentDay]; +} + - (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date { NSMutableDictionary *qp; @@ -202,4 +266,4 @@ return [NSCalendarDate dateWithString:_dateString calendarFormat:@"%Y%m%d"]; } -@end /* OGoCalView */ +@end /* UIxCalView */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.m b/ZideStore/UI-X/Scheduler/UIxCalWeekOverview.m similarity index 55% rename from ZideStore/UI-X/Scheduler/OGoCalWeekOverview.m rename to ZideStore/UI-X/Scheduler/UIxCalWeekOverview.m index 949ae13d..f2d8cafc 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.m +++ b/ZideStore/UI-X/Scheduler/UIxCalWeekOverview.m @@ -18,41 +18,27 @@ 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 -#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; @@ -76,10 +62,6 @@ return self->dayIndex; } -- (NSDictionary *)currentDayQueryParameters { - return [self queryParametersBySettingSelectedDate:self->currentDay]; -} - /* style sheet */ - (NSString *)titleStyle { @@ -94,43 +76,4 @@ 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 */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/UIxCalWeekOverview.wox similarity index 94% rename from ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox rename to ZideStore/UI-X/Scheduler/UIxCalWeekOverview.wox index 39753fbd..d5df607e 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox +++ b/ZideStore/UI-X/Scheduler/UIxCalWeekOverview.wox @@ -4,7 +4,7 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" xmlns:uix="OGo:uix" - className="OGoPageFrame" + className="UIxPageFrame" title="name"> @@ -14,9 +14,9 @@ +
- - +
@@ -29,7 +29,7 @@ TODO: controls - - + @@ -152,7 +152,7 @@
Appointments: - + --> diff --git a/ZideStore/UI-X/Scheduler/UIxCalWeekView.h b/ZideStore/UI-X/Scheduler/UIxCalWeekView.h new file mode 100644 index 00000000..f32b4340 --- /dev/null +++ b/ZideStore/UI-X/Scheduler/UIxCalWeekView.h @@ -0,0 +1,19 @@ +// $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__ */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m b/ZideStore/UI-X/Scheduler/UIxCalWeekView.m similarity index 83% rename from ZideStore/UI-X/Scheduler/OGoCalWeekView.m rename to ZideStore/UI-X/Scheduler/UIxCalWeekView.m index 9a3fe080..5df1d2d9 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m +++ b/ZideStore/UI-X/Scheduler/UIxCalWeekView.m @@ -1,9 +1,9 @@ -// $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]; @@ -32,4 +32,4 @@ return [self queryParametersBySettingSelectedDate:date]; } -@end /* OGoCalWeekView */ +@end /* UIxCalWeekView */ diff --git a/ZideStore/UI-X/Scheduler/product.plist b/ZideStore/UI-X/Scheduler/product.plist index 7984ec7b..d9d75b5f 100644 --- a/ZideStore/UI-X/Scheduler/product.plist +++ b/ZideStore/UI-X/Scheduler/product.plist @@ -21,27 +21,27 @@ 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"; }; }; }; @@ -50,7 +50,7 @@ methods = { "view" = { protectedBy = "View"; - pageName = "OGoAppointmentView"; + pageName = "UIxAppointmentView"; }; }; };