amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-14 21:04:53 +00:00
Code Issues Projects Releases Wiki Activity

merge of 'bded46ecbec55dcfe4c434982eb0a1d07a5ce436'

Browse Source 
and 'fe2f63c6432b82528c17fb060e145ead69df40d3'

Monotone-Parent: bded46ecbec55dcfe4c434982eb0a1d07a5ce436
Monotone-Parent: fe2f63c6432b82528c17fb060e145ead69df40d3
Monotone-Revision: 82fc330b5d4b9a01f4015dd01dcccb5316336a01

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-11T18:40:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-07-11 18:40:38 +00:00
parent 8a69b86e12 b6f3db9b3b
commit a4837c5611
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/GNUmakefile
+2 -2
View File
@@ -35,9 +35,9 @@ SchedulerUI_OBJC_FILES = \
UIxComponentEditor.m \
UIxCalendarSelector.m \
UIxAppointmentEditor.m \
UIxAppointmentProposal.m \
# UIxAppointmentProposal.m \
UIxTaskEditor.m \
UIxTaskProposal.m \
# UIxTaskProposal.m \
UIxCalDateLabel.m \
UIxDatePicker.m \
UIxTimeDateControl.m \
UI/Scheduler/UIxAppointmentEditor.m
+4 -3
View File
@@ -60,6 +60,7 @@
- (void) dealloc
{
[item release];
[event release];
[aptStartDate release];
[aptEndDate release];
[super dealloc];
@@ -91,7 +92,7 @@
hm = [self queryParameterForKey: @"hm"];
return (isAllDay
|| (hm && [hm isEqualToString: @"allday"]));
|| [hm isEqualToString: @"allday"]);
}
- (void) setIsAllDay: (BOOL) newIsAllDay
@@ -137,7 +138,7 @@
int hour;
newStartDate = [self selectedDate];
if ([[self queryParameterForKey: @"hm"] length] == 0)
if (![[self queryParameterForKey: @"hm"] length])
{
now = [NSCalendarDate calendarDate];
timeZone = [[context activeUser] timeZone];
@@ -202,7 +203,7 @@
co = [self clientObject];
objectId = [co globallyUniqueObjectId];
if ([objectId length] > 0)
if ([objectId length])
{
method = [NSString stringWithFormat:@"%@/%@.ics/editAsAppointment",
[co soURL], objectId];
UI/Scheduler/UIxCalDateSelector.m
+8 -4
View File
@@ -128,7 +128,6 @@
return [self localizedAbbreviatedNameForDayOfWeek: [self dayOfWeek]];
}
/* stylesheets */
- (NSString *) currentWeekStyle
@@ -151,9 +150,14 @@
- (NSString *) extraStyle
{
return (([[self selectedDate] isDateOnSameDay: currentDay])
? [self selectedDayExtraStyle]
: nil);
NSString *extraStyle;
if ([[self selectedDate] isDateOnSameDay: currentDay])
extraStyle = [self selectedDayExtraStyle];
else
extraStyle = nil;
return extraStyle;
}
/* URLs */
UI/Scheduler/UIxCalMainView.m
+10 -14
View File
@@ -126,32 +126,28 @@ static NSMutableArray *yearMenuItems = nil;
- (NSString *) verticalDragHandleStyle
{
NSString *vertical;
[self _setupContext];
[self _setupContext];
vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil);
return [[moduleSettings objectForKey: @"DragHandleVertical"]
stringByAppendingString: @"px"];
}
- (NSString *) horizontalDragHandleStyle
{
NSString *horizontal;
[self _setupContext];
[self _setupContext];
horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil);
return [[moduleSettings objectForKey: @"DragHandleHorizontal"]
stringByAppendingString: @"px"];
}
- (NSString *) eventsListViewStyle
{
NSString *height;
NSString *height;
[self _setupContext];
height = [moduleSettings objectForKey: @"DragHandleVertical"];
[self _setupContext];
height = [moduleSettings objectForKey: @"DragHandleVertical"];
return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
}
- (WOResponse *) saveDragHandleStateAction