From 105a5b7305a04b492150a1a6b502a2c441e9153f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Jan 2010 20:48:45 +0000 Subject: [PATCH 1/2] Monotone-Parent: 32e14dc57c4f6d9a43de5dfdf3c298091cbf84ea Monotone-Revision: 460aea753fb253c3922d6e75bf2e3cb21427b244 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-08T20:48:45 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 + UI/Scheduler/UIxCalDateLabel.m | 135 ------------------- UI/Templates/SchedulerUI/UIxCalDateLabel.wox | 9 -- 3 files changed, 2 insertions(+), 144 deletions(-) delete mode 100644 UI/Scheduler/UIxCalDateLabel.m delete mode 100644 UI/Templates/SchedulerUI/UIxCalDateLabel.wox diff --git a/ChangeLog b/ChangeLog index 4b48dc1a9..3f50312d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ 2010-01-08 Wolfgang Sourdeau + * UI/Scheduler/UIxCalDateLabel.m: dropped useless module. + * UnitTests/SOGoTestRunner.m: separated class "SOGoTestRunner" from sogo-tests.m. Moved reporting and logging methods from SOGoTest into SOGoTestRunner.m diff --git a/UI/Scheduler/UIxCalDateLabel.m b/UI/Scheduler/UIxCalDateLabel.m deleted file mode 100644 index 9931a5c85..000000000 --- a/UI/Scheduler/UIxCalDateLabel.m +++ /dev/null @@ -1,135 +0,0 @@ -/* - Copyright (C) 2004 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import - -#import -#import - -#import - -@interface UIxCalDateLabel : UIxComponent -{ - NSString *selection; - NSCalendarDate *startDate; - NSCalendarDate *endDate; -} - -- (NSString *)dayLabel; -- (NSString *)weekLabel; -- (NSString *)monthLabel; -- (NSString *)yearLabel; - -@end - -@implementation UIxCalDateLabel - -- (void)dealloc { - [self->selection release]; - [self->startDate release]; - [self->endDate release]; - [super dealloc]; -} - -/* accessors */ - -- (void)setSelection:(NSString *)_selection { - ASSIGNCOPY(self->selection, _selection); -} -- (NSString *)selection { - return self->selection; -} - -- (void)setStartDate:(NSCalendarDate *)_date { - ASSIGN(self->startDate, _date); -} -- (NSCalendarDate *)startDate { - return self->startDate; -} - -- (void)setEndDate:(NSCalendarDate *)_date { - ASSIGN(self->endDate, _date); -} -- (NSCalendarDate *)endDate { - return self->endDate; -} - -- (NSString *)label { - NSString *key = [self selection]; - - if([key isEqualToString:@"day"]) - return [self dayLabel]; - if ([key isEqualToString:@"week"]) - return [self weekLabel]; - if ([key isEqualToString:@"month"]) - return [self monthLabel]; - return [self yearLabel]; -} - -- (NSString *)dayLabel { - NSString *fmt; - - fmt = [self labelForKey:@"dayLabelFormat"]; - return [self->startDate descriptionWithCalendarFormat:fmt]; -} - -- (NSString *)weekLabel { - NSString *label, *le; - - if ([self->startDate monthOfYear] == [self->endDate monthOfYear]) - label = [NSString stringWithFormat:@"%@ %d", - [self localizedNameForMonthOfYear: [self->startDate monthOfYear]], - [self->startDate yearOfCommonEra]]; - else - { - le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]]; - label = [NSString stringWithFormat:@"%@ / %@ %d", - label, le, - [self->endDate yearOfCommonEra]]; - } - - return label; -} - -- (NSString *)monthLabel { - NSString *l; - unsigned diff; - - diff = [self->startDate monthsBetweenDate:self->endDate]; - if (diff == 0) { - l = [self localizedNameForMonthOfYear:[self->startDate monthOfYear]]; - } - else { - NSCalendarDate *date; - - date = [self->startDate dateByAddingYears:0 months:0 days:15]; - l = [self localizedNameForMonthOfYear:[date monthOfYear]]; - } - return [NSString stringWithFormat:@"%@ %d", - l, [self->startDate yearOfCommonEra]]; -} - -- (NSString *)yearLabel { - return [NSString stringWithFormat:@"%d", - [self->startDate yearOfCommonEra]]; -} - -@end /* UIxCalDateLabel */ diff --git a/UI/Templates/SchedulerUI/UIxCalDateLabel.wox b/UI/Templates/SchedulerUI/UIxCalDateLabel.wox deleted file mode 100644 index 565f093c1..000000000 --- a/UI/Templates/SchedulerUI/UIxCalDateLabel.wox +++ /dev/null @@ -1,9 +0,0 @@ - - From bc90de08262b96244ce8a2be96b7a415b27fbe68 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Jan 2010 22:49:54 +0000 Subject: [PATCH 2/2] reindentation Monotone-Parent: 460aea753fb253c3922d6e75bf2e3cb21427b244 Monotone-Revision: 2185decf68286616e141956d251df6580c4747cd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-13T22:49:54 Monotone-Branch: ca.inverse.sogo --- .../SchedulerUI/UIxCalendarProperties.wox | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox index adbb1292b..cef0c4716 100644 --- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox +++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox @@ -16,64 +16,64 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+