Support for event transparency

Monotone-Parent: 06e0cbe00f04ba2b584f2f5abbb2b38299b66333
Monotone-Revision: 17e3e8707a2ae061fd0c4184a32cd23a97af96ba

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-06T17:19:14
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-11-06 17:19:14 +00:00
parent 023e7a4b3c
commit 1b5c0ef81c
9 changed files with 99 additions and 6 deletions
@@ -371,6 +371,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Show Time as";
"opaque" = "opaque";
"transparent" = "transparent";
/* validation errors */
validate_notitle = "U heeft geen titel opgegeven. Wilt u doorgaan?";
@@ -388,6 +388,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Show Time as";
"opaque" = "opaque";
"transparent" = "transparent";
/* validation errors */
validate_notitle = "No title is set, continue?";
@@ -386,6 +386,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Disponibilité";
"opaque" = "occupé";
"transparent" = "disponible";
/* validation errors */
validate_notitle = "Le titre n'est pas rempli. Continuer quand-même ?";
@@ -372,6 +372,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Show Time as";
"opaque" = "opaque";
"transparent" = "transparent";
/* validation errors */
validate_notitle = "Sie haben keinen Titel eingegeben. Wollen Sie trotzdem fortfahren?";
@@ -384,6 +384,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Show Time as";
"opaque" = "opaque";
"transparent" = "transparent";
/* validation errors */
validate_notitle = "Nessun titolo inserito, continuare?";
@@ -392,6 +392,12 @@
"zoom_50" = "50%";
"zoom_25" = "25%";
/* transparency */
"Show Time as" = "Show Time as";
"opaque" = "opaque";
"transparent" = "transparent";
/* validation errors */
validate_notitle = "Sin título, ¿continuar?";
+7 -3
View File
@@ -33,6 +33,7 @@
iCalEvent *event;
SOGoAppointmentFolder *componentCalendar;
BOOL isAllDay;
NSString *transparency;
NSCalendarDate *aptStartDate;
NSCalendarDate *aptEndDate;
NSString *item;
@@ -43,13 +44,16 @@
- (iCalEvent *) event;
/* icalendar values */
- (BOOL) isAllDay;
- (void) setIsAllDay: (BOOL) newIsAllDay;
- (BOOL) isAllDay;
- (void) setAptStartDate: (NSCalendarDate *) _date;
- (void) setTransparency: (NSString *) newTransparency;
- (NSString *) transparency;
- (void) setAptStartDate: (NSCalendarDate *) newAptEndDate;
- (NSCalendarDate *) aptStartDate;
- (void) setAptEndDate: (NSCalendarDate *) _date;
- (void) setAptEndDate: (NSCalendarDate *) newAptEndDate;
- (NSCalendarDate *) aptEndDate;
@end
+38 -3
View File
@@ -109,6 +109,38 @@
isAllDay = newIsAllDay;
}
- (NSArray *) transparencyList
{
static NSArray *transparencies = nil;
if (!transparencies)
{
transparencies = [NSArray arrayWithObjects: @"OPAQUE", @"TRANSPARENT", nil];
[transparencies retain];
}
return transparencies;
}
- (NSString *) transparency
{
return transparency;
}
- (NSString *) itemTransparencyText
{
NSString *text;
text = [self labelForKey: [item lowercaseString]];
return text;
}
- (void) setTransparency: (NSString *) newTransparency
{
ASSIGN (transparency, newTransparency);
}
- (void) setAptStartDate: (NSCalendarDate *) newAptStartDate
{
ASSIGN (aptStartDate, newAptStartDate);
@@ -188,7 +220,7 @@
- (id <WOActionResults>) defaultAction
{
NSCalendarDate *startDate, *endDate;
NSString *duration;
NSString *duration, *transp;
unsigned int minutes;
SOGoObject <SOGoComponentOccurence> *co;
@@ -220,6 +252,9 @@
ASSIGN (aptStartDate, startDate);
ASSIGN (aptEndDate, endDate);
transp = [[event transparency] uppercaseString];
ASSIGN (transparency, transp);
return self;
}
@@ -356,8 +391,8 @@
[event setStartDate: aptStartDate];
[event setEndDate: aptEndDate];
}
if ([clientObject isNew])
[event setTransparency: @"OPAQUE"];
[event setTransparency: transparency];
}
// TODO: add tentatively
@@ -27,6 +27,24 @@
var:checked="isAllDay"
/><var:string label:value="All day Event"
/></span></label>
<label><span id="isOpque" 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></label>
<label><var:string label:value="Repeat:" />
<span class="content"><var:popup list="repeatList" item="item"
label:noSelectionString="repeat_NEVER"
var:disabled="isChildOccurence"
const:disabledValue="-"
const:name="repeatList"
const:id="repeatList"
string="itemRepeatText" var:selection="repeat"
/> <a href="#" id="repeatHref" style="display: none;"
><var:string label:value="Edit"/></a></span></label>
<span class="checkBoxList"><var:string label:value="Start:" />
<span class="content"><var:component className="UIxTimeDateControl"
const:controlID="startTime"