author | zautrix <zautrix> | 2005-06-13 23:07:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-13 23:07:29 (UTC) |
commit | b3743f5abe0a95c9ffeadf6701c9943f604febd6 (patch) (unidiff) | |
tree | ca7b4fa180795d5d6fb7b212eea74e0ddf2e73ad | |
parent | 35d40d945aed8c9e7c3389182014a2d99edb5254 (diff) | |
download | kdepimpi-b3743f5abe0a95c9ffeadf6701c9943f604febd6.zip kdepimpi-b3743f5abe0a95c9ffeadf6701c9943f604febd6.tar.gz kdepimpi-b3743f5abe0a95c9ffeadf6701c9943f604febd6.tar.bz2 |
fixxx
-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 | |||
@@ -341,33 +341,32 @@ void KOCalEditView::readConfig() | |||
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(); |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 42274ff..e98af3c 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -75,32 +75,36 @@ void Todo::setRunning( bool run ) | |||
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(); |
diff --git a/libkcal/todo.h b/libkcal/todo.h index 501c2ba..6fc4d4b 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -112,33 +112,34 @@ namespace KCal { | |||
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 | ||