Monotone-Parent: b92e4d17974a684ddf2c80a9d22bd0bcbe85f3f6

Monotone-Revision: 136367702e2d0a66ecd8c78c0f55fe81a6d9d1be

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-01T22:46:31
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxAppointmentEditor.h

@@ -32,8 +32,7 @@
 {
   iCalEvent *event;
   SOGoAppointmentFolder *componentCalendar;
-  BOOL isAllDay;
-  NSString *transparency;
+  BOOL isAllDay, isTransparent;
   NSCalendarDate *aptStartDate;
   NSCalendarDate *aptEndDate;
   NSString *item;
@@ -47,8 +46,8 @@
 - (void) setIsAllDay: (BOOL) newIsAllDay;
 - (BOOL) isAllDay;
 
-- (void) setTransparency: (NSString *) newTransparency;
-- (NSString *) transparency;
+- (void) setIsTransparent: (BOOL) newIsOpaque;
+- (BOOL) isTransparent;
 
 - (void) setAptStartDate: (NSCalendarDate *) newAptEndDate;
 - (NSCalendarDate *) aptStartDate;

UI/Scheduler/UIxAppointmentEditor.m

@@ -61,6 +61,7 @@
       item = nil;
       event = nil;
       isAllDay = NO;
+      isTransparent = NO;
     }
 
   return self;
@@ -109,36 +110,14 @@
   isAllDay = newIsAllDay;
 }
 
-- (NSArray *) transparencyList
+- (BOOL) isTransparent
 {
-  static NSArray *transparencies = nil;
-
-  if (!transparencies)
-    {
-      transparencies = [NSArray arrayWithObjects: @"OPAQUE", @"TRANSPARENT", nil];
-      [transparencies retain];
-    }
-
-  return transparencies;
+  return isTransparent;
 }
 
-- (NSString *) transparency
+- (void) setIsTransparent: (BOOL) newIsTransparent
 {
-  return transparency;
-}
-
-- (NSString *) itemTransparencyText
-{
-  NSString *text;
-
-  text = [self labelForKey: [item lowercaseString]];
-
-  return text;
-}
-
-- (void) setTransparency: (NSString *) newTransparency
-{
-  ASSIGN (transparency, newTransparency);
+  isTransparent = newIsTransparent;
 }
 
 - (void) setAptStartDate: (NSCalendarDate *) newAptStartDate
@@ -220,7 +199,7 @@
 - (id <WOActionResults>) defaultAction
 {
   NSCalendarDate *startDate, *endDate;
-  NSString *duration, *transp;
+  NSString *duration;
   unsigned int minutes;
   SOGoObject <SOGoComponentOccurence> *co;
 
@@ -247,14 +226,12 @@
 	endDate = [[event endDate] dateByAddingYears: 0 months: 0 days: -1];
       else
 	endDate = [event endDate];
+      isTransparent = ![event isOpaque];
     }
 
   ASSIGN (aptStartDate, startDate);
   ASSIGN (aptEndDate, endDate);
 
-  transp = [[event transparency] uppercaseString];
-  ASSIGN (transparency, transp);
-
   return self;
 }
 
@@ -417,7 +394,7 @@
       [event setEndDate: aptEndDate];
     }
 
-  [event setTransparency: transparency];
+  [event setTransparency: (isTransparent? @"TRANSPARENT" : @"OPAQUE")];
 }
 
 // TODO: add tentatively

UI/Templates/SchedulerUI/UIxAppointmentEditor.wox

@@ -22,15 +22,8 @@
     </ul>
   </div>
 
-  <label><span class="content"
-	><var:string label:value="Show Time as"
-        /> <var:popup list="transparencyList" item="item"
-          const:name="transparencyList"
-	  const:id="transparencyList"
-          string="itemTransparencyText"
-	  var:selection="transparency"
-          />
-  <span id="allDay"><input class="checkBox"
+  <label><span class="content">
+    <span id="allDay"><input class="checkBox"
         type="checkbox" var:selection="isAllDay"
         var:checked="isAllDay"
         /> <var:string label:value="All day Event"
@@ -49,4 +42,10 @@
         const:dayStartHour="0"
         const:dayEndHour="23"
         /></span></span>
+  <label><span class="content">
+    <span id="isTransparent"><input class="checkBox"
+        type="checkbox" var:selection="isTransparent"
+        var:checked="isTransparent"
+        /> <var:string label:value="Show Time as Free"
+        /></span></span></label>
 </var:component>

UI/WebServerResources/UIxAppointmentEditor.css

@@ -82,13 +82,11 @@ SPAN.checkBoxList SPAN.content LABEL
 
 SPAN.content
 { position: absolute;
+  line-height: 2em;
   top: -.25em;
   left: 8em;
   right: 1em; }
 
-SPAN.content
-{ line-height: 2em; }
-
 SPAN.content A
 { line-height: 2em; }
 
@@ -125,13 +123,9 @@ SPAN#categoriesCB LABEL
 { margin-left: 0px;
   margin-right: 1em; }
 
-SPAN.content > INPUT
+SPAN.content > INPUT.textField
 { width: 380px; }
 
-SPAN#allDay > INPUT
-{ position: static;
-  width: auto; }
-
 LABEL#urlArea INPUT
 { position: static; }
 

UI/WebServerResources/UIxTaskEditor.css

@@ -93,7 +93,7 @@ SPAN#categoriesCB LABEL
 SPAN#allDay > INPUT
 { position: static; }
 
-SPAN.content > INPUT
+SPAN.content > INPUT.textField
 { width: 390px; }
 
 INPUT#startDateCB,