From 0f35bfa07f221031c45f98f7551c1d6b83d28d53 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 13 Aug 2004 15:16:48 +0000
Subject: [PATCH] new default

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@203 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Scheduler/ChangeLog                 | 12 ++++++++++++
 SOGo/UI/Scheduler/NOTES                     |  8 ++++++++
 SOGo/UI/Scheduler/UIxCalView.m              | 13 ++++++++++++-
 SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox |  2 +-
 SOGo/UI/Scheduler/UIxCalWeekOverview.wox    |  2 +-
 SOGo/UI/Scheduler/Version                   |  2 +-
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 0e48d7dd..d9c8dcd6 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,15 @@
+2004-08-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* v0.9.32
+
+	* UIxCalView.m: shouldHideWeekend according to new default,
+	  SOGoShouldDisplayWeekend.
+
+	* UIxCalWeekOverview.wox, UIxCalWeekColumnsview.wox: use new dynamic
+	  value for "hideWeekend" association.
+
+	* NOTES: new "Defaults" section.
+
 2004-08-13  Helge Hess  <helge.hess@skyrix.com>
 
 	* UIxCalWeekColumnsview.wox: hide weekend (requires libWEExtensions 
diff --git a/SOGo/UI/Scheduler/NOTES b/SOGo/UI/Scheduler/NOTES
index 17658cd6..5e1230b0 100644
--- a/SOGo/UI/Scheduler/NOTES
+++ b/SOGo/UI/Scheduler/NOTES
@@ -51,3 +51,11 @@ URLs
 => SoProductResourceManager
 /zidestore/ControlPanel/Products/ZideStoreUI/Resources/calendar.css
 => resource
+
+
+Defaults
+========
+
+Name                        Type    Synopsis
+SOGoShouldDisplayWeekend    BOOL    Display weekends in week related views.
+                                    Default is NO.
diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 8d38d972..9405d2e9 100644
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -13,6 +13,13 @@
 
 @implementation UIxCalView
 
+static BOOL shouldDisplayWeekend = NO;
+
++ (void)initialize {
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    shouldDisplayWeekend = [ud boolForKey:@"SOGoShouldDisplayWeekend"];
+}
+
 - (void)dealloc {
   [self->appointments release];
   [self->allDayApts release];
@@ -205,7 +212,11 @@
 }
 
 - (BOOL)shouldDisplayWeekend {
-  return NO;
+  return shouldDisplayWeekend;
+}
+
+- (BOOL)shouldHideWeekend {
+    return ![self shouldDisplayWeekend];
 }
 
 
diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
index 2a5415a9..4eda8c98 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
@@ -176,7 +176,7 @@
                                 const:contentColor="#e8e8e0"
                                 const:cellpadding="0"
                                 const:cellspacing="2"
-                                const:hideWeekend="YES"
+                                const:hideWeekend="shouldHideWeekend"
               >
                 <var:weekcol-title>
                   <table cellpadding="0" width="100%" border="0" cellspacing="0"
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index 560c584e..87aceebf 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -131,7 +131,7 @@
                        const:startDateKey="startDate"
                        const:endDateKey="endDate"
                        const:titleStyle="weekoverview_title"
-                       const:hideWeekend="YES"
+                       hideWeekend="shouldHideWeekend"
                        contentStyle="contentStyle"
     >
       <var:week-title>
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index b36620c2..cf4bca34 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=31
+SUBMINOR_VERSION:=32
 
 # v0.9.31 requires libWEExtensions v4.2.52
 # v0.9.29 requires libWEExtensions v4.2.51
-- 
2.39.2