work on "edit" functionality in AppointmentProposal

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@264 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index f3e72ded685aece28962f10e3f44d1f61900066a..061164e59686251b126c80150ba4a1841dd7815c 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -58,6 +58,7 @@
                };
                AD07123806C904C900A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = AnaisUIProduct.m;
@@ -67,6 +68,7 @@
                AD07123906C904C900A9EEF4 = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                        refType = 4;
@@ -76,6 +78,7 @@
                AD07123A06C904C900A9EEF4 = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.postamble;
                        refType = 4;
@@ -85,6 +88,7 @@
                AD07123B06C904C900A9EEF4 = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        refType = 4;
@@ -100,12 +104,14 @@
                        sourceTree = "<group>";
                };
                AD07123D06C904C900A9EEF4 = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                AD07124006C904DE00A9EEF4 = {
                        children = (
@@ -153,6 +159,7 @@
                };
                AD07124C06C9052700A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = AnaisSelector.m;
@@ -161,6 +168,7 @@
                };
                AD0712CA06C917A600A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoDateFormatter.h;
@@ -169,6 +177,7 @@
                };
                AD0712CB06C917A600A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoDateFormatter.m;
@@ -177,12 +186,13 @@
                };
                AD07137606C926BF00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                AD0715CA06CA711600A9EEF4 = {
@@ -195,6 +205,7 @@
                };
                AD0715CB06CA711600A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = AnaisUidSelector.m;
@@ -203,6 +214,7 @@
                };
                AD071B3C06CCFA2000A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "iCalPerson+UIx.h";
@@ -211,6 +223,7 @@
                };
                AD071B3D06CCFA2000A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "iCalPerson+UIx.m";
@@ -219,6 +232,7 @@
                };
                AD071C7D06CD214600A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAptFormatter.h;
@@ -227,6 +241,7 @@
                };
                AD071C7E06CD214700A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAptFormatter.m;
@@ -261,6 +276,7 @@
                };
                AD071CE606CD2ACE00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -307,6 +323,7 @@
                };
                AD071CEC06CD2ACE00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAppointment.h;
@@ -315,6 +332,7 @@
                };
                AD071CED06CD2ACE00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAppointment.m;
@@ -322,13 +340,15 @@
                        sourceTree = "<group>";
                };
                AD071CF006CD2ACE00A9EEF4 = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        name = Version;
                        path = ../SOGoLogic/Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                AD071CF406CD2B0400A9EEF4 = {
                        children = (
@@ -359,6 +379,7 @@
                };
                AD071D1206CD2BCB00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = AgenorUserManager.h;
@@ -367,6 +388,7 @@
                };
                AD071D1306CD2BCB00A9EEF4 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = AgenorUserManager.m;
@@ -385,12 +407,13 @@
                };
                AD152B6F06AC159A002375D2 = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                AD5ED0AF06B1385700E3EC4B = {
@@ -403,6 +426,7 @@
                };
                AD5ED0B006B1385700E3EC4B = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDayOverview.m;
@@ -411,6 +435,7 @@
                };
                AD5ED1AE06B1768900E3EC4B = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalDayView.h;
@@ -419,6 +444,7 @@
                };
                AD5ED1AF06B1768900E3EC4B = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDayView.m;
@@ -446,17 +472,19 @@
                };
                AD6BCF0D069D77E9003664CD = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                AD6BCF0E069D77E9003664CD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                        refType = 4;
@@ -466,6 +494,7 @@
                AD6BCF0F069D77E9003664CD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        refType = 4;
@@ -474,6 +503,7 @@
                };
                AD6BCF10069D77E9003664CD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxComponent.h;
@@ -482,6 +512,7 @@
                };
                AD6BCF11069D77E9003664CD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxComponent.m;
@@ -489,12 +520,14 @@
                        sourceTree = "<group>";
                };
                AD6BCF12069D77E9003664CD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                AD7379B206AEBB2500735920 = {
                        fileEncoding = 4;
@@ -506,6 +539,7 @@
                };
                AD7379B306AEBB2500735920 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalInlineMonthOverview.m;
@@ -514,6 +548,7 @@
                };
                AD737A1706AEC77E00735920 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalMonthOverview.h;
@@ -530,6 +565,7 @@
                };
                AD737A6A06AEE8BD00735920 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalYearOverview.m;
@@ -538,6 +574,7 @@
                };
                AD73BE4A06CF88BF00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAppointmentICalRenderer.h;
@@ -546,6 +583,7 @@
                };
                AD73BE4B06CF88BF00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAppointmentICalRenderer.m;
@@ -554,6 +592,7 @@
                };
                AD73BE6106CF8CC500226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "UIxComponent+Agenor.h";
@@ -562,6 +601,7 @@
                };
                AD73BE6206CF8CC500226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "UIxComponent+Agenor.m";
@@ -570,6 +610,7 @@
                };
                AD73BE7D06CF90EA00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSCalendarDate+UIx.h";
@@ -578,6 +619,7 @@
                };
                AD73BE7E06CF90EA00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSCalendarDate+UIx.m";
@@ -586,6 +628,7 @@
                };
                AD73BE8806CF92FC00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppointmentProposal.m;
@@ -610,6 +653,7 @@
                };
                AD73BE9406CF969100226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxDatePicker.m;
@@ -626,6 +670,7 @@
                };
                AD73BED806CFA0FD00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxDatePickerScript.m;
@@ -658,6 +703,7 @@
                };
                AD73BF6C06CFB4CE00226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxTimeSelector.m;
@@ -666,6 +712,7 @@
                };
                AD73C03406CFDE3600226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = AnaisAttendeeSelector.m;
@@ -682,6 +729,7 @@
                };
                AD73C03606CFDE4500226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -698,6 +746,7 @@
                };
                AD73C08306CFFEA600226A2D = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxTimeDateControl.m;
@@ -742,6 +791,7 @@
                };
                ADE2C23D06B7BED40065D56F = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekListview.m;
@@ -758,6 +808,7 @@
                };
                ADE2C24006B7BEE60065D56F = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekChartview.m;
@@ -774,6 +825,7 @@
                };
                ADE2C24A06B7BF020065D56F = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekColumnsview.m;
@@ -790,6 +842,7 @@
                };
                ADE2C28906B7C7B20065D56F = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDayChartview.m;
@@ -806,6 +859,7 @@
                };
                ADE2C28C06B7C7C20065D56F = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDayListview.m;
@@ -939,6 +993,7 @@
                };
                ADF15BFD06BA842A0047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDayPrintview.m;
@@ -955,6 +1010,7 @@
                };
                ADF15C0206BA84480047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekPrintview.m;
@@ -971,6 +1027,7 @@
                };
                ADF15C0506BA845E0047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalMonthPrintview.m;
@@ -979,6 +1036,7 @@
                };
                ADF15C2E06BA86420047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalDayOverview.h;
@@ -995,6 +1053,7 @@
                };
                ADF15C4A06BA89140047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxPrintPageFrame.m;
@@ -1003,6 +1062,7 @@
                };
                ADF15D1A06BAA6D20047D955 = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalWeekOverview.h;
@@ -1062,12 +1122,14 @@
                        );
                };
                E872058E0692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E872058F0692E3D00099CBBD = {
                        children = (
@@ -1096,6 +1158,7 @@
                };
                E87205CE0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -1105,18 +1168,22 @@
                E87205CF0692E3D00099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87205D00692E3D00099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87205D70692E3D00099CBBD = {
                        fileEncoding = 4;
@@ -1136,6 +1203,7 @@
                };
                E87205DF0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAuthenticator.h;
@@ -1144,6 +1212,7 @@
                };
                E87205E00692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAuthenticator.m;
@@ -1152,6 +1221,7 @@
                };
                E87205E10692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = sogod.m;
@@ -1161,6 +1231,7 @@
                };
                E87205ED0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoProductLoader.h;
@@ -1169,6 +1240,7 @@
                };
                E87205EE0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoProductLoader.m;
@@ -1177,6 +1249,7 @@
                };
                E87205EF0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoRootPage.m;
@@ -1193,6 +1266,7 @@
                };
                E87205F10692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoUserHomePage.m;
@@ -1208,12 +1282,14 @@
                        sourceTree = "<group>";
                };
                E87205F30692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87205F40692E3D00099CBBD = {
                        fileEncoding = 4;
@@ -1255,6 +1331,7 @@
                };
                E872063A0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -1262,23 +1339,28 @@
                        sourceTree = "<group>";
                };
                E872063B0692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E872063C0692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87206410692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = Product.m;
@@ -1295,6 +1377,7 @@
                };
                E87206470692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAppointmentFolder.h;
@@ -1303,6 +1386,7 @@
                };
                E87206480692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAppointmentFolder.m;
@@ -1311,6 +1395,7 @@
                };
                E87206490692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoAppointmentObject.h;
@@ -1319,6 +1404,7 @@
                };
                E872064A0692E3D00099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoAppointmentObject.m;
@@ -1326,20 +1412,24 @@
                        sourceTree = "<group>";
                };
                E872064B0692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E872064C0692E3D00099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E872064D0692E3D00099CBBD = {
                        fileEncoding = 4;
@@ -1371,6 +1461,7 @@
                };
                E87206880692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -1378,20 +1469,24 @@
                        sourceTree = "<group>";
                };
                E87206890692E3D10099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E872068A0692E3D10099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87206930692E3D10099CBBD = {
                        fileEncoding = 4;
@@ -1403,6 +1498,7 @@
                };
                E872069C0692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoContentObject.h;
@@ -1411,6 +1507,7 @@
                };
                E872069D0692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoContentObject.m;
@@ -1419,6 +1516,7 @@
                };
                E872069E0692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoFolder.h;
@@ -1427,6 +1525,7 @@
                };
                E872069F0692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoFolder.m;
@@ -1435,6 +1534,7 @@
                };
                E87206A00692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoObject.h;
@@ -1443,6 +1543,7 @@
                };
                E87206A10692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoObject.m;
@@ -1451,6 +1552,7 @@
                };
                E87206A20692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = SOGoUserFolder.h;
@@ -1459,6 +1561,7 @@
                };
                E87206A30692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoUserFolder.m;
@@ -1482,12 +1585,13 @@
                };
                E87206C20692E3D10099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                E87206C30692E3D10099CBBD = {
@@ -1526,16 +1630,18 @@
                };
                E87207490692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                E872074A0692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -1544,6 +1650,7 @@
                };
                E872074C0692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = CommonUIProduct.m;
@@ -1553,30 +1660,33 @@
                E872074D0692E3D20099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                E872074E0692E3D20099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.postamble;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                };
                E872074F0692E3D20099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                E87207500692E3D20099CBBD = {
@@ -1733,6 +1843,7 @@
                };
                E87207D40692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppFrame.m;
@@ -1749,6 +1860,7 @@
                };
                E87207D60692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppHeader.m;
@@ -1765,6 +1877,7 @@
                };
                E87207D80692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppNavigation.m;
@@ -1781,6 +1894,7 @@
                };
                E87207DA0692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppNavView.m;
@@ -1797,6 +1911,7 @@
                };
                E87207DE0692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxElemBuilder.m;
@@ -1805,6 +1920,7 @@
                };
                E87207DF0692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxPageFrame.m;
@@ -1821,6 +1937,7 @@
                };
                E87207E10692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxTabItem.m;
@@ -1829,6 +1946,7 @@
                };
                E87207E20692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxTabView.h;
@@ -1837,6 +1955,7 @@
                };
                E87207E30692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxTabView.m;
@@ -1845,6 +1964,7 @@
                };
                E87207E40692E3D20099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxWinClose.m;
@@ -1860,12 +1980,14 @@
                        sourceTree = "<group>";
                };
                E87207E60692E3D20099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87207E70692E3D20099CBBD = {
                        fileEncoding = 4;
@@ -1876,12 +1998,14 @@
                        sourceTree = "<group>";
                };
                E87207E80692E3D20099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E87207E90692E3D20099CBBD = {
                        fileEncoding = 4;
@@ -1921,16 +2045,18 @@
                };
                E872088F0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                        usesTabs = 1;
                };
                E87208900692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -1966,20 +2092,22 @@
                E87208940692E3D30099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.postamble;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                };
                E87208950692E3D30099CBBD = {
                        explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
-                       tabWidth = 4;
+                       tabWidth = 8;
                };
                E87208960692E3D30099CBBD = {
                        children = (
@@ -2031,6 +2159,7 @@
                };
                E87208E40692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SchedulerUIProduct.m;
@@ -2039,6 +2168,7 @@
                };
                E87208F30692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppointmentEditor.m;
@@ -2055,6 +2185,7 @@
                };
                E87208F50692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxAppointmentFormatter.h;
@@ -2063,6 +2194,7 @@
                };
                E87208F60692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppointmentFormatter.m;
@@ -2071,6 +2203,7 @@
                };
                E87208F70692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxAppointmentView.h;
@@ -2079,6 +2212,7 @@
                };
                E87208F80692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAppointmentView.m;
@@ -2095,6 +2229,7 @@
                };
                E87208FA0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxAptTableView.m;
@@ -2111,6 +2246,7 @@
                };
                E87208FC0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalBackForthNavView.m;
@@ -2127,6 +2263,7 @@
                };
                E87208FE0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalDateLabel.m;
@@ -2143,6 +2280,7 @@
                };
                E87209000692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalMonthOverview.m;
@@ -2159,6 +2297,7 @@
                };
                E87209020692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalMonthView.h;
@@ -2167,6 +2306,7 @@
                };
                E87209030692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalMonthView.m;
@@ -2175,6 +2315,7 @@
                };
                E87209040692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalSelectTab.m;
@@ -2191,6 +2332,7 @@
                };
                E87209060692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalView.h;
@@ -2199,6 +2341,7 @@
                };
                E87209070692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalView.m;
@@ -2207,6 +2350,7 @@
                };
                E87209080692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekOverview.m;
@@ -2223,6 +2367,7 @@
                };
                E872090A0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = UIxCalWeekView.h;
@@ -2231,6 +2376,7 @@
                };
                E872090B0692E3D30099CBBD = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = UIxCalWeekView.m;
@@ -2238,12 +2384,14 @@
                        sourceTree = "<group>";
                };
                E872090C0692E3D30099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = Version;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                E8720A0C0692E4940099CBBD = {
                        children = (

diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index cffab75b330a53863420044207acf9e9dc7a363f..653e60094bf490f7720f775d0a2448fca01a648d 100644 (file)
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-24  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxComponent.m: new date related methods moved here from UIxCalView
+         (v0.9.10)
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxComponent.m: new method -isUIxDebugEnabled, triggered by new

diff --git a/SOGo/UI/SOGoUI/UIxComponent.h b/SOGo/UI/SOGoUI/UIxComponent.h
index 0676cd2792a7b11ac3c145afaa5636c5b53260c8..86d32e17a81b03290b0fc78b29cade1a1595ec04 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.h
+++ b/SOGo/UI/SOGoUI/UIxComponent.h
@@ -40,6 +40,11 @@
 /* use this to set 'sticky' query parameters */
 - (void)setQueryParameter:(NSString *)_param forKey:(NSString *)_key;
 
+/* date related query parameters */
+- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date;
+- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
+        inDictionary:(NSMutableDictionary *)_qp;
+
 /* appends queryParameters to _method if any are set */
 - (NSString *)completeHrefForMethod:(NSString *)_method;
 

diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index e581e5a577c7394e613d6d19e0aa1f4e694834e0..8d60b8105968b2450d6e10fb82193f041d835d5c 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -176,6 +176,23 @@ static BOOL uixDebugEnabled = NO;
   return self->queryParameters;
 }
 
+- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date {
+  NSMutableDictionary *qp;
+    
+  qp = [[self queryParameters] mutableCopy];
+  [self setSelectedDateQueryParameter:_date inDictionary:qp];
+  return [qp autorelease];
+}
+
+- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
+        inDictionary:(NSMutableDictionary *)_qp;
+{
+  if(_newDate != nil)
+    [_qp setObject:[self dateStringForDate:_newDate] forKey:@"day"];
+  else
+    [_qp removeObjectForKey:@"day"];
+}
+
 - (NSString *)completeHrefForMethod:(NSString *)_method {
   NSDictionary *qp;
   NSString *qs;

diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version
index 81be7eb6e79defb0b93e0ca78f8a44c310c033c2..317960a726fc24e656b0d801367866c318018c26 100644 (file)
--- a/SOGo/UI/SOGoUI/Version
+++ b/SOGo/UI/SOGoUI/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 0a8b5706ff367403f92145db662793dc2795d545..5885bd304cbedd6587d6049f225ce163eb612589 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,15 @@
 2004-08-24  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * v0.9.68
+
+       * UIxAppointmentEditor.m: added knowledge about "dur" parameter
+
+       * UIxAppointmentProposal.[m|wox]: added edit functionality, still
+         incomplete
+
+       * UIxCalView.[hm]: remove date related query parameter methods, moved
+         to UIxComponent
+
        * GNUmakefile.preamble: changes for linking against SOPE 4.3 (v0.9.67)
 
 2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index dd8363fa7b05581f56d98546011741de3e8dd079..d06a662ee4d73706661f506bb29534831e80a205 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -182,11 +182,20 @@
     @"END:VEVENT\n"
     @"END:VCALENDAR";
   NSCalendarDate *lStartDate, *lEndDate;
-  NSString       *template;
+  NSString       *template, *s;
+  unsigned       minutes;
+
+  s = [self queryParameterForKey:@"dur"];
+  if(s && [s length] > 0) {
+    minutes = [s intValue];
+  }
+  else {
+    minutes = 60;
+  }
   
   lStartDate = [self selectedDate];
   lEndDate   = [lStartDate dateByAddingYears:0 months:0 days:0
-                         hours:1 minutes:0 seconds:0];
+                         hours:0 minutes:minutes seconds:0];
   
   template = [NSString stringWithFormat:iCalStringTemplate,
                         [[self clientObject] nameInContainer],

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 39996737f367ec8b71e83eb266bdae923990f8b1..47bd022f5463377b72de1f6fdf0a0cf3c5b812ac 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -45,8 +45,11 @@
   id             duration;
   
   NSArray *blockedRanges;
+  NSMutableDictionary *currentQueryParameters;
 }
 
+- (NSMutableDictionary *)currentQueryParameters;
+- (NSDictionary *)currentHourQueryParametersForFirstHalf:(BOOL)_first;
 @end
 
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
@@ -73,6 +76,8 @@
     
   [self->participants    release];
   [self->resources       release];
+  
+  [self->currentQueryParameters release];
   [super dealloc];
 }
 
@@ -419,4 +424,40 @@
   return self;
 }
 
+/* URLs */
+
+- (NSMutableDictionary *)currentQueryParameters {
+  if(!self->currentQueryParameters) {
+    self->currentQueryParameters = [[self queryParameters] mutableCopy];
+    [self->currentQueryParameters setObject:[self duration] forKey:@"dur"];
+    // TODO: add participants
+  }
+  return self->currentQueryParameters;
+}
+
+- (NSDictionary *)currentHourQueryParametersForFirstHalf:(BOOL)_first {
+  NSMutableDictionary *qp;
+  NSString *hmString;
+  NSCalendarDate *date;
+  unsigned minute;
+
+  minute = _first ? 0 : 30;
+  qp = [self currentQueryParameters];
+
+  date = [self currentDay];
+  hmString = [NSString stringWithFormat:@"%02d%02d",
+    [item intValue], minute];
+  [self setSelectedDateQueryParameter:date inDictionary:qp];
+  [qp setObject:hmString forKey:@"hm"];
+  return qp;
+}
+
+- (NSDictionary *)currentFirstHalfQueryParameters {
+  return [self currentHourQueryParametersForFirstHalf:YES];
+}
+
+- (NSDictionary *)currentSecondHalfQueryParameters {
+  return [self currentHourQueryParametersForFirstHalf:NO];
+}
+
 @end /* UIxAppointmentProposal */

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
index 01a8ba66d4987120f105d1509cf28de4008a590a..c918dad26a3df25e92e88ec8e8042078174b6e92 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
@@ -26,228 +26,222 @@
         </table>
       </td>
     </tr>
-
     <tr>
       <td id="skywinbodycell" class="wincontent">
         <form var:href="clientObject.baseURL">
           <table border="0" width="100%" cellspacing="0" cellpadding="4">
-                <tr bgcolor="#e8e8e0">
-                  <td align="left" colspan="2">
-                    <span class="aptview_title">
-                      <var:string label:value="Search appointments"/>
-                    </span>
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0">
-                    <span class="aptview_text">
-                      <var:string label:value="Start date" />:
-                    </span>
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0">
-                    <span class="aptview_text">
-                      <var:component className="UIxDatePickerScript" />
-                      <var:component className="UIxDatePicker"
-                                     const:dateID="startDate"
-                                     day="startDateDay"
-                                     month="startDateMonth"
-                                     year="startDateYear"
-                                     label:label="browse start date"
-                      />
-                    </span>
-                  </td>
-                </tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" 
-                     class="aptview_text" >
-                    <var:string label:value="End date" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                    <var:component className="UIxDatePicker"
-                                   const:dateID="endDate"
-                                   day="endDateDay"
-                                   month="endDateMonth"
-                                   year="endDateYear"
-                                   label:label="browse end date"
-                    />
-                  </td>
-                </tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0"
-                      class="aptview_text"
-                  >
-                    <var:string label:value="Earliest start time" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:component className="UIxTimeSelector"
-                                   const:timeID="earliestStartTime"
-                                   hour="startDateHour"
-                                   minute="startDateMinute"
-                    />
-                  </td>
-                </tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" 
-                     class="aptview_text" >
-                    <var:string label:value="Latest end time" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                    <var:component className="UIxTimeSelector"
-                                   const:timeID="latestEndTime"
-                                   hour="endDateHour"
-                                   minute="endDateMinute"
-                    />
-                  </td>
-                </tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" 
-                     class="aptview_text" >
-                    <var:string label:value="Duration" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                    <var:popup list="durationSteps" item="item"
-                               string="itemDurationText"
-                               selection="duration" />
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-
-
-                <tr bgcolor="#e8e8e0">
-                  <td align="left" colspan="2">
-                    <span class="aptview_title">
-                      <var:string label:value="Search resources" />
-                    </span>
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0">
-                    <span class="aptview_text">
-                      <var:string label:value="Search in Anais" />:
-                    </span>
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0">
-                    <span class="aptview_text">
-                      <var:component className="AnaisAttendeeSelector"
-                        const:selectorID="resource"
-                        const:role="NON-PARTICIPANT"
-                        attendees="resources"
-                        const:division="CC"
-                      />
-                    </span>
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-
-
-                <tr bgcolor="#e8e8e0">
-                  <td align="left" colspan="2">
-                    <span class="aptview_title">
-                      <var:string label:value="Search participants" />
-                    </span>
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-                <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0">
-                    <span class="aptview_text">
-                      <var:string label:value="Search in Anais" />:
-                    </span>
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0">
-                    <span class="aptview_text">
-                      <var:component className="AnaisAttendeeSelector"
-                        const:selectorID="participant"
-                        const:division="CC"
-                        const:withCN="YES"
-                        const:role="REQ-PARTICIPANT"
-                        attendees="participants"
-                        var:emailForUser="emailForUser"
-                        var:cnForUser="cnForUser"
-                      />
-                    </span>
-                  </td>
-                </tr>
-                <tr><td colspan="2"> </td></tr>
-
-                <tr>
-                  <td></td>
-                  <td>
-                    <input type="submit"
-                           label:value="Search"
-                           name="proposalSearch:method"
-                    />
-                    <span class="button_auto_env"
-                      ><a href="weekoverview"
-                          var:queryDictionary="queryParameters"
-                          class="button_auto"
-                      ><var:string label:value="Cancel" /></a></span>
-                  </td>
-                </tr>
-              </table>
+            <tr bgcolor="#e8e8e0">
+              <td align="left" colspan="2">
+                <span class="aptview_title">
+                  <var:string label:value="Search appointments"/>
+                </span>
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0">
+                <span class="aptview_text">
+                  <var:string label:value="Start date" />:
+                </span>
+              </td>
+              <td align="left" bgcolor="#FFFFF0">
+                <span class="aptview_text">
+                  <var:component className="UIxDatePickerScript" />
+                  <var:component className="UIxDatePicker"
+                                 const:dateID="startDate"
+                                 day="startDateDay"
+                                 month="startDateMonth"
+                                 year="startDateYear"
+                                 label:label="browse start date"
+                  />
+                </span>
+              </td>
+            </tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0" 
+    class="aptview_text" >
+                <var:string label:value="End date" />:
+              </td>
+              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
+                <var:component className="UIxDatePicker"
+                               const:dateID="endDate"
+                               day="endDateDay"
+                               month="endDateMonth"
+                               year="endDateYear"
+                               label:label="browse end date"
+                />
+              </td>
+            </tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0"
+                  class="aptview_text"
+              >
+                <var:string label:value="Earliest start time" />:
+              </td>
+              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                <var:component className="UIxTimeSelector"
+                               const:timeID="earliestStartTime"
+                               hour="startDateHour"
+                               minute="startDateMinute"
+                />
+              </td>
+            </tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0" 
+    class="aptview_text" >
+                <var:string label:value="Latest end time" />:
+              </td>
+              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
+                <var:component className="UIxTimeSelector"
+                               const:timeID="latestEndTime"
+                               hour="endDateHour"
+                               minute="endDateMinute"
+                />
+              </td>
+            </tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0" 
+    class="aptview_text" >
+                <var:string label:value="Duration" />:
+              </td>
+              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
+                <var:popup list="durationSteps" item="item"
+                           string="itemDurationText"
+                           selection="duration" />
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr bgcolor="#e8e8e0">
+              <td align="left" colspan="2">
+                <span class="aptview_title">
+                  <var:string label:value="Search resources" />
+                </span>
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0">
+                <span class="aptview_text">
+                  <var:string label:value="Search in Anais" />:
+                </span>
+              </td>
+              <td align="left" bgcolor="#FFFFF0">
+                <span class="aptview_text">
+                  <var:component className="AnaisAttendeeSelector"
+                                 const:selectorID="resource"
+                                 const:role="NON-PARTICIPANT"
+                                 attendees="resources"
+                                 const:division="CC"
+                  />
+                </span>
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr bgcolor="#e8e8e0">
+              <td align="left" colspan="2">
+                <span class="aptview_title">
+                  <var:string label:value="Search participants" />
+                </span>
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr valign="top">
+              <td align="right" width="15%" bgcolor="#E8E8E0">
+                <span class="aptview_text">
+                  <var:string label:value="Search in Anais" />:
+                </span>
+              </td>
+              <td align="left" bgcolor="#FFFFF0">
+                <span class="aptview_text">
+                  <var:component className="AnaisAttendeeSelector"
+                                 const:selectorID="participant"
+                                 const:division="CC"
+                                 const:withCN="YES"
+                                 const:role="REQ-PARTICIPANT"
+                                 attendees="participants"
+                                 var:emailForUser="emailForUser"
+                                 var:cnForUser="cnForUser"
+                  />
+                </span>
+              </td>
+            </tr>
+            <tr><td colspan="2"> </td></tr>
+            <tr>
+              <td></td>
+              <td>
+                <input type="submit"
+                       label:value="Search"
+                       name="proposalSearch:method"
+                />
+                <span class="button_auto_env"
+                  ><a href="weekoverview"
+                      var:queryDictionary="queryParameters"
+                      class="button_auto"
+                  ><var:string label:value="Cancel" /></a></span>
+              </td>
+            </tr>
+          </table>
         </form>
-
-
         <hr size="1" noshade="noshade" />
         <table border="0" cellpadding="0" width="100%" cellspacing="1">
-              <tr>
-                <td align="middle" bgcolor="#FFDAAA" 
-                    colspan="1" rowspan="2"> </td>
-                <var:foreach list="hours" item="item">
-                  <td colspan="2" align="middle" bgcolor="#FFDAAA">
-                    <font color="black" size="2" 
-                          face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                    ><var:string value="item"/></font>
-                  </td>
-                </var:foreach>
-              </tr>
-              <tr>
-                <var:foreach list="hours" item="item">
-                  <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                    <font color="black" size="2" 
-                       face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>
-                  </td>
-                  <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                    <font color="black" size="2" 
-                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>
-                  </td>
-                </var:foreach>
-              </tr>
-              <var:foreach list="days" item="currentDay">
-                <tr>
-                  <td width="15%" align="middle" bgcolor="#FFDAAA" colspan="1">
-                    <font color="black" size="2" 
-                          face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                          ><var:string value="currentDay" 
-                                       const:dateformat="%Y-%m-%d" /></font>
-                  </td>
-                  <var:foreach list="hours" item="item">
-                    <var:if condition="isFirstHalfGreen">
-                      <td align="left" bgcolor="#FAE8B8" valign="top">
-                        <a href="#"><img rsrc:src="green_corner.gif" alt="new" 
-                                         border="0" /></a>
-                      </td>
-                    </var:if>
-                    <var:if condition="isFirstHalfBlocked">
-                      <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                      </td>
-                   </var:if>
-
-                    <var:if condition="isSecondHalfGreen">
-                      <td align="left" bgcolor="#FAE8B8" valign="top">
-                        <a href="#"><img rsrc:src="green_corner.gif" alt="new" 
-                                         border="0" /></a>
-                      </td>
-                    </var:if>
-                    <var:if condition="isSecondHalfBlocked">
-                      <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                      </td>
-                   </var:if>
-                  </var:foreach>
-                </tr>
+          <tr>
+            <td align="middle" bgcolor="#FFDAAA" 
+                colspan="1" rowspan="2"> </td>
+            <var:foreach list="hours" item="item">
+              <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                <font color="black" size="2" 
+                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
+                ><var:string value="item"/></font>
+              </td>
+            </var:foreach>
+          </tr>
+          <tr>
+            <var:foreach list="hours" item="item">
+              <td colspan="1" align="middle" bgcolor="#FFDAAA">
+                <font color="black" size="2" 
+                   face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>
+              </td>
+              <td colspan="1" align="middle" bgcolor="#FFDAAA">
+                <font color="black" size="2" 
+                    face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>
+              </td>
+            </var:foreach>
+          </tr>
+          <var:foreach list="days" item="currentDay">
+            <tr>
+              <td width="15%" align="middle" bgcolor="#FFDAAA" colspan="1">
+                <font color="black" size="2" 
+                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
+                      ><var:string value="currentDay" 
+                                   const:dateformat="%Y-%m-%d" /></font>
+              </td>
+              <var:foreach list="hours" item="item">
+                <var:if condition="isFirstHalfGreen">
+                  <td align="left" bgcolor="#FAE8B8" valign="top">
+                    <a href="new"
+                       var:queryDictionary="currentFirstHalfQueryParameters"
+                    ><img rsrc:src="green_corner.gif" alt="new" 
+                                     border="0" /></a>
+                  </td>
+                </var:if>
+                <var:if condition="isFirstHalfBlocked">
+                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
+                  </td>
+                </var:if>
+                <var:if condition="isSecondHalfGreen">
+                  <td align="left" bgcolor="#FAE8B8" valign="top">
+                    <a href="new"
+                       var:queryDictionary="currentSecondHalfQueryParameters"
+                    ><img rsrc:src="green_corner.gif" alt="new" 
+                                     border="0" /></a>
+                  </td>
+                </var:if>
+                <var:if condition="isSecondHalfBlocked">
+                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
+                  </td>
+                </var:if>
+              </var:foreach>
+            </tr>
           </var:foreach>
         </table>
       </td>

diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h
index daac43dea120b169c2642d99cb1f35b8b23d8e7f..603ab29ac77c8673012f75160bd9c48636865a88 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.h
+++ b/SOGo/UI/Scheduler/UIxCalView.h
@@ -74,9 +74,6 @@
 
 - (NSDictionary *)todayQueryParameters;
 - (NSDictionary *)currentDayQueryParameters;
-- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date;
-- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
-  inDictionary:(NSMutableDictionary *)_qp;
 
 @end
 

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 917c45fe591132ab89edd641e04e23b16a066d5f..e37aedab05a3243abd8290cd6393b5f53fd76fae 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -367,7 +367,6 @@ static BOOL shouldDisplayWeekend = NO;
 
 /* date selection & conversion */
 
-
 - (NSDictionary *)todayQueryParameters {
   NSCalendarDate *date;
     
@@ -379,23 +378,6 @@ static BOOL shouldDisplayWeekend = NO;
   return [self queryParametersBySettingSelectedDate:self->currentDay];
 }
 
-- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date {
-    NSMutableDictionary *qp;
-    
-    qp = [[self queryParameters] mutableCopy];
-    [self setSelectedDateQueryParameter:_date inDictionary:qp];
-    return [qp autorelease];
-}
-
-- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
-  inDictionary:(NSMutableDictionary *)_qp;
-{
-  if(_newDate != nil)
-    [_qp setObject:[self dateStringForDate:_newDate] forKey:@"day"];
-  else
-    [_qp removeObjectForKey:@"day"];
-}
-
 /* calendarUIDs */
 
 - (NSString *)formattedCalendarUIDs {

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index c2617985eb8cc267388b59e181a5dc0a73bad128..e5294622fd6fe57ed83cce2638611e44f47e3213 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=67
+SUBMINOR_VERSION:=68
 
 # v0.9.67 requires SOPE 4.3
 # v0.9.61 requires libNGExtensions v4.2.102