* 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, 7 insertions, 3 deletions

diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp
index 551f23a9d..93bc51eff 100644
--- a/korganizer/plugins/printing/journal/journalprint.cpp
+++ b/korganizer/plugins/printing/journal/journalprint.cpp
@@ -123,13 +123,19 @@ void CalPrintJournal::print( TQPainter &p, int width, int height )
     }
   }
 
-  drawHeader( p, i18n("Journal entries"), TQDate(), TQDate(), TQRect( 0, 0, width, headerHeight() ) );
+  TQRect headerBox( 0, 0, width, headerHeight() );
+  TQRect footerBox( 0, height - footerHeight(), width, footerHeight() );
+  height -= footerHeight();
+
+  drawHeader( p, i18n("Journal entries"), TQDate(), TQDate(), headerBox );
   y = headerHeight() + 15;
 
   Journal::List::Iterator it = journals.begin();
   for ( ; it != journals.end(); ++it ) {
     drawJournal( *it, p, x, y, width, height );
   }
+
+  drawFooter( p, footerBox );
 }
 
 #endif
diff --git a/korganizer/plugins/printing/journal/journalprint.desktop b/korganizer/plugins/printing/journal/journalprint.desktop
index 081f73d6d..6d811fcec 100644
--- a/korganizer/plugins/printing/journal/journalprint.desktop
+++ b/korganizer/plugins/printing/journal/journalprint.desktop
@@ -21,7 +21,6 @@ Name[hu]=Naplónyomtatási stílus
 Name[is]=Dagbókarprentstíll
 Name[it]=Stile di stampa a diario
 Name[ja]=ジャーナル印刷スタイル
-Name[ka]=ჟურნალის ბეჭდვის სტილი
 Name[kk]=Күнделікті басу стилі
 Name[km]=រចនាប័ទ្ម​បោះពុម្ព​ទិនានុប្បវត្តិ
 Name[lt]=Dienyno spausdinimo stilius
@@ -65,7 +64,6 @@ Comment[hu]=Ez a modul naplóbejegyzések kinyomtatását teszi lehetővé.
 Comment[is]=Þetta íforrit gerir þér kleyft að prenta út dagbókarfærslur.
 Comment[it]=Questo plugin ti permette di stampare le registrazioni del diario.
 Comment[ja]=このプラグインにより、ジャーナル (日誌) のエントリを印刷できるようになります。
-Comment[ka]=ეს მოდული საშუალებას გაძლევთ ამობეჭდოთ ჟურნალის შემადგენლობა (დღიურის ელემენტები)
 Comment[kk]=Бұл күнделіктің жазуларын басып шығаратын модулі.
 Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បោះពុម្ព​ធាតុ​ទិនានុប្បវត្តិ (ធាតុ​កំណត់ហេតុ​ប្រចាំ​ថ្ងៃ) ។
 Comment[lt]=Šis priedas leidžia spausdinti dienyno įrašus.