-rw-r--r-- | korganizer/journalentry.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 5fc3f2f..7f6f221 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -206,96 +206,98 @@ void JournalEntry::slotLoadTemplate() | |||
206 | QFile fileIn( fileName ); | 206 | QFile fileIn( fileName ); |
207 | if (!fileIn.open( IO_ReadOnly ) ) { | 207 | if (!fileIn.open( IO_ReadOnly ) ) { |
208 | KMessageBox::error( this, i18n("Error loading template file\n '%1'.") | 208 | KMessageBox::error( this, i18n("Error loading template file\n '%1'.") |
209 | .arg( fileName ) ); | 209 | .arg( fileName ) ); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | QTextStream tsIn( &fileIn ); | 212 | QTextStream tsIn( &fileIn ); |
213 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | 213 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); |
214 | QString text = tsIn.read(); | 214 | QString text = tsIn.read(); |
215 | fileIn.close(); | 215 | fileIn.close(); |
216 | int line, col; | 216 | int line, col; |
217 | mEditor->getCursorPosition (& line, & col ); | 217 | mEditor->getCursorPosition (& line, & col ); |
218 | mEditor-> insertAt ( text, line, col, true ); | 218 | mEditor-> insertAt ( text, line, col, true ); |
219 | //mEditor->setIgnoreMark( true ); | 219 | //mEditor->setIgnoreMark( true ); |
220 | } | 220 | } |
221 | void JournalEntry::setDate(const QDate &date) | 221 | void JournalEntry::setDate(const QDate &date) |
222 | { | 222 | { |
223 | showOnlyMode = false; | 223 | showOnlyMode = false; |
224 | writeJournal(); | 224 | writeJournal(); |
225 | mDate = date; | 225 | mDate = date; |
226 | fillCalendar( mCalendar->defaultCalendar() ); | 226 | fillCalendar( mCalendar->defaultCalendar() ); |
227 | } | 227 | } |
228 | void JournalEntry::fillCalendar( int setToID ) | 228 | void JournalEntry::fillCalendar( int setToID ) |
229 | { | 229 | { |
230 | mCalendarBox->clear(); | 230 | mCalendarBox->clear(); |
231 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 231 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
232 | int std = 0; | 232 | int std = 0; |
233 | int count = 0; | 233 | int count = 0; |
234 | while ( kkf ) { | 234 | while ( kkf ) { |
235 | if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) || setToID == kkf->mCalNumber ) { | 235 | if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) || setToID == kkf->mCalNumber ) { |
236 | if ( setToID ) { | 236 | if ( setToID ) { |
237 | if ( kkf->mCalNumber == setToID ) | 237 | if ( kkf->mCalNumber == setToID ) |
238 | std = count; | 238 | std = count; |
239 | } else { | 239 | } else { |
240 | if ( kkf->isStandard ) { | 240 | if ( kkf->isStandard ) { |
241 | std = count; | 241 | std = count; |
242 | } | 242 | } |
243 | } | 243 | } |
244 | ++count; | 244 | ++count; |
245 | mCalendarBox->insertItem( kkf->mName ); | 245 | mCalendarBox->insertItem( kkf->mName ); |
246 | } | 246 | } |
247 | kkf = KOPrefs::instance()->mCalendars.next(); | 247 | kkf = KOPrefs::instance()->mCalendars.next(); |
248 | } | 248 | } |
249 | mCalendarBox->setCurrentItem( std ); | 249 | mCalendarBox->setCurrentItem( std ); |
250 | } | 250 | } |
251 | 251 | ||
252 | void JournalEntry::toggleShowJournal() | 252 | void JournalEntry::toggleShowJournal() |
253 | { | 253 | { |
254 | if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() ) | ||
255 | return; | ||
254 | if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) | 256 | if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) |
255 | flushEntry(); | 257 | flushEntry(); |
256 | if ( showOnlyMode ) | 258 | if ( showOnlyMode ) |
257 | emit showJournalOnly( 0 ); | 259 | emit showJournalOnly( 0 ); |
258 | else { | 260 | else { |
259 | // we have to protect mJournal from deleting if mJournal has empty text | 261 | // we have to protect mJournal from deleting if mJournal has empty text |
260 | visibleMode = false; // set to true via :setShowOnly() | 262 | visibleMode = false; // set to true via :setShowOnly() |
261 | emit showJournalOnly( mJournal ); | 263 | emit showJournalOnly( mJournal ); |
262 | //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) ); | 264 | //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) ); |
263 | } | 265 | } |
264 | } | 266 | } |
265 | void JournalEntry::setVisibleOn() | 267 | void JournalEntry::setVisibleOn() |
266 | { | 268 | { |
267 | visibleMode = true; | 269 | visibleMode = true; |
268 | } | 270 | } |
269 | void JournalEntry::setShowOnly() | 271 | void JournalEntry::setShowOnly() |
270 | { | 272 | { |
271 | showOnlyMode = true; | 273 | showOnlyMode = true; |
272 | if ( mTitle->currentText().isEmpty() ) | 274 | if ( mTitle->currentText().isEmpty() ) |
273 | mTitle->setFocus(); | 275 | mTitle->setFocus(); |
274 | else | 276 | else |
275 | mEditor->setFocus(); | 277 | mEditor->setFocus(); |
276 | } | 278 | } |
277 | void JournalEntry::setJournal(Journal *journal, bool saveJournal ) | 279 | void JournalEntry::setJournal(Journal *journal, bool saveJournal ) |
278 | { | 280 | { |
279 | if ( saveJournal ) | 281 | if ( saveJournal ) |
280 | writeJournal(); | 282 | writeJournal(); |
281 | mTitle->load( KOLocationBox::SUMMARYJOURNAL ); | 283 | mTitle->load( KOLocationBox::SUMMARYJOURNAL ); |
282 | 284 | ||
283 | mJournal = journal; | 285 | mJournal = journal; |
284 | if ( journal->isReadOnly() ) | 286 | if ( journal->isReadOnly() ) |
285 | mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")"); | 287 | mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")"); |
286 | else | 288 | else |
287 | mTitle->lineEdit ()->setText(mJournal->summary()); | 289 | mTitle->lineEdit ()->setText(mJournal->summary()); |
288 | mEditor->setText(mJournal->description()); | 290 | mEditor->setText(mJournal->description()); |
289 | mTitle->setEnabled (!journal->isReadOnly() ); | 291 | mTitle->setEnabled (!journal->isReadOnly() ); |
290 | mEditor->setReadOnly ( journal->isReadOnly() ); | 292 | mEditor->setReadOnly ( journal->isReadOnly() ); |
291 | mCalendarBox->setEnabled (!journal->isReadOnly() ); | 293 | mCalendarBox->setEnabled (!journal->isReadOnly() ); |
292 | fillCalendar( mJournal->calID() ); | 294 | fillCalendar( mJournal->calID() ); |
293 | } | 295 | } |
294 | 296 | ||
295 | Journal *JournalEntry::journal() const | 297 | Journal *JournalEntry::journal() const |
296 | { | 298 | { |
297 | return mJournal; | 299 | return mJournal; |
298 | } | 300 | } |
299 | 301 | ||
300 | 302 | ||
301 | void JournalEntry::clear() | 303 | void JournalEntry::clear() |