new default

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 0e48d7dd4a2dcc5251ed8aa655383fcb5a63d595..d9c8dcd6daaef1738026c5213876b64c12e03526 100644 (file)
--- 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 17658cd638e78664754f70c5c5cef5534578dc8b..5e1230b0e95f1e5eb160273897acc16f5af8c132 100644 (file)
--- 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 8d38d9725c1d126224a5a786be371fbd340d64f6..9405d2e95a67e882218aa43e8e421061033a55bf 100644 (file)
--- 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 2a5415a9f51719ca226fb55c9872c6c64314c79c..4eda8c988e6a29bd4d0001974e20e3114e741206 100644 (file)
--- 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 560c584e742ceb1e8243c1fca11ab721b1b69872..87aceebf2dc7fe8e4fc565a7f909dd765e3cda5a 100644 (file)
--- 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 b36620c228688c8df810dc2cfb02f642df41959f..cf4bca34b87c8f93c90222941a67f5b9012b7b9a 100644 (file)
--- 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