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

merge of '88fd2a0a000ff31c79e91314a17503ec1d076d23'

Browse Source 
and 'bf01e6f088a2111decc0b38c4b13d77205fd3b39'

Monotone-Parent: 88fd2a0a000ff31c79e91314a17503ec1d076d23
Monotone-Parent: bf01e6f088a2111decc0b38c4b13d77205fd3b39
Monotone-Revision: aada198309b5b9b1d7e6e2f2faade7b2b97c4718

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-13T23:03:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-01-13 23:03:17 +00:00
parent c4820e081a 3f0908f384
commit 0197a8b333
4 changed files with 54 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -28,6 +28,8 @@
2010-01-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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

135
UI/Scheduler/UIxCalDateLabel.m
View File

@@ -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 <Foundation/NSCalendarDate.h>
#import <NGCards/NSCalendarDate+ICal.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <SOGoUI/UIxComponent.h>
@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:@"<nobr>%@ / %@ %d</nobr>",
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 */

9
UI/Templates/SchedulerUI/UIxCalDateLabel.wox
View File

@@ -1,9 +0,0 @@
<?xml version='1.0' standalone='yes'?>
<span xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:lbl="OGo:label"
xmlns:uix="OGo:uix"
xmlns:rsrc="OGo:url"
const:class="window_label"
><var:string value="label" /></span>

104
UI/Templates/SchedulerUI/UIxCalendarProperties.wox
View File

@@ -16,64 +16,64 @@
<div id="propertiesView">
<fieldset>
<legend><var:string label:value="Properties" /></legend>
<div><span class="label"><var:string label:value="Name:"/></span
><span class="content"><input type="text"
name="calendarName" id="calendarName"
var:disabled="calendarNameIsDisabled"
class="textField"
var:value="calendarName"
/></span></div>
<var:if condition="isWebCalendar"
><div const:id="webCalendarUrl"><span class="label"
><var:string label:value="URL:"/></span
><span class="content" var:title="webCalendarURL"
><a var:href="webCalendarURL" target="_new"><var:string var:value="webCalendarURL"/></a>
</span></div></var:if>
<div><span class="label"><var:string
label:value="Color:"
/></span><span class="content"
><button id="colorButton"><!-- space --></button
><input type="hidden"
name="calendarColor"
id="calendarColor"
var:value="calendarColor"
/></span></div>
<div><span class="label"><var:string label:value="Name:"/></span
><span class="content"><input type="text"
name="calendarName" id="calendarName"
var:disabled="calendarNameIsDisabled"
class="textField"
var:value="calendarName"
/></span></div>
<var:if condition="isWebCalendar"
><div const:id="webCalendarUrl"><span class="label"
><var:string label:value="URL:"/></span
><span class="content" var:title="webCalendarURL"
><a var:href="webCalendarURL" target="_new"><var:string var:value="webCalendarURL"/></a>
</span></div></var:if>
<div><span class="label"><var:string
label:value="Color:"
/></span><span class="content"
><button id="colorButton"><!-- space --></button
><input type="hidden"
name="calendarColor"
id="calendarColor"
var:value="calendarColor"
/></span></div>
</fieldset>
<fieldset>
<legend><var:string label:value="Synchronization" /></legend>
<div><span class="label"><var:string label:value="Synchronize" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
name="synchronizeCalendar"
id="synchronizeCalendar"
var:checked="synchronizeCalendar"
var:disabled="mustSynchronize" /></span
></div>
<var:if condition="mustSynchronize" const:negate="YES"><div><span class="label"><var:string
label:value="Tag:"/></span><span class="content"><input type="text"
name="calendarSyncTag"
id="calendarSyncTag"
class="textField"
var:value="calendarSyncTag"
/><var:if condition="synchronizeCalendar"><input type="hidden"
name="originalCalendarSyncTag"
id="originalCalendarSyncTag"
var:value="originalCalendarSyncTag"
/></var:if><input type="hidden"
name="allCalendarSyncTags"
id="allCalendarSyncTags"
var:value="allCalendarSyncTags"
/></span></div></var:if>
<div><span class="label"><var:string label:value="Synchronize" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
name="synchronizeCalendar"
id="synchronizeCalendar"
var:checked="synchronizeCalendar"
var:disabled="mustSynchronize" /></span
></div>
<var:if condition="mustSynchronize" const:negate="YES"><div><span class="label"><var:string
label:value="Tag:"/></span><span class="content"><input type="text"
name="calendarSyncTag"
id="calendarSyncTag"
class="textField"
var:value="calendarSyncTag"
/><var:if condition="synchronizeCalendar"><input type="hidden"
name="originalCalendarSyncTag"
id="originalCalendarSyncTag"
var:value="originalCalendarSyncTag"
/></var:if><input type="hidden"
name="allCalendarSyncTags"
id="allCalendarSyncTags"
var:value="allCalendarSyncTags"
/></span></div></var:if>
</fieldset>
<fieldset>
<legend><var:string label:value="Display" /></legend>
<div><span class="label"><var:string label:value="Show alarms" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
id="showCalendarAlarms" var:checked="showCalendarAlarms" /></span
></div>
<div><span class="label"><var:string label:value="Show tasks" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
id="showCalendarTasks" var:checked="showCalendarTasks" /></span
></div>
<div><span class="label"><var:string label:value="Show alarms" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
id="showCalendarAlarms" var:checked="showCalendarAlarms" /></span
></div>
<div><span class="label"><var:string label:value="Show tasks" /></span
><span class="content"><input type="checkbox" const:class="checkBox"
id="showCalendarTasks" var:checked="showCalendarTasks" /></span
></div>
</fieldset>
<div id="buttons">
<a href="#" class="button actionButton" id="okButton"