summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-17 08:17:07 (UTC)
committer zautrix <zautrix>2005-06-17 08:17:07 (UTC)
commitcd71ce2dd43e4cca3b3da3f599616e7b1b6b8deb (patch) (unidiff)
tree9f9d60464230d5c5e0bf32852d59ef87a30659f9
parent825c34c11200f8ff0229cfb00b82b1880ef55b94 (diff)
downloadkdepimpi-cd71ce2dd43e4cca3b3da3f599616e7b1b6b8deb.zip
kdepimpi-cd71ce2dd43e4cca3b3da3f599616e7b1b6b8deb.tar.gz
kdepimpi-cd71ce2dd43e4cca3b3da3f599616e7b1b6b8deb.tar.bz2
fixxxxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kotodoview.cpp9
-rw-r--r--libkcal/todo.cpp10
-rw-r--r--libkcal/todo.h2
3 files changed, 18 insertions, 3 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 99e6a3a..c5fae17 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1,223 +1,230 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qlayout.h> 24#include <qlayout.h>
25#include <qheader.h> 25#include <qheader.h>
26#include <qcursor.h> 26#include <qcursor.h>
27#include <qwhatsthis.h> 27#include <qwhatsthis.h>
28#include <qdialog.h> 28#include <qdialog.h>
29#include <qlabel.h> 29#include <qlabel.h>
30#include <qpushbutton.h> 30#include <qpushbutton.h>
31 31
32#include <qinputdialog.h> 32#include <qinputdialog.h>
33 33
34#include <qvbox.h> 34#include <qvbox.h>
35#include <kdebug.h> 35#include <kdebug.h>
36#include "koprefs.h" 36#include "koprefs.h"
37#include <klocale.h> 37#include <klocale.h>
38#include <kglobal.h> 38#include <kglobal.h>
39#include <kiconloader.h> 39#include <kiconloader.h>
40#include <kmessagebox.h> 40#include <kmessagebox.h>
41 41
42#include <libkcal/icaldrag.h> 42#include <libkcal/icaldrag.h>
43#include <libkcal/vcaldrag.h> 43#include <libkcal/vcaldrag.h>
44#include <libkcal/calfilter.h> 44#include <libkcal/calfilter.h>
45#include <libkcal/dndfactory.h> 45#include <libkcal/dndfactory.h>
46#include <libkcal/calendarresources.h> 46#include <libkcal/calendarresources.h>
47#include <libkcal/resourcecalendar.h> 47#include <libkcal/resourcecalendar.h>
48#include <kresources/resourceselectdialog.h> 48#include <kresources/resourceselectdialog.h>
49#include <libkcal/kincidenceformatter.h> 49#include <libkcal/kincidenceformatter.h>
50#ifndef DESKTOP_VERSION 50#ifndef DESKTOP_VERSION
51#include <qpe/qpeapplication.h> 51#include <qpe/qpeapplication.h>
52#else 52#else
53#include <qapplication.h> 53#include <qapplication.h>
54#endif 54#endif
55#ifndef KORG_NOPRINTER 55#ifndef KORG_NOPRINTER
56#include "calprinter.h" 56#include "calprinter.h"
57#endif 57#endif
58#include "docprefs.h" 58#include "docprefs.h"
59 59
60#include "kotodoview.h" 60#include "kotodoview.h"
61using namespace KOrg; 61using namespace KOrg;
62 62
63 63
64KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) : 64KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) :
65 QDialog( parent, name, true ) 65 QDialog( parent, name, true )
66{ 66{
67 mTodo = todo; 67 mTodo = todo;
68 setCaption( i18n("Stop todo") ); 68 setCaption( i18n("Stop todo") );
69 QVBoxLayout* lay = new QVBoxLayout( this ); 69 QVBoxLayout* lay = new QVBoxLayout( this );
70 lay->setSpacing( 3 ); 70 lay->setSpacing( 3 );
71 lay->setMargin( 3 ); 71 lay->setMargin( 3 );
72 QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this ); 72 QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this );
73 lay->addWidget( lab ); 73 lay->addWidget( lab );
74 lab->setAlignment( AlignHCenter ); 74 lab->setAlignment( AlignHCenter );
75 75
76 QPushButton * ok = new QPushButton( i18n("Stop and save"), this ); 76 QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
77 lay->addWidget( ok ); 77 lay->addWidget( ok );
78 QPushButton * cancel = new QPushButton( i18n("Continue running"), this ); 78 QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
79 lay->addWidget( cancel ); 79 lay->addWidget( cancel );
80 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 80 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
81 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 81 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
82 ok = new QPushButton( i18n("Stop - do not save"), this ); 82 ok = new QPushButton( i18n("Stop - do not save"), this );
83 connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() ) ); 83 connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() ) );
84 lay->addWidget( ok ); 84 lay->addWidget( ok );
85 resize( 200, 200 ); 85 resize( 200, 200 );
86} 86}
87 87
88void KOStopTodoPrefs::accept() 88void KOStopTodoPrefs::accept()
89{ 89{
90 qDebug("KOStopTodoPrefs::accept() "); 90 qDebug("KOStopTodoPrefs::accept() ");
91
92
93#if 0
94 t->setRunningFalse( comment );
95
96 t->setRunning( false );
97#endif
98
91 QDialog::accept(); 99 QDialog::accept();
92} 100}
93void KOStopTodoPrefs::doNotSave() 101void KOStopTodoPrefs::doNotSave()
94{ 102{
95
96 int result = KMessageBox::warningContinueCancel(this, 103 int result = KMessageBox::warningContinueCancel(this,
97 i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() ); 104 i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() );
98 if (result != KMessageBox::Continue) return; 105 if (result != KMessageBox::Continue) return;
99 mTodo->stopRunning(); 106 mTodo->stopRunning();
100 QDialog::accept(); 107 QDialog::accept();
101} 108}
102 109
103 110
104class KOTodoViewWhatsThis :public QWhatsThis 111class KOTodoViewWhatsThis :public QWhatsThis
105{ 112{
106public: 113public:
107 KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; 114 KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
108 115
109protected: 116protected:
110 virtual QString text( const QPoint& p) 117 virtual QString text( const QPoint& p)
111 { 118 {
112 return _view->getWhatsThisText(p) ; 119 return _view->getWhatsThisText(p) ;
113 } 120 }
114private: 121private:
115 QWidget* _wid; 122 QWidget* _wid;
116 KOTodoView * _view; 123 KOTodoView * _view;
117}; 124};
118 125
119KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent, 126KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
120 const char *name) : 127 const char *name) :
121 KListView(parent,name) 128 KListView(parent,name)
122{ 129{
123 mName = QString ( name ); 130 mName = QString ( name );
124 mCalendar = calendar; 131 mCalendar = calendar;
125#ifndef DESKTOP_VERSION 132#ifndef DESKTOP_VERSION
126 QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); 133 QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
127#endif 134#endif
128 mOldCurrent = 0; 135 mOldCurrent = 0;
129 mMousePressed = false; 136 mMousePressed = false;
130 137
131 setAcceptDrops(true); 138 setAcceptDrops(true);
132 viewport()->setAcceptDrops(true); 139 viewport()->setAcceptDrops(true);
133 int size = 16; 140 int size = 16;
134 if (qApp->desktop()->width() < 300 ) 141 if (qApp->desktop()->width() < 300 )
135 size = 12; 142 size = 12;
136 setTreeStepSize( size + 6 ); 143 setTreeStepSize( size + 6 );
137 144
138} 145}
139 146
140void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e) 147void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
141{ 148{
142#ifndef KORG_NODND 149#ifndef KORG_NODND
143// kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl; 150// kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
144 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 151 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
145 !QTextDrag::canDecode( e ) ) { 152 !QTextDrag::canDecode( e ) ) {
146 e->ignore(); 153 e->ignore();
147 return; 154 return;
148 } 155 }
149 156
150 mOldCurrent = currentItem(); 157 mOldCurrent = currentItem();
151#endif 158#endif
152} 159}
153 160
154 161
155void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e) 162void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
156{ 163{
157#ifndef KORG_NODND 164#ifndef KORG_NODND
158// kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl; 165// kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl;
159 166
160 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 167 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
161 !QTextDrag::canDecode( e ) ) { 168 !QTextDrag::canDecode( e ) ) {
162 e->ignore(); 169 e->ignore();
163 return; 170 return;
164 } 171 }
165 172
166 e->accept(); 173 e->accept();
167#endif 174#endif
168} 175}
169 176
170void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *) 177void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *)
171{ 178{
172#ifndef KORG_NODND 179#ifndef KORG_NODND
173// kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl; 180// kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl;
174 181
175 setCurrentItem(mOldCurrent); 182 setCurrentItem(mOldCurrent);
176 setSelected(mOldCurrent,true); 183 setSelected(mOldCurrent,true);
177#endif 184#endif
178} 185}
179 186
180void KOTodoListView::contentsDropEvent(QDropEvent *e) 187void KOTodoListView::contentsDropEvent(QDropEvent *e)
181{ 188{
182#ifndef KORG_NODND 189#ifndef KORG_NODND
183// kdDebug() << "KOTodoListView::contentsDropEvent" << endl; 190// kdDebug() << "KOTodoListView::contentsDropEvent" << endl;
184 191
185 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 192 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
186 !QTextDrag::canDecode( e ) ) { 193 !QTextDrag::canDecode( e ) ) {
187 e->ignore(); 194 e->ignore();
188 return; 195 return;
189 } 196 }
190 197
191 DndFactory factory( mCalendar ); 198 DndFactory factory( mCalendar );
192 Todo *todo = factory.createDropTodo(e); 199 Todo *todo = factory.createDropTodo(e);
193 200
194 if (todo) { 201 if (todo) {
195 e->acceptAction(); 202 e->acceptAction();
196 203
197 KOTodoViewItem *destination = 204 KOTodoViewItem *destination =
198 (KOTodoViewItem *)itemAt(contentsToViewport(e->pos())); 205 (KOTodoViewItem *)itemAt(contentsToViewport(e->pos()));
199 Todo *destinationEvent = 0; 206 Todo *destinationEvent = 0;
200 if (destination) destinationEvent = destination->todo(); 207 if (destination) destinationEvent = destination->todo();
201 208
202 Todo *existingTodo = mCalendar->todo(todo->uid()); 209 Todo *existingTodo = mCalendar->todo(todo->uid());
203 210
204 if(existingTodo) { 211 if(existingTodo) {
205 Incidence *to = destinationEvent; 212 Incidence *to = destinationEvent;
206 while(to) { 213 while(to) {
207 if (to->uid() == todo->uid()) { 214 if (to->uid() == todo->uid()) {
208 KMessageBox::sorry(this, 215 KMessageBox::sorry(this,
209 i18n("Cannot move Todo to itself\nor a child of itself"), 216 i18n("Cannot move Todo to itself\nor a child of itself"),
210 i18n("Drop Todo")); 217 i18n("Drop Todo"));
211 delete todo; 218 delete todo;
212 return; 219 return;
213 } 220 }
214 to = to->relatedTo(); 221 to = to->relatedTo();
215 } 222 }
216 internalDrop = true; 223 internalDrop = true;
217 if ( destinationEvent ) 224 if ( destinationEvent )
218 reparentTodoSignal( destinationEvent, existingTodo ); 225 reparentTodoSignal( destinationEvent, existingTodo );
219 else 226 else
220 unparentTodoSignal(existingTodo); 227 unparentTodoSignal(existingTodo);
221 delete todo; 228 delete todo;
222 } else { 229 } else {
223 mCalendar->addTodo(todo); 230 mCalendar->addTodo(todo);
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index d062492..62b74f1 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -1,251 +1,257 @@
1/* 1/*
2 This file is part of libkcal. 2 This file is part of libkcal.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21#include <kglobal.h> 21#include <kglobal.h>
22#include <kglobalsettings.h> 22#include <kglobalsettings.h>
23#include <klocale.h> 23#include <klocale.h>
24#include <kdebug.h> 24#include <kdebug.h>
25#include <qregexp.h> 25#include <qregexp.h>
26#include <qfileinfo.h> 26#include <qfileinfo.h>
27 27
28#include "calendarlocal.h" 28#include "calendarlocal.h"
29#include "icalformat.h" 29#include "icalformat.h"
30#include "todo.h" 30#include "todo.h"
31 31
32using namespace KCal; 32using namespace KCal;
33 33
34Todo::Todo(): QObject(), Incidence() 34Todo::Todo(): QObject(), Incidence()
35{ 35{
36// mStatus = TENTATIVE; 36// mStatus = TENTATIVE;
37 37
38 mHasDueDate = false; 38 mHasDueDate = false;
39 setHasStartDate( false ); 39 setHasStartDate( false );
40 mCompleted = getEvenTime(QDateTime::currentDateTime()); 40 mCompleted = getEvenTime(QDateTime::currentDateTime());
41 mHasCompletedDate = false; 41 mHasCompletedDate = false;
42 mPercentComplete = 0; 42 mPercentComplete = 0;
43 mRunning = false; 43 mRunning = false;
44 mRunSaveTimer = 0; 44 mRunSaveTimer = 0;
45} 45}
46 46
47Todo::Todo(const Todo &t) : QObject(),Incidence(t) 47Todo::Todo(const Todo &t) : QObject(),Incidence(t)
48{ 48{
49 mDtDue = t.mDtDue; 49 mDtDue = t.mDtDue;
50 mHasDueDate = t.mHasDueDate; 50 mHasDueDate = t.mHasDueDate;
51 mCompleted = t.mCompleted; 51 mCompleted = t.mCompleted;
52 mHasCompletedDate = t.mHasCompletedDate; 52 mHasCompletedDate = t.mHasCompletedDate;
53 mPercentComplete = t.mPercentComplete; 53 mPercentComplete = t.mPercentComplete;
54 mRunning = false; 54 mRunning = false;
55 mRunSaveTimer = 0; 55 mRunSaveTimer = 0;
56} 56}
57 57
58Todo::~Todo() 58Todo::~Todo()
59{ 59{
60 setRunning( false ); 60 setRunning( false );
61 //qDebug("Todo::~Todo() "); 61 //qDebug("Todo::~Todo() ");
62} 62}
63 63
64void Todo::setRunningFalse( QString s ) 64void 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}
72void Todo::stopRunning() 72void Todo::stopRunning()
73{ 73{
74 if ( !mRunning ) 74 if ( !mRunning )
75 return; 75 return;
76 if ( mRunSaveTimer ) 76 if ( mRunSaveTimer )
77 mRunSaveTimer->stop(); 77 mRunSaveTimer->stop();
78 mRunning = false; 78 mRunning = false;
79} 79}
80void Todo::setRunning( bool run ) 80void Todo::setRunning( bool run )
81{ 81{
82 if ( run == mRunning ) 82 if ( run == mRunning )
83 return; 83 return;
84 //qDebug("Todo::setRunning %d ", run); 84 //qDebug("Todo::setRunning %d ", run);
85 if ( !mRunSaveTimer ) { 85 if ( !mRunSaveTimer ) {
86 mRunSaveTimer = new QTimer ( this ); 86 mRunSaveTimer = new QTimer ( this );
87 connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); 87 connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) );
88 } 88 }
89 mRunning = run; 89 mRunning = run;
90 if ( mRunning ) { 90 if ( mRunning ) {
91 mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min 91 mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min
92 mRunStart = QDateTime::currentDateTime(); 92 mRunStart = QDateTime::currentDateTime();
93 } else { 93 } else {
94 mRunSaveTimer->stop(); 94 mRunSaveTimer->stop();
95 saveRunningInfoToFile(); 95 saveRunningInfoToFile();
96 } 96 }
97} 97}
98 98void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end )
99{
100 mRunStart = start;
101 mRunEnd = end;
102 saveRunningInfoToFile( comment );
103}
99void Todo::saveRunningInfoToFile() 104void Todo::saveRunningInfoToFile()
100{ 105{
106 mRunEnd = QDateTime::currentDateTime();
101 saveRunningInfoToFile( QString::null ); 107 saveRunningInfoToFile( QString::null );
102} 108}
103void Todo::saveRunningInfoToFile( QString comment ) 109void Todo::saveRunningInfoToFile( QString comment )
104{ 110{
105 //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); 111 //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
106 if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) { 112 if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) {
107 qDebug("Running time < 30 seconds. Skipped. "); 113 qDebug("Running time < 30 seconds. Skipped. ");
108 return; 114 return;
109 } 115 }
110 QString dir = KGlobalSettings::timeTrackerDir(); 116 QString dir = KGlobalSettings::timeTrackerDir();
111 //qDebug("%s ", dir.latin1()); 117 //qDebug("%s ", dir.latin1());
112 QString file = "%1%2%3-%4%5%6-"; 118 QString file = "%1%2%3-%4%5%6-";
113 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 ); 119 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 );
114 file.replace ( QRegExp (" "), "0" ); 120 file.replace ( QRegExp (" "), "0" );
115 file += uid(); 121 file += uid();
116 //qDebug("File %s ",file.latin1() ); 122 //qDebug("File %s ",file.latin1() );
117 CalendarLocal cal; 123 CalendarLocal cal;
118 cal.setLocalTime(); 124 cal.setLocalTime();
119 Todo * to = (Todo*) clone(); 125 Todo * to = (Todo*) clone();
120 to->setFloats( false ); 126 to->setFloats( false );
121 to->setDtStart( mRunStart ); 127 to->setDtStart( mRunStart );
122 to->setHasStartDate( true ); 128 to->setHasStartDate( true );
123 to->setDtDue( QDateTime::currentDateTime() ); 129 to->setDtDue( mRunEnd );
124 to->setHasDueDate( true ); 130 to->setHasDueDate( true );
125 to->setUid( file ); 131 to->setUid( file );
126 if ( !comment.isEmpty() ) { 132 if ( !comment.isEmpty() ) {
127 QString des = to->description(); 133 QString des = to->description();
128 if ( des.isEmpty () ) 134 if ( des.isEmpty () )
129 to->setDescription( "TT-Note: " + comment ); 135 to->setDescription( "TT-Note: " + comment );
130 else 136 else
131 to->setDescription( "TT-Note: " + comment +"\n" + des ); 137 to->setDescription( "TT-Note: " + comment +"\n" + des );
132 } 138 }
133 cal.addIncidence( to ); 139 cal.addIncidence( to );
134 ICalFormat format; 140 ICalFormat format;
135 file = dir +"/" +file +".ics"; 141 file = dir +"/" +file +".ics";
136 format.save( &cal, file ); 142 format.save( &cal, file );
137 saveParents(); 143 saveParents();
138 144
139} 145}
140void Todo::saveParents() 146void Todo::saveParents()
141{ 147{
142 if (!relatedTo() ) 148 if (!relatedTo() )
143 return; 149 return;
144 Incidence * inc = relatedTo(); 150 Incidence * inc = relatedTo();
145 if ( inc->typeID() != todoID ) 151 if ( inc->typeID() != todoID )
146 return; 152 return;
147 Todo* to = (Todo*)inc; 153 Todo* to = (Todo*)inc;
148 bool saveTodo = false; 154 bool saveTodo = false;
149 QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics"; 155 QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics";
150 QFileInfo fi ( file ); 156 QFileInfo fi ( file );
151 if ( fi.exists() ) { 157 if ( fi.exists() ) {
152 if ( fi.lastModified () < to->lastModified ()) 158 if ( fi.lastModified () < to->lastModified ())
153 saveTodo = true; 159 saveTodo = true;
154 } else { 160 } else {
155 saveTodo = true; 161 saveTodo = true;
156 } 162 }
157 if ( saveTodo ) { 163 if ( saveTodo ) {
158 CalendarLocal cal; 164 CalendarLocal cal;
159 cal.setLocalTime(); 165 cal.setLocalTime();
160 Todo * par = (Todo *) to->clone(); 166 Todo * par = (Todo *) to->clone();
161 cal.addIncidence( par ); 167 cal.addIncidence( par );
162 ICalFormat format; 168 ICalFormat format;
163 format.save( &cal, file ); 169 format.save( &cal, file );
164 } 170 }
165 to->saveParents(); 171 to->saveParents();
166} 172}
167 173
168int Todo::runTime() 174int Todo::runTime()
169{ 175{
170 if ( !mRunning ) 176 if ( !mRunning )
171 return 0; 177 return 0;
172 return mRunStart.secsTo( QDateTime::currentDateTime() ); 178 return mRunStart.secsTo( QDateTime::currentDateTime() );
173} 179}
174bool Todo::hasRunningSub() 180bool Todo::hasRunningSub()
175{ 181{
176 if ( mRunning ) 182 if ( mRunning )
177 return true; 183 return true;
178 Incidence *aTodo; 184 Incidence *aTodo;
179 for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { 185 for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) {
180 if ( ((Todo*)aTodo)->hasRunningSub() ) 186 if ( ((Todo*)aTodo)->hasRunningSub() )
181 return true; 187 return true;
182 } 188 }
183 return false; 189 return false;
184} 190}
185Incidence *Todo::clone() 191Incidence *Todo::clone()
186{ 192{
187 return new Todo(*this); 193 return new Todo(*this);
188} 194}
189 195
190bool Todo::contains ( Todo* from ) 196bool Todo::contains ( Todo* from )
191{ 197{
192 198
193 if ( !from->summary().isEmpty() ) 199 if ( !from->summary().isEmpty() )
194 if ( !summary().startsWith( from->summary() )) 200 if ( !summary().startsWith( from->summary() ))
195 return false; 201 return false;
196 if ( from->hasStartDate() ) { 202 if ( from->hasStartDate() ) {
197 if ( !hasStartDate() ) 203 if ( !hasStartDate() )
198 return false; 204 return false;
199 if ( from->dtStart() != dtStart()) 205 if ( from->dtStart() != dtStart())
200 return false; 206 return false;
201 } 207 }
202 if ( from->hasDueDate() ){ 208 if ( from->hasDueDate() ){
203 if ( !hasDueDate() ) 209 if ( !hasDueDate() )
204 return false; 210 return false;
205 if ( from->dtDue() != dtDue()) 211 if ( from->dtDue() != dtDue())
206 return false; 212 return false;
207 } 213 }
208 if ( !from->location().isEmpty() ) 214 if ( !from->location().isEmpty() )
209 if ( !location().startsWith( from->location() ) ) 215 if ( !location().startsWith( from->location() ) )
210 return false; 216 return false;
211 if ( !from->description().isEmpty() ) 217 if ( !from->description().isEmpty() )
212 if ( !description().startsWith( from->description() )) 218 if ( !description().startsWith( from->description() ))
213 return false; 219 return false;
214 if ( from->alarms().count() ) { 220 if ( from->alarms().count() ) {
215 Alarm *a = from->alarms().first(); 221 Alarm *a = from->alarms().first();
216 if ( a->enabled() ){ 222 if ( a->enabled() ){
217 if ( !alarms().count() ) 223 if ( !alarms().count() )
218 return false; 224 return false;
219 Alarm *b = alarms().first(); 225 Alarm *b = alarms().first();
220 if( ! b->enabled() ) 226 if( ! b->enabled() )
221 return false; 227 return false;
222 if ( ! (a->offset() == b->offset() )) 228 if ( ! (a->offset() == b->offset() ))
223 return false; 229 return false;
224 } 230 }
225 } 231 }
226 232
227 QStringList cat = categories(); 233 QStringList cat = categories();
228 QStringList catFrom = from->categories(); 234 QStringList catFrom = from->categories();
229 QString nCat; 235 QString nCat;
230 unsigned int iii; 236 unsigned int iii;
231 for ( iii = 0; iii < catFrom.count();++iii ) { 237 for ( iii = 0; iii < catFrom.count();++iii ) {
232 nCat = catFrom[iii]; 238 nCat = catFrom[iii];
233 if ( !nCat.isEmpty() ) 239 if ( !nCat.isEmpty() )
234 if ( !cat.contains( nCat )) { 240 if ( !cat.contains( nCat )) {
235 return false; 241 return false;
236 } 242 }
237 } 243 }
238 if ( from->isCompleted() ) { 244 if ( from->isCompleted() ) {
239 if ( !isCompleted() ) 245 if ( !isCompleted() )
240 return false; 246 return false;
241 } 247 }
242 if( priority() != from->priority() ) 248 if( priority() != from->priority() )
243 return false; 249 return false;
244 250
245 251
246 return true; 252 return true;
247 253
248} 254}
249bool KCal::operator==( const Todo& t1, const Todo& t2 ) 255bool KCal::operator==( const Todo& t1, const Todo& t2 )
250{ 256{
251 257
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 42db025..11f848e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -1,153 +1,155 @@
1/* 1/*
2 This file is part of libkcal. 2 This file is part of libkcal.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20#ifndef TODO_H 20#ifndef TODO_H
21#define TODO_H 21#define TODO_H
22// 22//
23// Todo component, representing a VTODO object 23// Todo component, representing a VTODO object
24// 24//
25 25
26#include "incidence.h" 26#include "incidence.h"
27 27
28#include <qtimer.h> 28#include <qtimer.h>
29 29
30namespace KCal { 30namespace KCal {
31 31
32/** 32/**
33 This class provides a Todo in the sense of RFC2445. 33 This class provides a Todo in the sense of RFC2445.
34*/ 34*/
35 class Todo : public QObject,public Incidence 35 class Todo : public QObject,public Incidence
36{ 36{
37 Q_OBJECT 37 Q_OBJECT
38 public: 38 public:
39 Todo(); 39 Todo();
40 Todo(const Todo &); 40 Todo(const Todo &);
41 ~Todo(); 41 ~Todo();
42 typedef ListBase<Todo> List; 42 typedef ListBase<Todo> List;
43 QCString type() const { return "Todo"; } 43 QCString type() const { return "Todo"; }
44 IncTypeID typeID() const { return todoID; } 44 IncTypeID typeID() const { return todoID; }
45 void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
45 46
46 /** Return an exact copy of this todo. */ 47 /** Return an exact copy of this todo. */
47 Incidence *clone(); 48 Incidence *clone();
48 QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; 49 QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const;
49 50
50 /** for setting the todo's due date/time with a QDateTime. */ 51 /** for setting the todo's due date/time with a QDateTime. */
51 void setDtDue(const QDateTime &dtDue); 52 void setDtDue(const QDateTime &dtDue);
52 /** returns an event's Due date/time as a QDateTime. */ 53 /** returns an event's Due date/time as a QDateTime. */
53 QDateTime dtDue() const; 54 QDateTime dtDue() const;
54 /** returns an event's due time as a string formatted according to the 55 /** returns an event's due time as a string formatted according to the
55 users locale settings */ 56 users locale settings */
56 QString dtDueTimeStr() const; 57 QString dtDueTimeStr() const;
57 /** returns an event's due date as a string formatted according to the 58 /** returns an event's due date as a string formatted according to the
58 users locale settings */ 59 users locale settings */
59 QString dtDueDateStr(bool shortfmt=true) const; 60 QString dtDueDateStr(bool shortfmt=true) const;
60 /** returns an event's due date and time as a string formatted according 61 /** returns an event's due date and time as a string formatted according
61 to the users locale settings */ 62 to the users locale settings */
62 QString dtDueStr(bool shortfmt=true) const; 63 QString dtDueStr(bool shortfmt=true) const;
63 64
64 /** returns TRUE or FALSE depending on whether the todo has a due date */ 65 /** returns TRUE or FALSE depending on whether the todo has a due date */
65 bool hasDueDate() const; 66 bool hasDueDate() const;
66 /** sets the event's hasDueDate value. */ 67 /** sets the event's hasDueDate value. */
67 void setHasDueDate(bool f); 68 void setHasDueDate(bool f);
68 69
69 /* 70 /*
70 Looks for a subtodo (including itself ) which is not complete and is 71 Looks for a subtodo (including itself ) which is not complete and is
71 - overdue, or 72 - overdue, or
72 - due today. 73 - due today.
73 It returns 0 for nothing found, 74 It returns 0 for nothing found,
74 1 for found a todo which is due today and no overdue found 75 1 for found a todo which is due today and no overdue found
75 2 for found a overdue todo 76 2 for found a overdue todo
76 */ 77 */
77 int hasDueSubTodo( bool checkSubtodos = true ); 78 int hasDueSubTodo( bool checkSubtodos = true );
78 /* same as above, but a specific date can be specified*/ 79 /* same as above, but a specific date can be specified*/
79 int hasDueSubTodoForDate( const QDate & date, bool checkSubtodos ); 80 int hasDueSubTodoForDate( const QDate & date, bool checkSubtodos );
80 81
81 82
82 /** sets the event's status to the string specified. The string 83 /** sets the event's status to the string specified. The string
83 * must be a recognized value for the status field, i.e. a string 84 * must be a recognized value for the status field, i.e. a string
84 * equivalent of the possible status enumerations previously described. */ 85 * equivalent of the possible status enumerations previously described. */
85// void setStatus(const QString &statStr); 86// void setStatus(const QString &statStr);
86 /** sets the event's status to the value specified. See the enumeration 87 /** sets the event's status to the value specified. See the enumeration
87 * above for possible values. */ 88 * above for possible values. */
88// void setStatus(int); 89// void setStatus(int);
89 /** return the event's status. */ 90 /** return the event's status. */
90// int status() const; 91// int status() const;
91 /** return the event's status in string format. */ 92 /** return the event's status in string format. */
92// QString statusStr() const; 93// QString statusStr() const;
93 94
94 /** return, if this todo is completed */ 95 /** return, if this todo is completed */
95 bool isCompleted() const; 96 bool isCompleted() const;
96 /** set completed state of this todo */ 97 /** set completed state of this todo */
97 void setCompleted(bool); 98 void setCompleted(bool);
98 99
99 /** 100 /**
100 Return how many percent of the task are completed. Returns a value 101 Return how many percent of the task are completed. Returns a value
101 between 0 and 100. 102 between 0 and 100.
102 */ 103 */
103 int percentComplete() const; 104 int percentComplete() const;
104 /** 105 /**
105 Set how many percent of the task are completed. Valid values are in the 106 Set how many percent of the task are completed. Valid values are in the
106 range from 0 to 100. 107 range from 0 to 100.
107 */ 108 */
108 void setPercentComplete(int); 109 void setPercentComplete(int);
109 110
110 /** return date and time when todo was completed */ 111 /** return date and time when todo was completed */
111 QDateTime completed() const; 112 QDateTime completed() const;
112 QString completedStr(bool shortF = true) const; 113 QString completedStr(bool shortF = true) const;
113 /** set date and time of completion */ 114 /** set date and time of completion */
114 void setCompleted(const QDateTime &completed); 115 void setCompleted(const QDateTime &completed);
115 116
116 /** Return true, if todo has a date associated with completion */ 117 /** Return true, if todo has a date associated with completion */
117 bool hasCompletedDate() const; 118 bool hasCompletedDate() const;
118 bool contains ( Todo*); 119 bool contains ( Todo*);
119 void checkSetCompletedFalse(); 120 void checkSetCompletedFalse();
120 bool setRecurDates(); 121 bool setRecurDates();
121 bool isRunning() {return mRunning;} 122 bool isRunning() {return mRunning;}
122 bool hasRunningSub(); 123 bool hasRunningSub();
123 void setRunning( bool ); 124 void setRunning( bool );
124 void setRunningFalse( QString ); 125 void setRunningFalse( QString );
125 void stopRunning(); 126 void stopRunning();
126 int runTime(); 127 int runTime();
127 QDateTime runStart () const { return mRunStart;} 128 QDateTime runStart () const { return mRunStart;}
128 public slots: 129 public slots:
129 void saveRunningInfoToFile( QString st ); 130 void saveRunningInfoToFile( QString st );
130 void saveRunningInfoToFile( ); 131 void saveRunningInfoToFile( );
131 void saveParents(); 132 void saveParents();
132 private: 133 private:
133 bool mRunning; 134 bool mRunning;
134 QTimer * mRunSaveTimer; 135 QTimer * mRunSaveTimer;
135 QDateTime mRunStart; 136 QDateTime mRunStart;
137 QDateTime mRunEnd;
136 bool accept(Visitor &v) { return v.visit(this); } 138 bool accept(Visitor &v) { return v.visit(this); }
137 139
138 QDateTime mDtDue; // due date of todo 140 QDateTime mDtDue; // due date of todo
139 141
140 bool mHasDueDate; // if todo has associated due date 142 bool mHasDueDate; // if todo has associated due date
141 143
142// int mStatus; // confirmed/delegated/tentative/etc 144// int mStatus; // confirmed/delegated/tentative/etc
143 145
144 QDateTime mCompleted; 146 QDateTime mCompleted;
145 bool mHasCompletedDate; 147 bool mHasCompletedDate;
146 148
147 int mPercentComplete; 149 int mPercentComplete;
148}; 150};
149 151
150 bool operator==( const Todo&, const Todo& ); 152 bool operator==( const Todo&, const Todo& );
151} 153}
152 154
153#endif 155#endif