From 7df117e494435b484df85496abe5ebc3dd80d9ab Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 18 Jul 2005 10:29:48 +0000 Subject: [PATCH] work on ical viewer git-svn-id: http://svn.opengroupware.org/SOGo/trunk@784 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/MailPartViewers/ChangeLog | 6 + .../English.lproj/Localizable.strings | 30 ++++- .../MailPartViewers/UIxMailPartICalViewer.m | 26 ++-- SOGo/UI/MailPartViewers/Version | 2 +- SOGo/UI/SOGoUI/SOGoAptFormatter.m | 3 +- .../MailPartViewers/UIxMailPartICalViewer.wox | 125 +++++++++--------- 6 files changed, 105 insertions(+), 87 deletions(-) diff --git a/SOGo/UI/MailPartViewers/ChangeLog b/SOGo/UI/MailPartViewers/ChangeLog index 0b2d961e..673cd7d4 100644 --- a/SOGo/UI/MailPartViewers/ChangeLog +++ b/SOGo/UI/MailPartViewers/ChangeLog @@ -1,5 +1,11 @@ 2005-07-18 Helge Hess + * v0.9.14 + + * UIxMailPartICalViewer.m: replaced some methods with label bindings + + * English.lproj/Localizable.strings: added more strings + * UIxMailPartICalViewer.m: added -attendeeStatusLabel to produce a readable and localized part-stat (v0.9.13) diff --git a/SOGo/UI/MailPartViewers/English.lproj/Localizable.strings b/SOGo/UI/MailPartViewers/English.lproj/Localizable.strings index e1d2eed7..08cb2ebc 100644 --- a/SOGo/UI/MailPartViewers/English.lproj/Localizable.strings +++ b/SOGo/UI/MailPartViewers/English.lproj/Localizable.strings @@ -1,7 +1,23 @@ -ACCEPTED = "accepted" -COMPLETED = "completed" -DECLINED = "declined" -DELEGATED = "delegated" -IN-PROCESS = "in process" -NEEDS-ACTION = "needs action" -TENTATIVE = "tentative" +ACCEPTED = "accepted"; +COMPLETED = "completed"; +DECLINED = "declined"; +DELEGATED = "delegated"; +IN-PROCESS = "in process"; +NEEDS-ACTION = "needs action"; +TENTATIVE = "tentative"; +organized_by_you = "organized by you"; +you_are_an_attendee = "you are an attendee"; +add_info_text = "iMIP 'ADD' requests are not yet supported by SOGo."; +publish_info_text = "The sender informs you of the attached event." +cancel_info_text = "Your invitation or the whole event was canceled."; +request_info_no_attendee = "is proposing a meeting to the attendees. You receive this mail as a notification, you are not scheduled as a participant."; +Organizer = "Organizer"; +request_info = "invites you to participate in a meeting."; +do_add_to_cal = "add to calendar"; +do_del_from_cal = "delete from calendar"; +do_accept = "accept"; +do_decline = "decline"; +do_tentative = "tentative"; +do_update_status = "update status in calendar"; +reply_info_no_attendee = "You received a reply to a scheduling event but the sender of the reply is not a participant."; +reply_info = "This is a reply to an event invitation done by you."; diff --git a/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m b/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m index cd9ab67e..fd468cc0 100644 --- a/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m +++ b/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m @@ -41,6 +41,8 @@ iCalEvent *storedEvent; } +- (iCalEvent *)authorativeEvent; + @end #include @@ -151,7 +153,7 @@ - (NSCalendarDate *)startTime { NSCalendarDate *date; - date = [[self inEvent] startDate]; + date = [[self authorativeEvent] startDate]; [date setTimeZone:[self viewTimeZone]]; return date; } @@ -159,26 +161,16 @@ - (NSCalendarDate *)endTime { NSCalendarDate *date; - date = [[self inEvent] endDate]; + date = [[self authorativeEvent] endDate]; [date setTimeZone:[self viewTimeZone]]; return date; } -/* attendee fields */ - -- (NSString *)attendeeStatusLabel { - NSString *p; - - p = [[self attendee] partStat]; - - if ([p hasPrefix:@"x-"] || [p hasPrefix:@"X-"]) { - p = [self labelForKey:@"icalstatus_extended_prefix"]; - return [p stringByAppendingString:[p substringFromIndex:2]]; - } - - if ([p length] == 0) p = @"NEEDS-ACTION"; - p = [@"icalstatus_" stringByAppendingString:p]; - return [self labelForKey:p]; +- (BOOL)isEndDateOnSameDay { + return [[self startTime] isDateOnSameDay:[self endTime]]; +} +- (NSTimeInterval)duration { + return [[self endTime] timeIntervalSinceDate:[self startTime]]; } /* calendar folder support */ diff --git a/SOGo/UI/MailPartViewers/Version b/SOGo/UI/MailPartViewers/Version index fae4f21a..c2888967 100644 --- a/SOGo/UI/MailPartViewers/Version +++ b/SOGo/UI/MailPartViewers/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=13 +SUBMINOR_VERSION:=14 # v0.9.0 requires libNGiCal v4.5.53 # v0.9.1 requires libNGMime v4.5.213 diff --git a/SOGo/UI/SOGoUI/SOGoAptFormatter.m b/SOGo/UI/SOGoUI/SOGoAptFormatter.m index 750a0ee1..99f938c5 100644 --- a/SOGo/UI/SOGoUI/SOGoAptFormatter.m +++ b/SOGo/UI/SOGoUI/SOGoAptFormatter.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SOGoAptFormatter.h" #include "common.h" diff --git a/SOGo/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/SOGo/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox index 0fdbba57..e14df9df 100644 --- a/SOGo/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox +++ b/SOGo/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox @@ -14,51 +14,40 @@ - () + () - () + () -

- accept | - decline | - tentative -

- - - -

- The event is not in your primary calendar: - add to calendar. -

- - - +

+ | + | + + + | + +

+

- Organizer + - invites you to participate in a meeting. +

-

- Organizer + - is proposing a meeting to the attendees. You receive this - mail as a notification, you are not scheduled as a participant. +

@@ -66,45 +55,56 @@ -

- iMIP 'REPLY' requests are not yet supported by SOGo. -
- From: - -
- Status Update: - , - + +

+ + + +

+ +

+ + + +

+ Status Update: + , was: - . - - - the sender is not registered as an attendee! - -

+ . +

+ + +

+ +

+ +

- Your invitation or the whole event was canceled. +

-

- iMIP 'ADD' requests are not yet supported by SOGo. -

+

+

@@ -127,6 +127,16 @@ DECLINE-COUNTER --> + + + + +
+ +
+
+ +
@@ -135,7 +145,7 @@ @@ -154,25 +164,20 @@ - () + ()
- - - - - - - - - + + + + + +
- - +
: - -
: - -
: + +
-- 2.39.5