"private appointment" prefix for private appointments

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

diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index 5c4d9f4cad38512e5018066236e78f15264926db..f0618c572248e13c6fc4aa6397ef975cfaf11b1e 100644 (file)
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoAptFormatter.[hm]: added ability to set custom title for private
+         appointments. (v0.9.20)
+
 2004-12-10  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoAptFormatter.[hm]: added formatting for private apts, additional

diff --git a/SOGo/UI/SOGoUI/SOGoAptFormatter.h b/SOGo/UI/SOGoUI/SOGoAptFormatter.h
index 151e60fc940c1eda1a687a4fbb090dcada09e51c..2c815b8b4a5da37ae960407572165d55dd330850 100644 (file)
--- a/SOGo/UI/SOGoUI/SOGoAptFormatter.h
+++ b/SOGo/UI/SOGoUI/SOGoAptFormatter.h
@@ -32,6 +32,7 @@
 {
   NSTimeZone *tz;
   SEL formatAction;
+  NSString *privateTitle;
 }
 
 - (id)initWithDisplayTimeZone:(NSTimeZone *)_tz;
@@ -44,6 +45,9 @@
 - (void)setPrivateTooltip;
 - (void)setPrivateDetails;
 - (void)setPrivateSuppressAll;
+
+- (void)setPrivateTitle:(NSString *)_privateTitle;
+- (NSString *)privateTitle;
   
 @end
 

diff --git a/SOGo/UI/SOGoUI/SOGoAptFormatter.m b/SOGo/UI/SOGoUI/SOGoAptFormatter.m
index 9168f4e4ae2d07166be3f6d22fadf2761c34f199..9bcc4467badfcc0573ed8f1087a80c87d9ed9d0b 100644 (file)
--- a/SOGo/UI/SOGoUI/SOGoAptFormatter.m
+++ b/SOGo/UI/SOGoUI/SOGoAptFormatter.m
@@ -41,7 +41,8 @@
 }
 
 - (void)dealloc {
-  [self->tz release];
+  [self->tz           release];
+  [self->privateTitle release];
   [super dealloc];
 }
 
@@ -75,6 +76,13 @@
   self->formatAction = @selector(suppressApt:);
 }
 
+- (void)setPrivateTitle:(NSString *)_privateTitle {
+  ASSIGN(self->privateTitle, _privateTitle);
+}
+- (NSString *)privateTitle {
+  return self->privateTitle;
+}
+
 - (NSString *)stringForObjectValue:(id)_obj {
   return [self performSelector:self->formatAction withObject:_obj];
 }
@@ -140,17 +148,20 @@
 
 - (NSString *)detailsForPrivateApt:(id)_apt {
   NSMutableString *aptDescr;
+  NSString        *s;
 
-  aptDescr = [NSMutableString stringWithCapacity:25];
+  aptDescr = [NSMutableString stringWithCapacity:40];
   [self appendTimeInfoFromApt:_apt toBuffer:aptDescr];
+  if ((s = [self privateTitle]) != nil)
+    [aptDescr appendFormat:@"<br />%@", s];
   return aptDescr;
 }
 
 - (NSString *)tooltipForApt:(id)_apt {
-  NSCalendarDate *startDate, *endDate;
+  NSCalendarDate  *startDate, *endDate;
   NSMutableString *aptDescr;
-  NSString *s;
-  BOOL spansRange;
+  NSString        *s;
+  BOOL            spansRange;
     
   spansRange = NO;
   startDate = [_apt valueForKey:@"startDate"];
@@ -180,9 +191,10 @@
 }
 
 - (NSString *)tooltipForPrivateApt:(id)_apt {
-  NSCalendarDate *startDate, *endDate;
+  NSCalendarDate  *startDate, *endDate;
   NSMutableString *aptDescr;
-  BOOL spansRange;
+  NSString        *s;
+  BOOL            spansRange;
   
   spansRange = NO;
   startDate  = [_apt valueForKey:@"startDate"];
@@ -202,6 +214,10 @@
       [endDate hourOfDay],
       [endDate minuteOfHour]];
   }
+
+  if ((s = [self privateTitle]) != nil)
+    [aptDescr appendFormat:@"\n%@", s];
+
   return aptDescr;
 }
 

diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version
index 4973dd211cf48726d4863eedadca6417e9b1157f..b735e6e03f67f9ba09179e8430ed59035e327e3c 100644 (file)
--- a/SOGo/UI/SOGoUI/Version
+++ b/SOGo/UI/SOGoUI/Version
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=19
+SUBMINOR_VERSION:=20
 
 # v0.9.18 requires NGExtensions v4.5.136

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 57b981f9f2f866cc8477bac9ed6728db2acd10ae..38a87aa9d951acca851aa5996195674dc5c4cbc7 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,16 @@
+2004-12-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.99
+
+       * {English,French}.lproj/default.strings: new label
+         "private appointment", requested by Laurent for agenor.
+
+       * UIxCalWeekPrintview.m, UIxCalMonthPrintview.m: add label
+         "private appointment" if apt is not accessible.
+
+       * UIxCalView.m: set label "private appointment" as privateTitle of
+         private formatters.
+
 2004-12-10  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.98

diff --git a/SOGo/UI/Scheduler/English.lproj/default.strings b/SOGo/UI/Scheduler/English.lproj/default.strings
index 3800aa1686e42b8c19a75d775fc5c5d386c84c3a..a70917af0cafa0bb73873442f236513b243a2f83 100644 (file)
--- a/SOGo/UI/Scheduler/English.lproj/default.strings
+++ b/SOGo/UI/Scheduler/English.lproj/default.strings
@@ -120,6 +120,8 @@
 /* classification */
 "Public"               = "Public";
 "Private"              = "Private";
+/* text used in overviews and tooltips */
+"private appointment"  = "Private appointment";
 
 
 /* Searching */

diff --git a/SOGo/UI/Scheduler/French.lproj/default.strings b/SOGo/UI/Scheduler/French.lproj/default.strings
index bea90330beebe115277d4abaae1020375e7d0f33..7b5297ead28cc44e8d5d7f737be439364f2863ee 100644 (file)
--- a/SOGo/UI/Scheduler/French.lproj/default.strings
+++ b/SOGo/UI/Scheduler/French.lproj/default.strings
@@ -89,4 +89,8 @@
 "Comment"              ="Notes"
 "Save"                 ="Sauvegarder"
 "Cancel"               ="Annuler"
-"Test"                 ="Test"
\ No newline at end of file
+"Test"                 ="Test"
+
+
+/* text used in overviews and tooltips */
+"private appointment"  = "Rendez-vous privé";

diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
index 9563157a9a65873f37297e3b329e1c489fa5b338..ba2cb4c0041b96fc0cf9730d02e7ef6e5926e3d9 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
@@ -78,6 +78,10 @@
       [aptDescr appendFormat:@"<br />%@", s];
     }
   }
+  else {
+    [aptDescr appendFormat:@"<br />%@",
+      [self labelForKey:@"private appointment"]];
+  }
   if(!isMyApt)
     [aptDescr appendString:@"</span>"];
   return [aptDescr autorelease];

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index f6a8a267d596e3276cffc34c1a93d27ffb0ecf8c..899fd136720a7bd2f47bd4172a36beb616eb4acc 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -56,10 +56,16 @@ static BOOL shouldDisplayWeekend = NO;
 
 /* subclasses should override this */
 - (void)configureFormatters {
+  NSString *title;
+
   [self->aptFormatter setFullDetails];
   [self->aptTooltipFormatter setTooltip];
   [self->privateAptFormatter setPrivateDetails];
   [self->privateAptTooltipFormatter setPrivateTooltip];
+  
+  title = [self labelForKey:@"private appointment"];
+  [self->privateAptFormatter setPrivateTitle:title];
+  [self->privateAptTooltipFormatter setPrivateTitle:title];
 }
 
 /* accessors */

diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
index 6a165cf44a122fe1051d9862c63434f232a1b34e..17d920cf059a4227a1efb0c012db74d9f2a21af8 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
@@ -76,6 +76,11 @@
       [aptDescr appendFormat:@"<br />%@", s];
     }
   }
+  else {
+    [aptDescr appendFormat:@"<br />%@",
+                             [self labelForKey:@"private appointment"]];
+  }
+
   if(!isMyApt)
     [aptDescr appendString:@"</span>"];
   return [aptDescr autorelease];

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 91f73e22c0ceb1eb2a7d352cd95f6de74a0e43f3..e258872bfbe23a7d2d4806ae00df4a90a6bdf714 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,7 +1,8 @@
 # $Id$
 
-SUBMINOR_VERSION:=98
+SUBMINOR_VERSION:=99
 
+# v0.9.99 requires SOGoUI       v0.9.20
 # v0.9.98 requires SOGoUI       v0.9.19
 # v0.9.96 requires SOGoLogic    v0.9.27
 # v0.9.94 requires NGExtensions v4.5.136