| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 14 | ||||
| -rw-r--r-- | libkcal/todo.cpp | 13 | ||||
| -rw-r--r-- | libkcal/todo.h | 3 | ||||
| -rw-r--r-- | qtcompat/qinputdialog.cpp | 2 |
5 files changed, 31 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index bba9f87..2cb0132 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1338,3 +1338,3 @@ { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, -{ "Todo is started","Todo is gestarted" }, +{ "Todo is started","Todo ist gestartet" }, { "Stop todo","Stoppe Todo" }, @@ -1369,2 +1369,4 @@ { "Choose action","Wähle Aktion" }, +{ "Comment for todo:","Kommentar zum Todo:" }, +{ "Stop+note","Stop+Notiz" }, { "","" }, diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index e95039d..8fe9999 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -28,2 +28,4 @@ +#include <qinputdialog.h> + #include <qvbox.h> @@ -1128,6 +1130,16 @@ void KOTodoView::toggleRunningItem() if ( t->isRunning() ) { +#if 0 int result = KMessageBox::warningContinueCancel(this, i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop todo"),i18n("Cancel"), true); - if (result != KMessageBox::Continue) return; +#endif + + int result = KMessageBox::warningYesNoCancel(this, + i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop"),i18n("Stop+note")); + if (result == KMessageBox::Cancel) return; + if ( result == KMessageBox::No ) { + QString comment = QInputDialog::getText(mActiveItem->text(0).left( 25 ),i18n("Comment for todo:") ); + t->setRunningFalse( comment ); + } else { t->setRunning( false ); + } mActiveItem->construct(); diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 002d3f2..f7e38a7 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -63,2 +63,10 @@ Todo::~Todo() +void Todo::setRunningFalse( QString s ) +{ + if ( ! mRunning ) + return; + mRunning = false; + mRunSaveTimer->stop(); + saveRunningInfoToFile( s ); +} void Todo::setRunning( bool run ) @@ -82,3 +90,3 @@ void Todo::setRunning( bool run ) -void Todo::saveRunningInfoToFile() +void Todo::saveRunningInfoToFile( QString comment ) { @@ -105,2 +113,5 @@ void Todo::saveRunningInfoToFile() to->setUid( file ); + if ( !comment.isEmpty() ) { + to->setDescription( comment ); + } cal.addIncidence( to ); diff --git a/libkcal/todo.h b/libkcal/todo.h index ec1ffda..a5354ce 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h @@ -122,2 +122,3 @@ namespace KCal { void setRunning( bool ); + void setRunningFalse( QString ); int runTime(); @@ -125,3 +126,3 @@ namespace KCal { public slots: - void saveRunningInfoToFile(); + void saveRunningInfoToFile( QString st = QString::null ); void saveParents(); diff --git a/qtcompat/qinputdialog.cpp b/qtcompat/qinputdialog.cpp index 64c581e..ce46118 100644 --- a/qtcompat/qinputdialog.cpp +++ b/qtcompat/qinputdialog.cpp @@ -310,3 +310,3 @@ QString QInputDialog::getText( const QString &caption, const QString &label, QLi dlg->lineEdit()->selectAll(); - + dlg->setMinimumWidth ( 230 ); bool ok_ = FALSE; |