From a3671f52a06362158091a9d19709746e4ec4f8ec Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 11 Jul 2008 17:26:11 +0000 Subject: [PATCH 1/3] Monotone-Parent: 16bafd35c923b43175977acf723114a90f37d677 Monotone-Revision: ff35c4a69655239a569e90ab2fcc971a46c7b83f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-11T17:26:11 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxAppointmentEditor.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 745d432a9..81cff9b69 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -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]; From cf289984670d4b3a725c6341e0c904e2292cb279 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 11 Jul 2008 17:32:59 +0000 Subject: [PATCH 2/3] Monotone-Parent: ff35c4a69655239a569e90ab2fcc971a46c7b83f Monotone-Revision: ff087e7476d15851d3c25585e3b00d2b2bf705cc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-11T17:32:59 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/GNUmakefile | 4 ++-- UI/Scheduler/UIxCalDateSelector.m | 11 ++++++++--- UI/Scheduler/UIxCalMainView.m | 24 ++++++++++-------------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index be6f42394..30e4b7e51 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -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 \ diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m index bfb2efc1f..139b7c4ac 100644 --- a/UI/Scheduler/UIxCalDateSelector.m +++ b/UI/Scheduler/UIxCalDateSelector.m @@ -151,9 +151,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 */ diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m index d0939c643..1ffa77a92 100644 --- a/UI/Scheduler/UIxCalMainView.m +++ b/UI/Scheduler/UIxCalMainView.m @@ -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 From b6f3db9b3bcf539eb12daa3d430991815fc93bc2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 11 Jul 2008 17:33:31 +0000 Subject: [PATCH 3/3] Monotone-Parent: ff087e7476d15851d3c25585e3b00d2b2bf705cc Monotone-Revision: fe2f63c6432b82528c17fb060e145ead69df40d3 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-11T17:33:31 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalDateSelector.m | 1 - 1 file changed, 1 deletion(-) diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m index 139b7c4ac..0541b600b 100644 --- a/UI/Scheduler/UIxCalDateSelector.m +++ b/UI/Scheduler/UIxCalDateSelector.m @@ -128,7 +128,6 @@ return [self localizedAbbreviatedNameForDayOfWeek: [self dayOfWeek]]; } - /* stylesheets */ - (NSString *) currentWeekStyle