summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-22 15:51:43 (UTC)
committer zautrix <zautrix>2005-10-22 15:51:43 (UTC)
commitc643664ae97e757afda1012dc998b49e6cc2d575 (patch) (side-by-side diff)
tree4af2b52729153d5d194ab46364e38dde85a0efeb
parenta29a801e5500a8e5994afc317229698aeebe22e9 (diff)
downloadkdepimpi-c643664ae97e757afda1012dc998b49e6cc2d575.zip
kdepimpi-c643664ae97e757afda1012dc998b49e6cc2d575.tar.gz
kdepimpi-c643664ae97e757afda1012dc998b49e6cc2d575.tar.bz2
second fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kotodoview.cpp13
-rw-r--r--korganizer/kotodoview.h1
2 files changed, 12 insertions, 2 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 07bfdbf..a12c43e 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -109,61 +109,70 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
mComment = new QLineEdit( this );
lay->addWidget( mComment );
QHBox * start = new QHBox ( this );
lay->addWidget( start );
lab = new QLabel( i18n("Start:"), start );
QHBox * end = new QHBox ( this );
lay->addWidget( end );
lab = new QLabel( i18n("End:"), end );
sde = new KDateEdit( start );
ste = new KOTimeEdit( start );
connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime ) ) );
ede = new KDateEdit( end );
ete = new KOTimeEdit(end );
connect ( ede,SIGNAL(setTimeTo( QTime ) ),ete , SLOT ( setTime(QTime ) ) );
sde->setDate( mTodo->runStart().date() );
ste->setTime( mTodo->runStart().time() );
- ede->setDate( QDate::currentDate());
- ete->setTime( QTime::currentTime() );
+ mStop = QDateTime::currentDateTime();
+ ede->setDate( mStop.date());
+ ete->setTime( mStop.time() );
QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
lay->addWidget( ok );
ok->setDefault( true );
QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
lay->addWidget( cancel );
connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
ok = new QPushButton( i18n("Stop - do not save"), this );
connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() ) );
lay->addWidget( ok );
if (QApplication::desktop()->width() < 320 )
resize( 240, sizeHint().height() );
else
resize( 320, sizeHint().height() );
}
void KOStopTodoPrefs::accept()
{
QDateTime start = QDateTime( sde->date(), ste->getTime() );
QDateTime stop = QDateTime( ede->date(), ete->getTime() );
if ( start > stop ) {
KMessageBox::sorry(this,
i18n("The start time is\nafter the end time!"),
i18n("Time mismatch!"));
return;
}
+ // restoring the seconds
+ if ( start == QDateTime( mTodo->runStart().date(),
+ QTime(mTodo->runStart().time().hour() , mTodo->runStart().time().minute() ) ) )
+ start = mTodo->runStart();
+ if ( stop == QDateTime( mStop.date(),
+ QTime( mStop.time().hour() , mStop.time().minute() ) ) )
+ stop = mStop;
+
mTodo->saveRunningInfo( mComment->text(), start, stop );
QDialog::accept();
}
void KOStopTodoPrefs::doNotSave()
{
int result = KMessageBox::warningContinueCancel(this,
i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary(),i18n("Yes, stop todo") );
if (result != KMessageBox::Continue) return;
mTodo->stopRunning();
QDialog::accept();
}
class KOTodoViewWhatsThis :public QWhatsThis
{
public:
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 9180015..ecd0ad9 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -58,32 +58,33 @@ class KOTimeEdit;
class DocPrefs;
class KOStopTodoPrefs : public QDialog
{
Q_OBJECT
public:
KOStopTodoPrefs( Todo* todo, QWidget *parent=0, const char *name=0 ) ;
private slots:
void doNotSave();
void accept();
private:
Todo* mTodo;
QLineEdit* mComment;
+ QDateTime mStop;
KDateEdit *sde, *ede;
KOTimeEdit *ste, *ete;
};
class KOStartTodoPrefs : public QDialog
{
Q_OBJECT
public:
KOStartTodoPrefs( QString sum, QWidget *parent=0, const char *name=0 ) ;
bool stopAll() { return mStopAll; }
private slots:
void doStop();
private:
bool mStopAll;