From 825c34c11200f8ff0229cfb00b82b1880ef55b94 Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 17 Jun 2005 07:51:48 +0000 Subject: fixes --- (limited to 'korganizer') diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index b2ff33b..99e6a3a 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include @@ -58,6 +61,46 @@ using namespace KOrg; +KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) : + QDialog( parent, name, true ) +{ + mTodo = todo; + setCaption( i18n("Stop todo") ); + QVBoxLayout* lay = new QVBoxLayout( this ); + lay->setSpacing( 3 ); + lay->setMargin( 3 ); + QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this ); + lay->addWidget( lab ); + lab->setAlignment( AlignHCenter ); + + QPushButton * ok = new QPushButton( i18n("Stop and save"), this ); + lay->addWidget( ok ); + 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 ); + resize( 200, 200 ); +} + +void KOStopTodoPrefs::accept() +{ + qDebug("KOStopTodoPrefs::accept() "); + 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() ); + if (result != KMessageBox::Continue) return; + mTodo->stopRunning(); + QDialog::accept(); +} + + class KOTodoViewWhatsThis :public QWhatsThis { public: @@ -1127,11 +1170,13 @@ void KOTodoView::toggleRunningItem() return; Todo * t = mActiveItem->todo(); 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); -#endif + + KOStopTodoPrefs tp ( t, this ); + tp.exec(); + + +#if 0 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; @@ -1142,6 +1187,9 @@ void KOTodoView::toggleRunningItem() t->setRunning( false ); } mActiveItem->construct(); + + +#endif } else { int result = KMessageBox::warningContinueCancel(this, i18n("The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is stopped"),i18n("Start todo"),i18n("Cancel"), true); diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 1ffc34a..ceabdba 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include #include @@ -53,6 +55,22 @@ class KOTodoViewWhatsThis; 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; + +}; + class KOTodoListView : public KListView { Q_OBJECT diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index f62aab8..0cf6e4c 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -360,7 +360,7 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i { QColorGroup _cg = cg; QColorGroup::ColorRole role; - if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) + if ( KOPrefs::instance()->mTodoViewUsesForegroundColor && !mTodo->isRunning()) role = QColorGroup::Text; else role = QColorGroup::Base; -- cgit v0.9.0.2