From: helge Date: Wed, 30 Jun 2004 09:32:43 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/trunk@104 d1b88da0-ebda-0310-925b-ed51d... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e289ead5b05c2cc68f992935a4cd6aeba9ff3a;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/trunk@104 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m index 94bbd390..a37d557e 100644 --- a/SOGo/Main/sogod.m +++ b/SOGo/Main/sogod.m @@ -30,6 +30,7 @@ #include "SOGoAuthenticator.h" #include "SOGoProductLoader.h" +#include #include "common.h" @implementation SOGo @@ -87,8 +88,8 @@ static unsigned int vMemSizeLimit = 0; } - (id)lookupUser:(NSString *)_key inContext:(id)_ctx { - //return [DSoUser dUserWithName:hostName port:port]; - return nil; + return [[[SOGoUserFolder alloc] initWithName:_key inContainer:self] + autorelease]; } - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag { diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile index bbf2df19..de2ccd9f 100644 --- a/SOGo/SoObjects/SOGo/GNUmakefile +++ b/SOGo/SoObjects/SOGo/GNUmakefile @@ -14,11 +14,13 @@ libSOGo_HEADER_FILES = \ SOGoObject.h \ SOGoFolder.h \ SOGoContentObject.h \ + SOGoUserFolder.h \ libSOGo_OBJC_FILES = \ SOGoObject.m \ SOGoFolder.m \ SOGoContentObject.m \ + SOGoUserFolder.m \ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index e44beab7..50aaf591 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -5,4 +5,3 @@ * GNUmakefile: patches for different build/runtime environment * created ChangeLog - diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile index 40c6391c..bc431e59 100644 --- a/SOGo/UI/Scheduler/GNUmakefile +++ b/SOGo/UI/Scheduler/GNUmakefile @@ -3,8 +3,8 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = SchedulerUI -BUNDLE_EXTENSION = .zsp -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/ZideStore12 +BUNDLE_EXTENSION = .SOGo +BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct @@ -32,33 +32,21 @@ SchedulerUI_RESOURCE_FILES += \ UIxCalWeekOverview.wox \ UIxCalMonthOverview.wox \ UIxAppointmentView.wox \ - UIxAppointmentEditor.wox \ - UIxCalSelectTab.wox \ - UIxCalDateLabel.wox \ - UIxCalBackForthNavView.wox \ + UIxAppointmentEditor.wox \ + UIxCalSelectTab.wox \ + UIxCalDateLabel.wox \ + UIxCalBackForthNavView.wox \ images/next_week.gif \ - images/previous_week.gif \ - images/icon_apt_chart.gif \ - images/icon_apt_overview.gif \ - images/icon_apt_chart_inactive.gif \ - images/icon_apt_overview_inactive.gif \ - images/icon_apt_column_view.gif \ - images/icon_apt_list.gif \ - images/icon_apt_list_inactive.gif \ + images/previous_week.gif \ + images/icon_apt_chart.gif \ + images/icon_apt_overview.gif \ + images/icon_apt_chart_inactive.gif \ + images/icon_apt_overview_inactive.gif \ + images/icon_apt_column_view.gif \ + images/icon_apt_list.gif \ + images/icon_apt_list_inactive.gif \ -ifeq ($(FOUNDATION_LIB),apple) -ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12 -else -ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12 -endif - -ADDITIONAL_INCLUDE_DIRS += \ - -I. \ - -I.. \ - -I$(ZIDESTORE)/Frontend -I$(ZIDESTORE)/Backend \ - -I$(ZIDESTORE) -I$(ZIDESTORE)/Common - # make -include GNUmakefile.preamble diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m index 5d1ef100..2287b597 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m @@ -36,7 +36,7 @@ @implementation NSObject (AppointmentHack) - (BOOL)isAppointment { - return [self isKindOfClass:NSClassFromString(@"SxAppointment")]; + return [self isKindOfClass:NSClassFromString(@"SOGoAppointmentObject")]; } @end diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.m b/SOGo/UI/Scheduler/UIxAppointmentView.m index b05f9084..aadd53be 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentView.m +++ b/SOGo/UI/Scheduler/UIxAppointmentView.m @@ -2,14 +2,8 @@ #include "UIxAppointmentView.h" #include "common.h" -#include #include - -@interface NSObject(UsedPrivates) -- (SxAptManager *)aptManagerInContext:(id)_ctx; -@end - @implementation UIxAppointmentView - (void)dealloc { @@ -42,10 +36,6 @@ /* backend */ -- (SxAptManager *)aptManager { - return [[self clientObject] aptManagerInContext:[self context]]; -} - - (SOGoAppointment *)appointment { if(self->appointment == nil) { NSString *iCalString; diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h index c9c10e60..dca1329c 100644 --- a/SOGo/UI/Scheduler/UIxCalView.h +++ b/SOGo/UI/Scheduler/UIxCalView.h @@ -6,7 +6,6 @@ #include @class NSArray, NSCalendarDate; -@class SxAptManager, SxAptSetIdentifier; @interface UIxCalView : UIxComponent { @@ -45,9 +44,6 @@ /* backend */ -- (SxAptManager *)aptManager; -- (SxAptSetIdentifier *)aptSetID; - /* fetching */ - (NSCalendarDate *)startDate; diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m index ebd925f3..732181ea 100644 --- a/SOGo/UI/Scheduler/UIxCalView.m +++ b/SOGo/UI/Scheduler/UIxCalView.m @@ -2,25 +2,19 @@ #include "UIxCalView.h" #include "common.h" -#include #include "UIxAppointmentFormatter.h" -@interface NSObject(UsedPrivates) -- (SxAptManager *)aptManagerInContext:(id)_ctx; -@end - @implementation UIxCalView - (void)dealloc { [self->appointment release]; [self->appointments release]; - [self->currentDay release]; + [self->currentDay release]; [super dealloc]; } /* accessors */ - - (void)setAppointments:(NSArray *)_apts { ASSIGN(self->appointments, _apts); } @@ -130,17 +124,10 @@ /* backend */ -- (SxAptManager *)aptManager { - return [[self clientObject] aptManagerInContext:[self context]]; -} -- (SxAptSetIdentifier *)aptSetID { - return [[self clientObject] aptSetID]; -} - /* resource URLs (TODO?) */ - (NSString *)resourcePath { - return @"/ZideStore.woa/WebServerResources/"; + return @"/sogod.woa/WebServerResources/"; } - (NSString *)favIconPath { @@ -150,6 +137,7 @@ NSString *path; // TODO: there should be reusable functionality for that! +#warning ZideStore specific? path = @"ControlPanel/Products/ZideStoreUI/Resources/zidestoreui.css"; return [[self context] urlWithRequestHandlerKey:@"so" path:path @@ -160,6 +148,7 @@ NSString *path; // TODO: there should be reusable functionality for that! +#warning ZideStore specific? path = @"ControlPanel/Products/ZideStoreUI/Resources/calendar.css"; return [[self context] urlWithRequestHandlerKey:@"so" path:path @@ -176,8 +165,13 @@ } - (NSArray *)fetchGIDs { +#warning ZIDESTORE FETCH BACKEND +#if 0 return [[self aptManager] gidsOfAppointmentSet:[self aptSetID] from:[self startDate] to:[self endDate]]; +#else + return nil; +#endif } - (NSArray *)fetchCoreInfos { @@ -191,9 +185,14 @@ gids = [self fetchGIDs]; [self logWithFormat:@" %i GIDs ...", [gids count]]; +#warning ZIDESTORE FETCH BACKEND +#if 0 self->appointments = [[[self aptManager] coreInfoOfAppointmentsWithGIDs:gids inSet:[self aptSetID]] retain]; +#else + self->appointments = nil; +#endif [self logWithFormat:@"fetched %i records.", [self->appointments count]]; return self->appointments; diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.m b/SOGo/UI/Scheduler/UIxCalWeekOverview.m index f2d8cafc..f1d0d377 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekOverview.m +++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.m @@ -30,8 +30,6 @@ @end #include "common.h" -#include - @implementation UIxCalWeekOverview diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist index 680bd695..f00e9f8d 100644 --- a/SOGo/UI/Scheduler/product.plist +++ b/SOGo/UI/Scheduler/product.plist @@ -17,7 +17,7 @@ }; categories = { - SxAppointmentFolder = { + SOGoAppointmentFolder = { methods = { "weekoverview" = { protectedBy = "View"; @@ -50,7 +50,7 @@ }; }; - SxAppointment = { + SOGoAppointmentObject = { methods = { "view" = { protectedBy = "View";