author | llornkcor <llornkcor> | 2003-01-08 16:44:31 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-01-08 16:44:31 (UTC) |
commit | ade18a3bf5111a8ff7e43e94ca003c0dd64bc89d (patch) (unidiff) | |
tree | f5ea5e991d7e60ba642612d7ce7b0c3f9108246f | |
parent | 6f03e28e8fd89c29de7b4cf97a2f6550a5ad8832 (diff) | |
download | opie-ade18a3bf5111a8ff7e43e94ca003c0dd64bc89d.zip opie-ade18a3bf5111a8ff7e43e94ca003c0dd64bc89d.tar.gz opie-ade18a3bf5111a8ff7e43e94ca003c0dd64bc89d.tar.bz2 |
fix for empty _*.txt entries when there are no other notes
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 2b25476..4e98b31 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp | |||
@@ -350,58 +350,58 @@ void NotesControl::populateBox() { | |||
350 | QString entryName; | 350 | QString entryName; |
351 | for ( int i = 0; i < noOfFiles; i++ ) { | 351 | for ( int i = 0; i < noOfFiles; i++ ) { |
352 | entryName.sprintf( "File%i", i + 1 ); | 352 | entryName.sprintf( "File%i", i + 1 ); |
353 | list.append(cfg.readEntry( entryName )); | 353 | list.append(cfg.readEntry( entryName )); |
354 | } | 354 | } |
355 | list.sort(); | 355 | list.sort(); |
356 | box->insertStringList(list,-1); | 356 | box->insertStringList(list,-1); |
357 | doPopulate=false; | 357 | doPopulate=false; |
358 | update(); | 358 | update(); |
359 | } | 359 | } |
360 | 360 | ||
361 | void NotesControl::load() { | 361 | void NotesControl::load() { |
362 | 362 | ||
363 | if(!loaded) { | 363 | if(!loaded) { |
364 | Config cfg("Notes"); | 364 | Config cfg("Notes"); |
365 | cfg.setGroup("Docs"); | 365 | cfg.setGroup("Docs"); |
366 | QString lastDoc=cfg.readEntry( "LastDoc",""); | 366 | QString lastDoc=cfg.readEntry( "LastDoc","notes"); |
367 | DocLnk nf; | 367 | DocLnk nf; |
368 | nf.setType("text/plain"); | 368 | nf.setType("text/plain"); |
369 | nf.setFile(lastDoc); | 369 | nf.setFile(lastDoc); |
370 | 370 | ||
371 | loadDoc(nf); | 371 | loadDoc(nf); |
372 | loaded=true; | 372 | loaded=true; |
373 | oldDocName=lastDoc; | 373 | oldDocName=lastDoc; |
374 | cfg.writeEntry( "LastDoc",oldDocName ); | 374 | cfg.writeEntry( "LastDoc",oldDocName ); |
375 | cfg.write(); | 375 | cfg.write(); |
376 | } | 376 | } |
377 | } | 377 | } |
378 | 378 | ||
379 | void NotesControl::load(const QString & file) { | 379 | void NotesControl::load(const QString & file) { |
380 | qDebug("loading "+file); | 380 | qDebug("loading "+file); |
381 | QString name = file; | 381 | QString name = file; |
382 | QString temp; | 382 | QString temp; |
383 | if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) | 383 | if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) |
384 | temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); | 384 | temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); |
385 | else | 385 | else |
386 | temp = name; | 386 | temp = name; |
387 | if(!loaded) { | 387 | if(!loaded) { |
388 | DocLnk nf; | 388 | DocLnk nf; |
389 | nf.setType("text/plain"); | 389 | nf.setType("text/plain"); |
390 | nf.setFile( temp); | 390 | nf.setFile( temp); |
391 | 391 | if(!temp.isEmpty()) | |
392 | loadDoc(nf); | 392 | loadDoc(nf); |
393 | loaded=true; | 393 | loaded=true; |
394 | } | 394 | } |
395 | // view->setFocus(); | 395 | // view->setFocus(); |
396 | oldDocName=file; | 396 | oldDocName=file; |
397 | Config cfg("Notes"); | 397 | Config cfg("Notes"); |
398 | cfg.setGroup("Docs"); | 398 | cfg.setGroup("Docs"); |
399 | cfg.writeEntry( "LastDoc",oldDocName ); | 399 | cfg.writeEntry( "LastDoc",oldDocName ); |
400 | cfg.write(); | 400 | cfg.write(); |
401 | } | 401 | } |
402 | 402 | ||
403 | void NotesControl::loadDoc( const DocLnk &f) { | 403 | void NotesControl::loadDoc( const DocLnk &f) { |
404 | FileManager fm; | 404 | FileManager fm; |
405 | QString txt; | 405 | QString txt; |
406 | if ( !fm.loadFile( f, txt ) ) { | 406 | if ( !fm.loadFile( f, txt ) ) { |
407 | qDebug("could not load file "+f.file()); | 407 | qDebug("could not load file "+f.file()); |