-rw-r--r-- | korganizer/kofilterview.cpp | 1 | ||||
-rw-r--r-- | libkcal/todo.cpp | 4 | ||||
-rw-r--r-- | libkcal/todo.h | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 19d731f..9633b2c 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -325,65 +325,64 @@ void KOCalEditView::readConfig() | |||
325 | cb->setEnabled( false ); | 325 | cb->setEnabled( false ); |
326 | cb = new KOCalCheckButton( mw ); | 326 | cb = new KOCalCheckButton( mw ); |
327 | mainLayout->addWidget( cb,row,4 );mROB.append( cb ); | 327 | mainLayout->addWidget( cb,row,4 );mROB.append( cb ); |
328 | cb->setChecked( kkf->isReadOnly ); | 328 | cb->setChecked( kkf->isReadOnly ); |
329 | cb->setNum( kkf->mCalNumber ); | 329 | cb->setNum( kkf->mCalNumber ); |
330 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); | 330 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); |
331 | if ( kkf->mErrorOnLoad ) | 331 | if ( kkf->mErrorOnLoad ) |
332 | cb->setEnabled( false ); | 332 | cb->setEnabled( false ); |
333 | KColorButton *colb = new KColorButton( mw ); | 333 | KColorButton *colb = new KColorButton( mw ); |
334 | mainLayout->addWidget( colb,row,5 ); | 334 | mainLayout->addWidget( colb,row,5 ); |
335 | colb->setID( kkf->mCalNumber ); | 335 | colb->setID( kkf->mCalNumber ); |
336 | colb->setColor( kkf->mDefaultColor ); | 336 | colb->setColor( kkf->mDefaultColor ); |
337 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); | 337 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); |
338 | if ( row > 1) { | 338 | if ( row > 1) { |
339 | KOCalButton* calb = new KOCalButton( mw ); | 339 | KOCalButton* calb = new KOCalButton( mw ); |
340 | mainLayout->addWidget( calb,row,6 ); | 340 | mainLayout->addWidget( calb,row,6 ); |
341 | calb->setNum( kkf->mCalNumber ); | 341 | calb->setNum( kkf->mCalNumber ); |
342 | calb->setPixmap ( SmallIcon("minus")); | 342 | calb->setPixmap ( SmallIcon("minus")); |
343 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 343 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
344 | int hei = calb->sizeHint().height(); | 344 | int hei = calb->sizeHint().height(); |
345 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); | 345 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); |
346 | } | 346 | } |
347 | ++row; | 347 | ++row; |
348 | kkf = KOPrefs::instance()->mCalendars.next(); | 348 | kkf = KOPrefs::instance()->mCalendars.next(); |
349 | } | 349 | } |
350 | lab = new QLabel ( "", mw ); | 350 | lab = new QLabel ( "", mw ); |
351 | mainLayout->addWidget( lab,row,0 ); | 351 | mainLayout->addWidget( lab,row,0 ); |
352 | mw->show(); | 352 | mw->show(); |
353 | 353 | ||
354 | } | 354 | } |
355 | void KOCalEditView::addCal() | 355 | void KOCalEditView::addCal() |
356 | { | 356 | { |
357 | qDebug("addcal "); | ||
358 | KONewCalPrefs prefs ( this ); | 357 | KONewCalPrefs prefs ( this ); |
359 | if ( ! prefs.exec() ) | 358 | if ( ! prefs.exec() ) |
360 | return; | 359 | return; |
361 | QString name = prefs.calName(); | 360 | QString name = prefs.calName(); |
362 | QString file = prefs.calFileName(); | 361 | QString file = prefs.calFileName(); |
363 | QFileInfo fi ( file ); | 362 | QFileInfo fi ( file ); |
364 | if (!fi.exists() ) { | 363 | if (!fi.exists() ) { |
365 | KMessageBox::information( this, i18n("File does not exist!\nNo calendar added!")); | 364 | KMessageBox::information( this, i18n("File does not exist!\nNo calendar added!")); |
366 | return; | 365 | return; |
367 | } | 366 | } |
368 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); | 367 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); |
369 | kkf->mName = name; | 368 | kkf->mName = name; |
370 | kkf->mFileName = file; | 369 | kkf->mFileName = file; |
371 | emit calendarAdded( kkf->mCalNumber ); | 370 | emit calendarAdded( kkf->mCalNumber ); |
372 | readConfig(); | 371 | readConfig(); |
373 | emit needsUpdate(); | 372 | emit needsUpdate(); |
374 | } | 373 | } |
375 | void KOCalEditView::enableAll() | 374 | void KOCalEditView::enableAll() |
376 | { | 375 | { |
377 | toggleList( mEnabledB ); | 376 | toggleList( mEnabledB ); |
378 | } | 377 | } |
379 | void KOCalEditView::enableAlarm() | 378 | void KOCalEditView::enableAlarm() |
380 | { | 379 | { |
381 | toggleList( mAlarmB ); | 380 | toggleList( mAlarmB ); |
382 | } | 381 | } |
383 | void KOCalEditView::disableRO() | 382 | void KOCalEditView::disableRO() |
384 | { | 383 | { |
385 | toggleList( mROB ); | 384 | toggleList( mROB ); |
386 | } | 385 | } |
387 | void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list ) | 386 | void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list ) |
388 | { | 387 | { |
389 | bool dis = false; | 388 | bool dis = false; |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 42274ff..e98af3c 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -59,64 +59,68 @@ Todo::~Todo() | |||
59 | { | 59 | { |
60 | setRunning( false ); | 60 | setRunning( false ); |
61 | //qDebug("Todo::~Todo() "); | 61 | //qDebug("Todo::~Todo() "); |
62 | } | 62 | } |
63 | 63 | ||
64 | void Todo::setRunningFalse( QString s ) | 64 | void Todo::setRunningFalse( QString s ) |
65 | { | 65 | { |
66 | if ( ! mRunning ) | 66 | if ( ! mRunning ) |
67 | return; | 67 | return; |
68 | mRunning = false; | 68 | mRunning = false; |
69 | mRunSaveTimer->stop(); | 69 | mRunSaveTimer->stop(); |
70 | saveRunningInfoToFile( s ); | 70 | saveRunningInfoToFile( s ); |
71 | } | 71 | } |
72 | void Todo::setRunning( bool run ) | 72 | void Todo::setRunning( bool run ) |
73 | { | 73 | { |
74 | if ( run == mRunning ) | 74 | if ( run == mRunning ) |
75 | return; | 75 | return; |
76 | //qDebug("Todo::setRunning %d ", run); | 76 | //qDebug("Todo::setRunning %d ", run); |
77 | if ( !mRunSaveTimer ) { | 77 | if ( !mRunSaveTimer ) { |
78 | mRunSaveTimer = new QTimer ( this ); | 78 | mRunSaveTimer = new QTimer ( this ); |
79 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); | 79 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); |
80 | } | 80 | } |
81 | mRunning = run; | 81 | mRunning = run; |
82 | if ( mRunning ) { | 82 | if ( mRunning ) { |
83 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min | 83 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min |
84 | mRunStart = QDateTime::currentDateTime(); | 84 | mRunStart = QDateTime::currentDateTime(); |
85 | } else { | 85 | } else { |
86 | mRunSaveTimer->stop(); | 86 | mRunSaveTimer->stop(); |
87 | saveRunningInfoToFile(); | 87 | saveRunningInfoToFile(); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | void Todo::saveRunningInfoToFile() | ||
92 | { | ||
93 | saveRunningInfoToFile( QString::null ); | ||
94 | } | ||
91 | void Todo::saveRunningInfoToFile( QString comment ) | 95 | void Todo::saveRunningInfoToFile( QString comment ) |
92 | { | 96 | { |
93 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 97 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
94 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 30 ) { | 98 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 30 ) { |
95 | qDebug("Running time < 30 seconds. Skipped. "); | 99 | qDebug("Running time < 30 seconds. Skipped. "); |
96 | return; | 100 | return; |
97 | } | 101 | } |
98 | QString dir = KGlobalSettings::timeTrackerDir(); | 102 | QString dir = KGlobalSettings::timeTrackerDir(); |
99 | //qDebug("%s ", dir.latin1()); | 103 | //qDebug("%s ", dir.latin1()); |
100 | QString file = "%1%2%3-%4%5%6-"; | 104 | QString file = "%1%2%3-%4%5%6-"; |
101 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); | 105 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); |
102 | file.replace ( QRegExp (" "), "0" ); | 106 | file.replace ( QRegExp (" "), "0" ); |
103 | file += uid(); | 107 | file += uid(); |
104 | //qDebug("File %s ",file.latin1() ); | 108 | //qDebug("File %s ",file.latin1() ); |
105 | CalendarLocal cal; | 109 | CalendarLocal cal; |
106 | cal.setLocalTime(); | 110 | cal.setLocalTime(); |
107 | Todo * to = (Todo*) clone(); | 111 | Todo * to = (Todo*) clone(); |
108 | to->setFloats( false ); | 112 | to->setFloats( false ); |
109 | to->setDtStart( mRunStart ); | 113 | to->setDtStart( mRunStart ); |
110 | to->setHasStartDate( true ); | 114 | to->setHasStartDate( true ); |
111 | to->setDtDue( QDateTime::currentDateTime() ); | 115 | to->setDtDue( QDateTime::currentDateTime() ); |
112 | to->setHasDueDate( true ); | 116 | to->setHasDueDate( true ); |
113 | to->setUid( file ); | 117 | to->setUid( file ); |
114 | if ( !comment.isEmpty() ) { | 118 | if ( !comment.isEmpty() ) { |
115 | QString des = to->description(); | 119 | QString des = to->description(); |
116 | if ( des.isEmpty () ) | 120 | if ( des.isEmpty () ) |
117 | to->setDescription( "TT-Note: " + comment ); | 121 | to->setDescription( "TT-Note: " + comment ); |
118 | else | 122 | else |
119 | to->setDescription( "TT-Note: " + comment +"\n" + des ); | 123 | to->setDescription( "TT-Note: " + comment +"\n" + des ); |
120 | } | 124 | } |
121 | cal.addIncidence( to ); | 125 | cal.addIncidence( to ); |
122 | ICalFormat format; | 126 | ICalFormat format; |
diff --git a/libkcal/todo.h b/libkcal/todo.h index 501c2ba..6fc4d4b 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -96,56 +96,57 @@ namespace KCal { | |||
96 | /** set completed state of this todo */ | 96 | /** set completed state of this todo */ |
97 | void setCompleted(bool); | 97 | void setCompleted(bool); |
98 | 98 | ||
99 | /** | 99 | /** |
100 | Return how many percent of the task are completed. Returns a value | 100 | Return how many percent of the task are completed. Returns a value |
101 | between 0 and 100. | 101 | between 0 and 100. |
102 | */ | 102 | */ |
103 | int percentComplete() const; | 103 | int percentComplete() const; |
104 | /** | 104 | /** |
105 | Set how many percent of the task are completed. Valid values are in the | 105 | Set how many percent of the task are completed. Valid values are in the |
106 | range from 0 to 100. | 106 | range from 0 to 100. |
107 | */ | 107 | */ |
108 | void setPercentComplete(int); | 108 | void setPercentComplete(int); |
109 | 109 | ||
110 | /** return date and time when todo was completed */ | 110 | /** return date and time when todo was completed */ |
111 | QDateTime completed() const; | 111 | QDateTime completed() const; |
112 | QString completedStr(bool shortF = true) const; | 112 | QString completedStr(bool shortF = true) const; |
113 | /** set date and time of completion */ | 113 | /** set date and time of completion */ |
114 | void setCompleted(const QDateTime &completed); | 114 | void setCompleted(const QDateTime &completed); |
115 | 115 | ||
116 | /** Return true, if todo has a date associated with completion */ | 116 | /** Return true, if todo has a date associated with completion */ |
117 | bool hasCompletedDate() const; | 117 | bool hasCompletedDate() const; |
118 | bool contains ( Todo*); | 118 | bool contains ( Todo*); |
119 | void checkSetCompletedFalse(); | 119 | void checkSetCompletedFalse(); |
120 | bool setRecurDates(); | 120 | bool setRecurDates(); |
121 | bool isRunning() {return mRunning;} | 121 | bool isRunning() {return mRunning;} |
122 | bool hasRunningSub(); | 122 | bool hasRunningSub(); |
123 | void setRunning( bool ); | 123 | void setRunning( bool ); |
124 | void setRunningFalse( QString ); | 124 | void setRunningFalse( QString ); |
125 | int runTime(); | 125 | int runTime(); |
126 | QDateTime runStart () const { return mRunStart;} | 126 | QDateTime runStart () const { return mRunStart;} |
127 | public slots: | 127 | public slots: |
128 | void saveRunningInfoToFile( QString st = QString::null ); | 128 | void saveRunningInfoToFile( QString st ); |
129 | void saveRunningInfoToFile( ); | ||
129 | void saveParents(); | 130 | void saveParents(); |
130 | private: | 131 | private: |
131 | bool mRunning; | 132 | bool mRunning; |
132 | QTimer * mRunSaveTimer; | 133 | QTimer * mRunSaveTimer; |
133 | QDateTime mRunStart; | 134 | QDateTime mRunStart; |
134 | bool accept(Visitor &v) { return v.visit(this); } | 135 | bool accept(Visitor &v) { return v.visit(this); } |
135 | 136 | ||
136 | QDateTime mDtDue; // due date of todo | 137 | QDateTime mDtDue; // due date of todo |
137 | 138 | ||
138 | bool mHasDueDate; // if todo has associated due date | 139 | bool mHasDueDate; // if todo has associated due date |
139 | 140 | ||
140 | // int mStatus; // confirmed/delegated/tentative/etc | 141 | // int mStatus; // confirmed/delegated/tentative/etc |
141 | 142 | ||
142 | QDateTime mCompleted; | 143 | QDateTime mCompleted; |
143 | bool mHasCompletedDate; | 144 | bool mHasCompletedDate; |
144 | 145 | ||
145 | int mPercentComplete; | 146 | int mPercentComplete; |
146 | }; | 147 | }; |
147 | 148 | ||
148 | bool operator==( const Todo&, const Todo& ); | 149 | bool operator==( const Todo&, const Todo& ); |
149 | } | 150 | } |
150 | 151 | ||
151 | #endif | 152 | #endif |