author | zautrix <zautrix> | 2005-06-30 05:32:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 05:32:10 (UTC) |
commit | da264cf19c0183d6ea4e8dab6eabd40994e351c8 (patch) (unidiff) | |
tree | 061026fe6869c365641853b1ebba542b852046bc /korganizer/journalentry.cpp | |
parent | 4e850fa7aa99f92676e49466cfccaa5d5e0ec24c (diff) | |
download | kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.zip kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.tar.gz kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/journalentry.cpp | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 58863fe..add874f 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -61,14 +61,13 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
61 | showOnlyMode = false; | 61 | showOnlyMode = false; |
62 | mCalendar = calendar; | 62 | mCalendar = calendar; |
63 | mJournal = 0; | 63 | mJournal = 0; |
64 | mDirty = false; | ||
65 | 64 | ||
66 | QHBox * vb = new QHBox ( this ); | 65 | QHBox * vb = new QHBox ( this ); |
67 | QIconSet icon; | 66 | QPixmap iconp; |
68 | 67 | ||
69 | QPushButton * toggleJournal = new QPushButton( vb ); | 68 | QPushButton * toggleJournal = new QPushButton( vb ); |
70 | icon = SmallIcon("1updownarrow"); | 69 | iconp = SmallIcon("1updownarrow"); |
71 | toggleJournal->setIconSet (icon ) ; | 70 | toggleJournal->setPixmap (iconp ) ; |
72 | new QLabel(i18n(" Title: "),vb); | 71 | new QLabel(i18n(" Title: "),vb); |
73 | mTitle = new KLineEdit ( vb ); | 72 | mTitle = new KLineEdit ( vb ); |
74 | mTitleLabel = new QLabel(i18n("Title"),vb); | 73 | mTitleLabel = new QLabel(i18n("Title"),vb); |
@@ -77,21 +76,20 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
77 | QPushButton * loadTemplate = new QPushButton( vb ); | 76 | QPushButton * loadTemplate = new QPushButton( vb ); |
78 | QPushButton * saveTemplate = new QPushButton( vb ); | 77 | QPushButton * saveTemplate = new QPushButton( vb ); |
79 | if ( QApplication::desktop()->width() < 321 ) | 78 | if ( QApplication::desktop()->width() < 321 ) |
80 | icon = SmallIcon("fileexport16"); | 79 | iconp = SmallIcon("fileexport16"); |
81 | else | 80 | else |
82 | icon = SmallIcon("fileexport"); | 81 | iconp = SmallIcon("fileexport"); |
83 | saveTemplate->setIconSet (icon ) ; | 82 | saveTemplate->setPixmap (iconp ) ; |
84 | int size = saveTemplate->sizeHint().height(); | 83 | int size = saveTemplate->sizeHint().height(); |
85 | if ( QApplication::desktop()->width() < 321 ) | 84 | if ( QApplication::desktop()->width() < 321 ) |
86 | icon = SmallIcon("fileimport16"); | 85 | iconp = SmallIcon("fileimport16"); |
87 | else | 86 | else |
88 | icon = SmallIcon("fileimport"); | 87 | iconp = SmallIcon("fileimport"); |
89 | loadTemplate->setIconSet (icon ) ; | 88 | loadTemplate->setPixmap (iconp ) ; |
90 | loadTemplate->setFixedSize( size, size ); | 89 | loadTemplate->setFixedSize( size, size ); |
91 | saveTemplate->setFixedSize( size, size ); | 90 | saveTemplate->setFixedSize( size, size ); |
92 | toggleJournal->setFixedSize( size , size ); | 91 | toggleJournal->setFixedSize( size , size ); |
93 | mEditor = new KTextEdit(this); | 92 | mEditor = new KTextEdit(this); |
94 | connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); | ||
95 | #ifndef DESKTOP_VERSION | 93 | #ifndef DESKTOP_VERSION |
96 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 94 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
97 | #endif | 95 | #endif |
@@ -101,7 +99,6 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
101 | topLayout->addWidget(mEditor); | 99 | topLayout->addWidget(mEditor); |
102 | mEditor->installEventFilter(this); | 100 | mEditor->installEventFilter(this); |
103 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 101 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
104 | connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) ); | ||
105 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 102 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
106 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); | 103 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); |
107 | } | 104 | } |
@@ -161,7 +158,6 @@ void JournalEntry::slotLoadTemplate() | |||
161 | mEditor->getCursorPosition (& line, & col ); | 158 | mEditor->getCursorPosition (& line, & col ); |
162 | mEditor-> insertAt ( text, line, col, true ); | 159 | mEditor-> insertAt ( text, line, col, true ); |
163 | //mEditor->setIgnoreMark( true ); | 160 | //mEditor->setIgnoreMark( true ); |
164 | setDirty(); | ||
165 | } | 161 | } |
166 | void JournalEntry::setDate(const QDate &date) | 162 | void JournalEntry::setDate(const QDate &date) |
167 | { | 163 | { |
@@ -203,7 +199,6 @@ void JournalEntry::setJournal(Journal *journal) | |||
203 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | 199 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; |
204 | mTitleLabel->setText( " (" + calname +")"); | 200 | mTitleLabel->setText( " (" + calname +")"); |
205 | 201 | ||
206 | mDirty = false; | ||
207 | } | 202 | } |
208 | 203 | ||
209 | Journal *JournalEntry::journal() const | 204 | Journal *JournalEntry::journal() const |
@@ -211,12 +206,6 @@ Journal *JournalEntry::journal() const | |||
211 | return mJournal; | 206 | return mJournal; |
212 | } | 207 | } |
213 | 208 | ||
214 | void JournalEntry::setDirty() | ||
215 | { | ||
216 | mDirty = true; | ||
217 | |||
218 | // kdDebug() << "JournalEntry::setDirty()" << endl; | ||
219 | } | ||
220 | 209 | ||
221 | void JournalEntry::clear() | 210 | void JournalEntry::clear() |
222 | { | 211 | { |
@@ -244,12 +233,9 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e ) | |||
244 | 233 | ||
245 | void JournalEntry::writeJournal() | 234 | void JournalEntry::writeJournal() |
246 | { | 235 | { |
247 | // kdDebug() << "JournalEntry::writeJournal()" << endl; | ||
248 | if (!mDirty) return; | ||
249 | 236 | ||
250 | if (mEditor->text().isEmpty()) { | 237 | if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) { |
251 | if ( mJournal ) { | 238 | if ( mJournal ) { |
252 | mDirty = false; | ||
253 | bool conf = KOPrefs::instance()->mConfirm; | 239 | bool conf = KOPrefs::instance()->mConfirm; |
254 | KOPrefs::instance()->mConfirm = false; | 240 | KOPrefs::instance()->mConfirm = false; |
255 | emit deleteJournal(mJournal); | 241 | emit deleteJournal(mJournal); |
@@ -269,14 +255,11 @@ void JournalEntry::writeJournal() | |||
269 | 255 | ||
270 | mJournal->setDescription(mEditor->text()); | 256 | mJournal->setDescription(mEditor->text()); |
271 | mJournal->setSummary(mTitle->text()); | 257 | mJournal->setSummary(mTitle->text()); |
272 | mDirty = false; | ||
273 | } | 258 | } |
274 | 259 | ||
275 | void JournalEntry::flushEntry() | 260 | void JournalEntry::flushEntry() |
276 | { | 261 | { |
277 | if (!mDirty) return; | 262 | writeJournal(); |
278 | |||
279 | writeJournal(); | ||
280 | } | 263 | } |
281 | void JournalEntry::keyPressEvent ( QKeyEvent * e ) | 264 | void JournalEntry::keyPressEvent ( QKeyEvent * e ) |
282 | { | 265 | { |