printviews

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

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index d91d5b937b500024565e474490d370e9ad0cb88a..d86474ffa0645f03f85ee0b641e0e19822cce3ee 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -289,12 +289,15 @@
                };
                ADE2C28F06B7C7EA0065D56F = {
                        children = (
+                               ADF15C2E06BA86420047D955,
                                AD5ED0B006B1385700E3EC4B,
                                AD5ED0AF06B1385700E3EC4B,
                                ADE2C28906B7C7B20065D56F,
                                ADE2C28806B7C7B20065D56F,
                                ADE2C28C06B7C7C20065D56F,
                                ADE2C28B06B7C7C20065D56F,
+                               ADF15BFD06BA842A0047D955,
+                               ADF15BFC06BA842A0047D955,
                        );
                        isa = PBXGroup;
                        name = Day;
@@ -303,6 +306,7 @@
                };
                ADE2C29206B7C7F70065D56F = {
                        children = (
+                               ADF15D1A06BAA6D20047D955,
                                E87209080692E3D30099CBBD,
                                E87209090692E3D30099CBBD,
                                ADE2C24006B7BEE60065D56F,
@@ -311,6 +315,8 @@
                                ADE2C23C06B7BED40065D56F,
                                ADE2C24A06B7BF020065D56F,
                                ADE2C24906B7BF020065D56F,
+                               ADF15C0206BA84480047D955,
+                               ADF15C0106BA84480047D955,
                        );
                        isa = PBXGroup;
                        name = Week;
@@ -324,6 +330,8 @@
                                AD737A1706AEC77E00735920,
                                E87209000692E3D30099CBBD,
                                E87209010692E3D30099CBBD,
+                               ADF15C0506BA845E0047D955,
+                               ADF15C0406BA845E0047D955,
                        );
                        isa = PBXGroup;
                        name = Month;
@@ -340,6 +348,142 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               ADF15BF306BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_chart_inactive.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF406BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_chart.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF506BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_columns_inactive.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF606BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_columns.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF706BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_list_inactive.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF806BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_list.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BF906BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_overview_inactive.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BFA06BA839B0047D955 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = image.gif;
+                       path = icon_view_overview.gif;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BFC06BA842A0047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxCalDayPrintview.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15BFD06BA842A0047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxCalDayPrintview.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C0106BA84480047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxCalWeekPrintview.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C0206BA84480047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxCalWeekPrintview.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C0406BA845E0047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxCalMonthPrintview.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C0506BA845E0047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxCalMonthPrintview.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C2E06BA86420047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = UIxCalDayOverview.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C4906BA89140047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxPrintPageFrame.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15C4A06BA89140047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxPrintPageFrame.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADF15D1A06BAA6D20047D955 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = UIxCalWeekOverview.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
 //AD0
 //AD1
 //AD2
@@ -880,28 +1024,33 @@
                        sourceTree = "<group>";
                };
                E872074D0692E3D20099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 4;
+                       usesTabs = 1;
                };
                E872074E0692E3D20099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile.postamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 4;
                };
                E872074F0692E3D20099CBBD = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 4;
+                       usesTabs = 1;
                };
                E87207500692E3D20099CBBD = {
                        children = (
@@ -1306,14 +1455,14 @@
                };
                E87208960692E3D30099CBBD = {
                        children = (
-                               E87208970692E3D30099CBBD,
-                               E87208CA0692E3D30099CBBD,
-                               E87208CB0692E3D30099CBBD,
-                               E87208CC0692E3D30099CBBD,
-                               E87208CD0692E3D30099CBBD,
-                               E87208CE0692E3D30099CBBD,
-                               E87208CF0692E3D30099CBBD,
-                               E87208D00692E3D30099CBBD,
+                               ADF15BF306BA839B0047D955,
+                               ADF15BF406BA839B0047D955,
+                               ADF15BF506BA839B0047D955,
+                               ADF15BF606BA839B0047D955,
+                               ADF15BF706BA839B0047D955,
+                               ADF15BF806BA839B0047D955,
+                               ADF15BF906BA839B0047D955,
+                               ADF15BFA06BA839B0047D955,
                                E87208D10692E3D30099CBBD,
                                E87208D20692E3D30099CBBD,
                        );
@@ -1322,504 +1471,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               E87208970692E3D30099CBBD = {
-                       children = (
-                               E87208980692E3D30099CBBD,
-                               E87208990692E3D30099CBBD,
-                               E872089A0692E3D30099CBBD,
-                               E872089B0692E3D30099CBBD,
-                               E872089C0692E3D30099CBBD,
-                               E87208A60692E3D30099CBBD,
-                               E87208B00692E3D30099CBBD,
-                               E87208B10692E3D30099CBBD,
-                               E87208BB0692E3D30099CBBD,
-                               E87208C00692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = .svn;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208980692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "dir-wcprops";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208990692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "empty-file";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089A0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text.xml;
-                       path = entries;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089B0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = format;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089C0692E3D30099CBBD = {
-                       children = (
-                               E872089D0692E3D30099CBBD,
-                               E872089E0692E3D30099CBBD,
-                               E872089F0692E3D30099CBBD,
-                               E87208A00692E3D30099CBBD,
-                               E87208A10692E3D30099CBBD,
-                               E87208A20692E3D30099CBBD,
-                               E87208A30692E3D30099CBBD,
-                               E87208A40692E3D30099CBBD,
-                               E87208A50692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = "prop-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089D0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089E0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E872089F0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_column_view.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A00692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A10692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A20692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A30692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A40692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "next_week.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A50692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "previous_week.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A60692E3D30099CBBD = {
-                       children = (
-                               E87208A70692E3D30099CBBD,
-                               E87208A80692E3D30099CBBD,
-                               E87208A90692E3D30099CBBD,
-                               E87208AA0692E3D30099CBBD,
-                               E87208AB0692E3D30099CBBD,
-                               E87208AC0692E3D30099CBBD,
-                               E87208AD0692E3D30099CBBD,
-                               E87208AE0692E3D30099CBBD,
-                               E87208AF0692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = props;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A70692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A80692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208A90692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_column_view.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AA0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AB0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AC0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AD0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AE0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "next_week.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208AF0692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "previous_week.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B00692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = README.txt;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B10692E3D30099CBBD = {
-                       children = (
-                               E87208B20692E3D30099CBBD,
-                               E87208B30692E3D30099CBBD,
-                               E87208B40692E3D30099CBBD,
-                               E87208B50692E3D30099CBBD,
-                               E87208B60692E3D30099CBBD,
-                               E87208B70692E3D30099CBBD,
-                               E87208B80692E3D30099CBBD,
-                               E87208B90692E3D30099CBBD,
-                               E87208BA0692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = "text-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B20692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_chart.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B30692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_chart_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B40692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_column_view.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B50692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_list.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B60692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_list_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B70692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_overview.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B80692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "icon_apt_overview_inactive.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208B90692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "next_week.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BA0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = file;
-                       path = "previous_week.gif.svn-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BB0692E3D30099CBBD = {
-                       children = (
-                               E87208BC0692E3D30099CBBD,
-                               E87208BD0692E3D30099CBBD,
-                               E87208BE0692E3D30099CBBD,
-                               E87208BF0692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = tmp;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BC0692E3D30099CBBD = {
-                       children = (
-                       );
-                       isa = PBXGroup;
-                       path = "prop-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BD0692E3D30099CBBD = {
-                       children = (
-                       );
-                       isa = PBXGroup;
-                       path = props;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BE0692E3D30099CBBD = {
-                       children = (
-                       );
-                       isa = PBXGroup;
-                       path = "text-base";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208BF0692E3D30099CBBD = {
-                       children = (
-                       );
-                       isa = PBXGroup;
-                       path = wcprops;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C00692E3D30099CBBD = {
-                       children = (
-                               E87208C10692E3D30099CBBD,
-                               E87208C20692E3D30099CBBD,
-                               E87208C30692E3D30099CBBD,
-                               E87208C40692E3D30099CBBD,
-                               E87208C50692E3D30099CBBD,
-                               E87208C60692E3D30099CBBD,
-                               E87208C70692E3D30099CBBD,
-                               E87208C80692E3D30099CBBD,
-                               E87208C90692E3D30099CBBD,
-                       );
-                       isa = PBXGroup;
-                       path = wcprops;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C10692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C20692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_chart_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C30692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_column_view.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C40692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C50692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_list_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C60692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C70692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "icon_apt_overview_inactive.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C80692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "next_week.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208C90692E3D30099CBBD = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       path = "previous_week.gif.svn-work";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CA0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_chart.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CB0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_chart_inactive.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CC0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_column_view.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CD0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_list.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CE0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_list_inactive.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208CF0692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_overview.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               E87208D00692E3D30099CBBD = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = image.gif;
-                       path = icon_apt_overview_inactive.gif;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                E87208D10692E3D30099CBBD = {
                        isa = PBXFileReference;
                        lastKnownFileType = image.gif;
@@ -2147,6 +1798,8 @@
                                E87207E00692E3D20099CBBD,
                                E87207E40692E3D20099CBBD,
                                E87207E50692E3D20099CBBD,
+                               ADF15C4A06BA89140047D955,
+                               ADF15C4906BA89140047D955,
                        );
                        isa = PBXGroup;
                        name = Components;

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index c0225016624f2d0eff965bdb2ac211e84f1ba7b3..ba12287704fcc23f61e3163d6c0148003563e84c 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-30  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.4
+
+       * calendar.css: added CSS for printviews
+
+       * UIxPrintPageFrame.[wox|m]: new wrapper component for all views that
+         require printing.
+
 2004-07-28  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * calendar.css: added CSS for weekcolumnsview (v0.9.3)

diff --git a/SOGo/UI/Common/GNUmakefile b/SOGo/UI/Common/GNUmakefile
index d4e578f04e6cb95f84a6641b32a9caf771b46679..532946eed3f6fcf4d9f87db1503b4c8e124e06d3 100644 (file)
--- a/SOGo/UI/Common/GNUmakefile
+++ b/SOGo/UI/Common/GNUmakefile
@@ -8,29 +8,31 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
 
 CommonUI_PRINCIPAL_CLASS = CommonUIProduct
 
-CommonUI_OBJC_FILES += \
-       CommonUIProduct.m       \
-       UIxPageFrame.m          \
-       UIxAppFrame.m           \
-       UIxAppHeader.m          \
-       UIxAppNavigation.m      \
-       UIxWinClose.m   \
-       UIxAppNavView.m \
-       \
-       UIxElemBuilder.m \
-       UIxTabView.m \
-       UIxTabItem.m \
-
-
-CommonUI_RESOURCE_FILES += \
-       Version                 \
-       product.plist           \
-       UIxPageFrame.wox        \
-       UIxAppFrame.wox         \
-       UIxAppHeader.wox        \
-       UIxAppNavigation.wox    \
-       UIxWinClose.wox         \
-       UIxAppNavView.wox       \
+CommonUI_OBJC_FILES +=         \
+       CommonUIProduct.m               \
+       UIxPageFrame.m                  \
+       UIxPrintPageFrame.m             \
+       UIxAppFrame.m                   \
+       UIxAppHeader.m                  \
+       UIxAppNavigation.m              \
+       UIxWinClose.m                   \
+       UIxAppNavView.m                 \
+                                                       \
+       UIxElemBuilder.m                \
+       UIxTabView.m                    \
+       UIxTabItem.m                    \
+
+
+CommonUI_RESOURCE_FILES +=             \
+       Version                                         \
+       product.plist                           \
+       UIxPageFrame.wox                        \
+       UIxPrintPageFrame.wox           \
+       UIxAppFrame.wox                         \
+       UIxAppHeader.wox                        \
+       UIxAppNavigation.wox            \
+       UIxWinClose.wox                         \
+       UIxAppNavView.wox                       \
        \
        uix.css                 \
        calendar.css            \

diff --git a/SOGo/UI/Common/UIxPrintPageFrame.m b/SOGo/UI/Common/UIxPrintPageFrame.m
new file mode 100644 (file)
index 0000000..f72b207
--- /dev/null
+++ b/SOGo/UI/Common/UIxPrintPageFrame.m
@@ -0,0 +1,51 @@
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OGo
+
+  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 <NGObjWeb/SoComponent.h>
+
+@interface UIxPrintPageFrame : SoComponent
+{
+    NSString *title;
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxPrintPageFrame
+
+- (void)dealloc {
+    [self->title release];
+    [super dealloc];
+}
+
+/* accessors */
+
+- (void)setTitle:(NSString *)_value {
+    ASSIGN(self->title, _value);
+}
+- (NSString *)title {
+    return self->title;
+}
+
+@end

diff --git a/SOGo/UI/Common/UIxPrintPageFrame.wox b/SOGo/UI/Common/UIxPrintPageFrame.wox
new file mode 100644 (file)
index 0000000..75049cb
--- /dev/null
+++ b/SOGo/UI/Common/UIxPrintPageFrame.wox
@@ -0,0 +1,23 @@
+<?xml version='1.0' standalone='yes'?>
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+>
+  <head>
+    <title>
+      <var:string value="title"/>
+    </title>
+    <meta name="description" content="SOGo Web Interface"/>
+    <meta name="author" content="SKYRIX Software AG"/>
+    <meta name="robots" content="stop"/>
+    <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
+    <link type="text/css" rel="stylesheet" rsrc:href="calendar.css"/>
+    <link href="mailto:hh@skyrix.com" rev="made"/>
+  </head>
+
+  <body>
+    <var:component-content/>
+  </body>
+</html>
\ No newline at end of file

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 2c9bdd95ac11718db4432f22aa46d2f6f016f30b..fba951940e1bf466fb573629d6a4520f418f92cd 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,5 +1,5 @@
 # $Id: Version,v 1.1 2003/11/24 01:24:40 helge Exp $
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=4
 
 # 1.1.0 requires NGObjWeb 4.2.202

diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css
index 7b4f3460d42255e67fcf5df57226f84e4375b567..04c3ac3d8944934a0b41722ffaf9f0eaccd32905 100644 (file)
--- a/SOGo/UI/Common/calendar.css
+++ b/SOGo/UI/Common/calendar.css
@@ -132,6 +132,34 @@
   color:            #5a5a5a;
 }
 
+.dayprintview {
+  font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  letter-spacing:   0pt;
+  font-size:        10pt;
+}
+
+td.dayprintview_time {
+  font-size:        10pt;
+  font-weight:      bold;
+  text-align:       center;
+}
+
+td.dayprintview_content {
+  font-size:        10pt;
+  text-align:       left;
+}
+
+h1.dayprintview, h2.dayprintview {
+  font-size:        11pt;
+  font-weight:      bold;
+  margin:           0px;
+  padding:          0px;
+  text-align:       center;
+}
+
+h1.dayprintview {
+  font-style:       italic;
+}
 
 .weekoverview_title {
   font-size:        10pt;

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index fb18d88f4aa1d729852e59c06e2476fca38f7d8b..872e4376e1a281752380c99f4a7b598f20f7868a 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-30  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.11
+
+       * UIxCalDayOverview.h, UIxCalWeekOverview.h: new headers for subclassers.
+
+       * UIxCalDayPrintview.[wox|m], UIxCalWeekPrintview.[wox|m],
+         UIxCalMonthPrintview.[wox|m]: new views for printing.
+
+       * product.plist: mapped "*printview"'s to appropriate new classes
+
 2004-07-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.10

diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile
index 7637901eed06d1f1315dc32a4c64c3849006c9e4..6e2607539521a14a38d0de637c4c259c6225f8e1 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile
+++ b/SOGo/UI/Scheduler/GNUmakefile
@@ -10,53 +10,59 @@ SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct
 
 SchedulerUI_LANGUAGES = English French
 
-SchedulerUI_OBJC_FILES = \
-       SchedulerUIProduct.m    \
-       UIxAppointmentFormatter.m \
-       UIxCalView.m            \
-       UIxCalDayView.m \
-       UIxCalWeekView.m        \
-       UIxCalMonthView.m       \
-       UIxAptTableView.m       \
-       \
-       UIxCalDayOverview.m             \
-       UIxCalDayChartview.m    \
-       UIxCalDayListview.m             \
-       UIxCalWeekOverview.m    \
-       UIxCalWeekChartview.m   \
-       UIxCalWeekListview.m    \
-       UIxCalWeekColumnsview.m \
-       UIxCalMonthOverview.m   \
-       UIxCalYearOverview.m    \
+SchedulerUI_OBJC_FILES =               \
+       SchedulerUIProduct.m            \
+       UIxAppointmentFormatter.m       \
+       UIxCalView.m                            \
+       UIxCalDayView.m                         \
+       UIxCalWeekView.m                        \
+       UIxCalMonthView.m                       \
+       UIxAptTableView.m                       \
+                                                               \
+       UIxCalDayOverview.m                     \
+       UIxCalDayChartview.m            \
+       UIxCalDayListview.m                     \
+       UIxCalDayPrintview.m            \
+       UIxCalWeekOverview.m            \
+       UIxCalWeekChartview.m           \
+       UIxCalWeekListview.m            \
+       UIxCalWeekColumnsview.m         \
+       UIxCalWeekPrintview.m           \
+       UIxCalMonthOverview.m           \
+       UIxCalMonthPrintview.m          \
+       UIxCalYearOverview.m            \
        UIxCalInlineMonthOverview.m     \
-       UIxAppointmentView.m    \
-       UIxAppointmentEditor.m  \
-       UIxCalSelectTab.m \
-       UIxCalDateLabel.m \
-       UIxCalBackForthNavView.m \
+       UIxAppointmentView.m            \
+       UIxAppointmentEditor.m          \
+       UIxCalSelectTab.m                       \
+       UIxCalDateLabel.m                       \
+       UIxCalBackForthNavView.m        \
 
-SchedulerUI_RESOURCE_FILES += \
-       Version                         \
-       product.plist                   \
-       \
-       UIxAptTableView.wox             \
-       UIxCalDayOverview.wox           \
-       UIxCalDayChartview.wox          \
-       UIxCalDayListview.wox           \
-       UIxCalWeekOverview.wox          \
-       UIxCalWeekChartview.wox \
-       UIxCalWeekListview.wox          \
-       UIxCalWeekColumnsview.wox       \
-       UIxCalMonthOverview.wox         \
-       UIxCalYearOverview.wox          \
-       UIxCalInlineMonthOverview.wox           \
-       UIxAppointmentView.wox          \
-       UIxAppointmentEditor.wox        \
-       UIxCalSelectTab.wox             \
-       UIxCalDateLabel.wox             \
-       UIxCalBackForthNavView.wox      \
-       images/next_week.gif            \
-       images/previous_week.gif        \
+SchedulerUI_RESOURCE_FILES +=                          \
+       Version                                                                 \
+       product.plist                                                   \
+                                                                                       \
+       UIxAptTableView.wox                                             \
+       UIxCalDayOverview.wox                                   \
+       UIxCalDayChartview.wox                                  \
+       UIxCalDayListview.wox                                   \
+       UIxCalDayPrintview.wox                                  \
+       UIxCalWeekOverview.wox                                  \
+       UIxCalWeekChartview.wox                                 \
+       UIxCalWeekListview.wox                                  \
+       UIxCalWeekColumnsview.wox                               \
+       UIxCalWeekPrintview.wox                                 \
+       UIxCalMonthOverview.wox                                 \
+       UIxCalMonthPrintview.wox                                \
+       UIxCalYearOverview.wox                                  \
+       UIxCalInlineMonthOverview.wox                   \
+       UIxAppointmentView.wox                                  \
+       UIxAppointmentEditor.wox                                \
+       UIxCalSelectTab.wox                                             \
+       UIxCalDateLabel.wox                                             \
+       UIxCalBackForthNavView.wox                              \
+       images/next_week.gif                                    \
+       images/previous_week.gif                                \
        images/icon_view_overview.gif                   \
        images/icon_view_overview_inactive.gif  \
        images/icon_view_chart.gif                              \

diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.h b/SOGo/UI/Scheduler/UIxCalDayOverview.h
new file mode 100644 (file)
index 0000000..f33cf01
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.h
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2000-2004 SKYRIX Software AG
+ 
+ This file is part of OGo
+ 
+ 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 "UIxCalDayView.h"
+#include "common.h"
+
+@interface UIxCalDayOverview : UIxCalDayView
+{
+    NSCalendarDate *currentDate;
+    NSArray *currentApts;
+}
+
+
+- (void)setCurrentDate:(NSCalendarDate *)_date;
+- (NSCalendarDate *)currentDate;
+
+- (void)setCurrentApts:(NSArray *)_apts;
+- (NSArray *)currentApts;
+
+- (NSArray *)aptsForCurrentDate;
+
+- (BOOL)hasNoAptsForCurrentDate;
+- (int)minRequiredRowSpan;
+
+- (NSDictionary *)currentDateQueryParameters;
+    
+@end

diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.m b/SOGo/UI/Scheduler/UIxCalDayOverview.m
index df44ec5229ce603545eaeadc8167fd277447abaa..75522a0e5883d84f2e7a47f7a5fba3375da08284 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.m
@@ -21,17 +21,7 @@
 // $Id$
 
 
-#include "UIxCalDayView.h"
-#include "common.h"
-
-@interface UIxCalDayOverview : UIxCalDayView
-{
-    NSCalendarDate *currentDate;
-    NSArray *currentApts;
-}
-
-@end
-
+#include "UIxCalDayOverview.h"
 
 @implementation UIxCalDayOverview
 
@@ -94,6 +84,15 @@
     return [filtered autorelease];
 }
 
+- (BOOL)hasNoAptsForCurrentDate {
+    return [[self aptsForCurrentDate] count] == 0;
+}
+
+- (int)minRequiredRowSpan {
+    unsigned count = [[self aptsForCurrentDate] count];
+    return count == 0 ? 1 : count;
+}
+
 - (NSDictionary *)currentDateQueryParameters {
     NSMutableDictionary *qp;
     NSString *hmString;

diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
index cc244e84e3164326c417b3663f0c3e63e5c6e8d2..7cc732a026fc5a322e44b8f48d8f5560487f608b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
@@ -156,7 +156,7 @@
                         <var:foreach list="allDayApts" item="appointment">
                           <tr>
                             <td class="dayoverview_content_time">
-                              <var:entity value="nbsp" />
+                              <var:entity name="nbsp" />
                             </td>
                             <td class="dayoverview_content_apts" width="90%">
                               <var:foreach list="allDayApts" item="appointment">

diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.m b/SOGo/UI/Scheduler/UIxCalDayPrintview.m
new file mode 100644 (file)
index 0000000..0386f9c
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.m
@@ -0,0 +1,43 @@
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OGo
+
+  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 "UIxCalDayOverview.h"
+
+
+@interface UIxCalDayPrintview : UIxCalDayOverview
+{
+}
+
+@end
+
+
+@implementation UIxCalDayPrintview
+
+- (NSString *)title {
+    NSString *fmt;
+    
+    fmt = [self labelForKey:@"dayLabelFormat"];
+    return [[self startDate] descriptionWithCalendarFormat:fmt];
+}
+
+@end

diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
new file mode 100644 (file)
index 0000000..6e33ef6
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
@@ -0,0 +1,59 @@
+<?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:rsrc="OGo:url"
+               xmlns:label="OGo:label"
+               className="UIxPrintPageFrame"
+               title="title"
+>
+  <table border="1" cellpadding="5" cellspacing="0" width="100%">
+    <tr>
+      <td colspan="2" align="center">
+        <h1 class="dayprintview"><var:string value="title" /></h1>
+        <h2 class="dayprintview">TODO: owner</h2>
+      </td>
+    </tr>
+    <tr valign="top">
+      <var:if condition="hasHolidayInfo">
+        <tr>
+          <td colspan="2" align="left">
+            <b><var:string value="holidayInfo.title" /></b>
+          </td>
+        </tr>
+      </var:if>
+      <var:foreach list="allDayApts" item="appointment">
+        <tr>
+          <td width="10%">
+            <var:entity name="nbsp" />
+          </td>
+          <td class="dayprintview_content">
+            <var:foreach list="allDayApts" item="appointment">
+              <var:string value="shortTextForApt" />
+              <br />
+            </var:foreach>
+          </td>
+        </tr>
+      </var:foreach>
+      <var:foreach list="dateRange" item="currentDate">
+        <tr>
+          <td width="10%" rowspan="minRequiredRowSpan" class="dayprintview_time">
+            <var:string value="currentDate"
+                        const:dateformat="%H:%M"
+            />
+          </td>
+          <var:foreach list="aptsForCurrentDate" item="appointment">
+            <td class="dayprintview_content">
+              <var:string value="shortTextForApt" />
+            </td>
+            <var:if condition="minRequiredRowSpan" const:value="1" const:negate="YES">
+            </var:if>
+          </var:foreach>
+          <var:if condition="hasNoAptsForCurrentDate">
+            <td><var:entity const:name="nbsp" /></td>
+          </var:if>
+        </tr>
+      </var:foreach>
+    </tr>
+  </table>
+</var:component>

diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
new file mode 100644 (file)
index 0000000..5689d8d
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
@@ -0,0 +1,36 @@
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OGo
+
+  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 "UIxCalMonthOverview.h"
+
+
+@interface UIxCalMonthPrintview : UIxCalMonthOverview
+{
+}
+
+@end
+
+
+@implementation UIxCalMonthPrintview
+
+@end

diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox b/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox
new file mode 100644 (file)
index 0000000..e868c7b
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox
@@ -0,0 +1,47 @@
+<?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:rsrc="OGo:url"
+               xmlns:label="OGo:label"
+               className="UIxPrintPageFrame"
+               title="title"
+>
+  <var:month-overview list="appointments"
+                      item="appointment"
+                      currentDay="currentDay"
+                      index="dayIndex"
+                      year="year"
+                      month="month"
+                      const:startDateKey="startDate"
+                      const:endDateKey="endDate"
+                      const:class="monthoverview"
+                      contentStyle="contentStyle"
+                      const:width="100%"
+  >
+    <var:month-info>
+      <var:if condition="hasHolidayInfo">
+        <var:string value="holidayInfo" const:class="monthoverview_holidayinfo"/>
+      </var:if>
+      <var:foreach list="allDayApts" item="appointment">
+        <var:string value="shortTextForApt"/>
+        <br />
+      </var:foreach>
+    </var:month-info>
+    <var:month-label const:orientation="top" dayOfWeek="dayOfWeek" const:class="monthoverview_title">
+      <var:string value="localizedDayOfWeekName"/>
+    </var:month-label>
+    <var:month-label const:orientation="left" weekOfYear="weekOfYear" class="weekStyle">
+      <var:string value="weekOfYear"/>
+    </var:month-label>
+    <var:month-title class="contentStyle">
+      <span class="monthoverview_day">
+        <var:string value="currentDay.dayOfMonth"/>
+      </span>
+    </var:month-title>
+    <var:month>
+      <var:string value="shortTitleForApt"/>
+      <br />
+    </var:month>
+  </var:month-overview>
+</var:component>

diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.h b/SOGo/UI/Scheduler/UIxCalWeekOverview.h
new file mode 100644 (file)
index 0000000..24516bf
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.h
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2000-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 "UIxCalWeekView.h"
+
+@interface UIxCalWeekOverview : UIxCalWeekView
+{
+    int dayIndex;
+}
+
+@end

diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.m b/SOGo/UI/Scheduler/UIxCalWeekOverview.m
index f1d0d37764e3bb31683dbaeaaf3293ad8de66ae7..3b978eba17f384d13735fcb29010eb1fbd90aa73 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.m
@@ -20,15 +20,7 @@
 */
 // $Id$
 
-#include "UIxCalWeekView.h"
-
-@interface UIxCalWeekOverview : UIxCalWeekView
-{
-    int dayIndex;
-}
-
-@end
-
+#include "UIxCalWeekOverview.h"
 #include "common.h"
 
 @implementation UIxCalWeekOverview

diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
new file mode 100644 (file)
index 0000000..a7a7c08
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
@@ -0,0 +1,36 @@
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OGo
+
+  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"
+
+
+@interface UIxCalWeekPrintview : UIxCalWeekOverview
+{
+}
+
+@end
+
+
+@implementation UIxCalWeekPrintview
+
+@end

diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox b/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox
new file mode 100644 (file)
index 0000000..2d4f1b7
--- /dev/null
+++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox
@@ -0,0 +1,48 @@
+<?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:rsrc="OGo:url"
+               xmlns:label="OGo:label"
+               xmlns:uix="OGo:uix"
+               className="UIxPrintPageFrame"
+               title="title">
+
+ <var:week-overview list="appointments"
+                     item="appointment"
+                     weekStart="startDate"
+                     dayIndex="dayIndex"
+                     const:startDateKey="startDate"
+                     const:endDateKey="endDate"
+                     const:titleStyle="weekoverview_title"
+                     contentStyle="contentStyle"
+  >
+    <var:week-title>
+      <table cellpadding="0" width="100%" border="0" cellspacing="0"
+             var:class="titleStyle">
+        <tr>
+          <td align="left" valign="top">
+            <var:string value="currentDay.dayOfMonth" />
+          </td>
+          <td align="center" valign="top" width="97%">
+            <var:string value="currentDayName" />
+          </td>
+        </tr>
+      </table>
+    </var:week-title>
+    <var:if condition="hasDayInfo">
+      <var:week-info>
+        <var:if condition="hasHolidayInfo">
+          <var:string value="holidayInfo" 
+        const:class="weekoverview_holidayinfo" />
+        </var:if>
+        <var:foreach list="allDayApts" item="appointment">
+          <var:string value="shortTextForApt" />
+        </var:foreach>
+      </var:week-info>
+    </var:if>
+    <var:week>
+      <var:string value="shortTextForApt" /><br />
+    </var:week>
+  </var:week-overview>
+</var:component>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index f979db5f4ff190a67d2eb770db72b594358e5b76..33e7d461ceab0d78349cacbd008134563e71823f 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=11
 
 # 1.1.0 requires NGObjWeb 4.2.202

diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist
index ed15f6e0ceeda6351bdddd38f5d5bb4d384af720..ab62774ef195454410194b59f5ce94228f766d34 100644 (file)
--- a/SOGo/UI/Scheduler/product.plist
+++ b/SOGo/UI/Scheduler/product.plist
@@ -32,6 +32,10 @@
           protectedBy = "View";
           pageName    = "UIxCalDayListview"; 
         };
+        "dayprintview" = { 
+          protectedBy = "View";
+          pageName    = "UIxCalDayPrintview"; 
+        };
         "weekoverview" = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekOverview"; 
@@ -50,16 +54,24 @@
         };
         "weekprintview" = { 
           protectedBy = "View";
-          pageName    = "UIxCalWeekOverview"; 
+          pageName    = "UIxCalWeekPrintview"; 
         };
         "monthoverview" = { 
           protectedBy = "View";
           pageName    = "UIxCalMonthOverview"; 
         };
+        "monthprintview" = { 
+          protectedBy = "View";
+          pageName    = "UIxCalMonthPrintview"; 
+        };
         "yearoverview" = { 
           protectedBy = "View";
           pageName    = "UIxCalYearOverview"; 
         };
+        "yearprintview" = { 
+          protectedBy = "View";
+          pageName    = "UIxCalYearPrintview"; 
+        };
         "new" = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor";