From 231a90376b096687770b2b029d4a3d2efa232b2e Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 05 Feb 2005 14:31:01 +0000 Subject: many fixes --- diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 4421e61..41c60ea 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -24,6 +24,11 @@ it is now displayed in overdue/due today color depending on the subtodos overdue Added info about the numbers of years to the caption (title) information about a birthday event. +Made completion date in todo editor editable. + +Added possibility to save/load templates for journals. +(Which is just a simple "save text to file" or "insert text from file". + ********** VERSION 2.0.2 ************ KO/Pi: diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index b8080b5..5c18aaa 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1218,6 +1218,12 @@ { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, { " on"," am" }, { " completed on "," erledigt am " }, +{ "Save as Event template","Speichere als Vorlage" }, +{ "Load Event template","Lade Termin Vorlage" }, +{ "Save as Journal template","Speichere als Journal Vorlage" }, +{ "Insert Journal template","Füge Journal Vorlage ein" }, +{ "","" }, +{ "","" }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 7af5cf4..dca42e0 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -26,11 +26,20 @@ #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include #include "koprefs.h" #include @@ -50,7 +59,25 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : 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); @@ -61,15 +88,66 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : #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(); @@ -153,6 +231,7 @@ void JournalEntry::writeJournal() } 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 @@ -50,6 +50,8 @@ 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 @@ -335,7 +335,7 @@ void KOEventEditor::slotLoadTemplate() 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; @@ -364,7 +364,7 @@ void KOEventEditor::slotSaveTemplate() 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 ); } diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp index 309f8dc..3f47425 100644 --- a/microkde/kfiledialog.cpp +++ b/microkde/kfiledialog.cpp @@ -16,7 +16,6 @@ QString KFileDialog::getSaveFileName( const QString & fn, QVBoxLayout lay( &dia ); lay.setMargin(7); lay.setSpacing(7); - dia.setCaption( cap ); QString file = fn; if ( file.isEmpty() ) file = QDir::homeDirPath()+"/*"; @@ -27,6 +26,7 @@ QString KFileDialog::getSaveFileName( const QString & fn, // o.setNewVisible( true ); // o.setNameVisible( true ); dia.showMaximized(); + dia.setCaption( cap ); int res = dia.exec(); if ( res ) retfile = o.selectedName(); @@ -42,7 +42,6 @@ QString KFileDialog::getOpenFileName( const QString & fn, QVBoxLayout lay( &dia ); lay.setMargin(7); lay.setSpacing(7); - dia.setCaption( cap ); QString file = fn; if ( file.isEmpty() ) file = QDir::homeDirPath()+"/*";; @@ -51,6 +50,7 @@ QString KFileDialog::getOpenFileName( const QString & fn, QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); lay.addWidget( &o); dia.showMaximized(); + dia.setCaption( cap ); int res = dia.exec(); if ( res ) retfile = o.selectedName(); diff --git a/microkde/ktextedit.h b/microkde/ktextedit.h index c912f3b..87c0602 100644 --- a/microkde/ktextedit.h +++ b/microkde/ktextedit.h @@ -7,6 +7,7 @@ class KTextEdit : public QMultiLineEdit { public: KTextEdit( QWidget *parent ) ; + void setIgnoreMark( bool b ) { mIgnoreMark = b; } private: bool mAllowPopupMenu; -- cgit v0.9.0.2