created libZideStoreCommonUI on Helge's request

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@50 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/ZideStore/UI-X/Common/GNUmakefile b/ZideStore/UI-X/Common/GNUmakefile
index ce11ad9ae683accae1417fba7c77cf6cfc329445..604f8b77014c7af3cbf6e1ac1f0e1b193ca3a6dd 100644 (file)
--- 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 d8d84475fba80953eebae76a430725700b8ffc37..6ad999c79efe5c7852e13e69fb60f039838b4201 100644 (file)
--- 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 851e89d8662baff8ae3819ae786d1956ce08ef57..e650c67dbd178f30b58728188618417a8c2e1e1c 100644 (file)
--- 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 0579092b3414e949b581dc867d91aa72e5f5a8d7..1ac7bed9733eacde1a464d79d6d2ddfb62c27392 100644 (file)
--- 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 41f31b866bfd633f26716cff6448487fb1f5ffe5..6521cbf3dacf0ab2b4f9c10db46164bf94ef3d5e 100644 (file)
--- 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 07d26696d5a2834c8b0217121d96ed69fc509bb0..21dfb3f384f25bb7fb539b0fff43d6aa8ff759ac 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
@@ -21,7 +21,7 @@
 // $Id$
 
 
-#include <CommonUI/OGoComponent.h>
+#include <Common/OGoComponent.h>
 #include <NGObjWeb/NGObjWeb.h>
 #include <NGExtensions/NGExtensions.h>
 

diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.h b/ZideStore/UI-X/Scheduler/OGoCalView.h
index 37783a76b696c3acde0ab3ee25c4207ed5f5c654..76984038b1079dca4bb7df9d7a0b3ab35e7f189b 100644 (file)
--- 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 <CommonUI/OGoComponent.h>
+#include <Common/OGoComponent.h>
 
 @class NSArray, NSCalendarDate;
 @class SxAptManager, SxAptSetIdentifier;

diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/OGoCalView.m
index 6fe2a0582f57146818d442e116d7b633f8fc8eff..9f1b922823a61afb3f466a54515ea72ef05e9c32 100644 (file)
--- 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 */