Monotone-Parent: b92e4d17974a684ddf2c80a9d22bd0bcbe85f3f6
Monotone-Revision: 136367702e2d0a66ecd8c78c0f55fe81a6d9d1be Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-12-01T22:46:31 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
f8a1dd4ef0
commit
0b69340ca5
|
@ -32,8 +32,7 @@
|
||||||
{
|
{
|
||||||
iCalEvent *event;
|
iCalEvent *event;
|
||||||
SOGoAppointmentFolder *componentCalendar;
|
SOGoAppointmentFolder *componentCalendar;
|
||||||
BOOL isAllDay;
|
BOOL isAllDay, isTransparent;
|
||||||
NSString *transparency;
|
|
||||||
NSCalendarDate *aptStartDate;
|
NSCalendarDate *aptStartDate;
|
||||||
NSCalendarDate *aptEndDate;
|
NSCalendarDate *aptEndDate;
|
||||||
NSString *item;
|
NSString *item;
|
||||||
|
@ -47,8 +46,8 @@
|
||||||
- (void) setIsAllDay: (BOOL) newIsAllDay;
|
- (void) setIsAllDay: (BOOL) newIsAllDay;
|
||||||
- (BOOL) isAllDay;
|
- (BOOL) isAllDay;
|
||||||
|
|
||||||
- (void) setTransparency: (NSString *) newTransparency;
|
- (void) setIsTransparent: (BOOL) newIsOpaque;
|
||||||
- (NSString *) transparency;
|
- (BOOL) isTransparent;
|
||||||
|
|
||||||
- (void) setAptStartDate: (NSCalendarDate *) newAptEndDate;
|
- (void) setAptStartDate: (NSCalendarDate *) newAptEndDate;
|
||||||
- (NSCalendarDate *) aptStartDate;
|
- (NSCalendarDate *) aptStartDate;
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
item = nil;
|
item = nil;
|
||||||
event = nil;
|
event = nil;
|
||||||
isAllDay = NO;
|
isAllDay = NO;
|
||||||
|
isTransparent = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
@ -109,36 +110,14 @@
|
||||||
isAllDay = newIsAllDay;
|
isAllDay = newIsAllDay;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *) transparencyList
|
- (BOOL) isTransparent
|
||||||
{
|
{
|
||||||
static NSArray *transparencies = nil;
|
return isTransparent;
|
||||||
|
|
||||||
if (!transparencies)
|
|
||||||
{
|
|
||||||
transparencies = [NSArray arrayWithObjects: @"OPAQUE", @"TRANSPARENT", nil];
|
|
||||||
[transparencies retain];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return transparencies;
|
- (void) setIsTransparent: (BOOL) newIsTransparent
|
||||||
}
|
|
||||||
|
|
||||||
- (NSString *) transparency
|
|
||||||
{
|
{
|
||||||
return transparency;
|
isTransparent = newIsTransparent;
|
||||||
}
|
|
||||||
|
|
||||||
- (NSString *) itemTransparencyText
|
|
||||||
{
|
|
||||||
NSString *text;
|
|
||||||
|
|
||||||
text = [self labelForKey: [item lowercaseString]];
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void) setTransparency: (NSString *) newTransparency
|
|
||||||
{
|
|
||||||
ASSIGN (transparency, newTransparency);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setAptStartDate: (NSCalendarDate *) newAptStartDate
|
- (void) setAptStartDate: (NSCalendarDate *) newAptStartDate
|
||||||
|
@ -220,7 +199,7 @@
|
||||||
- (id <WOActionResults>) defaultAction
|
- (id <WOActionResults>) defaultAction
|
||||||
{
|
{
|
||||||
NSCalendarDate *startDate, *endDate;
|
NSCalendarDate *startDate, *endDate;
|
||||||
NSString *duration, *transp;
|
NSString *duration;
|
||||||
unsigned int minutes;
|
unsigned int minutes;
|
||||||
SOGoObject <SOGoComponentOccurence> *co;
|
SOGoObject <SOGoComponentOccurence> *co;
|
||||||
|
|
||||||
|
@ -247,14 +226,12 @@
|
||||||
endDate = [[event endDate] dateByAddingYears: 0 months: 0 days: -1];
|
endDate = [[event endDate] dateByAddingYears: 0 months: 0 days: -1];
|
||||||
else
|
else
|
||||||
endDate = [event endDate];
|
endDate = [event endDate];
|
||||||
|
isTransparent = ![event isOpaque];
|
||||||
}
|
}
|
||||||
|
|
||||||
ASSIGN (aptStartDate, startDate);
|
ASSIGN (aptStartDate, startDate);
|
||||||
ASSIGN (aptEndDate, endDate);
|
ASSIGN (aptEndDate, endDate);
|
||||||
|
|
||||||
transp = [[event transparency] uppercaseString];
|
|
||||||
ASSIGN (transparency, transp);
|
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -417,7 +394,7 @@
|
||||||
[event setEndDate: aptEndDate];
|
[event setEndDate: aptEndDate];
|
||||||
}
|
}
|
||||||
|
|
||||||
[event setTransparency: transparency];
|
[event setTransparency: (isTransparent? @"TRANSPARENT" : @"OPAQUE")];
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add tentatively
|
// TODO: add tentatively
|
||||||
|
|
|
@ -22,14 +22,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<label><span class="content"
|
<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"
|
<span id="allDay"><input class="checkBox"
|
||||||
type="checkbox" var:selection="isAllDay"
|
type="checkbox" var:selection="isAllDay"
|
||||||
var:checked="isAllDay"
|
var:checked="isAllDay"
|
||||||
|
@ -49,4 +42,10 @@
|
||||||
const:dayStartHour="0"
|
const:dayStartHour="0"
|
||||||
const:dayEndHour="23"
|
const:dayEndHour="23"
|
||||||
/></span></span>
|
/></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>
|
</var:component>
|
||||||
|
|
|
@ -82,13 +82,11 @@ SPAN.checkBoxList SPAN.content LABEL
|
||||||
|
|
||||||
SPAN.content
|
SPAN.content
|
||||||
{ position: absolute;
|
{ position: absolute;
|
||||||
|
line-height: 2em;
|
||||||
top: -.25em;
|
top: -.25em;
|
||||||
left: 8em;
|
left: 8em;
|
||||||
right: 1em; }
|
right: 1em; }
|
||||||
|
|
||||||
SPAN.content
|
|
||||||
{ line-height: 2em; }
|
|
||||||
|
|
||||||
SPAN.content A
|
SPAN.content A
|
||||||
{ line-height: 2em; }
|
{ line-height: 2em; }
|
||||||
|
|
||||||
|
@ -125,13 +123,9 @@ SPAN#categoriesCB LABEL
|
||||||
{ margin-left: 0px;
|
{ margin-left: 0px;
|
||||||
margin-right: 1em; }
|
margin-right: 1em; }
|
||||||
|
|
||||||
SPAN.content > INPUT
|
SPAN.content > INPUT.textField
|
||||||
{ width: 380px; }
|
{ width: 380px; }
|
||||||
|
|
||||||
SPAN#allDay > INPUT
|
|
||||||
{ position: static;
|
|
||||||
width: auto; }
|
|
||||||
|
|
||||||
LABEL#urlArea INPUT
|
LABEL#urlArea INPUT
|
||||||
{ position: static; }
|
{ position: static; }
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ SPAN#categoriesCB LABEL
|
||||||
SPAN#allDay > INPUT
|
SPAN#allDay > INPUT
|
||||||
{ position: static; }
|
{ position: static; }
|
||||||
|
|
||||||
SPAN.content > INPUT
|
SPAN.content > INPUT.textField
|
||||||
{ width: 390px; }
|
{ width: 390px; }
|
||||||
|
|
||||||
INPUT#startDateCB,
|
INPUT#startDateCB,
|
||||||
|
|
Loading…
Reference in a new issue