"private appointment" prefix for private appointments

[scalable-opengroupware.org] / SOGo / UI / SOGoUI / SOGoAptFormatter.m

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;
 }