From ac0727be2711b50c6c97cd0451aafeb5ab24b4cd Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 18 Jun 2004 16:00:54 +0000 Subject: [PATCH] created libZideStoreCommonUI on Helge's request git-svn-id: http://svn.opengroupware.org/SOGo/trunk@50 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ZideStore/UI-X/Common/GNUmakefile | 25 +++++++++++++------ ZideStore/UI-X/Common/GNUmakefile.preamble | 10 +++++++- ZideStore/UI-X/Common/calendar.css | 5 +++- ZideStore/UI-X/Scheduler/GNUmakefile | 4 ++- ZideStore/UI-X/Scheduler/GNUmakefile.preamble | 10 +++++++- ZideStore/UI-X/Scheduler/OGoCalSelectTab.m | 2 +- ZideStore/UI-X/Scheduler/OGoCalView.h | 2 +- ZideStore/UI-X/Scheduler/OGoCalView.m | 6 ----- 8 files changed, 45 insertions(+), 19 deletions(-) diff --git a/ZideStore/UI-X/Common/GNUmakefile b/ZideStore/UI-X/Common/GNUmakefile index ce11ad9a..604f8b77 100644 --- a/ZideStore/UI-X/Common/GNUmakefile +++ b/ZideStore/UI-X/Common/GNUmakefile @@ -2,15 +2,30 @@ include $(GNUSTEP_MAKEFILES)/common.make +ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12 + + BUNDLE_NAME = CommonUI BUNDLE_EXTENSION = .zsp BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/ZideStore12 +LIBRARY_NAME = libZideStoreCommonUI + + +libZideStoreCommonUI_HEADER_FILES_DIR = . +libZideStoreCommonUI_HEADER_FILES_INSTALL_DIR = $(ZIDESTORE)/Common + +libZideStoreCommonUI_HEADER_FILES = \ + OGoComponent.h \ + +libZideStoreCommonUI_OBJC_FILES = \ + OGoComponent.m \ + + CommonUI_PRINCIPAL_CLASS = CommonUIProduct CommonUI_OBJC_FILES = \ CommonUIProduct.m \ - OGoComponent.m \ OGoPageFrame.m \ OGoAppFrame.m \ OGoAppHeader.m \ @@ -23,10 +38,6 @@ CommonUI_OBJC_FILES = \ UIxTabItem.m \ -CommonUI_HEADER_FILES = \ - OGoComponent.h \ - - CommonUI_RESOURCE_FILES += \ Version \ product.plist \ @@ -58,14 +69,14 @@ CommonUI_RESOURCE_FILES += \ images/corner_right.gif\ images/closewindow.gif -ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12 - ADDITIONAL_INCLUDE_DIRS += \ -I. \ -I$(ZIDESTORE)/Frontend -I$(ZIDESTORE)/Backend -I$(ZIDESTORE) + # make -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make +include $(GNUSTEP_MAKEFILES)/library.make -include GNUmakefile.postamble diff --git a/ZideStore/UI-X/Common/GNUmakefile.preamble b/ZideStore/UI-X/Common/GNUmakefile.preamble index d8d84475..6ad999c7 100644 --- a/ZideStore/UI-X/Common/GNUmakefile.preamble +++ b/ZideStore/UI-X/Common/GNUmakefile.preamble @@ -1,6 +1,14 @@ # $Id$ +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libZideStoreCommonUI=$(GNUSTEP_BUILD_DIR)/libZideStoreCommonUI +else + RELBUILD_DIR_libZideStoreCommonUI=. +endif + +CommonUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI) + CommonUI_BUNDLE_LIBS += \ -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC + -lXmlRpc -lDOM -lSaxObjC -lZideStoreCommonUI diff --git a/ZideStore/UI-X/Common/calendar.css b/ZideStore/UI-X/Common/calendar.css index 851e89d8..e650c67d 100644 --- a/ZideStore/UI-X/Common/calendar.css +++ b/ZideStore/UI-X/Common/calendar.css @@ -6,7 +6,10 @@ } .weekoverview_title { - color: #000000; + font-size: 8pt; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + letter-spacing: 0pt; + color: #ff0000; background-color: #d2d2cc; } diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile index 0579092b..1ac7bed9 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile +++ b/ZideStore/UI-X/Scheduler/GNUmakefile @@ -52,7 +52,9 @@ endif ADDITIONAL_INCLUDE_DIRS += \ -I. \ - -I$(ZIDESTORE)/Frontend -I$(ZIDESTORE)/Backend -I$(ZIDESTORE) + -I.. \ + -I$(ZIDESTORE)/Frontend -I$(ZIDESTORE)/Backend \ + -I$(ZIDESTORE) -I$(ZIDESTORE)/Common # make diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble index 41f31b86..6521cbf3 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble +++ b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble @@ -1,6 +1,14 @@ # $Id$ +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libZideStoreCommonUI=$(GNUSTEP_BUILD_DIR)/libZideStoreCommonUI +else + RELBUILD_DIR_libZideStoreCommonUI=../Common +endif + +SchedulerUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI) + SchedulerUI_BUNDLE_LIBS += \ -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC + -lXmlRpc -lDOM -lSaxObjC -lZideStoreCommonUI diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m index 07d26696..21dfb3f3 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m +++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m @@ -21,7 +21,7 @@ // $Id$ -#include +#include #include #include diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.h b/ZideStore/UI-X/Scheduler/OGoCalView.h index 37783a76..76984038 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.h +++ b/ZideStore/UI-X/Scheduler/OGoCalView.h @@ -3,7 +3,7 @@ #ifndef __ZideStoreUI_OGoCalView_H__ #define __ZideStoreUI_OGoCalView_H__ -#include +#include @class NSArray, NSCalendarDate; @class SxAptManager, SxAptSetIdentifier; diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/OGoCalView.m index 6fe2a058..9f1b9228 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.m +++ b/ZideStore/UI-X/Scheduler/OGoCalView.m @@ -68,12 +68,6 @@ return [uri substringFromIndex:(r.location + 1)]; } -- (NSString *)dateNavigationURLWithNewStartDate:(NSCalendarDate *)_newDate { -#warning !! REMOVE ME!! - return [NSString stringWithFormat:@"%@?startDate=%@", - [self ownMethodName], - [self dateStringForDate:_newDate]]; -} /* backend */ -- 2.39.5