3 files changed, 85 insertions, 4 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 7af5cf4..dca42e0 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -28,2 +28,9 @@
 #include <qlayout.h>
+#include <qvbox.h>
+#include <qfile.h>
+#include <qdir.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
+#include <qpixmap.h>
+#include <qpushbutton.h>
 
@@ -33,2 +40,4 @@
 #include <ktextedit.h>
+#include <kfiledialog.h>
+#include <kmessagebox.h>
 #include "koprefs.h"
@@ -52,3 +61,21 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
 
-  mTitleLabel = new QLabel(i18n("Title"),this);
+  QHBox * vb = new QHBox ( this );
+  QPushButton * loadTemplate = new QPushButton( vb );
+  QPushButton * saveTemplate = new QPushButton( vb );
+  QIconSet icon;
+  if ( QApplication::desktop()->width() < 321 ) 
+      icon = SmallIcon("fileexport16");
+  else
+      icon = SmallIcon("fileexport");
+  saveTemplate->setIconSet (icon ) ;
+  int size = saveTemplate->sizeHint().height();
+  saveTemplate->setFixedSize(  size, size );
+  if ( QApplication::desktop()->width() < 321 ) 
+      icon = SmallIcon("fileimport16");
+  else
+      icon = SmallIcon("fileimport");
+  loadTemplate->setIconSet (icon ) ;
+  loadTemplate->setFixedSize(  size, size );
+
+  mTitleLabel = new QLabel(i18n("Title"),vb);
   mTitleLabel->setMargin(2);
@@ -63,5 +90,7 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->addWidget(mTitleLabel);
+  topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
+  connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
+  connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
 }
@@ -72,2 +101,51 @@ JournalEntry::~JournalEntry()
 
+void JournalEntry::slotSaveTemplate()
+{
+    QString fileName =locateLocal( "templates", "journals" ); 
+    QDir t_dir;
+    if ( !t_dir.exists(fileName) )
+        t_dir.mkdir ( fileName );
+    fileName += "/journal";
+    fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );
+    if ( fileName.length() == 0 )
+        return;
+
+    QFile fileIn( fileName );
+    if (!fileIn.open( IO_WriteOnly ) ) {
+        KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
+                            .arg( fileName ) );
+        return;
+    } 
+    // QString text;
+    QTextStream tsIn( &fileIn );
+    tsIn.setCodec( QTextCodec::codecForName("utf8") );
+    tsIn << mEditor->text();
+    fileIn.close();  
+}
+void JournalEntry::slotLoadTemplate()
+{
+    QString fileName =locateLocal( "templates", "journals" ); 
+    QDir t_dir;
+    if ( !t_dir.exists(fileName) )
+        t_dir.mkdir ( fileName );
+    fileName += "/journal";
+    fileName = KFileDialog::getOpenFileName(  fileName , i18n("Insert Journal template"), this );
+    if ( fileName.length() == 0 )
+        return;
+    QFile fileIn( fileName );
+    if (!fileIn.open( IO_ReadOnly ) ) {
+        KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
+                            .arg( fileName ) );
+        return;
+    }
+    QTextStream tsIn( &fileIn );
+    tsIn.setCodec( QTextCodec::codecForName("utf8") );
+    QString text =  tsIn.read();
+    fileIn.close();  
+    int line, col;
+    mEditor->getCursorPosition (& line, & col );
+    mEditor-> insertAt ( text, line, col, true ); 
+    //mEditor->setIgnoreMark( true );
+    setDirty();
+}
 void JournalEntry::setDate(const QDate &date)
@@ -155,2 +233,3 @@ void JournalEntry::writeJournal()
   mJournal->setDescription(mEditor->text());
+  //qDebug("tttt%s ", mEditor->text().latin1());
 
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 1f784f4..f1a1fef 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -52,2 +52,4 @@ class JournalEntry : public QFrame {
   protected slots:
+    void slotSaveTemplate();
+    void slotLoadTemplate();
     void setDirty();
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 0ff99a4..337db9b 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -337,3 +337,3 @@ void KOEventEditor::slotLoadTemplate()
     fileName += "/event";
-    fileName = KFileDialog::getSaveFileName(  fileName , "Load Event template", this );
+    fileName = KFileDialog::getOpenFileName(  fileName , i18n("Load Event template"), this );
     if ( fileName.length() == 0 )
@@ -366,3 +366,3 @@ void KOEventEditor::slotSaveTemplate()
      fileName += "/event";
-     fileName = KFileDialog::getSaveFileName(  fileName , "Save as Event template", this );
+     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Event template"), this );
      if ( fileName.length() > 0 )