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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 281e4e91fd6f4f766c81b27be7c5d2a2caaeee25..54ef707423ed0f39d284b53ef212b949eb20bd77 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-12  Helge Hess  <helge.hess@skyrix.com>
 
+       * added (still empty) proposal component (v0.9.21)
+
        * some code reorganizations, fixed some compile warnings (v0.9.20)
 
 2004-08-11  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile
index 3c70f375407b51a148f943f0aad3c2d48afa1e97..d5d35baee0d0d0c8a361382ec1653488391476e4 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile
+++ b/SOGo/UI/Scheduler/GNUmakefile
@@ -38,40 +38,45 @@ SchedulerUI_OBJC_FILES =            \
        UIxCalSelectTab.m               \
        UIxCalDateLabel.m               \
        UIxCalBackForthNavView.m        \
+       UIxAppointmentProposal.m        \
+
+SchedulerUI_RESOURCE_FILES += \
+       Version         \
+       product.plist
 
 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                              \
-       images/icon_view_chart_inactive.gif                     \
-       images/icon_view_list.gif                               \
-       images/icon_view_list_inactive.gif                      \
-       images/icon_view_columns.gif                            \
-       images/icon_view_columns_inactive.gif                   \
+       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      \
+       UIxAppointmentProposal.wox
+
+SchedulerUI_RESOURCE_FILES += \
+       images/next_week.gif                    \
+       images/previous_week.gif                \
+       images/icon_view_overview.gif           \
+       images/icon_view_overview_inactive.gif  \
+       images/icon_view_chart.gif              \
+       images/icon_view_chart_inactive.gif     \
+       images/icon_view_list.gif               \
+       images/icon_view_list_inactive.gif      \
+       images/icon_view_columns.gif            \
+       images/icon_view_columns_inactive.gif
 
 SchedulerUI_LOCALIZED_RESOURCE_FILES += \
        default.strings

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 462c00d835e3fe7adcdd13ad7ab47f27440d52ba..a1ea38c08b2866d2a6bb34efc8a39a239ae97154 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -19,3 +19,16 @@
   02111-1307, USA.
 */
 // $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
+
+#include <SOGoUI/UIxComponent.h>
+
+@interface UIxAppointmentProposal : UIxComponent
+{
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxAppointmentProposal
+@end /* UIxAppointmentProposal */

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 7cb001acfe53aa2f6319d40435bdf0120783297d..49f242e531df55a4ec8619c8424bdc414d69e19a 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=20
+SUBMINOR_VERSION:=21

diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist
index d282d996c6da761064a7de7140ac3fbe2d942ec3..048493dc067536eaba6670a75b2373d9b4b46619 100644 (file)
--- a/SOGo/UI/Scheduler/product.plist
+++ b/SOGo/UI/Scheduler/product.plist
@@ -20,78 +20,82 @@
   categories = {
     SOGoAppointmentFolder = {
       methods = {
-        "dayoverview" = { 
+        dayoverview = {
           protectedBy = "View";
           pageName    = "UIxCalDayOverview"; 
         };
-        "daychartview" = { 
+        daychartview = { 
           protectedBy = "View";
           pageName    = "UIxCalDayChartview"; 
         };
-        "daylistview" = { 
+        daylistview = { 
           protectedBy = "View";
           pageName    = "UIxCalDayListview"; 
         };
-        "dayprintview" = { 
+        dayprintview = { 
           protectedBy = "View";
           pageName    = "UIxCalDayPrintview"; 
         };
-        "weekoverview" = { 
+        weekoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekOverview"; 
         };
-        "weekchartview" = { 
+        weekchartview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekChartview"; 
         };
-        "weeklistview" = { 
+        weeklistview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekListview"; 
         };
-        "weekcolumnsview" = { 
+        weekcolumnsview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekColumnsview"; 
         };
-        "weekprintview" = { 
+        weekprintview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekPrintview"; 
         };
-        "monthoverview" = { 
+        monthoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalMonthOverview"; 
         };
-        "monthprintview" = { 
+        monthprintview = { 
           protectedBy = "View";
           pageName    = "UIxCalMonthPrintview"; 
         };
-        "yearoverview" = { 
+        yearoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalYearOverview"; 
         };
-        "new" = { 
+        new = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
           actionName  = "new";
         };
-        "show" = { 
+        show = { 
           protectedBy = "View";
           pageName    = "UIxCalView"; 
           actionName  = "redirectForUIDs";
         };
+        proposal = { 
+          protectedBy = "View";
+          pageName    = "UIxAppointmentProposal"; 
+        };
       };
     };
 
     SOGoAppointmentObject = {
       methods = {
-        "view" = { 
+        view = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentView"; 
         };
-        "edit" = { 
+        edit = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
         };
-        "save" = { 
+        save = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
           actionName  = "save";