summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-02-05 14:31:01 (UTC)
committer zautrix <zautrix>2005-02-05 14:31:01 (UTC)
commit231a90376b096687770b2b029d4a3d2efa232b2e (patch) (side-by-side diff)
tree609a9b8434fe28eab8ea9a1a7e4441a37be0b246 /korganizer
parent7be6218eaf6bd29d4bc09d0bb79bb0dec6da9ae5 (diff)
downloadkdepimpi-231a90376b096687770b2b029d4a3d2efa232b2e.zip
kdepimpi-231a90376b096687770b2b029d4a3d2efa232b2e.tar.gz
kdepimpi-231a90376b096687770b2b029d4a3d2efa232b2e.tar.bz2
many fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp83
-rw-r--r--korganizer/journalentry.h2
-rw-r--r--korganizer/koeventeditor.cpp4
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
@@ -25,13 +25,22 @@
// Journal Entry
#include <qlabel.h>
#include <qlayout.h>
+#include <qvbox.h>
+#include <qfile.h>
+#include <qdir.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
+#include <qpixmap.h>
+#include <qpushbutton.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
#include <ktextedit.h>
+#include <kfiledialog.h>
+#include <kmessagebox.h>
#include "koprefs.h"
#include <libkcal/journal.h>
#include <libkcal/calendarresources.h>
@@ -49,9 +58,27 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
mCalendar = calendar;
mJournal = 0;
mDirty = false;
- 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);
mTitleLabel->setAlignment(AlignCenter);
mEditor = new KTextEdit(this);
@@ -60,17 +87,68 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
#endif
mEditor->setWordWrap( KTextEdit::WidgetWidth );
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() ) );
}
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)
{
writeJournal();
@@ -152,8 +230,9 @@ void JournalEntry::writeJournal()
mCalendar->addJournal(mJournal);
}
mJournal->setDescription(mEditor->text());
+ //qDebug("tttt%s ", mEditor->text().latin1());
mDirty = false;
}
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 1f784f4..f1a1fef 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -49,8 +49,10 @@ class JournalEntry : public QFrame {
void flushEntry();
protected slots:
+ void slotSaveTemplate();
+ void slotLoadTemplate();
void setDirty();
signals:
void deleteJournal(Journal *);
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 0ff99a4..337db9b 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -334,9 +334,9 @@ void KOEventEditor::slotLoadTemplate()
QDir t_dir;
if ( !t_dir.exists(fileName) )
t_dir.mkdir ( fileName );
fileName += "/event";
- fileName = KFileDialog::getSaveFileName( fileName , "Load Event template", this );
+ fileName = KFileDialog::getOpenFileName( fileName , i18n("Load Event template"), this );
if ( fileName.length() == 0 )
return;
CalendarLocal cal;
ICalFormat format;
@@ -363,9 +363,9 @@ void KOEventEditor::slotSaveTemplate()
QDir t_dir;
if ( !t_dir.exists(fileName) )
t_dir.mkdir ( fileName );
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 )
saveTemplate( fileName );
}