* 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

2 files changed, 6 insertions, 5 deletions

diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 5f3a9dc68..59a43db75 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -137,13 +137,14 @@ void CalPrintYear::setDateRange( const TQDate& from, const TQDate& to )
 
 void CalPrintYear::print( TQPainter &p, int width, int height )
 {
-kdDebug()<<"CalPrintYear::print, width: "<<width<<", height: "<<height<<endl;
-  TQRect headerBox( 0, 0, width, headerHeight() );
-kdDebug()<<"headerBox: "<<headerBox<<endl;
   const KCalendarSystem *calsys = calendarSystem();
   KLocale *locale = KGlobal::locale();
   if ( !calsys || !locale ) return;
 
+  TQRect headerBox( 0, 0, width, headerHeight() );
+  TQRect footerBox( 0, height - footerHeight(), width, footerHeight() );
+  height -= footerHeight();
+
   TQDate start;
   calsys->setYMD( start, mYear, 1, 1 );
 
@@ -197,6 +198,8 @@ kdDebug()<<"headerBox: "<<headerBox<<endl;
 
       temp = calsys->addMonths( temp, 1 );
     }
+
+    drawFooter( p, footerBox );
     start = calsys->addMonths( start, monthsPerPage );
   }
 }
diff --git a/korganizer/plugins/printing/year/yearprint.desktop b/korganizer/plugins/printing/year/yearprint.desktop
index 5edafedc2..40f1de60b 100644
--- a/korganizer/plugins/printing/year/yearprint.desktop
+++ b/korganizer/plugins/printing/year/yearprint.desktop
@@ -16,7 +16,6 @@ Name[fr]=Impression annuelle
 Name[fy]=Printstyl foar jierkalinder
 Name[gl]=Estilo de impresión anual
 Name[hu]=Éves naptár nyomtatási stílus
-Name[is]=Ársyfirlitsprentstíll
 Name[it]=Stile di stampa annuale
 Name[ja]=年毎印刷スタイル
 Name[kk]=Жылдық басу стилі
@@ -54,7 +53,6 @@ Comment[fr]=Ce module vous permet d'imprimer l'ensemble de l'année
 Comment[fy]=Dizze plugin makket it mooglik om in jierkalinder út te printsjen.
 Comment[gl]=Este engadido permítelle imprimir un calendario anual.
 Comment[hu]=Ez a modul egy egész éves naptár kinyomtatását teszi lehetővé.
-Comment[is]=Þetta íforrit gerir þér kleyft að prenta út dagbókarfærslur fyrir allt árið.
 Comment[it]=Questo plugin ti permette di stampare un calendario annuale.
 Comment[ja]=このプラグインにより、年毎のカレンダーを印刷できるようになります。
 Comment[kk]=Бұл жылдық күнтізбені басып шығаратын модулі.