* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 104 insertions, 32 deletions

diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h
index 79a909a87..a16526433 100644
--- a/korganizer/printing/calprintdefaultplugins.h
+++ b/korganizer/printing/calprintdefaultplugins.h
@@ -42,10 +42,20 @@ class CalPrintIncidence : public CalPrintPluginBase
   public:
     CalPrintIncidence();
     virtual ~CalPrintIncidence();
-    virtual TQString description() { return i18n("Print &incidence"); }
-    virtual TQString info() { return i18n("Prints an incidence on one page"); }
-    virtual int sortID() { return CalPrinterBase::Incidence; }
-    // Enable the Print Incidence option only if there are selected incidences.
+    virtual TQString description()
+    {
+      return i18n( "Print &incidence" );
+    }
+    virtual TQString info()
+    {
+      return i18n( "Prints an incidence on one page" );
+    }
+    virtual int sortID()
+    {
+      return CalPrinterBase::Incidence;
+    }
+
+  // Enable the Print Incidence option only if there are selected incidences.
     virtual bool enabled()
       {
         if ( mSelectedIncidences.count() > 0 ) {
@@ -54,9 +64,11 @@ class CalPrintIncidence : public CalPrintPluginBase
           return false;
         }
       }
-    virtual TQWidget *createConfigWidget(TQWidget*);
+    virtual TQWidget *createConfigWidget( TQWidget * );
     virtual KPrinter::Orientation defaultOrientation()
-      { return KPrinter::Portrait; }
+    {
+      return KPrinter::Portrait;
+    }
 
   public:
     void print( TQPainter &p, int width, int height );
@@ -66,7 +78,7 @@ class CalPrintIncidence : public CalPrintPluginBase
     virtual void saveConfig();
   protected:
     int printCaptionAndText( TQPainter &p, const TQRect &box, const TQString &caption, 
-           const TQString &text, TQFont captionFont, TQFont textFont );
+                             const TQString &text, TQFont captionFont, TQFont textFont );
   
 
   protected:
@@ -82,10 +94,22 @@ class CalPrintDay : public CalPrintPluginBase
   public:
     CalPrintDay();
     virtual ~CalPrintDay();
-    virtual TQString description() { return i18n("Print da&y"); }
-    virtual TQString info() { return i18n("Prints all events of a single day on one page"); }
-    virtual int sortID() { return CalPrinterBase::Day; }
-    virtual bool enabled() { return true; }
+    virtual TQString description()
+    {
+      return i18n( "Print da&y" );
+    }
+    virtual TQString info()
+    {
+      return i18n( "Prints all events of a single day on one page" );
+    }
+    virtual int sortID()
+    {
+      return CalPrinterBase::Day;
+    }
+    virtual bool enabled()
+    {
+      return true;
+    }
     virtual TQWidget *createConfigWidget( TQWidget* );
 
   public:
@@ -107,11 +131,24 @@ class CalPrintWeek : public CalPrintPluginBase
   public:
     CalPrintWeek();
     virtual ~CalPrintWeek();
-    virtual TQString description() { return i18n("Print &week"); }
-    virtual TQString info() { return i18n("Prints all events of one week on one page"); }
-    virtual int sortID() { return CalPrinterBase::Week; }
-    virtual bool enabled() { return true; }
-    virtual TQWidget *createConfigWidget(TQWidget*);
+    virtual TQString description()
+    {
+      return i18n( "Print &week" );
+    }
+    virtual TQString info()
+    {
+      return i18n( "Prints all events of one week on one page" );
+    }
+    virtual int sortID()
+    {
+      return CalPrinterBase::Week;
+    }
+    virtual bool enabled()
+    {
+      return true;
+    }
+    virtual TQWidget *createConfigWidget( TQWidget * );
+
     /**
       Returns the default orientation for the eWeekPrintType.
     */
@@ -136,12 +173,28 @@ class CalPrintMonth : public CalPrintPluginBase
   public:
     CalPrintMonth();
     virtual ~CalPrintMonth();
-    virtual TQString description() { return i18n("Print mont&h"); }
-    virtual TQString info() { return i18n("Prints all events of one month on one page"); }
-    virtual int sortID() { return CalPrinterBase::Month; }
-    virtual bool enabled() { return true; }
-    virtual TQWidget *createConfigWidget(TQWidget*);
-    virtual KPrinter::Orientation defaultOrientation() { return KPrinter::Landscape; }
+    virtual TQString description()
+    {
+      return i18n( "Print mont&h" );
+    }
+    virtual TQString info()
+    {
+      return i18n( "Prints all events of one month on one page" );
+    }
+    virtual int sortID()
+    {
+      return CalPrinterBase::Month;
+    }
+    virtual bool enabled()
+    {
+      return true;
+    }
+    virtual TQWidget *createConfigWidget( TQWidget * );
+    virtual KPrinter::Orientation defaultOrientation()
+    {
+      return KPrinter::Landscape;
+    }
+
 
   public:
     void print(TQPainter &p, int width, int height);
@@ -163,11 +216,23 @@ class CalPrintTodos : public CalPrintPluginBase
   public:
     CalPrintTodos();
     virtual ~CalPrintTodos();
-    virtual TQString description() { return i18n("Print to-&dos"); }
-    virtual TQString info() { return i18n("Prints all to-dos in a (tree-like) list"); }
-    virtual int sortID() { return CalPrinterBase::Todolist; }
-    virtual bool enabled() { return true; }
-    virtual TQWidget *createConfigWidget(TQWidget*);
+    virtual TQString description()
+    {
+      return i18n( "Print to-&dos" );
+    }
+    virtual TQString info()
+    {
+      return i18n( "Prints all to-dos in a (tree-like) list" );
+    }
+    virtual int sortID()
+    {
+      return CalPrinterBase::Todolist;
+    }
+    virtual bool enabled()
+    {
+      return true;
+    }
+    virtual TQWidget *createConfigWidget( TQWidget * );
 
   public:
     void print( TQPainter &p, int width, int height );
@@ -180,18 +245,23 @@ class CalPrintTodos : public CalPrintPluginBase
     TQString mPageTitle;
 
     enum eTodoPrintType {
-      TodosAll = 0, TodosUnfinished, TodosDueRange
+      TodosAll = 0,
+      TodosUnfinished,
+      TodosDueRange
     } mTodoPrintType;
 
     enum eTodoSortField {
-      TodoFieldSummary=0,
-      TodoFieldStartDate, TodoFieldDueDate,
-      TodoFieldPriority, TodoFieldPercentComplete,
+      TodoFieldSummary = 0,
+      TodoFieldStartDate,
+      TodoFieldDueDate,
+      TodoFieldPriority,
+      TodoFieldPercentComplete,
       TodoFieldUnset
     } mTodoSortField;
 
     enum eTodoSortDirection {
-      TodoDirectionAscending=0, TodoDirectionDescending,
+      TodoDirectionAscending = 0,
+      TodoDirectionDescending,
       TodoDirectionUnset
     } mTodoSortDirection;
 
@@ -205,5 +275,7 @@ class CalPrintTodos : public CalPrintPluginBase
     bool mSortDirection;
 };
 
+
 #endif
+
 #endif