From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 19 Jul 2004 17:08:47 +0000 (+0000)
Subject: minor additions
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08368825a29b10e6c8f5cc684c15543b49a429b7;p=scalable-opengroupware.org

minor additions

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

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 82e9800b..3d62590a 100644
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -5,6 +5,34 @@
 	};
 	objectVersion = 39;
 	objects = {
+		AD06608A06AC2F3F006525C9 = {
+			children = (
+				AD06608B06AC2F3F006525C9,
+				AD06608C06AC2F4A006525C9,
+			);
+			isa = PBXVariantGroup;
+			name = Locale;
+			path = "";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AD06608B06AC2F3F006525C9 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			name = English;
+			path = English.lproj/Locale;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AD06608C06AC2F4A006525C9 = {
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			name = French;
+			path = French.lproj/Locale;
+			refType = 4;
+			sourceTree = "<group>";
+		};
 		AD152B6F06AC159A002375D2 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -36,6 +64,8 @@
 			path = ChangeLog;
 			refType = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 1;
 		};
 		AD6BCF0E069D77E9003664CD = {
 			fileEncoding = 4;
@@ -144,6 +174,7 @@
 				AD152B6F06AC159A002375D2,
 				E87205F30692E3D00099CBBD,
 				E87205D70692E3D00099CBBD,
+				AD06608A06AC2F3F006525C9,
 				E87205CE0692E3D00099CBBD,
 				E87205DF0692E3D00099CBBD,
 				E87205E00692E3D00099CBBD,
@@ -223,6 +254,7 @@
 			path = sogod.m;
 			refType = 4;
 			sourceTree = "<group>";
+			usesTabs = 0;
 		};
 		E87205ED0692E3D00099CBBD = {
 			fileEncoding = 4;
@@ -982,6 +1014,8 @@
 			path = ChangeLog;
 			refType = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 1;
 		};
 		E87208900692E3D30099CBBD = {
 			fileEncoding = 4;
diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index c81828cf..e7f21c57 100644
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* UIxComponent.m: new method -backendTimeZone.
+
 2004-07-02  Helge Hess  <helge.hess@opengroupware.org>
 
 	* UIxComponent.m: introduced 'viewTimeZone' method and adds some
diff --git a/SOGo/UI/SOGoUI/UIxComponent.h b/SOGo/UI/SOGoUI/UIxComponent.h
index 8e99aba9..b97ec2cd 100644
--- a/SOGo/UI/SOGoUI/UIxComponent.h
+++ b/SOGo/UI/SOGoUI/UIxComponent.h
@@ -47,6 +47,7 @@
 
 /* date selection */
 - (NSTimeZone *)viewTimeZone;
+- (NSTimeZone *)backendTimeZone;
 - (NSCalendarDate *)selectedDate;
 - (NSString *)dateStringForDate:(NSCalendarDate *)_date;
 - (NSCalendarDate *)dateForDateString:(NSString *)_dateString;
diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index c52f0b93..5bda9cd0 100644
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -35,9 +35,13 @@
 @implementation UIxComponent
 
 static NSTimeZone *MET = nil;
+static NSTimeZone *GMT = nil;
 
 + (void)initialize {
-  if (MET == nil) MET = [[NSTimeZone timeZoneWithAbbreviation:@"MET"] retain];
+  if (MET == nil) {
+    MET = [[NSTimeZone timeZoneWithAbbreviation:@"MET"] retain];
+    GMT = [[NSTimeZone timeZoneWithAbbreviation:@"GMT"] retain];
+  }
 }
 
 - (id)init {
@@ -158,6 +162,10 @@ static NSTimeZone *MET = nil;
   return MET;
 }
 
+- (NSTimeZone *)backendTimeZone {
+  return GMT;
+}
+
 - (NSCalendarDate *)selectedDate {
   NSString       *s;
   NSCalendarDate *cdate;
diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 8345e43a..288dc8cc 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* UIxAppointmentEditor.m: Use -backendTimeZone from UIxComponent.
+
 2004-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxCalWeekOverview.wox: minor correction
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 156914d8..0eeb5058 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -72,13 +72,6 @@
 
 @implementation UIxAppointmentEditor
 
-static NSTimeZone *GMT = nil;
-
-+ (void)initialize {
-    if (GMT == nil)
-        GMT = [[NSTimeZone timeZoneWithAbbreviation:@"GMT"] retain];
-}
-
 - (void)dealloc {
     [self->appointment release];
     [self->participants release];
@@ -256,7 +249,7 @@ static NSTimeZone *GMT = nil;
 
     date = [NSCalendarDate dateWithString:_str 
                            calendarFormat:@"%Y-%m-%d %H:%M %Z"];
-    [date setTimeZone:GMT];
+    [date setTimeZone:[self backendTimeZone]];
     return date;
 }