]> err.no Git - scalable-opengroupware.org/commitdiff
fixes for SOGo bug #1070
authorznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Wed, 8 Dec 2004 14:01:10 +0000 (14:01 +0000)
committerznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Wed, 8 Dec 2004 14:01:10 +0000 (14:01 +0000)
git-svn-id: http://svn.opengroupware.org/SOGo/trunk@463 d1b88da0-ebda-0310-925b-ed51d893ca5b

17 files changed:
SOGo/SOGo.xcode/project.pbxproj
SOGo/UI/Common/ChangeLog
SOGo/UI/Common/Version
SOGo/UI/Common/calendar.css
SOGo/UI/Scheduler/ChangeLog
SOGo/UI/Scheduler/UIxAppointmentPrintview.m
SOGo/UI/Scheduler/UIxAppointmentPrintview.wox
SOGo/UI/Scheduler/UIxCalDayPrintview.m
SOGo/UI/Scheduler/UIxCalDayPrintview.wox
SOGo/UI/Scheduler/UIxCalMonthPrintview.m
SOGo/UI/Scheduler/UIxCalView.h
SOGo/UI/Scheduler/UIxCalWeekPrintview.m
SOGo/UI/Scheduler/Version
SOGoLogic/ChangeLog
SOGoLogic/SOGoAppointment.h
SOGoLogic/SOGoAppointment.m
SOGoLogic/Version

index ab0116c2dbfddc36ff3f454707cf3fbac972aff4..57de016fb10c5a89258c30d5206a13df0ddd83c5 100644 (file)
@@ -41,7 +41,8 @@
                        usesTabs = 1;
                };
                AD0134C306DF41C5000910D8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxSortButton.m;
                        sourceTree = "<group>";
                };
                AD0137AC06DF891E000910D8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppointmentPrintview.m;
                        sourceTree = "<group>";
                };
                AD07123806C904C900A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD07124C06C9052700A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD0712CA06C917A600A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD0712CB06C917A600A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD0715CB06CA711600A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD071B3C06CCFA2000A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD071B3D06CCFA2000A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD071C7D06CD214600A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD071C7E06CD214700A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        usesTabs = 1;
                };
                AD071CE606CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 8;
                };
                AD071CEC06CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<absolute>";
                };
                AD071CED06CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD071D1206CD2BCB00A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD071D1306CD2BCB00A9EEF4 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                };
                AD2C74A5071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxEnvelopeAddressFormatter.m;
                };
                AD2C74A6071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailAccountsView.m;
                };
                AD2C74A8071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailAccountView.m;
                };
                AD2C74AA071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxMailFormatter.h;
                };
                AD2C74AB071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailFormatter.m;
                };
                AD2C74AC071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailMainFrame.m;
                };
                AD2C74AE071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailPartAlternativeViewer.m;
                };
                AD2C74B0071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailPartImageViewer.m;
                };
                AD2C74B2071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailPartMixedViewer.m;
                };
                AD2C74B4071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailPartTextViewer.m;
                };
                AD2C74B6071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxMailPartViewer.h;
                };
                AD2C74B7071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailPartViewer.m;
                };
                AD2C74B8071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxMailRenderingContext.h;
                };
                AD2C74B9071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailRenderingContext.m;
                };
                AD2C74BA071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailToolbar.m;
                };
                AD2C74BC071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailTree.m;
                };
                AD2C74BE071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxSubjectFormatter.m;
                };
                AD2C74BF071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "WOContext+UIxMailer.h";
                };
                AD2C74C0071A9FF70087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "WOContext+UIxMailer.m";
                };
                AD2C76D5071BF4EB0087E027 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailEditorAction.m;
                        sourceTree = "<group>";
                };
                AD2C78F7071C23CE0087E027 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxMailAddressbook.m;
                        sourceTree = "<group>";
                };
                AD494C6206F5EA6600E51EC9 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD494C8E06F606F900E51EC9 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD494C9006F6072C00E51EC9 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD5ED0B006B1385700E3EC4B = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD5ED1AE06B1768900E3EC4B = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD5ED1AF06B1768900E3EC4B = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        tabWidth = 8;
                };
                AD6BCF10069D77E9003664CD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD6BCF11069D77E9003664CD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD7379B306AEBB2500735920 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD737A1706AEC77E00735920 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD737A6A06AEE8BD00735920 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BE4A06CF88BF00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD73BE4B06CF88BF00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BE6106CF8CC500226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD73BE6206CF8CC500226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BE7D06CF90EA00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD73BE7E06CF90EA00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BE8806CF92FC00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BE9406CF969100226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BED806CFA0FD00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73BF6C06CFB4CE00226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73C03406CFDE3600226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                AD73C03606CFDE4500226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                AD73C08306CFFEA600226A2D = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADA63205071330AE0058C21C = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "SOGoAppointment+UIx.h";
                        sourceTree = "<group>";
                };
                ADA63206071330AE0058C21C = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "SOGoAppointment+UIx.m";
                };
                ADBE3E5C0727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoDraftObject.h;
                };
                ADBE3E5D0727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoDraftObject.m;
                };
                ADBE3E5E0727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoDraftsFolder.h;
                };
                ADBE3E5F0727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoDraftsFolder.m;
                };
                ADBE3E600727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoMailBaseObject.h;
                };
                ADBE3E610727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoMailBaseObject.m;
                };
                ADBE3E620727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoMailBodyPart.h;
                };
                ADBE3E630727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoMailBodyPart.m;
                };
                ADBE3E640727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoMailConnectionEntry.h;
                };
                ADBE3E650727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoMailConnectionEntry.m;
                };
                ADBE3E660727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoMailManager.h;
                };
                ADBE3E670727167A000FEA6A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoMailManager.m;
                        usesTabs = 1;
                };
                ADDF4B3306DCEAC800C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4B6A06DCEBA100C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                ADDF4B7006DCEC4300C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4B7306DCEC5200C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4B7606DCEC5F00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4BDC06DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 8;
                };
                ADDF4BDE06DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        tabWidth = 2;
                };
                ADDF4BDF06DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 2;
                };
                ADDF4BE006DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        tabWidth = 2;
                };
                ADDF4BE106DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 2;
                };
                ADDF4BE206DCF5D400C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        usesTabs = 1;
                };
                ADDF4D6A06DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        usesTabs = 1;
                };
                ADDF4D6D06DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4D6F06DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                ADDF4D7006DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4D7106DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                ADDF4D7206DE0BAB00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        tabWidth = 8;
                };
                ADDF4DBE06DE0E9900C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 8;
                };
                ADDF4DC706DE0E9A00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4DCA06DE0E9A00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4DCC06DE0E9A00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADDF4DCE06DE0E9A00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADE2C23D06B7BED40065D56F = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADE2C24006B7BEE60065D56F = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADE2C24A06B7BF020065D56F = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADE2C28906B7C7B20065D56F = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADE2C28C06B7C7C20065D56F = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                                ADF15C0206BA84480047D955,
                                ADF15C0106BA84480047D955,
                        );
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXGroup;
                        name = Week;
                        refType = 4;
                        sourceTree = "<group>";
                };
                ADF15BFD06BA842A0047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADF15C0206BA84480047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADF15C0506BA845E0047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADF15C2E06BA86420047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                ADF15C4A06BA89140047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                ADF15D1A06BAA6D20047D955 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87205CE0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87205DF0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87205E00692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87205E10692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        usesTabs = 0;
                };
                E87205ED0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87205EE0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87205EF0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87205F10692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E872063A0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        tabWidth = 8;
                };
                E87206410692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87206470692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87206480692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87206490692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872064A0692E3D00099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87206880692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872069C0692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872069D0692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E872069E0692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872069F0692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87206A00692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87206A10692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87206A20692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87206A30692E3D10099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        usesTabs = 1;
                };
                E872074A0692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872074C0692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207DA0692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207DE0692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207DF0692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207E10692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207E20692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87207E30692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87207E40692E3D20099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        usesTabs = 1;
                };
                E87208900692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87208E40692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208F30692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208F50692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87208F60692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208F70692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87208F80692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208FA0692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208FC0692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87208FE0692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87209000692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87209020692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87209030692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87209040692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87209060692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E87209070692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E87209080692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        sourceTree = "<group>";
                };
                E872090A0692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        sourceTree = "<group>";
                };
                E872090B0692E3D30099CBBD = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
index 5bdf735e7d8c33d913db02c2752c39c8d489b9c5..902dfa90182e68250a2de47d9dcd6dd048f07982 100644 (file)
@@ -1,5 +1,8 @@
 2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * 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  <znek@mulle-kybernetik.com>
index 5a2df97aeb100bc37ec9dc9ca7300f7a58bccf8b..824ee0bb8c7f9d7aab5da174562fef877668a20a 100644 (file)
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=28
+SUBMINOR_VERSION:=29
 
 # v0.9.28 requires NGExtensions v4.5.136
index c1656e15c7499a4eb8e9bf26c9655c63cbb43ca5..b3dda7eb9ff0e9c35b947d6f2b1b89cc408c0259 100644 (file)
   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;
 
 /* 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;
index 3be821e43fc5013671b84d6b2d8589005b1354d1..40dbb69e00668bffbd857ea523d70119bf52312e 100644 (file)
@@ -1,5 +1,22 @@
 2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * 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,
index 67c357f64c8c4112f0c31e92aebc38e7ba98e2f2..9d4862f130f4325dc3c97a11885f89520ae1274d 100644 (file)
 {
 }
 
+- (BOOL)isMyApt;
+
 @end
 
 #include "common.h"
 #include <SOGo/UI/SOGoUI/SOGoDateFormatter.h>
+#include <SOGoLogic/SOGoAppointment.h>
+#include "UIxComponent+Agenor.h"
 
 @implementation UIxAppointmentPrintview
 
   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 */
index f81d218dcb1350238e6dadfa2937f8d5041e0fa7..416b5426cdfccf386d9d15870539709c25d5c2bf 100644 (file)
@@ -1,12 +1,11 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant"
-  xmlns:uix="OGo:uix"
-  xmlns:label="OGo:label"
-  className="UIxPrintPageFrame"
-  title="title"
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+               xmlns:var="http://www.skyrix.com/od/binding"
+               xmlns:const="http://www.skyrix.com/od/constant"
+               xmlns:uix="OGo:uix"
+               xmlns:label="OGo:label"
+               className="UIxPrintPageFrame"
+               title="title"
 >
   <table border="1" cellspacing="0" cellpadding="5" width="100%">
     <tr>
@@ -23,7 +22,9 @@
               <var:string label:value="Title" />:
             </td>
             <td align="left" class="aptview_text">
-              <var:string value="appointment.summary" />
+              <var:string value="appointment.summary"
+                          var:style="aptStyle"
+              />
             </td>
           </tr>
           <tr valign="top">
@@ -31,7 +32,9 @@
               <var:string label:value="Location" />:
             </td>
             <td align="left" class="aptview_text">
-              <var:string value="appointment.location" />
+              <var:string value="appointment.location"
+                          var:style="aptStyle"
+              />
             </td>
           </tr>
           <tr valign="top">
@@ -55,6 +58,7 @@
             <td align="left" class="aptview_text">
               <var:string value="startTime"
                           formatter="dateFormatter"
+                          var:style="aptStyle"
               />
             </td>
           </tr>
@@ -65,6 +69,7 @@
             <td align="left" class="aptview_text">
               <var:string value="endTime"
                           formatter="dateFormatter"
+                          var:style="aptStyle"
               />
             </td>
           </tr>
         </table>
       </td>
     </tr>
+    <var:if condition="isUIxDebugEnabled">
+      <tr>
+        <td colspan="2">
+          appointment: <var:string value="appointment" />
+          <br />
+          isMyApt: <var:string value="isMyApt" />
+          <br />
+          aptStyle: <var:string value="aptStyle" />
+          <br />
+          activeUser: <var:string value="context.activeUser"/>
+          <br />
+          email for user: <var:string value="emailForUser" />
+          <br />
+        </td>
+      </tr>
+    </var:if>
   </table>
 </var:component>
index 1cb3e76ee9631c394b46b877d539a02e3376278e..b5586f6dd612983c49b86ddc9511acec1114c09c 100644 (file)
 @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
index c6b5533e3248630b4138c7b6af2ccfd51c800d44..9dcdafa9a8c955d97833f2aa3c96bd6c1bb8b5c9 100644 (file)
@@ -49,6 +49,7 @@
             <td class="dayprintview_content">
               <var:string value="shortTextForApt"
                           const:escapeHTML="NO"
+                          var:style="aptStyle"
               />
             </td>
             <var:if condition="minRequiredRowSpan" const:value="1" const:negate="YES">
index 8e702d8c7e4ca62c87a71b5c6d05e383718d7f70..5dbd2644f7bbbde3312714d74da31afb62e7e88d 100644 (file)
@@ -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$
 
 
 @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:@"<span class=\"monthprintview_apt_time\">%02i:%02i",
-        [startDate hourOfDay],
-        [startDate minuteOfHour]];
-    if(spansRange) {
-        [aptDescr appendFormat:@" - %02i:%02i",
-            [endDate hourOfDay],
-            [endDate minuteOfHour]];
-    }
-    [aptDescr appendFormat:@"</span>,"];
-    s = [apt valueForKey:@"title"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", s];
-    }
-    s = [apt valueForKey:@"location"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", 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:@"<span class=\"%@\">%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:@"</span>,"];
+  if(!isMyApt)
+    [aptDescr appendFormat:@"<span class=\"%@\">", [self aptStyle]];
+  s = [apt valueForKey:@"title"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  s = [apt valueForKey:@"location"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  if(!isMyApt)
+    [aptDescr appendString:@"</span>"];
+  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]];
 }
 
 
 
 
 - (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
index 03bbd98770342ba3d135928bef2302a5f77274af..44a4678a1001c712c4f60f5319af24f83750e133 100644 (file)
@@ -29,6 +29,7 @@
 - (NSArray *)appointments;
 - (NSArray *)allDayApts;
 - (id)appointment;
+- (BOOL)isMyApt;
 
 - (BOOL)hasDayInfo;
 - (BOOL)hasHoldidayInfo;
 /* calendarUIDs */
 
 - (NSString *)formattedCalendarUIDs;
-  
+
+/* CSS related */
+
+- (NSString *)aptStyle;
+
 @end
 
 #endif /* __SOGo_UIxCalView_H__ */
index 72926bba1b58720c6efc564b9d809489212c3975..ba59e256b9644e064fdf9d1a56b43ff6d3f244b7 100644 (file)
@@ -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"
 @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:@"<span class=\"weekprintview_apt_time\">%02i:%02i",
-        [startDate hourOfDay],
-        [startDate minuteOfHour]];
-    if(spansRange) {
-        [aptDescr appendFormat:@" - %02i:%02i",
-            [endDate hourOfDay],
-            [endDate minuteOfHour]];
-    }
-    [aptDescr appendFormat:@"</span>,"];
-    s = [apt valueForKey:@"title"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", s];
-    }
-    s = [apt valueForKey:@"location"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", 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:@"<span class=\"%@\">%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:@"</span>,"];
+  if(!isMyApt)
+    [aptDescr appendFormat:@"<span class=\"%@\">", [self aptStyle]];
+  s = [apt valueForKey:@"title"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  s = [apt valueForKey:@"location"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  if(!isMyApt)
+    [aptDescr appendString:@"</span>"];
+  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
index a555eeebd00c01fd81306e766124968b81b6cd96..c9612d69b526bd99288047485943b72e8e01e3d2 100644 (file)
@@ -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
index 434cb5bf60b35b47a4a4d32f1876930d50a3864f..eab2500d34d7bda7916456e366f04fa6ad0c0bd2 100644 (file)
@@ -1,5 +1,9 @@
 2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * 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)
 
index 4c99db61e6815e94075dd3213640b96b65b7f494..6b18020240da4b6465bd244fab5608ac17339950 100644 (file)
@@ -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 */
 - (id)calendar;
 - (id)event;
 
+/* checking */
+
+- (BOOL)isOrganizer:(id)_email;
+- (BOOL)isParticipant:(id)_email;
+  
 @end
 
 #endif /* __SOGoAppointment_H_ */
index 947f575b450e7595e64d40957e75b0538f9e66c9..80853d14bad62346be6fb6fa11c0a1a179a554f0 100644 (file)
@@ -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 {
index e1570ae4602049b5009a71746e45b5163d2bda12..d3d84aae09b2a8146fc46256ce73c99364cd2507 100644 (file)
@@ -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