From a7153a94713f964169110ceb10e251c1e3ee306d Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 8 Dec 2004 14:01:10 +0000 Subject: [PATCH] fixes for SOGo bug #1070 git-svn-id: http://svn.opengroupware.org/SOGo/trunk@463 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SOGo.xcode/project.pbxproj | 293 ++++++++++-------- SOGo/UI/Common/ChangeLog | 3 + SOGo/UI/Common/Version | 2 +- SOGo/UI/Common/calendar.css | 33 +- SOGo/UI/Scheduler/ChangeLog | 17 + SOGo/UI/Scheduler/UIxAppointmentPrintview.m | 23 ++ SOGo/UI/Scheduler/UIxAppointmentPrintview.wox | 41 ++- SOGo/UI/Scheduler/UIxCalDayPrintview.m | 16 +- SOGo/UI/Scheduler/UIxCalDayPrintview.wox | 1 + SOGo/UI/Scheduler/UIxCalMonthPrintview.m | 139 +++++---- SOGo/UI/Scheduler/UIxCalView.h | 7 +- SOGo/UI/Scheduler/UIxCalWeekPrintview.m | 168 +++++----- SOGo/UI/Scheduler/Version | 3 +- SOGoLogic/ChangeLog | 4 + SOGoLogic/SOGoAppointment.h | 9 +- SOGoLogic/SOGoAppointment.m | 11 + SOGoLogic/Version | 2 +- 17 files changed, 478 insertions(+), 294 deletions(-) diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index ab0116c2..57de016f 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -41,7 +41,8 @@ usesTabs = 1; }; AD0134C306DF41C5000910D8 = { - fileEncoding = 4; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxSortButton.m; @@ -193,7 +194,8 @@ sourceTree = ""; }; AD0137AC06DF891E000910D8 = { - fileEncoding = 4; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxAppointmentPrintview.m; @@ -254,7 +256,7 @@ sourceTree = ""; }; AD07123806C904C900A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -355,7 +357,7 @@ sourceTree = ""; }; AD07124C06C9052700A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -364,7 +366,7 @@ sourceTree = ""; }; AD0712CA06C917A600A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -373,7 +375,7 @@ sourceTree = ""; }; AD0712CB06C917A600A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -401,7 +403,7 @@ sourceTree = ""; }; AD0715CB06CA711600A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -410,7 +412,7 @@ sourceTree = ""; }; AD071B3C06CCFA2000A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -419,7 +421,7 @@ sourceTree = ""; }; AD071B3D06CCFA2000A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -428,7 +430,7 @@ sourceTree = ""; }; AD071C7D06CD214600A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -437,7 +439,7 @@ sourceTree = ""; }; AD071C7E06CD214700A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -472,7 +474,7 @@ usesTabs = 1; }; AD071CE606CD2ACE00A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -519,7 +521,7 @@ tabWidth = 8; }; AD071CEC06CD2ACE00A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -529,7 +531,7 @@ sourceTree = ""; }; AD071CED06CD2ACE00A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -580,7 +582,7 @@ sourceTree = ""; }; AD071D1206CD2BCB00A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -589,7 +591,7 @@ sourceTree = ""; }; AD071D1306CD2BCB00A9EEF4 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -666,6 +668,7 @@ }; AD2C74A5071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxEnvelopeAddressFormatter.m; @@ -674,6 +677,7 @@ }; AD2C74A6071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailAccountsView.m; @@ -690,6 +694,7 @@ }; AD2C74A8071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailAccountView.m; @@ -706,6 +711,7 @@ }; AD2C74AA071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIxMailFormatter.h; @@ -714,6 +720,7 @@ }; AD2C74AB071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailFormatter.m; @@ -722,6 +729,7 @@ }; AD2C74AC071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailMainFrame.m; @@ -738,6 +746,7 @@ }; AD2C74AE071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartAlternativeViewer.m; @@ -754,6 +763,7 @@ }; AD2C74B0071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartImageViewer.m; @@ -770,6 +780,7 @@ }; AD2C74B2071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartMixedViewer.m; @@ -786,6 +797,7 @@ }; AD2C74B4071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartTextViewer.m; @@ -802,6 +814,7 @@ }; AD2C74B6071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIxMailPartViewer.h; @@ -810,6 +823,7 @@ }; AD2C74B7071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartViewer.m; @@ -818,6 +832,7 @@ }; AD2C74B8071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIxMailRenderingContext.h; @@ -826,6 +841,7 @@ }; AD2C74B9071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailRenderingContext.m; @@ -834,6 +850,7 @@ }; AD2C74BA071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailToolbar.m; @@ -850,6 +867,7 @@ }; AD2C74BC071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailTree.m; @@ -866,6 +884,7 @@ }; AD2C74BE071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxSubjectFormatter.m; @@ -874,6 +893,7 @@ }; AD2C74BF071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WOContext+UIxMailer.h"; @@ -882,6 +902,7 @@ }; AD2C74C0071A9FF70087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WOContext+UIxMailer.m"; @@ -921,6 +942,7 @@ }; AD2C76D5071BF4EB0087E027 = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailEditorAction.m; @@ -953,7 +975,8 @@ sourceTree = ""; }; AD2C78F7071C23CE0087E027 = { - fileEncoding = 4; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIxMailAddressbook.m; @@ -969,7 +992,7 @@ sourceTree = ""; }; AD494C6206F5EA6600E51EC9 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -986,7 +1009,7 @@ sourceTree = ""; }; AD494C8E06F606F900E51EC9 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -995,7 +1018,7 @@ sourceTree = ""; }; AD494C9006F6072C00E51EC9 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1065,7 +1088,7 @@ sourceTree = ""; }; AD5ED0B006B1385700E3EC4B = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1074,7 +1097,7 @@ sourceTree = ""; }; AD5ED1AE06B1768900E3EC4B = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1083,7 +1106,7 @@ sourceTree = ""; }; AD5ED1AF06B1768900E3EC4B = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1144,7 +1167,7 @@ tabWidth = 8; }; AD6BCF10069D77E9003664CD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1153,7 +1176,7 @@ sourceTree = ""; }; AD6BCF11069D77E9003664CD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1229,7 +1252,7 @@ sourceTree = ""; }; AD7379B306AEBB2500735920 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1238,7 +1261,7 @@ sourceTree = ""; }; AD737A1706AEC77E00735920 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1255,7 +1278,7 @@ sourceTree = ""; }; AD737A6A06AEE8BD00735920 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1264,7 +1287,7 @@ sourceTree = ""; }; AD73BE4A06CF88BF00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1273,7 +1296,7 @@ sourceTree = ""; }; AD73BE4B06CF88BF00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1282,7 +1305,7 @@ sourceTree = ""; }; AD73BE6106CF8CC500226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1291,7 +1314,7 @@ sourceTree = ""; }; AD73BE6206CF8CC500226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1300,7 +1323,7 @@ sourceTree = ""; }; AD73BE7D06CF90EA00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1309,7 +1332,7 @@ sourceTree = ""; }; AD73BE7E06CF90EA00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1318,7 +1341,7 @@ sourceTree = ""; }; AD73BE8806CF92FC00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1343,7 +1366,7 @@ sourceTree = ""; }; AD73BE9406CF969100226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1360,7 +1383,7 @@ sourceTree = ""; }; AD73BED806CFA0FD00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1393,7 +1416,7 @@ sourceTree = ""; }; AD73BF6C06CFB4CE00226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1402,7 +1425,7 @@ sourceTree = ""; }; AD73C03406CFDE3600226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1419,7 +1442,7 @@ sourceTree = ""; }; AD73C03606CFDE4500226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1436,7 +1459,7 @@ sourceTree = ""; }; AD73C08306CFFEA600226A2D = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1463,7 +1486,8 @@ sourceTree = ""; }; ADA63205071330AE0058C21C = { - fileEncoding = 4; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SOGoAppointment+UIx.h"; @@ -1471,7 +1495,8 @@ sourceTree = ""; }; ADA63206071330AE0058C21C = { - fileEncoding = 4; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SOGoAppointment+UIx.m"; @@ -1515,6 +1540,7 @@ }; ADBE3E5C0727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoDraftObject.h; @@ -1523,6 +1549,7 @@ }; ADBE3E5D0727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoDraftObject.m; @@ -1531,6 +1558,7 @@ }; ADBE3E5E0727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoDraftsFolder.h; @@ -1539,6 +1567,7 @@ }; ADBE3E5F0727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoDraftsFolder.m; @@ -1547,6 +1576,7 @@ }; ADBE3E600727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoMailBaseObject.h; @@ -1555,6 +1585,7 @@ }; ADBE3E610727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoMailBaseObject.m; @@ -1563,6 +1594,7 @@ }; ADBE3E620727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoMailBodyPart.h; @@ -1571,6 +1603,7 @@ }; ADBE3E630727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoMailBodyPart.m; @@ -1579,6 +1612,7 @@ }; ADBE3E640727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoMailConnectionEntry.h; @@ -1587,6 +1621,7 @@ }; ADBE3E650727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoMailConnectionEntry.m; @@ -1595,6 +1630,7 @@ }; ADBE3E660727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOGoMailManager.h; @@ -1603,6 +1639,7 @@ }; ADBE3E670727167A000FEA6A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoMailManager.m; @@ -1716,7 +1753,7 @@ usesTabs = 1; }; ADDF4B3306DCEAC800C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1848,7 +1885,7 @@ sourceTree = ""; }; ADDF4B6A06DCEBA100C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1884,7 +1921,7 @@ sourceTree = ""; }; ADDF4B7006DCEC4300C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1901,7 +1938,7 @@ sourceTree = ""; }; ADDF4B7306DCEC5200C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1918,7 +1955,7 @@ sourceTree = ""; }; ADDF4B7606DCEC5F00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1941,7 +1978,7 @@ sourceTree = ""; }; ADDF4BDC06DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1960,7 +1997,7 @@ tabWidth = 8; }; ADDF4BDE06DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1970,7 +2007,7 @@ tabWidth = 2; }; ADDF4BDF06DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1980,7 +2017,7 @@ tabWidth = 2; }; ADDF4BE006DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1990,7 +2027,7 @@ tabWidth = 2; }; ADDF4BE106DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2000,7 +2037,7 @@ tabWidth = 2; }; ADDF4BE206DCF5D400C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2122,7 +2159,7 @@ usesTabs = 1; }; ADDF4D6A06DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2153,7 +2190,7 @@ usesTabs = 1; }; ADDF4D6D06DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2170,7 +2207,7 @@ sourceTree = ""; }; ADDF4D6F06DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2179,7 +2216,7 @@ sourceTree = ""; }; ADDF4D7006DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2188,7 +2225,7 @@ sourceTree = ""; }; ADDF4D7106DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2197,7 +2234,7 @@ sourceTree = ""; }; ADDF4D7206DE0BAB00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2334,7 +2371,7 @@ tabWidth = 8; }; ADDF4DBE06DE0E9900C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2418,7 +2455,7 @@ tabWidth = 8; }; ADDF4DC706DE0E9A00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2443,7 +2480,7 @@ sourceTree = ""; }; ADDF4DCA06DE0E9A00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2460,7 +2497,7 @@ sourceTree = ""; }; ADDF4DCC06DE0E9A00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2477,7 +2514,7 @@ sourceTree = ""; }; ADDF4DCE06DE0E9A00C4E7F8 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2619,7 +2656,7 @@ sourceTree = ""; }; ADE2C23D06B7BED40065D56F = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2636,7 +2673,7 @@ sourceTree = ""; }; ADE2C24006B7BEE60065D56F = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2653,7 +2690,7 @@ sourceTree = ""; }; ADE2C24A06B7BF020065D56F = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2670,7 +2707,7 @@ sourceTree = ""; }; ADE2C28906B7C7B20065D56F = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2687,7 +2724,7 @@ sourceTree = ""; }; ADE2C28C06B7C7C20065D56F = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2726,6 +2763,8 @@ ADF15C0206BA84480047D955, ADF15C0106BA84480047D955, ); + fileEncoding = 5; + indentWidth = 2; isa = PBXGroup; name = Week; refType = 4; @@ -2821,7 +2860,7 @@ sourceTree = ""; }; ADF15BFD06BA842A0047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2838,7 +2877,7 @@ sourceTree = ""; }; ADF15C0206BA84480047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2855,7 +2894,7 @@ sourceTree = ""; }; ADF15C0506BA845E0047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2864,7 +2903,7 @@ sourceTree = ""; }; ADF15C2E06BA86420047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2881,7 +2920,7 @@ sourceTree = ""; }; ADF15C4A06BA89140047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -2890,7 +2929,7 @@ sourceTree = ""; }; ADF15D1A06BAA6D20047D955 = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -2978,7 +3017,7 @@ sourceTree = ""; }; E87205CE0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3023,7 +3062,7 @@ sourceTree = ""; }; E87205DF0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3032,7 +3071,7 @@ sourceTree = ""; }; E87205E00692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3041,7 +3080,7 @@ sourceTree = ""; }; E87205E10692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3051,7 +3090,7 @@ usesTabs = 0; }; E87205ED0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3060,7 +3099,7 @@ sourceTree = ""; }; E87205EE0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3069,7 +3108,7 @@ sourceTree = ""; }; E87205EF0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3086,7 +3125,7 @@ sourceTree = ""; }; E87205F10692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3148,7 +3187,7 @@ sourceTree = ""; }; E872063A0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3177,7 +3216,7 @@ tabWidth = 8; }; E87206410692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3194,7 +3233,7 @@ sourceTree = ""; }; E87206470692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3203,7 +3242,7 @@ sourceTree = ""; }; E87206480692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3212,7 +3251,7 @@ sourceTree = ""; }; E87206490692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3221,7 +3260,7 @@ sourceTree = ""; }; E872064A0692E3D00099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3269,7 +3308,7 @@ sourceTree = ""; }; E87206880692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3306,7 +3345,7 @@ sourceTree = ""; }; E872069C0692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3315,7 +3354,7 @@ sourceTree = ""; }; E872069D0692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3324,7 +3363,7 @@ sourceTree = ""; }; E872069E0692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3333,7 +3372,7 @@ sourceTree = ""; }; E872069F0692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3342,7 +3381,7 @@ sourceTree = ""; }; E87206A00692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3351,7 +3390,7 @@ sourceTree = ""; }; E87206A10692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3360,7 +3399,7 @@ sourceTree = ""; }; E87206A20692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3369,7 +3408,7 @@ sourceTree = ""; }; E87206A30692E3D10099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3452,7 +3491,7 @@ usesTabs = 1; }; E872074A0692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3461,7 +3500,7 @@ sourceTree = ""; }; E872074C0692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3657,7 +3696,7 @@ sourceTree = ""; }; E87207DA0692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3674,7 +3713,7 @@ sourceTree = ""; }; E87207DE0692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3683,7 +3722,7 @@ sourceTree = ""; }; E87207DF0692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3700,7 +3739,7 @@ sourceTree = ""; }; E87207E10692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3709,7 +3748,7 @@ sourceTree = ""; }; E87207E20692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3718,7 +3757,7 @@ sourceTree = ""; }; E87207E30692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3727,7 +3766,7 @@ sourceTree = ""; }; E87207E40692E3D20099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3819,7 +3858,7 @@ usesTabs = 1; }; E87208900692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3929,7 +3968,7 @@ sourceTree = ""; }; E87208E40692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3938,7 +3977,7 @@ sourceTree = ""; }; E87208F30692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3955,7 +3994,7 @@ sourceTree = ""; }; E87208F50692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3964,7 +4003,7 @@ sourceTree = ""; }; E87208F60692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3973,7 +4012,7 @@ sourceTree = ""; }; E87208F70692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3982,7 +4021,7 @@ sourceTree = ""; }; E87208F80692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -3999,7 +4038,7 @@ sourceTree = ""; }; E87208FA0692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4016,7 +4055,7 @@ sourceTree = ""; }; E87208FC0692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4033,7 +4072,7 @@ sourceTree = ""; }; E87208FE0692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4050,7 +4089,7 @@ sourceTree = ""; }; E87209000692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4067,7 +4106,7 @@ sourceTree = ""; }; E87209020692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -4076,7 +4115,7 @@ sourceTree = ""; }; E87209030692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4085,7 +4124,7 @@ sourceTree = ""; }; E87209040692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4102,7 +4141,7 @@ sourceTree = ""; }; E87209060692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -4111,7 +4150,7 @@ sourceTree = ""; }; E87209070692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4120,7 +4159,7 @@ sourceTree = ""; }; E87209080692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4137,7 +4176,7 @@ sourceTree = ""; }; E872090A0692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -4146,7 +4185,7 @@ sourceTree = ""; }; E872090B0692E3D30099CBBD = { - fileEncoding = 4; + fileEncoding = 5; indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index 5bdf735e..902dfa90 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,5 +1,8 @@ 2004-12-08 Marcus Mueller + * calendar.css: added styles for others' appointments in + printviews, so they are easy to distinguish (v0.9.29) + * UIxTabItem.m: changed to use NGLogging (v0.9.28) 2004-10-18 Marcus Mueller diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version index 5a2df97a..824ee0bb 100644 --- a/SOGo/UI/Common/Version +++ b/SOGo/UI/Common/Version @@ -1,5 +1,5 @@ # Version file -SUBMINOR_VERSION:=28 +SUBMINOR_VERSION:=29 # v0.9.28 requires NGExtensions v4.5.136 diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css index c1656e15..b3dda7eb 100644 --- a/SOGo/UI/Common/calendar.css +++ b/SOGo/UI/Common/calendar.css @@ -19,6 +19,10 @@ font-style: italic; } +.aptprintview_apt_other { + font-style: italic; +} + .anais_me { color: #0000FF; } @@ -28,8 +32,8 @@ font-size: 10pt; } -/* day overview */ +/* day overview */ .dayoverview_content { padding: 1px; @@ -153,7 +157,6 @@ /* day printview */ - .dayprintview { font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; letter-spacing: 0pt; @@ -183,10 +186,13 @@ h1.dayprintview { font-style: italic; } +.dayprintview_apt_other { + font-style: italic; +} + /* week overview */ - .weekoverview_title { font-size: 10pt; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; @@ -255,7 +261,6 @@ h1.dayprintview { /* week columnsview */ - .weekcolumnsview { } @@ -429,7 +434,6 @@ h1.weekprintview { font-style: italic; } - .weekprintview_title { font-size: 11pt; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; @@ -455,10 +459,17 @@ h1.weekprintview { font-style: italic; } +.weekprintview_apt_time_other { + font-style: italic; +} -/* month overview */ +.weekprintview_apt_other { + font-style: italic; +} +/* month overview */ + .monthoverview { color: #000000; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; @@ -574,6 +585,7 @@ h1.weekprintview { font-weight: normal; } + /* month printview */ .monthprintview { @@ -614,6 +626,14 @@ h1.monthprintview_header { font-style: italic; } +.monthprintview_apt_time_other { + font-style: italic; +} + +.monthprintview_apt_other { + font-style: italic; +} + td.monthprintview_content { text-align: left; vertical-align: top; @@ -633,7 +653,6 @@ td.monthprintview_content_dimmed { /* year overview */ - .yearoverview { color: #000000; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 3be821e4..40dbb69e 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,5 +1,22 @@ 2004-12-08 Marcus Mueller + * v0.9.96 + + * UIxCalView.h: made -isMyApt and -aptStyle public. + + * UIxAppointmentPrintview.m: implemented -isMyApt and -aptStyle, used + by UIxAppointmentPrintview.wox + + * UIxAppointmentPrintview.wox: print summary, location, start/endtime + in italics - fixes SOGo bug #1070 + + * UIxCalWeekPrintview.m, UIxCalMonthPrintview.m: extended + -shortTextForApt to use different css styles, when -isMyApt returns + NO - fixes SOGo bug #1070 + + * UIxCalDayPrintview.[m, wox]: use -aptStyle to print appointments not + belonging to user in italics - fixes SOGo bug #1070 + * UIxCalDayOverview.wox, UIxCalDayChartview.wox, UIxCalDayListview.wox UIxCalWeekOverview.wox, UIxCalWeekListview.wox, UIxCalWeekChartview.wox, UIxCalWeekColumnsview.wox, diff --git a/SOGo/UI/Scheduler/UIxAppointmentPrintview.m b/SOGo/UI/Scheduler/UIxAppointmentPrintview.m index 67c357f6..9d4862f1 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentPrintview.m +++ b/SOGo/UI/Scheduler/UIxAppointmentPrintview.m @@ -25,10 +25,14 @@ { } +- (BOOL)isMyApt; + @end #include "common.h" #include +#include +#include "UIxComponent+Agenor.h" @implementation UIxAppointmentPrintview @@ -36,4 +40,23 @@ return [[self dateFormatter] stringForObjectValue:[self startTime]]; } +- (BOOL)isMyApt { + id apt; + NSString *myEmail; + + apt = [self appointment]; + myEmail = [self emailForUser]; +#if 0 /* ZNeK 20041208 - Maxime says this isn't relevant to agenor */ + if ([apt isOrganizer:myEmail]) + return YES; +#endif + return [apt isParticipant:myEmail]; +} + +- (NSString *)aptStyle { + if (![self isMyApt]) + return @"aptprintview_apt_other"; + return nil; +} + @end /* UIxAppointmentPrintview */ diff --git a/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox index f81d218d..416b5426 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox @@ -1,12 +1,11 @@ - @@ -23,7 +22,9 @@ : @@ -31,7 +32,9 @@ : @@ -55,6 +58,7 @@ @@ -65,6 +69,7 @@ @@ -128,5 +133,21 @@
- +
- +
+ + + + appointment: +
+ isMyApt: +
+ aptStyle: +
+ activeUser: +
+ email for user: +
+ + + diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.m b/SOGo/UI/Scheduler/UIxCalDayPrintview.m index 1cb3e76e..b5586f6d 100644 --- a/SOGo/UI/Scheduler/UIxCalDayPrintview.m +++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.m @@ -35,10 +35,18 @@ @implementation UIxCalDayPrintview - (NSString *)title { - NSString *fmt; - - fmt = [self labelForKey:@"dayLabelFormat"]; - return [[self startDate] descriptionWithCalendarFormat:fmt]; + NSString *fmt; + + fmt = [self labelForKey:@"dayLabelFormat"]; + return [[self startDate] descriptionWithCalendarFormat:fmt]; +} + +/* style sheet */ + +- (NSString *)aptStyle { + if (![self isMyApt]) + return @"dayprintview_apt_other"; + return nil; } @end diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox index c6b5533e..9dcdafa9 100644 --- a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox +++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox @@ -49,6 +49,7 @@ diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m index 8e702d8c..5dbd2644 100644 --- a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m +++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m @@ -1,23 +1,23 @@ /* - 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. -*/ + 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. + */ // $Id$ @@ -34,49 +34,58 @@ @implementation UIxCalMonthPrintview - (NSString *)shortTextForApt { - NSCalendarDate *startDate, *endDate; - NSMutableString *aptDescr; - NSString *s; - BOOL spansRange; - id apt; - - apt = [self appointment]; - spansRange = NO; - startDate = [apt valueForKey:@"startDate"]; - [startDate setTimeZone:[self viewTimeZone]]; - endDate = [apt valueForKey:@"endDate"]; - if(endDate != nil) { - [endDate setTimeZone:[self viewTimeZone]]; - spansRange = ![endDate isEqualToDate:startDate]; - } - aptDescr = [[NSMutableString alloc] init]; - [aptDescr appendFormat:@"%02i:%02i", - [startDate hourOfDay], - [startDate minuteOfHour]]; - if(spansRange) { - [aptDescr appendFormat:@" - %02i:%02i", - [endDate hourOfDay], - [endDate minuteOfHour]]; - } - [aptDescr appendFormat:@","]; - s = [apt valueForKey:@"title"]; - if(s) { - [aptDescr appendFormat:@"
%@", s]; - } - s = [apt valueForKey:@"location"]; - if(s) { - [aptDescr appendFormat:@"
%@", s]; - } - return [aptDescr autorelease]; + NSCalendarDate *startDate, *endDate; + NSMutableString *aptDescr; + NSString *s; + BOOL isMyApt; + BOOL spansRange; + id apt; + + apt = [self appointment]; + isMyApt = [self isMyApt]; + spansRange = NO; + startDate = [apt valueForKey:@"startDate"]; + [startDate setTimeZone:[self viewTimeZone]]; + endDate = [apt valueForKey:@"endDate"]; + if(endDate != nil) { + [endDate setTimeZone:[self viewTimeZone]]; + spansRange = ![endDate isEqualToDate:startDate]; + } + + aptDescr = [[NSMutableString alloc] init]; + [aptDescr appendFormat:@"%02i:%02i", + isMyApt ? @"monthprintview_apt_time" : + @"monthprintview_apt_time_other", + [startDate hourOfDay], + [startDate minuteOfHour]]; + if(spansRange) { + [aptDescr appendFormat:@" - %02i:%02i", + [endDate hourOfDay], + [endDate minuteOfHour]]; + } + [aptDescr appendFormat:@","]; + if(!isMyApt) + [aptDescr appendFormat:@"", [self aptStyle]]; + s = [apt valueForKey:@"title"]; + if(s) { + [aptDescr appendFormat:@"
%@", s]; + } + s = [apt valueForKey:@"location"]; + if(s) { + [aptDescr appendFormat:@"
%@", s]; + } + if(!isMyApt) + [aptDescr appendString:@""]; + return [aptDescr autorelease]; } - (NSString *)title { - NSCalendarDate *date; - - date = [self startOfMonth]; - return [NSString stringWithFormat:@"%@ %d", - [self localizedNameForMonthOfYear:[date monthOfYear]], - [date yearOfCommonEra]]; + NSCalendarDate *date; + + date = [self startOfMonth]; + return [NSString stringWithFormat:@"%@ %d", + [self localizedNameForMonthOfYear:[date monthOfYear]], + [date yearOfCommonEra]]; } @@ -84,9 +93,15 @@ - (NSString *)contentStyle { - if([self->currentDay monthOfYear] != [[self startOfMonth] monthOfYear]) - return @"monthprintview_content_dimmed"; - return @"monthprintview_content"; + if([self->currentDay monthOfYear] != [[self startOfMonth] monthOfYear]) + return @"monthprintview_content_dimmed"; + return @"monthprintview_content"; +} + +- (NSString *)aptStyle { + if (![self isMyApt]) + return @"monthprintview_apt_other"; + return nil; } @end diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h index 03bbd987..44a4678a 100644 --- a/SOGo/UI/Scheduler/UIxCalView.h +++ b/SOGo/UI/Scheduler/UIxCalView.h @@ -29,6 +29,7 @@ - (NSArray *)appointments; - (NSArray *)allDayApts; - (id)appointment; +- (BOOL)isMyApt; - (BOOL)hasDayInfo; - (BOOL)hasHoldidayInfo; @@ -78,7 +79,11 @@ /* calendarUIDs */ - (NSString *)formattedCalendarUIDs; - + +/* CSS related */ + +- (NSString *)aptStyle; + @end #endif /* __SOGo_UIxCalView_H__ */ diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m index 72926bba..ba59e256 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m +++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m @@ -1,23 +1,23 @@ /* - 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. -*/ + 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. + */ // $Id$ #include "UIxCalWeekOverview.h" @@ -33,76 +33,88 @@ @implementation UIxCalWeekPrintview - (NSString *)shortTextForApt { - NSCalendarDate *startDate, *endDate; - NSMutableString *aptDescr; - NSString *s; - BOOL spansRange; - id apt; - - apt = [self appointment]; - spansRange = NO; - startDate = [apt valueForKey:@"startDate"]; - [startDate setTimeZone:[self viewTimeZone]]; - endDate = [apt valueForKey:@"endDate"]; - if(endDate != nil) { - [endDate setTimeZone:[self viewTimeZone]]; - spansRange = ![endDate isEqualToDate:startDate]; - } - aptDescr = [[NSMutableString alloc] init]; - [aptDescr appendFormat:@"%02i:%02i", - [startDate hourOfDay], - [startDate minuteOfHour]]; - if(spansRange) { - [aptDescr appendFormat:@" - %02i:%02i", - [endDate hourOfDay], - [endDate minuteOfHour]]; - } - [aptDescr appendFormat:@","]; - s = [apt valueForKey:@"title"]; - if(s) { - [aptDescr appendFormat:@"
%@", s]; - } - s = [apt valueForKey:@"location"]; - if(s) { - [aptDescr appendFormat:@"
%@", s]; - } - return [aptDescr autorelease]; + NSCalendarDate *startDate, *endDate; + NSMutableString *aptDescr; + NSString *s; + BOOL isMyApt; + BOOL spansRange; + id apt; + + apt = [self appointment]; + isMyApt = [self isMyApt]; + spansRange = NO; + startDate = [apt valueForKey:@"startDate"]; + [startDate setTimeZone:[self viewTimeZone]]; + endDate = [apt valueForKey:@"endDate"]; + if(endDate != nil) { + [endDate setTimeZone:[self viewTimeZone]]; + spansRange = ![endDate isEqualToDate:startDate]; + } + aptDescr = [[NSMutableString alloc] init]; + [aptDescr appendFormat:@"%02i:%02i", + isMyApt ? @"weekprintview_apt_time" : + @"weekprintview_apt_time_other", + [startDate hourOfDay], + [startDate minuteOfHour]]; + if(spansRange) { + [aptDescr appendFormat:@" - %02i:%02i", + [endDate hourOfDay], + [endDate minuteOfHour]]; + } + [aptDescr appendFormat:@","]; + if(!isMyApt) + [aptDescr appendFormat:@"", [self aptStyle]]; + s = [apt valueForKey:@"title"]; + if(s) { + [aptDescr appendFormat:@"
%@", s]; + } + s = [apt valueForKey:@"location"]; + if(s) { + [aptDescr appendFormat:@"
%@", s]; + } + if(!isMyApt) + [aptDescr appendString:@""]; + return [aptDescr autorelease]; } - (NSString *)title { - NSMutableString *title; - NSCalendarDate *date; - - date = [self startDate]; - title = [[NSMutableString alloc] init]; - [title appendFormat:@"%@ %d", - [self localizedNameForMonthOfYear:[date monthOfYear]], - [date yearOfCommonEra]]; - if([date monthOfYear] != [[self endDate] monthOfYear]) { - [title appendFormat:@" / %@ %d", - [self localizedNameForMonthOfYear:[[self endDate] monthOfYear]], - [[self endDate] yearOfCommonEra]]; - } - [title appendFormat:@", %@ %d", - [self labelForKey:@"Week"], - [date weekOfYear]]; - - return [title autorelease]; - + NSMutableString *title; + NSCalendarDate *date; + + date = [self startDate]; + title = [[NSMutableString alloc] init]; + [title appendFormat:@"%@ %d", + [self localizedNameForMonthOfYear:[date monthOfYear]], + [date yearOfCommonEra]]; + if([date monthOfYear] != [[self endDate] monthOfYear]) { + [title appendFormat:@" / %@ %d", + [self localizedNameForMonthOfYear:[[self endDate] monthOfYear]], + [[self endDate] yearOfCommonEra]]; + } + [title appendFormat:@", %@ %d", + [self labelForKey:@"Week"], + [date weekOfYear]]; + return [title autorelease]; } /* style sheet */ - (NSString *)titleStyle { - if([self->currentDay isToday]) - return @"weekoverview_title_hilite"; - return @"weekoverview_title"; + if([self->currentDay isToday]) + return @"weekoverview_title_hilite"; + return @"weekoverview_title"; } - (NSString *)contentStyle { - if([self->currentDay isToday]) - return @"weekoverview_content_hilite"; - return @"weekoverview_content"; + if([self->currentDay isToday]) + return @"weekoverview_content_hilite"; + return @"weekoverview_content"; +} + +- (NSString *)aptStyle { + if (![self isMyApt]) + return @"weekprintview_apt_other"; + return nil; } @end diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index a555eeeb..c9612d69 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,7 +1,8 @@ # $Id$ -SUBMINOR_VERSION:=95 +SUBMINOR_VERSION:=96 +# v0.9.96 requires SOGoLogic v0.9.27 # v0.9.94 requires NGExtensions v4.5.136 # v0.9.84 requires SOGoLogic v0.9.12 # v0.9.70 requires NGExtensions v4.3.107 diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog index 434cb5bf..eab2500d 100644 --- a/SOGoLogic/ChangeLog +++ b/SOGoLogic/ChangeLog @@ -1,5 +1,9 @@ 2004-12-08 Marcus Mueller + * SOGoAppointment.[hm]: added checks to see whether a given email + address is identical to the organizer or to one of the participants + (v0.9.27) + * SOGoAppointment.m, SOGoAppointmentICalRenderer.m: changed to use NGLogging (v0.9.26) diff --git a/SOGoLogic/SOGoAppointment.h b/SOGoLogic/SOGoAppointment.h index 4c99db61..6b180202 100644 --- a/SOGoLogic/SOGoAppointment.h +++ b/SOGoLogic/SOGoAppointment.h @@ -90,9 +90,9 @@ - (void)setAttendees:(NSArray *)_persons; - (NSArray *)attendees; -/* attendees -> role != X-OGo-RESOURCE */ +/* attendees -> role != NON-PART */ - (NSArray *)participants; -/* attendees -> role == X-OGo-RESOURCE */ +/* attendees -> role == NON-PART */ - (NSArray *)resources; /* iCal generation */ @@ -105,6 +105,11 @@ - (id)calendar; - (id)event; +/* checking */ + +- (BOOL)isOrganizer:(id)_email; +- (BOOL)isParticipant:(id)_email; + @end #endif /* __SOGoAppointment_H_ */ diff --git a/SOGoLogic/SOGoAppointment.m b/SOGoLogic/SOGoAppointment.m index 947f575b..80853d14 100644 --- a/SOGoLogic/SOGoAppointment.m +++ b/SOGoLogic/SOGoAppointment.m @@ -330,6 +330,17 @@ static SaxObjectDecoder *sax = nil; return filtered; } +- (BOOL)isOrganizer:(id)_email { + return [[[self organizer] rfc822Email] isEqualToString:_email]; +} + +- (BOOL)isParticipant:(id)_email { + NSArray *partEmails; + + partEmails = [[self participants] valueForKey:@"rfc822Email"]; + return [partEmails containsObject:_email]; +} + /* description */ - (void)appendAttributesToDescription:(NSMutableString *)_ms { diff --git a/SOGoLogic/Version b/SOGoLogic/Version index e1570ae4..d3d84aae 100644 --- a/SOGoLogic/Version +++ b/SOGoLogic/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=26 +SUBMINOR_VERSION:=27 # v0.9.26 requires NGExtensions v4.5.136 # v0.9.23 requires NGiCal v4.3.32 -- 2.39.2