-rw-r--r-- | korganizer/journalentry.cpp | 37 | ||||
-rw-r--r-- | korganizer/journalentry.h | 3 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 6 |
3 files changed, 14 insertions, 32 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 58863fe..add874f 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -60,39 +60,37 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : heiHint = QApplication::desktop()->height() / 5 ; showOnlyMode = false; mCalendar = calendar; mJournal = 0; - mDirty = false; QHBox * vb = new QHBox ( this ); - QIconSet icon; + QPixmap iconp; QPushButton * toggleJournal = new QPushButton( vb ); - icon = SmallIcon("1updownarrow"); - toggleJournal->setIconSet (icon ) ; + iconp = SmallIcon("1updownarrow"); + toggleJournal->setPixmap (iconp ) ; new QLabel(i18n(" Title: "),vb); mTitle = new KLineEdit ( vb ); mTitleLabel = new QLabel(i18n("Title"),vb); mTitleLabel->setMargin(0); mTitleLabel->setAlignment(AlignCenter); QPushButton * loadTemplate = new QPushButton( vb ); QPushButton * saveTemplate = new QPushButton( vb ); if ( QApplication::desktop()->width() < 321 ) - icon = SmallIcon("fileexport16"); + iconp = SmallIcon("fileexport16"); else - icon = SmallIcon("fileexport"); - saveTemplate->setIconSet (icon ) ; + iconp = SmallIcon("fileexport"); + saveTemplate->setPixmap (iconp ) ; int size = saveTemplate->sizeHint().height(); if ( QApplication::desktop()->width() < 321 ) - icon = SmallIcon("fileimport16"); + iconp = SmallIcon("fileimport16"); else - icon = SmallIcon("fileimport"); - loadTemplate->setIconSet (icon ) ; + iconp = SmallIcon("fileimport"); + loadTemplate->setPixmap (iconp ) ; loadTemplate->setFixedSize( size, size ); saveTemplate->setFixedSize( size, size ); toggleJournal->setFixedSize( size , size ); mEditor = new KTextEdit(this); - connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); #ifndef DESKTOP_VERSION QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); #endif mEditor->setWordWrap( KTextEdit::WidgetWidth ); @@ -100,9 +98,8 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : topLayout->addWidget(vb); topLayout->addWidget(mEditor); mEditor->installEventFilter(this); connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); - connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) ); connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); } @@ -160,9 +157,8 @@ void JournalEntry::slotLoadTemplate() int line, col; mEditor->getCursorPosition (& line, & col ); mEditor-> insertAt ( text, line, col, true ); //mEditor->setIgnoreMark( true ); - setDirty(); } void JournalEntry::setDate(const QDate &date) { showOnlyMode = false; @@ -202,22 +198,15 @@ void JournalEntry::setJournal(Journal *journal) QString calname = KOPrefs::instance()->getCalendar( id )->mName; mTitleLabel->setText( " (" + calname +")"); - mDirty = false; } Journal *JournalEntry::journal() const { return mJournal; } -void JournalEntry::setDirty() -{ - mDirty = true; - -// kdDebug() << "JournalEntry::setDirty()" << endl; -} void JournalEntry::clear() { mJournal = 0; @@ -243,14 +232,11 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e ) } void JournalEntry::writeJournal() { -// kdDebug() << "JournalEntry::writeJournal()" << endl; - if (!mDirty) return; - if (mEditor->text().isEmpty()) { + if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) { if ( mJournal ) { - mDirty = false; bool conf = KOPrefs::instance()->mConfirm; KOPrefs::instance()->mConfirm = false; emit deleteJournal(mJournal); KOPrefs::instance()->mConfirm = conf; @@ -268,15 +254,12 @@ void JournalEntry::writeJournal() } mJournal->setDescription(mEditor->text()); mJournal->setSummary(mTitle->text()); - mDirty = false; } void JournalEntry::flushEntry() { - if (!mDirty) return; - writeJournal(); } void JournalEntry::keyPressEvent ( QKeyEvent * e ) { diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index b37cabd..f2db785 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h @@ -54,9 +54,8 @@ class JournalEntry : public QFrame { protected slots: void slotSaveTemplate(); void slotLoadTemplate(); - void setDirty(); void toggleShowJournal(); signals: void deleteJournal(Journal *); void newJournal(); @@ -76,9 +75,7 @@ class JournalEntry : public QFrame { QLabel *mTitleLabel; KLineEdit * mTitle; KTextEdit *mEditor; int heiHint; - - bool mDirty; }; #endif diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index ff87ef4..cb9a2c0 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -58,14 +58,14 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, sv->setResizePolicy( QScrollView:: AutoOneFit ); mTopLayout = new QVBoxLayout(parWid); QHBox * vb = new QHBox ( parWid ); QPushButton * newJournal = new QPushButton( vb ); - QIconSet icon; + QPixmap icon; if ( QApplication::desktop()->width() < 321 ) icon = SmallIcon("ko16old"); else icon = SmallIcon("ko24old"); - newJournal->setIconSet (icon ) ; + newJournal->setPixmap (icon ) ; int size = newJournal->sizeHint().height(); newJournal->setFixedSize( size, size ); mDateLabel = new QLabel ( vb ); mTopLayout->addWidget( vb ); @@ -137,16 +137,18 @@ void KOJournalView::clearList() } } void KOJournalView::newJournal() { + flushView(); Journal* mJournal = new Journal; mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); mCalendar->addJournal(mJournal); showDates( mDate, QDate() ); } void KOJournalView::showOnly ( Journal* j ) { + flushView(); if ( j == 0 ) { showDates( mDate, QDate() ); return; } |