author | zautrix <zautrix> | 2005-06-30 11:54:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 11:54:09 (UTC) |
commit | 13eb32c82e736b033435e596111b7b0f3fe75608 (patch) (side-by-side diff) | |
tree | eef906423ff08d368b6a803e6d8ae4b919936ca3 /korganizer/kolistview.cpp | |
parent | b03b54ce54c1391db8979db0df1369e1c68656fa (diff) | |
download | kdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.zip kdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.tar.gz kdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.tar.bz2 |
fixx
-rw-r--r-- | korganizer/kolistview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 0c1ac7a..8f17e6e 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -646,64 +646,69 @@ void KOListView::saveDescriptionToFile() if ( fn == "" ) return; QFileInfo info; info.setFile( fn ); QString mes; bool createbup = true; if ( info. exists() ) { mes = i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, i18n("Overwrite!"), i18n("Cancel"), 0, 0, 1 ); if ( result != 0 ) { createbup = false; } } if ( createbup ) { QString text = i18n("KO/Pi Description/Journal save file.\nSave date: ") + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false); Incidence *incidence = delSel.first(); icount = 0; while ( incidence ) { if ( incidence->typeID() == journalID ) { text += "\n************************************\n"; - text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); + if ( !incidence->summary().isEmpty() ) + text += i18n("Journal: %1 from ").arg( incidence->summary() ) +incidence->dtStartDateStr( false ); + else + text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); text +="\n" + i18n("Description: ") + "\n"+ incidence->description(); ++icount; } else { if ( !incidence->description().isEmpty() ) { text += "\n************************************\n"; if ( incidence->typeID() == todoID ) text += i18n("To-Do: "); text += incidence->summary(); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; if ( incidence->hasStartDate() ) text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false ); text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); - if ( !incidence->location().isEmpty() ) - text += "\n" +i18n("Location: ") + incidence->location(); text += "\n" + i18n("Description: ") + "\n" + incidence->description(); ++icount; } } incidence = delSel.next(); } QFile file( fn ); if (!file.open( IO_WriteOnly ) ) { topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); return; } QTextStream ts( &file ); ts << text; file.close(); //qDebug("%s ", text.latin1()); mes = i18n("KO/Pi:Saved %1 descriptions/journals").arg(icount ); KOPrefs::instance()->mLastSaveFile = fn; topLevelWidget()->setCaption(mes); } } } void KOListView::saveToFileVCS() { |