summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp4
-rw-r--r--korganizer/koagenda.cpp6
-rw-r--r--korganizer/koagenda.h2
-rw-r--r--korganizer/kotodoview.cpp4
4 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5fc3f2f..7f6f221 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -1,371 +1,373 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 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// 24//
25// Journal Entry 25// Journal Entry
26 26
27#include <qlabel.h> 27#include <qlabel.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#include <qvbox.h> 29#include <qvbox.h>
30#include <qfile.h> 30#include <qfile.h>
31#include <qdir.h> 31#include <qdir.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
33#include <qtextcodec.h> 33#include <qtextcodec.h>
34#include <qpixmap.h> 34#include <qpixmap.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qapplication.h> 36#include <qapplication.h>
37 37
38#include <kdebug.h> 38#include <kdebug.h>
39#include <kglobal.h> 39#include <kglobal.h>
40#include <klocale.h> 40#include <klocale.h>
41#include <ktextedit.h> 41#include <ktextedit.h>
42#include <kfiledialog.h> 42#include <kfiledialog.h>
43#include <kmessagebox.h> 43#include <kmessagebox.h>
44#include "koprefs.h" 44#include "koprefs.h"
45#include <klineedit.h> 45#include <klineedit.h>
46#include <kdialog.h> 46#include <kdialog.h>
47#include "kolocationbox.h" 47#include "kolocationbox.h"
48 48
49#include <libkcal/journal.h> 49#include <libkcal/journal.h>
50#include <libkcal/calendarresources.h> 50#include <libkcal/calendarresources.h>
51#include <libkcal/resourcecalendar.h> 51#include <libkcal/resourcecalendar.h>
52#include <kresources/resourceselectdialog.h> 52#include <kresources/resourceselectdialog.h>
53 53
54#include "journalentry.h" 54#include "journalentry.h"
55//#include "journalentry.moc" 55//#include "journalentry.moc"
56#ifndef DESKTOP_VERSION 56#ifndef DESKTOP_VERSION
57#include <qpe/qpeapplication.h> 57#include <qpe/qpeapplication.h>
58#endif 58#endif
59JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : 59JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
60 QFrame(parent) 60 QFrame(parent)
61{ 61{
62 62
63 int fac = 5; 63 int fac = 5;
64 heiHint = QApplication::desktop()->height(); 64 heiHint = QApplication::desktop()->height();
65 if ( heiHint > 800 ) 65 if ( heiHint > 800 )
66 fac += 2; 66 fac += 2;
67 heiHint = heiHint / fac; 67 heiHint = heiHint / fac;
68 68
69 showOnlyMode = false; 69 showOnlyMode = false;
70 mCalendar = calendar; 70 mCalendar = calendar;
71 mJournal = 0; 71 mJournal = 0;
72 visibleMode = true; 72 visibleMode = true;
73 QHBox * vb = new QHBox ( this ); 73 QHBox * vb = new QHBox ( this );
74 QPixmap iconp; 74 QPixmap iconp;
75 vb->setMargin ( KDialog::marginHint()-1 ); 75 vb->setMargin ( KDialog::marginHint()-1 );
76 QPushButton * toggleJournal = new QPushButton( vb ); 76 QPushButton * toggleJournal = new QPushButton( vb );
77 iconp = SmallIcon("1updownarrow"); 77 iconp = SmallIcon("1updownarrow");
78 toggleJournal->setPixmap (iconp ) ; 78 toggleJournal->setPixmap (iconp ) ;
79 QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb); 79 QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
80 mTitle = new KOLocationBox(TRUE, vb, 30); 80 mTitle = new KOLocationBox(TRUE, vb, 30);
81 mTitle->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); 81 mTitle->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) );
82 mCalendarBox = new QComboBox(vb); 82 mCalendarBox = new QComboBox(vb);
83 mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); 83 mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) );
84#ifndef DESKTOP_VERSION 84#ifndef DESKTOP_VERSION
85 mTitle->setSizeLimit( 8 ); 85 mTitle->setSizeLimit( 8 );
86 mCalendarBox->setSizeLimit( 8 ); 86 mCalendarBox->setSizeLimit( 8 );
87#endif 87#endif
88 vb->setStretchFactor ( mTitle, 8 ); 88 vb->setStretchFactor ( mTitle, 8 );
89 int limit = 3; 89 int limit = 3;
90 if ( QApplication::desktop()->width() < 640 ) 90 if ( QApplication::desktop()->width() < 640 )
91 limit = 6; 91 limit = 6;
92 vb->setStretchFactor ( mCalendarBox, limit ); 92 vb->setStretchFactor ( mCalendarBox, limit );
93 //mTitleLabel->setMargin(0); 93 //mTitleLabel->setMargin(0);
94 //mTitleLabel->setAlignment(AlignCenter); 94 //mTitleLabel->setAlignment(AlignCenter);
95 QPushButton * loadTemplate = new QPushButton( vb ); 95 QPushButton * loadTemplate = new QPushButton( vb );
96 QPushButton * saveTemplate = new QPushButton( vb ); 96 QPushButton * saveTemplate = new QPushButton( vb );
97 if ( QApplication::desktop()->width() < 321 ) 97 if ( QApplication::desktop()->width() < 321 )
98 iconp = SmallIcon("fileexport16"); 98 iconp = SmallIcon("fileexport16");
99 else 99 else
100 iconp = SmallIcon("fileexport"); 100 iconp = SmallIcon("fileexport");
101 saveTemplate->setPixmap (iconp ) ; 101 saveTemplate->setPixmap (iconp ) ;
102 int size = saveTemplate->sizeHint().height(); 102 int size = saveTemplate->sizeHint().height();
103 if ( QApplication::desktop()->width() < 321 ) 103 if ( QApplication::desktop()->width() < 321 )
104 iconp = SmallIcon("fileimport16"); 104 iconp = SmallIcon("fileimport16");
105 else 105 else
106 iconp = SmallIcon("fileimport"); 106 iconp = SmallIcon("fileimport");
107 loadTemplate->setPixmap (iconp ) ; 107 loadTemplate->setPixmap (iconp ) ;
108 loadTemplate->setFixedSize( size, size ); 108 loadTemplate->setFixedSize( size, size );
109 saveTemplate->setFixedSize( size, size ); 109 saveTemplate->setFixedSize( size, size );
110 int widwid = size; 110 int widwid = size;
111 if ( QApplication::desktop()->width() < 320 ) 111 if ( QApplication::desktop()->width() < 320 )
112 widwid = size/2+1; 112 widwid = size/2+1;
113 toggleJournal->setFixedSize( widwid , size ); 113 toggleJournal->setFixedSize( widwid , size );
114 mTitle->setFixedHeight( size+4); 114 mTitle->setFixedHeight( size+4);
115 mCalendarBox->setFixedHeight( size+4); 115 mCalendarBox->setFixedHeight( size+4);
116 mEditor = new KTextEdit(this); 116 mEditor = new KTextEdit(this);
117#ifndef DESKTOP_VERSION 117#ifndef DESKTOP_VERSION
118 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); 118 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
119#endif 119#endif
120 mMaxWidDiff = 3*size - 2*frameWidth() - textLabel->sizeHint().width(); 120 mMaxWidDiff = 3*size - 2*frameWidth() - textLabel->sizeHint().width();
121 mDeskWid = QApplication::desktop()->width(); 121 mDeskWid = QApplication::desktop()->width();
122 int maxwid = mDeskWid - mMaxWidDiff; 122 int maxwid = mDeskWid - mMaxWidDiff;
123 if ( QApplication::desktop()->width() < 640 ) { 123 if ( QApplication::desktop()->width() < 640 ) {
124 mTitle->setMaximumWidth( maxwid/2 +20 ); 124 mTitle->setMaximumWidth( maxwid/2 +20 );
125 mCalendarBox->setMaximumWidth( maxwid/2 -20); 125 mCalendarBox->setMaximumWidth( maxwid/2 -20);
126 } else { 126 } else {
127 mTitle->setMaximumWidth( (maxwid/4)*3); 127 mTitle->setMaximumWidth( (maxwid/4)*3);
128 mCalendarBox->setMaximumWidth( maxwid/2 ); 128 mCalendarBox->setMaximumWidth( maxwid/2 );
129 } 129 }
130 //mCalendarBox->setMaximumWidth( maxwid/2 -20 ); 130 //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
131 mEditor->setWordWrap( KTextEdit::WidgetWidth ); 131 mEditor->setWordWrap( KTextEdit::WidgetWidth );
132 QBoxLayout *topLayout = new QVBoxLayout(this); 132 QBoxLayout *topLayout = new QVBoxLayout(this);
133 topLayout->addWidget(vb); 133 topLayout->addWidget(vb);
134 topLayout->addWidget(mEditor); 134 topLayout->addWidget(mEditor);
135 mEditor->installEventFilter(this); 135 mEditor->installEventFilter(this);
136 connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); 136 connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
137 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); 137 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
138 connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); 138 connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
139 mTitle->load( KOLocationBox::SUMMARYJOURNAL ); 139 mTitle->load( KOLocationBox::SUMMARYJOURNAL );
140 mTitle->lineEdit ()->setText(""); 140 mTitle->lineEdit ()->setText("");
141} 141}
142 142
143JournalEntry::~JournalEntry() 143JournalEntry::~JournalEntry()
144{ 144{
145 //qDebug("JournalEntry::~JournalEntry() "); 145 //qDebug("JournalEntry::~JournalEntry() ");
146} 146}
147void JournalEntry::resizeEvent(QResizeEvent* e ) 147void JournalEntry::resizeEvent(QResizeEvent* e )
148{ 148{
149#ifndef DESKTOP_VERSION 149#ifndef DESKTOP_VERSION
150 150
151 if ( mDeskWid != QApplication::desktop()->width() ) { 151 if ( mDeskWid != QApplication::desktop()->width() ) {
152 mDeskWid == QApplication::desktop()->width(); 152 mDeskWid == QApplication::desktop()->width();
153 int maxwid = mDeskWid - mMaxWidDiff; 153 int maxwid = mDeskWid - mMaxWidDiff;
154 if ( QApplication::desktop()->width() < 640 ) { 154 if ( QApplication::desktop()->width() < 640 ) {
155 mTitle->setMaximumWidth( maxwid/2 +20 ); 155 mTitle->setMaximumWidth( maxwid/2 +20 );
156 mCalendarBox->setMaximumWidth( maxwid/2 -20); 156 mCalendarBox->setMaximumWidth( maxwid/2 -20);
157 } 157 }
158 else { 158 else {
159 mTitle->setMaximumWidth( (maxwid/4)*3); 159 mTitle->setMaximumWidth( (maxwid/4)*3);
160 mCalendarBox->setMaximumWidth( maxwid/2 ); 160 mCalendarBox->setMaximumWidth( maxwid/2 );
161 } 161 }
162 //mCalendarBox->setMaximumWidth( maxwid/2 -20 ); 162 //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
163 } 163 }
164 //setMaximumWidth( QApplication::desktop()->width() ); 164 //setMaximumWidth( QApplication::desktop()->width() );
165 //qDebug("MAXXX %d ", QApplication::desktop()->width()); 165 //qDebug("MAXXX %d ", QApplication::desktop()->width());
166#endif 166#endif
167 QFrame::resizeEvent( e ); 167 QFrame::resizeEvent( e );
168} 168}
169QSize JournalEntry::sizeHint() const 169QSize JournalEntry::sizeHint() const
170{ 170{
171 return QSize ( 240, heiHint ); 171 return QSize ( 240, heiHint );
172} 172}
173void JournalEntry::slotSaveTemplate() 173void JournalEntry::slotSaveTemplate()
174{ 174{
175 QString fileName =locateLocal( "templates", "journals" ); 175 QString fileName =locateLocal( "templates", "journals" );
176 QDir t_dir; 176 QDir t_dir;
177 if ( !t_dir.exists(fileName) ) 177 if ( !t_dir.exists(fileName) )
178 t_dir.mkdir ( fileName ); 178 t_dir.mkdir ( fileName );
179 fileName += "/journal"; 179 fileName += "/journal";
180 fileName = KFileDialog::getSaveFileName( fileName , i18n("Save as Journal template"), this ); 180 fileName = KFileDialog::getSaveFileName( fileName , i18n("Save as Journal template"), this );
181 if ( fileName.length() == 0 ) 181 if ( fileName.length() == 0 )
182 return; 182 return;
183 183
184 QFile fileIn( fileName ); 184 QFile fileIn( fileName );
185 if (!fileIn.open( IO_WriteOnly ) ) { 185 if (!fileIn.open( IO_WriteOnly ) ) {
186 KMessageBox::error( this, i18n("Error saving template file\n '%1'.") 186 KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
187 .arg( fileName ) ); 187 .arg( fileName ) );
188 return; 188 return;
189 } 189 }
190 // QString text; 190 // QString text;
191 QTextStream tsIn( &fileIn ); 191 QTextStream tsIn( &fileIn );
192 tsIn.setCodec( QTextCodec::codecForName("utf8") ); 192 tsIn.setCodec( QTextCodec::codecForName("utf8") );
193 tsIn << mEditor->text(); 193 tsIn << mEditor->text();
194 fileIn.close(); 194 fileIn.close();
195} 195}
196void JournalEntry::slotLoadTemplate() 196void JournalEntry::slotLoadTemplate()
197{ 197{
198 QString fileName =locateLocal( "templates", "journals" ); 198 QString fileName =locateLocal( "templates", "journals" );
199 QDir t_dir; 199 QDir t_dir;
200 if ( !t_dir.exists(fileName) ) 200 if ( !t_dir.exists(fileName) )
201 t_dir.mkdir ( fileName ); 201 t_dir.mkdir ( fileName );
202 fileName += "/journal"; 202 fileName += "/journal";
203 fileName = KFileDialog::getOpenFileName( fileName , i18n("Insert Journal template"), this ); 203 fileName = KFileDialog::getOpenFileName( fileName , i18n("Insert Journal template"), this );
204 if ( fileName.length() == 0 ) 204 if ( fileName.length() == 0 )
205 return; 205 return;
206 QFile fileIn( fileName ); 206 QFile fileIn( fileName );
207 if (!fileIn.open( IO_ReadOnly ) ) { 207 if (!fileIn.open( IO_ReadOnly ) ) {
208 KMessageBox::error( this, i18n("Error loading template file\n '%1'.") 208 KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
209 .arg( fileName ) ); 209 .arg( fileName ) );
210 return; 210 return;
211 } 211 }
212 QTextStream tsIn( &fileIn ); 212 QTextStream tsIn( &fileIn );
213 tsIn.setCodec( QTextCodec::codecForName("utf8") ); 213 tsIn.setCodec( QTextCodec::codecForName("utf8") );
214 QString text = tsIn.read(); 214 QString text = tsIn.read();
215 fileIn.close(); 215 fileIn.close();
216 int line, col; 216 int line, col;
217 mEditor->getCursorPosition (& line, & col ); 217 mEditor->getCursorPosition (& line, & col );
218 mEditor-> insertAt ( text, line, col, true ); 218 mEditor-> insertAt ( text, line, col, true );
219 //mEditor->setIgnoreMark( true ); 219 //mEditor->setIgnoreMark( true );
220} 220}
221void JournalEntry::setDate(const QDate &date) 221void JournalEntry::setDate(const QDate &date)
222{ 222{
223 showOnlyMode = false; 223 showOnlyMode = false;
224 writeJournal(); 224 writeJournal();
225 mDate = date; 225 mDate = date;
226 fillCalendar( mCalendar->defaultCalendar() ); 226 fillCalendar( mCalendar->defaultCalendar() );
227} 227}
228void JournalEntry::fillCalendar( int setToID ) 228void JournalEntry::fillCalendar( int setToID )
229{ 229{
230 mCalendarBox->clear(); 230 mCalendarBox->clear();
231 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 231 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
232 int std = 0; 232 int std = 0;
233 int count = 0; 233 int count = 0;
234 while ( kkf ) { 234 while ( kkf ) {
235 if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) || setToID == kkf->mCalNumber ) { 235 if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) || setToID == kkf->mCalNumber ) {
236 if ( setToID ) { 236 if ( setToID ) {
237 if ( kkf->mCalNumber == setToID ) 237 if ( kkf->mCalNumber == setToID )
238 std = count; 238 std = count;
239 } else { 239 } else {
240 if ( kkf->isStandard ) { 240 if ( kkf->isStandard ) {
241 std = count; 241 std = count;
242 } 242 }
243 } 243 }
244 ++count; 244 ++count;
245 mCalendarBox->insertItem( kkf->mName ); 245 mCalendarBox->insertItem( kkf->mName );
246 } 246 }
247 kkf = KOPrefs::instance()->mCalendars.next(); 247 kkf = KOPrefs::instance()->mCalendars.next();
248 } 248 }
249 mCalendarBox->setCurrentItem( std ); 249 mCalendarBox->setCurrentItem( std );
250} 250}
251 251
252void JournalEntry::toggleShowJournal() 252void JournalEntry::toggleShowJournal()
253{ 253{
254 if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() )
255 return;
254 if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) 256 if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
255 flushEntry(); 257 flushEntry();
256 if ( showOnlyMode ) 258 if ( showOnlyMode )
257 emit showJournalOnly( 0 ); 259 emit showJournalOnly( 0 );
258 else { 260 else {
259 // we have to protect mJournal from deleting if mJournal has empty text 261 // we have to protect mJournal from deleting if mJournal has empty text
260 visibleMode = false; // set to true via :setShowOnly() 262 visibleMode = false; // set to true via :setShowOnly()
261 emit showJournalOnly( mJournal ); 263 emit showJournalOnly( mJournal );
262 //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) ); 264 //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) );
263 } 265 }
264} 266}
265void JournalEntry::setVisibleOn() 267void JournalEntry::setVisibleOn()
266{ 268{
267 visibleMode = true; 269 visibleMode = true;
268} 270}
269void JournalEntry::setShowOnly() 271void JournalEntry::setShowOnly()
270{ 272{
271 showOnlyMode = true; 273 showOnlyMode = true;
272 if ( mTitle->currentText().isEmpty() ) 274 if ( mTitle->currentText().isEmpty() )
273 mTitle->setFocus(); 275 mTitle->setFocus();
274 else 276 else
275 mEditor->setFocus(); 277 mEditor->setFocus();
276} 278}
277void JournalEntry::setJournal(Journal *journal, bool saveJournal ) 279void JournalEntry::setJournal(Journal *journal, bool saveJournal )
278{ 280{
279 if ( saveJournal ) 281 if ( saveJournal )
280 writeJournal(); 282 writeJournal();
281 mTitle->load( KOLocationBox::SUMMARYJOURNAL ); 283 mTitle->load( KOLocationBox::SUMMARYJOURNAL );
282 284
283 mJournal = journal; 285 mJournal = journal;
284 if ( journal->isReadOnly() ) 286 if ( journal->isReadOnly() )
285 mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")"); 287 mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")");
286 else 288 else
287 mTitle->lineEdit ()->setText(mJournal->summary()); 289 mTitle->lineEdit ()->setText(mJournal->summary());
288 mEditor->setText(mJournal->description()); 290 mEditor->setText(mJournal->description());
289 mTitle->setEnabled (!journal->isReadOnly() ); 291 mTitle->setEnabled (!journal->isReadOnly() );
290 mEditor->setReadOnly ( journal->isReadOnly() ); 292 mEditor->setReadOnly ( journal->isReadOnly() );
291 mCalendarBox->setEnabled (!journal->isReadOnly() ); 293 mCalendarBox->setEnabled (!journal->isReadOnly() );
292 fillCalendar( mJournal->calID() ); 294 fillCalendar( mJournal->calID() );
293} 295}
294 296
295Journal *JournalEntry::journal() const 297Journal *JournalEntry::journal() const
296{ 298{
297 return mJournal; 299 return mJournal;
298} 300}
299 301
300 302
301void JournalEntry::clear() 303void JournalEntry::clear()
302{ 304{
303 mJournal = 0; 305 mJournal = 0;
304 mEditor->setText(""); 306 mEditor->setText("");
305 mTitle->load( KOLocationBox::SUMMARYJOURNAL ); 307 mTitle->load( KOLocationBox::SUMMARYJOURNAL );
306 mTitle->lineEdit ()->setText(""); 308 mTitle->lineEdit ()->setText("");
307} 309}
308 310
309bool JournalEntry::eventFilter( QObject *o, QEvent *e ) 311bool JournalEntry::eventFilter( QObject *o, QEvent *e )
310{ 312{
311// kdDebug() << "JournalEntry::event received " << e->type() << endl; 313// kdDebug() << "JournalEntry::event received " << e->type() << endl;
312 314
313 if ( e->type() == QEvent::FocusOut ) { 315 if ( e->type() == QEvent::FocusOut ) {
314 writeJournal(); 316 writeJournal();
315 } 317 }
316 if ( e->type() == QEvent::KeyPress ) { 318 if ( e->type() == QEvent::KeyPress ) {
317 QKeyEvent * k = (QKeyEvent *) e; 319 QKeyEvent * k = (QKeyEvent *) e;
318 if ( k->state() == Qt::ControlButton ) { 320 if ( k->state() == Qt::ControlButton ) {
319 k->ignore(); 321 k->ignore();
320 //return true; 322 //return true;
321 } 323 }
322 } 324 }
323 325
324 return QFrame::eventFilter( o, e ); // standard event processing 326 return QFrame::eventFilter( o, e ); // standard event processing
325} 327}
326 328
327void JournalEntry::writeJournal() 329void JournalEntry::writeJournal()
328{ 330{
329 if ( !visibleMode ) return; 331 if ( !visibleMode ) return;
330 if ( !mTitle->isEnabled() ) return; 332 if ( !mTitle->isEnabled() ) return;
331 if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) { 333 if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) {
332 if ( mJournal ) { 334 if ( mJournal ) {
333 Journal* j = mJournal; 335 Journal* j = mJournal;
334 mJournal = 0; 336 mJournal = 0;
335 bool conf = KOPrefs::instance()->mConfirm; 337 bool conf = KOPrefs::instance()->mConfirm;
336 KOPrefs::instance()->mConfirm = false; 338 KOPrefs::instance()->mConfirm = false;
337 emit deleteJournal(j); 339 emit deleteJournal(j);
338 KOPrefs::instance()->mConfirm = conf; 340 KOPrefs::instance()->mConfirm = conf;
339 } 341 }
340 return; 342 return;
341 } 343 }
342 344
343// kdDebug() << "JournalEntry::writeJournal()..." << endl; 345// kdDebug() << "JournalEntry::writeJournal()..." << endl;
344 346
345 if (!mJournal) { 347 if (!mJournal) {
346 mJournal = new Journal; 348 mJournal = new Journal;
347 mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); 349 mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
348 mCalendar->addJournal(mJournal); 350 mCalendar->addJournal(mJournal);
349 } 351 }
350 if ( mJournal->description() != mEditor->text() ) { 352 if ( mJournal->description() != mEditor->text() ) {
351 mJournal->setDescription(mEditor->text()); 353 mJournal->setDescription(mEditor->text());
352 } 354 }
353 if ( mJournal->summary() != mTitle->currentText() ) { 355 if ( mJournal->summary() != mTitle->currentText() ) {
354 mJournal->setSummary(mTitle->currentText()); 356 mJournal->setSummary(mTitle->currentText());
355 mTitle->save(KOLocationBox::SUMMARYJOURNAL); 357 mTitle->save(KOLocationBox::SUMMARYJOURNAL);
356 } 358 }
357 int id = KOPrefs::instance()->getCalendarID( mCalendarBox->currentText() ); 359 int id = KOPrefs::instance()->getCalendarID( mCalendarBox->currentText() );
358 if ( mJournal->calID() != id ) { 360 if ( mJournal->calID() != id ) {
359 mJournal->setCalID( id ); 361 mJournal->setCalID( id );
360 } 362 }
361} 363}
362 364
363void JournalEntry::flushEntry() 365void JournalEntry::flushEntry()
364{ 366{
365 writeJournal(); 367 writeJournal();
366} 368}
367void JournalEntry::keyPressEvent ( QKeyEvent * e ) 369void JournalEntry::keyPressEvent ( QKeyEvent * e )
368{ 370{
369 e->ignore(); 371 e->ignore();
370 372
371} 373}
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c738f7e..7e9fa71 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1,1910 +1,1914 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 Marcus Bains line. 5 Marcus Bains line.
6 Copyright (c) 2001 Ali Rahimi 6 Copyright (c) 2001 Ali Rahimi
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 (at your option) any later version.
12 12
13 This program is distributed in the hope that it will be useful, 13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 GNU General Public License for more details.
17 17
18 You should have received a copy of the GNU General Public License 18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 along with this program; if not, write to the Free Software
20 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 21
22 As a special exception, permission is given to link this program 22 As a special exception, permission is given to link this program
23 with any edition of Qt, and distribute the resulting executable, 23 with any edition of Qt, and distribute the resulting executable,
24 without including the source code for Qt in the source distribution. 24 without including the source code for Qt in the source distribution.
25*/ 25*/
26 26
27#ifndef _WIN32_ 27#ifndef _WIN32_
28#define protected public 28#define protected public
29#include <qwidget.h> 29#include <qwidget.h>
30#undef protected 30#undef protected
31#endif 31#endif
32#include <qintdict.h> 32#include <qintdict.h>
33#include <qdatetime.h> 33#include <qdatetime.h>
34#include <qapplication.h> 34#include <qapplication.h>
35#include <qpopupmenu.h> 35#include <qpopupmenu.h>
36#include <qcursor.h> 36#include <qcursor.h>
37#include <qpainter.h> 37#include <qpainter.h>
38 38
39#include <kdebug.h> 39#include <kdebug.h>
40#include <klocale.h> 40#include <klocale.h>
41#include <kiconloader.h> 41#include <kiconloader.h>
42#include <kglobal.h> 42#include <kglobal.h>
43 43
44#include "koagendaitem.h" 44#include "koagendaitem.h"
45#include "koprefs.h" 45#include "koprefs.h"
46#include "koglobals.h" 46#include "koglobals.h"
47 47
48#include "koagenda.h" 48#include "koagenda.h"
49 49
50#include <libkcal/event.h> 50#include <libkcal/event.h>
51#include <libkcal/todo.h> 51#include <libkcal/todo.h>
52 52
53#ifndef DESKTOP_VERSION 53#ifndef DESKTOP_VERSION
54#include <qpe/qpeapplication.h> 54#include <qpe/qpeapplication.h>
55#endif 55#endif
56 56
57//extern bool globalFlagBlockPainting; 57//extern bool globalFlagBlockPainting;
58extern int globalFlagBlockAgenda; 58extern int globalFlagBlockAgenda;
59extern int globalFlagBlockAgendaItemPaint; 59extern int globalFlagBlockAgendaItemPaint;
60extern int globalFlagBlockAgendaItemUpdate; 60extern int globalFlagBlockAgendaItemUpdate;
61extern int globalFlagBlockStartup; 61extern int globalFlagBlockStartup;
62 62
63 63
64//////////////////////////////////////////////////////////////////////////// 64////////////////////////////////////////////////////////////////////////////
65MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name) 65MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
66 : QFrame(_agenda->viewport(),name), agenda(_agenda) 66 : QFrame(_agenda->viewport(),name), agenda(_agenda)
67{ 67{
68 setLineWidth(0); 68 setLineWidth(0);
69 setMargin(0); 69 setMargin(0);
70 setBackgroundColor(Qt::red); 70 setBackgroundColor(Qt::red);
71 minutes = new QTimer(this); 71 minutes = new QTimer(this);
72 connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc())); 72 connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
73 minutes->start(0, true); 73 minutes->start(0, true);
74 mTimeBox = new QLabel(this); 74 mTimeBox = new QLabel(this);
75 mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom); 75 mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
76 QPalette pal = mTimeBox->palette(); 76 QPalette pal = mTimeBox->palette();
77 pal.setColor(QColorGroup::Foreground, Qt::red); 77 pal.setColor(QColorGroup::Foreground, Qt::red);
78 mTimeBox->setPalette(pal); 78 mTimeBox->setPalette(pal);
79 //mTimeBox->setAutoMask(true); 79 //mTimeBox->setAutoMask(true);
80 80
81 agenda->addChild(mTimeBox); 81 agenda->addChild(mTimeBox);
82 82
83 oldToday = -1; 83 oldToday = -1;
84} 84}
85 85
86MarcusBains::~MarcusBains() 86MarcusBains::~MarcusBains()
87{ 87{
88 //delete minutes; 88 //delete minutes;
89} 89}
90 90void MarcusBains::hideMe()
91{
92 hide(); mTimeBox->hide();
93}
91int MarcusBains::todayColumn() 94int MarcusBains::todayColumn()
92{ 95{
93 QDate currentDate = QDate::currentDate(); 96 QDate currentDate = QDate::currentDate();
94 97
95 DateList dateList = agenda->dateList(); 98 DateList dateList = agenda->dateList();
96 DateList::ConstIterator it; 99 DateList::ConstIterator it;
97 int col = 0; 100 int col = 0;
98 for(it = dateList.begin(); it != dateList.end(); ++it) { 101 for(it = dateList.begin(); it != dateList.end(); ++it) {
99 if((*it) == currentDate) 102 if((*it) == currentDate)
100 return KOGlobals::self()->reverseLayout() ? 103 return KOGlobals::self()->reverseLayout() ?
101 agenda->columns() - 1 - col : col; 104 agenda->columns() - 1 - col : col;
102 ++col; 105 ++col;
103 } 106 }
104 107
105 return -1; 108 return -1;
106} 109}
107void MarcusBains::updateLoc() 110void MarcusBains::updateLoc()
108{ 111{
109 updateLocation(); 112 updateLocation();
110} 113}
111void MarcusBains::updateLocation(bool recalculate) 114void MarcusBains::updateLocation(bool recalculate)
112{ 115{
113 116
114 QTime tim = QTime::currentTime(); 117 QTime tim = QTime::currentTime();
115 //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1()); 118 //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1());
116 if((tim.hour() == 0) && (oldTime.hour()==23)) 119 if((tim.hour() == 0) && (oldTime.hour()==23))
117 recalculate = true; 120 recalculate = true;
118 121
119 int mins = tim.hour()*60 + tim.minute(); 122 int mins = tim.hour()*60 + tim.minute();
120 int minutesPerCell = 24 * 60 / agenda->rows(); 123 int minutesPerCell = 24 * 60 / agenda->rows();
121 int y = mins*agenda->gridSpacingY()/minutesPerCell; 124 int y = mins*agenda->gridSpacingY()/minutesPerCell;
122 int today = recalculate ? todayColumn() : oldToday; 125 int today = recalculate ? todayColumn() : oldToday;
123 int x = agenda->gridSpacingX()*today; 126 int x = agenda->gridSpacingX()*today;
124 bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled); 127 bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled);
125 128
126 oldTime = tim; 129 oldTime = tim;
127 oldToday = today; 130 oldToday = today;
128 131
129 if(disabled || (today<0)) { 132 if(disabled || (today<0)) {
130 hide(); mTimeBox->hide(); 133 hide(); mTimeBox->hide();
131 return; 134 return;
132 } else { 135 } else {
133 show(); mTimeBox->show(); 136 show(); mTimeBox->show();
134 } 137 }
135 138
136 if(recalculate) 139 if(recalculate)
137 setFixedSize(agenda->gridSpacingX(),1); 140 setFixedSize(agenda->gridSpacingX(),1);
138 agenda->moveChild(this, x, y); 141 agenda->moveChild(this, x, y);
139 raise(); 142 raise();
140 143
141 if(recalculate) 144 if(recalculate)
142 //mTimeBox->setFont(QFont("helvetica",10)); 145 //mTimeBox->setFont(QFont("helvetica",10));
143 mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont); 146 mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont);
144 147
145 mTimeBox->setText(KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds)); 148 mTimeBox->setText(KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds));
146 mTimeBox->adjustSize(); 149 mTimeBox->adjustSize();
147 // the -2 below is there because there is a bug in this program 150 // the -2 below is there because there is a bug in this program
148 // somewhere, where the last column of this widget is a few pixels 151 // somewhere, where the last column of this widget is a few pixels
149 // narrower than the other columns. 152 // narrower than the other columns.
150 int offs = (today==agenda->columns()-1) ? -4 : 0; 153 int offs = (today==agenda->columns()-1) ? -4 : 0;
151 agenda->moveChild(mTimeBox, 154 agenda->moveChild(mTimeBox,
152 x+agenda->gridSpacingX()-mTimeBox->width()+offs-1, 155 x+agenda->gridSpacingX()-mTimeBox->width()+offs-1,
153 y-mTimeBox->height()); 156 y-mTimeBox->height());
154 mTimeBox->raise(); 157 mTimeBox->raise();
155 //mTimeBox->setAutoMask(true); 158 //mTimeBox->setAutoMask(true);
156 int secs = QTime::currentTime().second(); 159 int secs = QTime::currentTime().second();
157 minutes->start( (60 - secs +1)*1000 ,true); 160 minutes->start( (60 - secs +1)*1000 ,true);
158} 161}
159 162
160 163
161//////////////////////////////////////////////////////////////////////////// 164////////////////////////////////////////////////////////////////////////////
162 165
163 166
164/* 167/*
165 Create an agenda widget with rows rows and columns columns. 168 Create an agenda widget with rows rows and columns columns.
166*/ 169*/
167KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, 170KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
168 const char *name,WFlags f) : 171 const char *name,WFlags f) :
169 QScrollView(parent,name,f) 172 QScrollView(parent,name,f)
170{ 173{
171 174
172 mAllAgendaPopup = 0; 175 mAllAgendaPopup = 0;
173 mColumns = columns; 176 mColumns = columns;
174 mRows = rows; 177 mRows = rows;
175 mGridSpacingY = rowSize; 178 mGridSpacingY = rowSize;
176 mAllDayMode = false; 179 mAllDayMode = false;
177#ifndef DESKTOP_VERSION 180#ifndef DESKTOP_VERSION
178 //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); 181 //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
179#endif 182#endif
180 mHolidayMask = 0; 183 mHolidayMask = 0;
181 init(); 184 init();
182 connect ( this, SIGNAL (contentsMoving ( int , int ) ), this, SLOT ( slotContentMove(int,int)) ); 185 connect ( this, SIGNAL (contentsMoving ( int , int ) ), this, SLOT ( slotContentMove(int,int)) );
183} 186}
184 187
185/* 188/*
186 Create an agenda widget with columns columns and one row. This is used for 189 Create an agenda widget with columns columns and one row. This is used for
187 all-day events. 190 all-day events.
188*/ 191*/
189KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) : 192KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
190 QScrollView(parent,name,f) 193 QScrollView(parent,name,f)
191{ 194{
192 mAllAgendaPopup = 0; 195 mAllAgendaPopup = 0;
193 blockResize = false; 196 blockResize = false;
194 mColumns = columns; 197 mColumns = columns;
195 mRows = 1; 198 mRows = 1;
196 //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize); 199 //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
197 mGridSpacingY = KOPrefs::instance()->mAllDaySize; 200 mGridSpacingY = KOPrefs::instance()->mAllDaySize;
198 mAllDayMode = true; 201 mAllDayMode = true;
199#ifndef DESKTOP_VERSION 202#ifndef DESKTOP_VERSION
200 //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); 203 //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
201#endif 204#endif
202 mHolidayMask = 0; 205 mHolidayMask = 0;
203 init(); 206 init();
204} 207}
205 208
206 209
207KOAgenda::~KOAgenda() 210KOAgenda::~KOAgenda()
208{ 211{
209 if(mMarcusBains) delete mMarcusBains; 212 if(mMarcusBains) delete mMarcusBains;
210 213
211} 214}
212 215
213Incidence *KOAgenda::selectedIncidence() const 216Incidence *KOAgenda::selectedIncidence() const
214{ 217{
215 return (mSelectedItem ? mSelectedItem->incidence() : 0); 218 return (mSelectedItem ? mSelectedItem->incidence() : 0);
216} 219}
217 220
218 221
219QDate KOAgenda::selectedIncidenceDate() const 222QDate KOAgenda::selectedIncidenceDate() const
220{ 223{
221 return (mSelectedItem ? mSelectedItem->itemDate() : QDate()); 224 return (mSelectedItem ? mSelectedItem->itemDate() : QDate());
222} 225}
223 226
224 227
225void KOAgenda::init() 228void KOAgenda::init()
226{ 229{
227 mPopupTimer = new QTimer(this); 230 mPopupTimer = new QTimer(this);
228 connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); 231 connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
229 232
230 mNewItemPopup = new QPopupMenu( this ); 233 mNewItemPopup = new QPopupMenu( this );
231 connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); 234 connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) );
232 QString pathString = ""; 235 QString pathString = "";
233 if ( !KOPrefs::instance()->mToolBarMiniIcons ) { 236 if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
234 if ( QApplication::desktop()->width() < 480 ) 237 if ( QApplication::desktop()->width() < 480 )
235 pathString += "icons16/"; 238 pathString += "icons16/";
236 } else 239 } else
237 pathString += "iconsmini/"; 240 pathString += "iconsmini/";
238 241
239 mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 242 mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 );
240 mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); 243 mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 );
241 mNewItemPopup->insertSeparator ( ); 244 mNewItemPopup->insertSeparator ( );
242 mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); 245 mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 );
243 mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ), i18n("Next days"),8 ); 246 mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ), i18n("Next days"),8 );
244 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next week"),4 ); 247 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next week"),4 );
245 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next two weeks"),5 ); 248 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next two weeks"),5 );
246 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("This month"),6 ); 249 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("This month"),6 );
247 mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); 250 mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 );
248#ifndef _WIN32_ 251#ifndef _WIN32_
249 int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase 252 int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
250 viewport()->setWFlags ( wflags); 253 viewport()->setWFlags ( wflags);
251#endif 254#endif
252 mGridSpacingX = 80; 255 mGridSpacingX = 80;
253 mResizeBorderWidth = 8; 256 mResizeBorderWidth = 8;
254 mScrollBorderWidth = 8; 257 mScrollBorderWidth = 8;
255 mScrollDelay = 30; 258 mScrollDelay = 30;
256 mScrollOffset = 10; 259 mScrollOffset = 10;
257 mPaintPixmap.resize( 20,20); 260 mPaintPixmap.resize( 20,20);
258 //enableClipper(true); 261 //enableClipper(true);
259 262
260 // Grab key strokes for keyboard navigation of agenda. Seems to have no 263 // Grab key strokes for keyboard navigation of agenda. Seems to have no
261 // effect. Has to be fixed. 264 // effect. Has to be fixed.
262 setFocusPolicy(WheelFocus); 265 setFocusPolicy(WheelFocus);
263 266
264 connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp())); 267 connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp()));
265 connect(&mScrollDownTimer,SIGNAL(timeout()),SLOT(scrollDown())); 268 connect(&mScrollDownTimer,SIGNAL(timeout()),SLOT(scrollDown()));
266 connect(&mResizeTimer,SIGNAL(timeout()),SLOT(finishResize())); 269 connect(&mResizeTimer,SIGNAL(timeout()),SLOT(finishResize()));
267 270
268 mStartCellX = 0; 271 mStartCellX = 0;
269 mStartCellY = 0; 272 mStartCellY = 0;
270 mCurrentCellX = 0; 273 mCurrentCellX = 0;
271 mCurrentCellY = 0; 274 mCurrentCellY = 0;
272 275
273 mSelectionCellX = 0; 276 mSelectionCellX = 0;
274 mSelectionYTop = 0; 277 mSelectionYTop = 0;
275 mSelectionHeight = 0; 278 mSelectionHeight = 0;
276 279
277 mOldLowerScrollValue = -1; 280 mOldLowerScrollValue = -1;
278 mOldUpperScrollValue = -1; 281 mOldUpperScrollValue = -1;
279 282
280 mClickedItem = 0; 283 mClickedItem = 0;
281 284
282 mActionItem = 0; 285 mActionItem = 0;
283 mActionType = NOP; 286 mActionType = NOP;
284 mItemMoved = false; 287 mItemMoved = false;
285 288
286 mSelectedItem = 0; 289 mSelectedItem = 0;
287 290
288 // mItems.setAutoDelete(true); 291 // mItems.setAutoDelete(true);
289 292
290 resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 ); 293 resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
291 294
292 viewport()->update(); 295 viewport()->update();
293 296
294 setMinimumSize(30, 1); 297 setMinimumSize(30, 1);
295// setMaximumHeight(mGridSpacingY * mRows + 5); 298// setMaximumHeight(mGridSpacingY * mRows + 5);
296 299
297 // Disable horizontal scrollbar. This is a hack. The geometry should be 300 // Disable horizontal scrollbar. This is a hack. The geometry should be
298 // controlled in a way that the contents horizontally always fits. Then it is 301 // controlled in a way that the contents horizontally always fits. Then it is
299 // not necessary to turn off the scrollbar. 302 // not necessary to turn off the scrollbar.
300 setHScrollBarMode(AlwaysOff); 303 setHScrollBarMode(AlwaysOff);
301 if ( ! mAllDayMode ) 304 if ( ! mAllDayMode )
302 setVScrollBarMode(AlwaysOn); 305 setVScrollBarMode(AlwaysOn);
303 else 306 else
304 setVScrollBarMode(AlwaysOff); 307 setVScrollBarMode(AlwaysOff);
305 308
306 setStartHour(KOPrefs::instance()->mDayBegins); 309 setStartHour(KOPrefs::instance()->mDayBegins);
307 310
308 calculateWorkingHours(); 311 calculateWorkingHours();
309 312
310 connect(verticalScrollBar(),SIGNAL(valueChanged(int)), 313 connect(verticalScrollBar(),SIGNAL(valueChanged(int)),
311 SLOT(checkScrollBoundaries(int))); 314 SLOT(checkScrollBoundaries(int)));
312 315
313 // Create the Marcus Bains line. 316 // Create the Marcus Bains line.
314 if(mAllDayMode) 317 if(mAllDayMode)
315 mMarcusBains = 0; 318 mMarcusBains = 0;
316 else { 319 else {
317 mMarcusBains = new MarcusBains(this); 320 mMarcusBains = new MarcusBains(this);
318 addChild(mMarcusBains); 321 addChild(mMarcusBains);
319 } 322 }
320 mPopupKind = 0; 323 mPopupKind = 0;
321 mPopupItem = 0; 324 mPopupItem = 0;
322 mInvalidPixmap = false; 325 mInvalidPixmap = false;
323 326
324} 327}
325 328
326void KOAgenda::shrinkPixmap() 329void KOAgenda::shrinkPixmap()
327{ 330{
328 mPaintPixmap.resize( 20,20); 331 mPaintPixmap.resize( 20,20);
329 mInvalidPixmap = true; 332 mInvalidPixmap = true;
330} 333}
331void KOAgenda::slotContentMove(int,int) 334void KOAgenda::slotContentMove(int,int)
332{ 335{
333 emit sendPing(); 336 emit sendPing();
334 if ( mActionType == NOP ) 337 if ( mActionType == NOP )
335 slotClearSelection(); 338 slotClearSelection();
336 if ( mSelectedItem && !mActionItem ) { 339 if ( mSelectedItem && !mActionItem ) {
337 deselectItem(); 340 deselectItem();
338 emit incidenceSelected( 0 ); 341 emit incidenceSelected( 0 );
339 } 342 }
340} 343}
341void KOAgenda::clear() 344void KOAgenda::clear()
342{ 345{
343 KOAgendaItem *item; 346 KOAgendaItem *item;
344 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 347 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
345 mUnusedItems.append( item ); 348 mUnusedItems.append( item );
346 //item->hide(); 349 //item->hide();
347 } 350 }
348 mItems.clear(); 351 mItems.clear();
349 mSelectedItem = 0; 352 mSelectedItem = 0;
350 clearSelection(); 353 clearSelection();
351} 354}
352 355
353void KOAgenda::clearSelection() 356void KOAgenda::clearSelection()
354{ 357{
355 mSelectionCellX = 0; 358 mSelectionCellX = 0;
356 mSelectionYTop = 0; 359 mSelectionYTop = 0;
357 mSelectionHeight = 0; 360 mSelectionHeight = 0;
358} 361}
359 362
360void KOAgenda::marcus_bains() 363void KOAgenda::marcus_bains()
361{ 364{
362 if(mMarcusBains) mMarcusBains->updateLocation(true); 365 if(mMarcusBains) mMarcusBains->updateLocation(true);
363} 366}
364 367
365 368
366void KOAgenda::changeColumns(int columns) 369void KOAgenda::changeColumns(int columns)
367{ 370{
368 if (columns == 0) { 371 if (columns == 0) {
369 qDebug("KOAgenda::changeColumns() called with argument 0 "); 372 qDebug("KOAgenda::changeColumns() called with argument 0 ");
370 return; 373 return;
371 } 374 }
372 clear(); 375 clear();
373 mColumns = columns; 376 mColumns = columns;
374 computeSizes(); 377 computeSizes();
378 if(mMarcusBains) mMarcusBains->hideMe();
375} 379}
376 380
377/* 381/*
378 This is the eventFilter function, which gets all events from the KOAgendaItems 382 This is the eventFilter function, which gets all events from the KOAgendaItems
379 contained in the agenda. It has to handle moving and resizing for all items. 383 contained in the agenda. It has to handle moving and resizing for all items.
380*/ 384*/
381bool KOAgenda::eventFilter ( QObject *object, QEvent *event ) 385bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
382{ 386{
383 // kdDebug() << "KOAgenda::eventFilter" << endl; 387 // kdDebug() << "KOAgenda::eventFilter" << endl;
384 switch(event->type()) { 388 switch(event->type()) {
385 case QEvent::MouseButtonPress: 389 case QEvent::MouseButtonPress:
386 case QEvent::MouseButtonDblClick: 390 case QEvent::MouseButtonDblClick:
387 case QEvent::MouseButtonRelease: 391 case QEvent::MouseButtonRelease:
388 case QEvent::MouseMove: 392 case QEvent::MouseMove:
389 return eventFilter_mouse(object, static_cast<QMouseEvent *>(event)); 393 return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
390 394
391 case (QEvent::Leave): 395 case (QEvent::Leave):
392 if (!mActionItem) 396 if (!mActionItem)
393 setCursor(arrowCursor); 397 setCursor(arrowCursor);
394 return true; 398 return true;
395 399
396 default: 400 default:
397 return QScrollView::eventFilter(object,event); 401 return QScrollView::eventFilter(object,event);
398 } 402 }
399} 403}
400void KOAgenda::popupMenu() 404void KOAgenda::popupMenu()
401{ 405{
402 mPopupTimer->stop(); 406 mPopupTimer->stop();
403 if ( mPopupKind == 1 || mPopupKind == 3 ) { 407 if ( mPopupKind == 1 || mPopupKind == 3 ) {
404 if (mActionItem ) { 408 if (mActionItem ) {
405 endItemAction(); 409 endItemAction();
406 } 410 }
407 mLeftMouseDown = false; // no more leftMouse computation 411 mLeftMouseDown = false; // no more leftMouse computation
408 if (mPopupItem) { 412 if (mPopupItem) {
409 //mClickedItem = mPopupItem; 413 //mClickedItem = mPopupItem;
410 selectItem(mPopupItem); 414 selectItem(mPopupItem);
411 if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 ) 415 if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 )
412 mAllAgendaPopup->installEventFilter( this ); 416 mAllAgendaPopup->installEventFilter( this );
413 emit showIncidencePopupSignal(mPopupItem->incidence()); 417 emit showIncidencePopupSignal(mPopupItem->incidence());
414 418
415 } 419 }
416 } else if ( mPopupKind == 2 || mPopupKind == 4 ) { 420 } else if ( mPopupKind == 2 || mPopupKind == 4 ) {
417 if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action 421 if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
418 endSelectAction( false ); // do not emit new event signal 422 endSelectAction( false ); // do not emit new event signal
419 mLeftMouseDown = false; // no more leftMouse computation 423 mLeftMouseDown = false; // no more leftMouse computation
420 } 424 }
421 if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 ) 425 if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 )
422 mNewItemPopup->installEventFilter( this ); 426 mNewItemPopup->installEventFilter( this );
423 mNewItemPopup->popup( mPopupPos); 427 mNewItemPopup->popup( mPopupPos);
424 428
425 } 429 }
426 mLeftMouseDown = false; 430 mLeftMouseDown = false;
427 mPopupItem = 0; 431 mPopupItem = 0;
428 mPopupKind = 0; 432 mPopupKind = 0;
429} 433}
430void KOAgenda::categoryChanged(Incidence * inc) 434void KOAgenda::categoryChanged(Incidence * inc)
431{ 435{
432 KOAgendaItem *item; 436 KOAgendaItem *item;
433 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 437 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
434 if ( item->incidence() == inc ) { 438 if ( item->incidence() == inc ) {
435 item->initColor (); 439 item->initColor ();
436 item->updateItem(); 440 item->updateItem();
437 } 441 }
438 } 442 }
439} 443}
440bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) 444bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
441{ 445{
442 446
443 if ( mInvalidPixmap ) { 447 if ( mInvalidPixmap ) {
444 mInvalidPixmap = false; 448 mInvalidPixmap = false;
445 qDebug("KO: Upsizing Pixmaps "); 449 qDebug("KO: Upsizing Pixmaps ");
446 computeSizes(); 450 computeSizes();
447 emit updateViewSignal(); 451 emit updateViewSignal();
448 return true; 452 return true;
449 } 453 }
450 emit sendPing(); 454 emit sendPing();
451 static int startX = 0; 455 static int startX = 0;
452 static int startY = 0; 456 static int startY = 0;
453 int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 ); 457 int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
454 static bool blockMoving = true; 458 static bool blockMoving = true;
455 459
456 //qDebug("KOAgenda::eventFilter_mous "); 460 //qDebug("KOAgenda::eventFilter_mous ");
457 if ( object == mNewItemPopup ) { 461 if ( object == mNewItemPopup ) {
458 //qDebug("mNewItemPopup "); 462 //qDebug("mNewItemPopup ");
459 if ( me->type() == QEvent::MouseButtonRelease ) { 463 if ( me->type() == QEvent::MouseButtonRelease ) {
460 mNewItemPopup->removeEventFilter( this ); 464 mNewItemPopup->removeEventFilter( this );
461 int dX = me->globalPos().x() - mPopupPos.x();; 465 int dX = me->globalPos().x() - mPopupPos.x();;
462 if ( dX < 0 ) 466 if ( dX < 0 )
463 dX = -dX; 467 dX = -dX;
464 int dY = me->globalPos().y() - mPopupPos.y(); 468 int dY = me->globalPos().y() - mPopupPos.y();
465 if ( dY < 0 ) 469 if ( dY < 0 )
466 dY = -dY; 470 dY = -dY;
467 if ( dX > blockmoveDist || dY > blockmoveDist ) { 471 if ( dX > blockmoveDist || dY > blockmoveDist ) {
468 mNewItemPopup->hide(); 472 mNewItemPopup->hide();
469 } 473 }
470 } 474 }
471 return true; 475 return true;
472 } 476 }
473 if ( object == mAllAgendaPopup ) { 477 if ( object == mAllAgendaPopup ) {
474 //qDebug(" mAllAgendaPopup "); 478 //qDebug(" mAllAgendaPopup ");
475 if ( me->type() == QEvent::MouseButtonRelease ) { 479 if ( me->type() == QEvent::MouseButtonRelease ) {
476 mAllAgendaPopup->removeEventFilter( this ); 480 mAllAgendaPopup->removeEventFilter( this );
477 int dX = me->globalPos().x() - mPopupPos.x();; 481 int dX = me->globalPos().x() - mPopupPos.x();;
478 if ( dX < 0 ) 482 if ( dX < 0 )
479 dX = -dX; 483 dX = -dX;
480 int dY = me->globalPos().y() - mPopupPos.y(); 484 int dY = me->globalPos().y() - mPopupPos.y();
481 if ( dY < 0 ) 485 if ( dY < 0 )
482 dY = -dY; 486 dY = -dY;
483 if ( dX > blockmoveDist || dY > blockmoveDist ) { 487 if ( dX > blockmoveDist || dY > blockmoveDist ) {
484 mAllAgendaPopup->hide(); 488 mAllAgendaPopup->hide();
485 } 489 }
486 } 490 }
487 return true; 491 return true;
488 } 492 }
489 QPoint viewportPos; 493 QPoint viewportPos;
490 if (object != viewport()) { 494 if (object != viewport()) {
491 blockmoveDist = blockmoveDist*2; 495 blockmoveDist = blockmoveDist*2;
492 viewportPos = ((QWidget *)object)->mapToParent(me->pos()); 496 viewportPos = ((QWidget *)object)->mapToParent(me->pos());
493 } else { 497 } else {
494 viewportPos = me->pos(); 498 viewportPos = me->pos();
495 } 499 }
496 bool objIsNotViewport = (object != viewport()); 500 bool objIsNotViewport = (object != viewport());
497 bool leftButt = false; 501 bool leftButt = false;
498#ifdef DESKTOP_VERSION 502#ifdef DESKTOP_VERSION
499 leftButt = (me->button() == LeftButton); 503 leftButt = (me->button() == LeftButton);
500#endif 504#endif
501 switch (me->type()) { 505 switch (me->type()) {
502 case QEvent::MouseButtonPress: 506 case QEvent::MouseButtonPress:
503 if (me->button() == LeftButton) { 507 if (me->button() == LeftButton) {
504 mPopupTimer->start( 600 ); 508 mPopupTimer->start( 600 );
505 mLeftMouseDown = true; 509 mLeftMouseDown = true;
506 } 510 }
507 blockMoving = true; 511 blockMoving = true;
508 startX = viewportPos.x(); 512 startX = viewportPos.x();
509 startY = viewportPos.y(); 513 startY = viewportPos.y();
510 mPopupPos = me->globalPos(); 514 mPopupPos = me->globalPos();
511 if ( objIsNotViewport && !leftButt ) { 515 if ( objIsNotViewport && !leftButt ) {
512 KOAgendaItem * tempItem = (KOAgendaItem *)object; 516 KOAgendaItem * tempItem = (KOAgendaItem *)object;
513 if (mAllDayMode) { 517 if (mAllDayMode) {
514 if ( tempItem->height() > 10 ) { 518 if ( tempItem->height() > 10 ) {
515 int minV = tempItem->height()/4; 519 int minV = tempItem->height()/4;
516 if ( minV > (blockmoveDist/2)-2 ) { 520 if ( minV > (blockmoveDist/2)-2 ) {
517 if ( minV > blockmoveDist ) 521 if ( minV > blockmoveDist )
518 minV = blockmoveDist; 522 minV = blockmoveDist;
519 else 523 else
520 minV = (blockmoveDist/2); 524 minV = (blockmoveDist/2);
521 } 525 }
522 bool border = false; 526 bool border = false;
523 int diff = tempItem->y() - viewportPos.y(); 527 int diff = tempItem->y() - viewportPos.y();
524 if ( diff < 0 ) 528 if ( diff < 0 )
525 diff *= -1; 529 diff *= -1;
526 if ( diff < minV ) { 530 if ( diff < minV ) {
527 border = true; 531 border = true;
528 objIsNotViewport = false; 532 objIsNotViewport = false;
529 } 533 }
530 if ( ! border ) { 534 if ( ! border ) {
531 diff = tempItem->y() + tempItem->height()- viewportPos.y(); 535 diff = tempItem->y() + tempItem->height()- viewportPos.y();
532 if ( diff < 0 ) 536 if ( diff < 0 )
533 diff *= -1; 537 diff *= -1;
534 if ( diff < minV ) { 538 if ( diff < minV ) {
535 border = true; 539 border = true;
536 objIsNotViewport = false; 540 objIsNotViewport = false;
537 } 541 }
538 } 542 }
539 } 543 }
540 } else { // not allday 544 } else { // not allday
541 if ( tempItem->width() > 10 ) { 545 if ( tempItem->width() > 10 ) {
542 int minH = tempItem->width()/4; 546 int minH = tempItem->width()/4;
543 if ( minH > (blockmoveDist/2)-2 ) { 547 if ( minH > (blockmoveDist/2)-2 ) {
544 if ( minH > blockmoveDist ) 548 if ( minH > blockmoveDist )
545 minH = blockmoveDist; 549 minH = blockmoveDist;
546 else 550 else
547 minH = (blockmoveDist/2); 551 minH = (blockmoveDist/2);
548 } 552 }
549 bool border = false; 553 bool border = false;
550 int diff = tempItem->x() - viewportPos.x(); 554 int diff = tempItem->x() - viewportPos.x();
551 if ( diff < 0 ) 555 if ( diff < 0 )
552 diff *= -1; 556 diff *= -1;
553 if ( diff < minH ) { 557 if ( diff < minH ) {
554 border = true; 558 border = true;
555 objIsNotViewport = false; 559 objIsNotViewport = false;
556 } 560 }
557 if ( ! border ) { 561 if ( ! border ) {
558 diff = tempItem->x() + tempItem->width() - viewportPos.x(); 562 diff = tempItem->x() + tempItem->width() - viewportPos.x();
559 if ( diff < 0 ) 563 if ( diff < 0 )
560 diff *= -1; 564 diff *= -1;
561 if ( diff < minH ) { 565 if ( diff < minH ) {
562 border = true; 566 border = true;
563 objIsNotViewport = false; 567 objIsNotViewport = false;
564 } 568 }
565 } 569 }
566 } 570 }
567 } 571 }
568 } 572 }
569 if ( objIsNotViewport ) { 573 if ( objIsNotViewport ) {
570 mPopupItem = (KOAgendaItem *)object; 574 mPopupItem = (KOAgendaItem *)object;
571 mPopupKind = 1; 575 mPopupKind = 1;
572 if (me->button() == RightButton) { 576 if (me->button() == RightButton) {
573 mPopupKind = 3; 577 mPopupKind = 3;
574 popupMenu(); 578 popupMenu();
575 } else if (me->button() == LeftButton) { 579 } else if (me->button() == LeftButton) {
576 mActionItem = (KOAgendaItem *)object; 580 mActionItem = (KOAgendaItem *)object;
577 if (mActionItem) { 581 if (mActionItem) {
578 emit signalClearSelection(); 582 emit signalClearSelection();
579 slotClearSelection(); 583 slotClearSelection();
580 selectItem(mActionItem); 584 selectItem(mActionItem);
581 Incidence *incidence = mActionItem->incidence(); 585 Incidence *incidence = mActionItem->incidence();
582 if ( incidence->isReadOnly() /*|| incidence->doesRecur() */) { 586 if ( incidence->isReadOnly() /*|| incidence->doesRecur() */) {
583 mActionItem = 0; 587 mActionItem = 0;
584 } else { 588 } else {
585 startItemAction(viewportPos); 589 startItemAction(viewportPos);
586 } 590 }
587 } 591 }
588 } 592 }
589 } else { // ---------- viewport() 593 } else { // ---------- viewport()
590 mPopupItem = 0; 594 mPopupItem = 0;
591 mPopupKind = 2; 595 mPopupKind = 2;
592 selectItem(0); 596 selectItem(0);
593 mActionItem = 0; 597 mActionItem = 0;
594 if (me->button() == RightButton) { 598 if (me->button() == RightButton) {
595 int x,y; 599 int x,y;
596 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 600 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
597 int gx,gy; 601 int gx,gy;
598 contentsToGrid(x,y,gx,gy); 602 contentsToGrid(x,y,gx,gy);
599 mCurrentCellX = gx; 603 mCurrentCellX = gx;
600 mCurrentCellY = gy; 604 mCurrentCellY = gy;
601 mStartCellX = gx; 605 mStartCellX = gx;
602 mStartCellY = gy; 606 mStartCellY = gy;
603 mPopupKind = 4; 607 mPopupKind = 4;
604 popupMenu(); 608 popupMenu();
605 } else if (me->button() == LeftButton) { 609 } else if (me->button() == LeftButton) {
606 setCursor(arrowCursor); 610 setCursor(arrowCursor);
607 startSelectAction(viewportPos); 611 startSelectAction(viewportPos);
608 } 612 }
609 } 613 }
610 break; 614 break;
611 615
612 case QEvent::MouseButtonRelease: 616 case QEvent::MouseButtonRelease:
613 if (me->button() == LeftButton ) { 617 if (me->button() == LeftButton ) {
614 mPopupTimer->stop(); 618 mPopupTimer->stop();
615 } 619 }
616 if (object != viewport()) { 620 if (object != viewport()) {
617 if (me->button() == LeftButton && mLeftMouseDown) { 621 if (me->button() == LeftButton && mLeftMouseDown) {
618 if (mActionItem) { 622 if (mActionItem) {
619 QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos)); 623 QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
620 //qDebug(" %d %d %d ",clipperPos.y(),visibleHeight() , 9 ); 624 //qDebug(" %d %d %d ",clipperPos.y(),visibleHeight() , 9 );
621 if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) { 625 if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
622 mScrollUpTimer.stop(); 626 mScrollUpTimer.stop();
623 mScrollDownTimer.stop(); 627 mScrollDownTimer.stop();
624 mActionItem->resetMove(); 628 mActionItem->resetMove();
625 placeSubCells( mActionItem ); 629 placeSubCells( mActionItem );
626 // emit startDragSignal( mActionItem->incidence() ); 630 // emit startDragSignal( mActionItem->incidence() );
627 setCursor( arrowCursor ); 631 setCursor( arrowCursor );
628 mActionItem = 0; 632 mActionItem = 0;
629 mActionType = NOP; 633 mActionType = NOP;
630 mItemMoved = 0; 634 mItemMoved = 0;
631 mLeftMouseDown = false; 635 mLeftMouseDown = false;
632 return true; 636 return true;
633 } 637 }
634 endItemAction(); 638 endItemAction();
635 } 639 }
636 } 640 }
637 641
638 } else { // ---------- viewport() 642 } else { // ---------- viewport()
639 if (me->button() == LeftButton && mLeftMouseDown ) { //left click 643 if (me->button() == LeftButton && mLeftMouseDown ) { //left click
640 endSelectAction( true ); // emit new event signal 644 endSelectAction( true ); // emit new event signal
641 } 645 }
642 } 646 }
643 if (me->button() == LeftButton) 647 if (me->button() == LeftButton)
644 mLeftMouseDown = false; 648 mLeftMouseDown = false;
645 649
646 break; 650 break;
647 651
648 case QEvent::MouseMove: 652 case QEvent::MouseMove:
649 //qDebug("mm "); 653 //qDebug("mm ");
650 if ( !mLeftMouseDown ) 654 if ( !mLeftMouseDown )
651 return false; 655 return false;
652 if ( blockMoving ) { 656 if ( blockMoving ) {
653 int dX, dY; 657 int dX, dY;
654 dX = startX - viewportPos.x(); 658 dX = startX - viewportPos.x();
655 if ( dX < 0 ) 659 if ( dX < 0 )
656 dX = -dX; 660 dX = -dX;
657 dY = viewportPos.y() - startY; 661 dY = viewportPos.y() - startY;
658 if ( dY < 0 ) 662 if ( dY < 0 )
659 dY = -dY; 663 dY = -dY;
660 //qDebug("%d %d %d ", dX, dY , blockmoveDist ); 664 //qDebug("%d %d %d ", dX, dY , blockmoveDist );
661 if ( dX > blockmoveDist || dY > blockmoveDist ) { 665 if ( dX > blockmoveDist || dY > blockmoveDist ) {
662 blockMoving = false; 666 blockMoving = false;
663 } 667 }
664 } 668 }
665 if ( ! blockMoving ) 669 if ( ! blockMoving )
666 mPopupTimer->stop(); 670 mPopupTimer->stop();
667 if (object != viewport()) { 671 if (object != viewport()) {
668 KOAgendaItem *moveItem = (KOAgendaItem *)object; 672 KOAgendaItem *moveItem = (KOAgendaItem *)object;
669 if (!moveItem->incidence()->isReadOnly() ) { 673 if (!moveItem->incidence()->isReadOnly() ) {
670 if (!mActionItem) 674 if (!mActionItem)
671 setNoActionCursor(moveItem,viewportPos); 675 setNoActionCursor(moveItem,viewportPos);
672 else { 676 else {
673 if ( !blockMoving ) 677 if ( !blockMoving )
674 performItemAction(viewportPos); 678 performItemAction(viewportPos);
675 } 679 }
676 } 680 }
677 } else { // ---------- viewport() 681 } else { // ---------- viewport()
678 mPopupPos = viewport()->mapToGlobal( me->pos() ); 682 mPopupPos = viewport()->mapToGlobal( me->pos() );
679 if ( mActionType == SELECT ) { 683 if ( mActionType == SELECT ) {
680 performSelectAction( viewportPos ); 684 performSelectAction( viewportPos );
681 } 685 }
682 } 686 }
683 break; 687 break;
684 688
685 case QEvent::MouseButtonDblClick: 689 case QEvent::MouseButtonDblClick:
686 mPopupTimer->stop(); 690 mPopupTimer->stop();
687 if (object == viewport()) { 691 if (object == viewport()) {
688 selectItem(0); 692 selectItem(0);
689 int x,y; 693 int x,y;
690 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 694 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
691 int gx,gy; 695 int gx,gy;
692 contentsToGrid(x,y,gx,gy); 696 contentsToGrid(x,y,gx,gy);
693 emit newEventSignal(gx,gy); 697 emit newEventSignal(gx,gy);
694 } else { 698 } else {
695 KOAgendaItem *doubleClickedItem = (KOAgendaItem *)object; 699 KOAgendaItem *doubleClickedItem = (KOAgendaItem *)object;
696 selectItem(doubleClickedItem); 700 selectItem(doubleClickedItem);
697 if ( KOPrefs::instance()->mEditOnDoubleClick ) 701 if ( KOPrefs::instance()->mEditOnDoubleClick )
698 emit editIncidenceSignal(doubleClickedItem->incidence()); 702 emit editIncidenceSignal(doubleClickedItem->incidence());
699 else 703 else
700 emit showIncidenceSignal(doubleClickedItem->incidence()); 704 emit showIncidenceSignal(doubleClickedItem->incidence());
701 } 705 }
702 break; 706 break;
703 707
704 default: 708 default:
705 break; 709 break;
706 } 710 }
707 return true; 711 return true;
708 712
709} 713}
710 714
711void KOAgenda::newItem( int item ) 715void KOAgenda::newItem( int item )
712{ 716{
713 if ( item == 1 ) { //new event 717 if ( item == 1 ) { //new event
714 newEventSignal(mStartCellX ,mStartCellY ); 718 newEventSignal(mStartCellX ,mStartCellY );
715 } else 719 } else
716 if ( item == 2 ) { //new event 720 if ( item == 2 ) { //new event
717 newTodoSignal(mStartCellX ,mStartCellY ); 721 newTodoSignal(mStartCellX ,mStartCellY );
718 } else 722 } else
719 { 723 {
720 emit showDateView( item, mStartCellX ); 724 emit showDateView( item, mStartCellX );
721 // 3Day view 725 // 3Day view
722 // 4Week view 726 // 4Week view
723 // 5Month view 727 // 5Month view
724 // 6Journal view 728 // 6Journal view
725 } 729 }
726} 730}
727void KOAgenda::slotClearSelection() 731void KOAgenda::slotClearSelection()
728{ 732{
729 if (mSelectionHeight) { 733 if (mSelectionHeight) {
730 int selectionX = mSelectionCellX * mGridSpacingX; 734 int selectionX = mSelectionCellX * mGridSpacingX;
731 int top = mSelectionYTop - 2 *mGridSpacingY; 735 int top = mSelectionYTop - 2 *mGridSpacingY;
732 int hei = mSelectionHeight + 4 *mGridSpacingY; 736 int hei = mSelectionHeight + 4 *mGridSpacingY;
733 clearSelection(); 737 clearSelection();
734 repaintContents( selectionX, top, 738 repaintContents( selectionX, top,
735 mGridSpacingX, hei ,false ); 739 mGridSpacingX, hei ,false );
736 } 740 }
737 741
738} 742}
739void KOAgenda::startSelectAction(QPoint viewportPos) 743void KOAgenda::startSelectAction(QPoint viewportPos)
740{ 744{
741 745
742 emit signalClearSelection(); 746 emit signalClearSelection();
743 slotClearSelection(); 747 slotClearSelection();
744 748
745 mActionType = SELECT; 749 mActionType = SELECT;
746 750
747 int x,y; 751 int x,y;
748 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 752 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
749 int gx,gy; 753 int gx,gy;
750 contentsToGrid(x,y,gx,gy); 754 contentsToGrid(x,y,gx,gy);
751 755
752 mStartCellX = gx; 756 mStartCellX = gx;
753 mStartCellY = gy; 757 mStartCellY = gy;
754 mCurrentCellX = gx; 758 mCurrentCellX = gx;
755 mCurrentCellY = gy; 759 mCurrentCellY = gy;
756 760
757 // Store new selection 761 // Store new selection
758 mSelectionCellX = gx; 762 mSelectionCellX = gx;
759 mSelectionYTop = gy * mGridSpacingY; 763 mSelectionYTop = gy * mGridSpacingY;
760 mSelectionHeight = mGridSpacingY; 764 mSelectionHeight = mGridSpacingY;
761 765
762 // Paint new selection 766 // Paint new selection
763 repaintContents( mSelectionCellX * mGridSpacingX+1, mSelectionYTop, 767 repaintContents( mSelectionCellX * mGridSpacingX+1, mSelectionYTop,
764 mGridSpacingX-1, mSelectionHeight ); 768 mGridSpacingX-1, mSelectionHeight );
765} 769}
766 770
767void KOAgenda::performSelectAction(QPoint viewportPos) 771void KOAgenda::performSelectAction(QPoint viewportPos)
768{ 772{
769 int x,y; 773 int x,y;
770 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 774 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
771 int gx,gy; 775 int gx,gy;
772 contentsToGrid(x,y,gx,gy); 776 contentsToGrid(x,y,gx,gy);
773 777
774 QPoint clipperPos = clipper()-> 778 QPoint clipperPos = clipper()->
775 mapFromGlobal(viewport()->mapToGlobal(viewportPos)); 779 mapFromGlobal(viewport()->mapToGlobal(viewportPos));
776 780
777 // Scroll if cursor was moved to upper or lower end of agenda. 781 // Scroll if cursor was moved to upper or lower end of agenda.
778 if (clipperPos.y() < mScrollBorderWidth) { 782 if (clipperPos.y() < mScrollBorderWidth) {
779 mScrollUpTimer.start(mScrollDelay); 783 mScrollUpTimer.start(mScrollDelay);
780 } else if (visibleHeight() - clipperPos.y() < 784 } else if (visibleHeight() - clipperPos.y() <
781 mScrollBorderWidth) { 785 mScrollBorderWidth) {
782 mScrollDownTimer.start(mScrollDelay); 786 mScrollDownTimer.start(mScrollDelay);
783 } else { 787 } else {
784 mScrollUpTimer.stop(); 788 mScrollUpTimer.stop();
785 mScrollDownTimer.stop(); 789 mScrollDownTimer.stop();
786 } 790 }
787 791
788 if ( gy > mCurrentCellY ) { 792 if ( gy > mCurrentCellY ) {
789 mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop; 793 mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
790 794
791 795
792 repaintContents( (KOGlobals::self()->reverseLayout() ? 796 repaintContents( (KOGlobals::self()->reverseLayout() ?
793 mColumns - 1 - mSelectionCellX : mSelectionCellX) * 797 mColumns - 1 - mSelectionCellX : mSelectionCellX) *
794 mGridSpacingX, mSelectionYTop, 798 mGridSpacingX, mSelectionYTop,
795 mGridSpacingX, mSelectionHeight , false); 799 mGridSpacingX, mSelectionHeight , false);
796 800
797 mCurrentCellY = gy; 801 mCurrentCellY = gy;
798 } else if ( gy < mCurrentCellY ) { 802 } else if ( gy < mCurrentCellY ) {
799 if ( gy >= mStartCellY ) { 803 if ( gy >= mStartCellY ) {
800 int selectionHeight = mSelectionHeight; 804 int selectionHeight = mSelectionHeight;
801 mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop; 805 mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
802 806
803 repaintContents( (KOGlobals::self()->reverseLayout() ? 807 repaintContents( (KOGlobals::self()->reverseLayout() ?
804 mColumns - 1 - mSelectionCellX : mSelectionCellX) * 808 mColumns - 1 - mSelectionCellX : mSelectionCellX) *
805 mGridSpacingX, mSelectionYTop, 809 mGridSpacingX, mSelectionYTop,
806 mGridSpacingX, selectionHeight,false ); 810 mGridSpacingX, selectionHeight,false );
807 811
808 mCurrentCellY = gy; 812 mCurrentCellY = gy;
809 } else { 813 } else {
810 } 814 }
811 } 815 }
812} 816}
813 817
814void KOAgenda::endSelectAction( bool emitNewEvent ) 818void KOAgenda::endSelectAction( bool emitNewEvent )
815{ 819{
816 mActionType = NOP; 820 mActionType = NOP;
817 mScrollUpTimer.stop(); 821 mScrollUpTimer.stop();
818 mScrollDownTimer.stop(); 822 mScrollDownTimer.stop();
819 823
820 emit newTimeSpanSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY); 824 emit newTimeSpanSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
821 if ( emitNewEvent && mStartCellY < mCurrentCellY ) { 825 if ( emitNewEvent && mStartCellY < mCurrentCellY ) {
822 emit newEventSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY); 826 emit newEventSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
823 } 827 }
824} 828}
825 829
826void KOAgenda::startItemAction(QPoint viewportPos) 830void KOAgenda::startItemAction(QPoint viewportPos)
827{ 831{
828 int x,y; 832 int x,y;
829 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 833 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
830 int gx,gy; 834 int gx,gy;
831 contentsToGrid(x,y,gx,gy); 835 contentsToGrid(x,y,gx,gy);
832 836
833 mStartCellX = gx; 837 mStartCellX = gx;
834 mStartCellY = gy; 838 mStartCellY = gy;
835 mCurrentCellX = gx; 839 mCurrentCellX = gx;
836 mCurrentCellY = gy; 840 mCurrentCellY = gy;
837 841
838 if (mAllDayMode) { 842 if (mAllDayMode) {
839 int gridDistanceX = (x - gx * mGridSpacingX); 843 int gridDistanceX = (x - gx * mGridSpacingX);
840 if (gridDistanceX < mResizeBorderWidth && 844 if (gridDistanceX < mResizeBorderWidth &&
841 mActionItem->cellX() == mCurrentCellX) { 845 mActionItem->cellX() == mCurrentCellX) {
842 mActionType = RESIZELEFT; 846 mActionType = RESIZELEFT;
843 setCursor(sizeHorCursor); 847 setCursor(sizeHorCursor);
844 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth && 848 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
845 mActionItem->cellXWidth() == mCurrentCellX) { 849 mActionItem->cellXWidth() == mCurrentCellX) {
846 mActionType = RESIZERIGHT; 850 mActionType = RESIZERIGHT;
847 setCursor(sizeHorCursor); 851 setCursor(sizeHorCursor);
848 } else { 852 } else {
849 mActionType = MOVE; 853 mActionType = MOVE;
850 mActionItem->startMove(); 854 mActionItem->startMove();
851 setCursor(sizeAllCursor); 855 setCursor(sizeAllCursor);
852 } 856 }
853 } else { 857 } else {
854 int gridDistanceY = (y - gy * mGridSpacingY); 858 int gridDistanceY = (y - gy * mGridSpacingY);
855 bool allowResize = ( mActionItem->incidence()->typeID() != todoID ); 859 bool allowResize = ( mActionItem->incidence()->typeID() != todoID );
856 if (allowResize && gridDistanceY < mResizeBorderWidth && 860 if (allowResize && gridDistanceY < mResizeBorderWidth &&
857 mActionItem->cellYTop() == mCurrentCellY && 861 mActionItem->cellYTop() == mCurrentCellY &&
858 !mActionItem->firstMultiItem()) { 862 !mActionItem->firstMultiItem()) {
859 mActionType = RESIZETOP; 863 mActionType = RESIZETOP;
860 setCursor(sizeVerCursor); 864 setCursor(sizeVerCursor);
861 } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth && 865 } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
862 mActionItem->cellYBottom() == mCurrentCellY && 866 mActionItem->cellYBottom() == mCurrentCellY &&
863 !mActionItem->lastMultiItem()) { 867 !mActionItem->lastMultiItem()) {
864 mActionType = RESIZEBOTTOM; 868 mActionType = RESIZEBOTTOM;
865 setCursor(sizeVerCursor); 869 setCursor(sizeVerCursor);
866 } else { 870 } else {
867 mActionType = MOVE; 871 mActionType = MOVE;
868 mActionItem->startMove(); 872 mActionItem->startMove();
869 setCursor(sizeAllCursor); 873 setCursor(sizeAllCursor);
870 } 874 }
871 } 875 }
872} 876}
873 877
874void KOAgenda::performItemAction(QPoint viewportPos) 878void KOAgenda::performItemAction(QPoint viewportPos)
875{ 879{
876// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl; 880// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
877// QPoint point = viewport()->mapToGlobal(viewportPos); 881// QPoint point = viewport()->mapToGlobal(viewportPos);
878// kdDebug() << "Global: " << point.x() << "," << point.y() << endl; 882// kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
879// point = clipper()->mapFromGlobal(point); 883// point = clipper()->mapFromGlobal(point);
880// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl; 884// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
881// kdDebug() << "visible height: " << visibleHeight() << endl; 885// kdDebug() << "visible height: " << visibleHeight() << endl;
882 int x,y; 886 int x,y;
883 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 887 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
884// kdDebug() << "contents: " << x << "," << y << "\n" << endl; 888// kdDebug() << "contents: " << x << "," << y << "\n" << endl;
885 int gx,gy; 889 int gx,gy;
886 contentsToGrid(x,y,gx,gy); 890 contentsToGrid(x,y,gx,gy);
887 QPoint clipperPos = clipper()-> 891 QPoint clipperPos = clipper()->
888 mapFromGlobal(viewport()->mapToGlobal(viewportPos)); 892 mapFromGlobal(viewport()->mapToGlobal(viewportPos));
889 893
890 // Cursor left active agenda area. 894 // Cursor left active agenda area.
891 // This starts a drag. 895 // This starts a drag.
892 if ( /*clipperPos.y() < 0 || clipperPos.y() > visibleHeight() ||*/ 896 if ( /*clipperPos.y() < 0 || clipperPos.y() > visibleHeight() ||*/
893 clipperPos.x() < 0 || clipperPos.x() > visibleWidth() ) { 897 clipperPos.x() < 0 || clipperPos.x() > visibleWidth() ) {
894 if ( mActionType == MOVE ) { 898 if ( mActionType == MOVE ) {
895 mScrollUpTimer.stop(); 899 mScrollUpTimer.stop();
896 mScrollDownTimer.stop(); 900 mScrollDownTimer.stop();
897 mActionItem->resetMove(); 901 mActionItem->resetMove();
898 placeSubCells( mActionItem ); 902 placeSubCells( mActionItem );
899 // emit startDragSignal( mActionItem->incidence() ); 903 // emit startDragSignal( mActionItem->incidence() );
900 setCursor( arrowCursor ); 904 setCursor( arrowCursor );
901 mActionItem = 0; 905 mActionItem = 0;
902 mActionType = NOP; 906 mActionType = NOP;
903 mItemMoved = 0; 907 mItemMoved = 0;
904 return; 908 return;
905 } 909 }
906 } else { 910 } else {
907 switch ( mActionType ) { 911 switch ( mActionType ) {
908 case MOVE: 912 case MOVE:
909 setCursor( sizeAllCursor ); 913 setCursor( sizeAllCursor );
910 break; 914 break;
911 case RESIZETOP: 915 case RESIZETOP:
912 case RESIZEBOTTOM: 916 case RESIZEBOTTOM:
913 setCursor( sizeVerCursor ); 917 setCursor( sizeVerCursor );
914 break; 918 break;
915 case RESIZELEFT: 919 case RESIZELEFT:
916 case RESIZERIGHT: 920 case RESIZERIGHT:
917 setCursor( sizeHorCursor ); 921 setCursor( sizeHorCursor );
918 break; 922 break;
919 default: 923 default:
920 setCursor( arrowCursor ); 924 setCursor( arrowCursor );
921 } 925 }
922 } 926 }
923 927
924 // Scroll if item was moved to upper or lower end of agenda. 928 // Scroll if item was moved to upper or lower end of agenda.
925 if (clipperPos.y() < mScrollBorderWidth) { 929 if (clipperPos.y() < mScrollBorderWidth) {
926 mScrollUpTimer.start(mScrollDelay); 930 mScrollUpTimer.start(mScrollDelay);
927 } else if (visibleHeight() - clipperPos.y() < 931 } else if (visibleHeight() - clipperPos.y() <
928 mScrollBorderWidth) { 932 mScrollBorderWidth) {
929 mScrollDownTimer.start(mScrollDelay); 933 mScrollDownTimer.start(mScrollDelay);
930 } else { 934 } else {
931 mScrollUpTimer.stop(); 935 mScrollUpTimer.stop();
932 mScrollDownTimer.stop(); 936 mScrollDownTimer.stop();
933 } 937 }
934 938
935 // Move or resize item if necessary 939 // Move or resize item if necessary
936 if (mCurrentCellX != gx || mCurrentCellY != gy) { 940 if (mCurrentCellX != gx || mCurrentCellY != gy) {
937 mItemMoved = true; 941 mItemMoved = true;
938 mActionItem->raise(); 942 mActionItem->raise();
939 if (mActionType == MOVE) { 943 if (mActionType == MOVE) {
940 // Move all items belonging to a multi item 944 // Move all items belonging to a multi item
941 KOAgendaItem *moveItem = mActionItem->firstMultiItem(); 945 KOAgendaItem *moveItem = mActionItem->firstMultiItem();
942 bool isMultiItem = (moveItem || mActionItem->lastMultiItem()); 946 bool isMultiItem = (moveItem || mActionItem->lastMultiItem());
943 if (!moveItem) moveItem = mActionItem; 947 if (!moveItem) moveItem = mActionItem;
944 while (moveItem) { 948 while (moveItem) {
945 int dy; 949 int dy;
946 if (isMultiItem) dy = 0; 950 if (isMultiItem) dy = 0;
947 else dy = gy - mCurrentCellY; 951 else dy = gy - mCurrentCellY;
948 moveItem->moveRelative(gx - mCurrentCellX,dy); 952 moveItem->moveRelative(gx - mCurrentCellX,dy);
949 int x,y; 953 int x,y;
950 gridToContents(moveItem->cellX(),moveItem->cellYTop(),x,y); 954 gridToContents(moveItem->cellX(),moveItem->cellYTop(),x,y);
951 moveItem->resize(mGridSpacingX * moveItem->cellWidth(), 955 moveItem->resize(mGridSpacingX * moveItem->cellWidth(),
952 mGridSpacingY * moveItem->cellHeight()); 956 mGridSpacingY * moveItem->cellHeight());
953 moveItem->raise(); 957 moveItem->raise();
954 moveChild(moveItem,x,y); 958 moveChild(moveItem,x,y);
955 moveItem = moveItem->nextMultiItem(); 959 moveItem = moveItem->nextMultiItem();
956 } 960 }
957 } else if (mActionType == RESIZETOP) { 961 } else if (mActionType == RESIZETOP) {
958 if (mCurrentCellY <= mActionItem->cellYBottom()) { 962 if (mCurrentCellY <= mActionItem->cellYBottom()) {
959 mActionItem->expandTop(gy - mCurrentCellY); 963 mActionItem->expandTop(gy - mCurrentCellY);
960 mActionItem->resize(mActionItem->width(), 964 mActionItem->resize(mActionItem->width(),
961 mGridSpacingY * mActionItem->cellHeight()); 965 mGridSpacingY * mActionItem->cellHeight());
962 int x,y; 966 int x,y;
963 gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y); 967 gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y);
964 //moveChild(mActionItem,childX(mActionItem),y); 968 //moveChild(mActionItem,childX(mActionItem),y);
965 QScrollView::moveChild( mActionItem,childX(mActionItem),y ); 969 QScrollView::moveChild( mActionItem,childX(mActionItem),y );
966 } 970 }
967 } else if (mActionType == RESIZEBOTTOM) { 971 } else if (mActionType == RESIZEBOTTOM) {
968 if (mCurrentCellY >= mActionItem->cellYTop()) { 972 if (mCurrentCellY >= mActionItem->cellYTop()) {
969 mActionItem->expandBottom(gy - mCurrentCellY); 973 mActionItem->expandBottom(gy - mCurrentCellY);
970 mActionItem->resize(mActionItem->width(), 974 mActionItem->resize(mActionItem->width(),
971 mGridSpacingY * mActionItem->cellHeight()); 975 mGridSpacingY * mActionItem->cellHeight());
972 } 976 }
973 } else if (mActionType == RESIZELEFT) { 977 } else if (mActionType == RESIZELEFT) {
974 if (mCurrentCellX <= mActionItem->cellXWidth()) { 978 if (mCurrentCellX <= mActionItem->cellXWidth()) {
975 mActionItem->expandLeft(gx - mCurrentCellX); 979 mActionItem->expandLeft(gx - mCurrentCellX);
976 mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(), 980 mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(),
977 mActionItem->height()); 981 mActionItem->height());
978 int x,y; 982 int x,y;
979 gridToContents(mActionItem->cellX(),mActionItem->cellYTop(),x,y); 983 gridToContents(mActionItem->cellX(),mActionItem->cellYTop(),x,y);
980 moveChild(mActionItem,x,childY(mActionItem)); 984 moveChild(mActionItem,x,childY(mActionItem));
981 } 985 }
982 } else if (mActionType == RESIZERIGHT) { 986 } else if (mActionType == RESIZERIGHT) {
983 if (mCurrentCellX >= mActionItem->cellX()) { 987 if (mCurrentCellX >= mActionItem->cellX()) {
984 mActionItem->expandRight(gx - mCurrentCellX); 988 mActionItem->expandRight(gx - mCurrentCellX);
985 mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(), 989 mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(),
986 mActionItem->height()); 990 mActionItem->height());
987 } 991 }
988 } 992 }
989 mCurrentCellX = gx; 993 mCurrentCellX = gx;
990 mCurrentCellY = gy; 994 mCurrentCellY = gy;
991 } 995 }
992} 996}
993 997
994void KOAgenda::endItemAction() 998void KOAgenda::endItemAction()
995{ 999{
996 1000
997 if ( mItemMoved ) { 1001 if ( mItemMoved ) {
998 KOAgendaItem *placeItem = mActionItem->firstMultiItem(); 1002 KOAgendaItem *placeItem = mActionItem->firstMultiItem();
999 if ( !placeItem ) { 1003 if ( !placeItem ) {
1000 placeItem = mActionItem; 1004 placeItem = mActionItem;
1001 } 1005 }
1002 if ( placeItem->incidence()->doesRecur() ) { 1006 if ( placeItem->incidence()->doesRecur() ) {
1003 Incidence* oldInc = placeItem->incidence(); 1007 Incidence* oldInc = placeItem->incidence();
1004 placeItem->recreateIncidence(); 1008 placeItem->recreateIncidence();
1005 emit addToCalSignal(placeItem->incidence(), oldInc ); 1009 emit addToCalSignal(placeItem->incidence(), oldInc );
1006 } 1010 }
1007 int type = mActionType; 1011 int type = mActionType;
1008 if ( mAllDayMode ) 1012 if ( mAllDayMode )
1009 type = -1; 1013 type = -1;
1010 KOAgendaItem *modifiedItem = placeItem; 1014 KOAgendaItem *modifiedItem = placeItem;
1011 //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */); 1015 //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */);
1012 QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems(); 1016 QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
1013 KOAgendaItem *item; 1017 KOAgendaItem *item;
1014 1018
1015 if ( placeItem->incidence()->typeID() == todoID ) { 1019 if ( placeItem->incidence()->typeID() == todoID ) {
1016 mSelectedItem = 0; 1020 mSelectedItem = 0;
1017 //qDebug("todo %d %d %d ", mCurrentCellX, modifiedItem->cellX() ,modifiedItem->cellXWidth()); 1021 //qDebug("todo %d %d %d ", mCurrentCellX, modifiedItem->cellX() ,modifiedItem->cellXWidth());
1018 modifiedItem->mLastMoveXPos = mCurrentCellX; 1022 modifiedItem->mLastMoveXPos = mCurrentCellX;
1019 emit itemModified( modifiedItem, mActionType ); 1023 emit itemModified( modifiedItem, mActionType );
1020 } 1024 }
1021 else { 1025 else {
1022 1026
1023 1027
1024 globalFlagBlockAgendaItemPaint = 1; 1028 globalFlagBlockAgendaItemPaint = 1;
1025 for ( item=oldconflictItems.first(); item != 0; 1029 for ( item=oldconflictItems.first(); item != 0;
1026 item=oldconflictItems.next() ) { 1030 item=oldconflictItems.next() ) {
1027 placeSubCells(item); 1031 placeSubCells(item);
1028 } 1032 }
1029 while ( placeItem ) { 1033 while ( placeItem ) {
1030 //qDebug("placeItem %s ", placeItem->incidence()->summary().latin1()); 1034 //qDebug("placeItem %s ", placeItem->incidence()->summary().latin1());
1031 oldconflictItems = placeItem->conflictItems(); 1035 oldconflictItems = placeItem->conflictItems();
1032 for ( item=oldconflictItems.first(); item != 0; 1036 for ( item=oldconflictItems.first(); item != 0;
1033 item=oldconflictItems.next() ) { 1037 item=oldconflictItems.next() ) {
1034 placeSubCells(item); 1038 placeSubCells(item);
1035 } 1039 }
1036 placeSubCells( placeItem ); 1040 placeSubCells( placeItem );
1037 placeItem = placeItem->nextMultiItem(); 1041 placeItem = placeItem->nextMultiItem();
1038 } 1042 }
1039 globalFlagBlockAgendaItemPaint = 0; 1043 globalFlagBlockAgendaItemPaint = 0;
1040 for ( item=oldconflictItems.first(); item != 0; 1044 for ( item=oldconflictItems.first(); item != 0;
1041 item=oldconflictItems.next() ) { 1045 item=oldconflictItems.next() ) {
1042 globalFlagBlockAgendaItemUpdate = 0; 1046 globalFlagBlockAgendaItemUpdate = 0;
1043 item->repaintMe(); 1047 item->repaintMe();
1044 globalFlagBlockAgendaItemUpdate = 1; 1048 globalFlagBlockAgendaItemUpdate = 1;
1045 item->repaint( false ); 1049 item->repaint( false );
1046 } 1050 }
1047 placeItem = modifiedItem; 1051 placeItem = modifiedItem;
1048 1052
1049 while ( placeItem ) { 1053 while ( placeItem ) {
1050 //qDebug("placeItem %s ", placeItem->incidence()->summary().latin1()); 1054 //qDebug("placeItem %s ", placeItem->incidence()->summary().latin1());
1051 globalFlagBlockAgendaItemUpdate = 0; 1055 globalFlagBlockAgendaItemUpdate = 0;
1052 placeItem->repaintMe(); 1056 placeItem->repaintMe();
1053 globalFlagBlockAgendaItemUpdate = 1; 1057 globalFlagBlockAgendaItemUpdate = 1;
1054 placeItem->repaint(false); 1058 placeItem->repaint(false);
1055 placeItem = placeItem->nextMultiItem(); 1059 placeItem = placeItem->nextMultiItem();
1056 } 1060 }
1057 emit itemModified( modifiedItem, mActionType ); 1061 emit itemModified( modifiedItem, mActionType );
1058 1062
1059 1063
1060 placeItem = modifiedItem; 1064 placeItem = modifiedItem;
1061 while ( placeItem ) { 1065 while ( placeItem ) {
1062 oldconflictItems = placeItem->conflictItems(); 1066 oldconflictItems = placeItem->conflictItems();
1063 for ( item=oldconflictItems.first(); item != 0; 1067 for ( item=oldconflictItems.first(); item != 0;
1064 item=oldconflictItems.next() ) { 1068 item=oldconflictItems.next() ) {
1065 placeSubCells(item); 1069 placeSubCells(item);
1066 } 1070 }
1067 placeSubCells( placeItem ); 1071 placeSubCells( placeItem );
1068 placeItem = placeItem->nextMultiItem(); 1072 placeItem = placeItem->nextMultiItem();
1069 1073
1070 } 1074 }
1071 placeItem = modifiedItem; 1075 placeItem = modifiedItem;
1072 while ( placeItem ) { 1076 while ( placeItem ) {
1073 oldconflictItems = placeItem->conflictItems(); 1077 oldconflictItems = placeItem->conflictItems();
1074 for ( item=oldconflictItems.first(); item != 0; 1078 for ( item=oldconflictItems.first(); item != 0;
1075 item=oldconflictItems.next() ) { 1079 item=oldconflictItems.next() ) {
1076 globalFlagBlockAgendaItemUpdate = 0; 1080 globalFlagBlockAgendaItemUpdate = 0;
1077 item->repaintMe(); 1081 item->repaintMe();
1078 globalFlagBlockAgendaItemUpdate = 1; 1082 globalFlagBlockAgendaItemUpdate = 1;
1079 item->repaint(false); 1083 item->repaint(false);
1080 } 1084 }
1081 placeItem = placeItem->nextMultiItem(); 1085 placeItem = placeItem->nextMultiItem();
1082 } 1086 }
1083 /* 1087 /*
1084 1088
1085 oldconflictItems = modifiedItem->conflictItems(); 1089 oldconflictItems = modifiedItem->conflictItems();
1086 for ( item=oldconflictItems.first(); item != 0; 1090 for ( item=oldconflictItems.first(); item != 0;
1087 item=oldconflictItems.next() ) { 1091 item=oldconflictItems.next() ) {
1088 globalFlagBlockAgendaItemUpdate = 0; 1092 globalFlagBlockAgendaItemUpdate = 0;
1089 item->paintMe(false); 1093 item->paintMe(false);
1090 globalFlagBlockAgendaItemUpdate = 1; 1094 globalFlagBlockAgendaItemUpdate = 1;
1091 item->repaint(false); 1095 item->repaint(false);
1092 } 1096 }
1093 */ 1097 */
1094 1098
1095 1099
1096 } 1100 }
1097 1101
1098 } 1102 }
1099 if ( mActionItem ) 1103 if ( mActionItem )
1100 emit incidenceSelected( mActionItem->incidence() ); 1104 emit incidenceSelected( mActionItem->incidence() );
1101 mScrollUpTimer.stop(); 1105 mScrollUpTimer.stop();
1102 mScrollDownTimer.stop(); 1106 mScrollDownTimer.stop();
1103 setCursor( arrowCursor ); 1107 setCursor( arrowCursor );
1104 mActionItem = 0; 1108 mActionItem = 0;
1105 mActionType = NOP; 1109 mActionType = NOP;
1106 mItemMoved = 0; 1110 mItemMoved = 0;
1107 1111
1108} 1112}
1109 1113
1110void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos) 1114void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
1111{ 1115{
1112// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl; 1116// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
1113// QPoint point = viewport()->mapToGlobal(viewportPos); 1117// QPoint point = viewport()->mapToGlobal(viewportPos);
1114// kdDebug() << "Global: " << point.x() << "," << point.y() << endl; 1118// kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
1115// point = clipper()->mapFromGlobal(point); 1119// point = clipper()->mapFromGlobal(point);
1116// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl; 1120// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
1117 1121
1118 int x,y; 1122 int x,y;
1119 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 1123 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
1120// kdDebug() << "contents: " << x << "," << y << "\n" << endl; 1124// kdDebug() << "contents: " << x << "," << y << "\n" << endl;
1121 int gx,gy; 1125 int gx,gy;
1122 contentsToGrid(x,y,gx,gy); 1126 contentsToGrid(x,y,gx,gy);
1123 1127
1124 // Change cursor to resize cursor if appropriate 1128 // Change cursor to resize cursor if appropriate
1125 if (mAllDayMode) { 1129 if (mAllDayMode) {
1126 int gridDistanceX = (x - gx * mGridSpacingX); 1130 int gridDistanceX = (x - gx * mGridSpacingX);
1127 if (gridDistanceX < mResizeBorderWidth && 1131 if (gridDistanceX < mResizeBorderWidth &&
1128 moveItem->cellX() == gx) { 1132 moveItem->cellX() == gx) {
1129 setCursor(sizeHorCursor); 1133 setCursor(sizeHorCursor);
1130 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth && 1134 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
1131 moveItem->cellXWidth() == gx) { 1135 moveItem->cellXWidth() == gx) {
1132 setCursor(sizeHorCursor); 1136 setCursor(sizeHorCursor);
1133 } else { 1137 } else {
1134 setCursor(arrowCursor); 1138 setCursor(arrowCursor);
1135 } 1139 }
1136 } else { 1140 } else {
1137 int gridDistanceY = (y - gy * mGridSpacingY); 1141 int gridDistanceY = (y - gy * mGridSpacingY);
1138 if (gridDistanceY < mResizeBorderWidth && 1142 if (gridDistanceY < mResizeBorderWidth &&
1139 moveItem->cellYTop() == gy && 1143 moveItem->cellYTop() == gy &&
1140 !moveItem->firstMultiItem()) { 1144 !moveItem->firstMultiItem()) {
1141 setCursor(sizeVerCursor); 1145 setCursor(sizeVerCursor);
1142 } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth && 1146 } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
1143 moveItem->cellYBottom() == gy && 1147 moveItem->cellYBottom() == gy &&
1144 !moveItem->lastMultiItem()) { 1148 !moveItem->lastMultiItem()) {
1145 setCursor(sizeVerCursor); 1149 setCursor(sizeVerCursor);
1146 } else { 1150 } else {
1147 setCursor(arrowCursor); 1151 setCursor(arrowCursor);
1148 } 1152 }
1149 } 1153 }
1150} 1154}
1151 1155
1152 1156
1153/* 1157/*
1154 Place item in cell and take care that multiple items using the same cell do 1158 Place item in cell and take care that multiple items using the same cell do
1155 not overlap. This method is not yet optimal. It doesn´t use the maximum space 1159 not overlap. This method is not yet optimal. It doesn´t use the maximum space
1156 it can get in all cases. 1160 it can get in all cases.
1157 At the moment the method has a bug: When an item is placed only the sub cell 1161 At the moment the method has a bug: When an item is placed only the sub cell
1158 widths of the items are changed, which are within the Y region the item to 1162 widths of the items are changed, which are within the Y region the item to
1159 place spans. When the sub cell width change of one of this items affects a 1163 place spans. When the sub cell width change of one of this items affects a
1160 cell, where other items are, which do not overlap in Y with the item to place, 1164 cell, where other items are, which do not overlap in Y with the item to place,
1161 the display gets corrupted, although the corruption looks quite nice. 1165 the display gets corrupted, although the corruption looks quite nice.
1162*/ 1166*/
1163void KOAgenda::placeSubCells(KOAgendaItem *placeItem) 1167void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
1164{ 1168{
1165 1169
1166 QPtrList<KOAgendaItem> conflictItems; 1170 QPtrList<KOAgendaItem> conflictItems;
1167 int maxSubCells = 0; 1171 int maxSubCells = 0;
1168 QIntDict<KOAgendaItem> subCellDict(7); 1172 QIntDict<KOAgendaItem> subCellDict(7);
1169 1173
1170 KOAgendaItem *item; 1174 KOAgendaItem *item;
1171 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1175 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1172 if (item != placeItem) { 1176 if (item != placeItem) {
1173 if (placeItem->cellX() <= item->cellXWidth() && 1177 if (placeItem->cellX() <= item->cellXWidth() &&
1174 placeItem->cellXWidth() >= item->cellX()) { 1178 placeItem->cellXWidth() >= item->cellX()) {
1175 if ((placeItem->cellYTop() <= item->cellYBottom()) && 1179 if ((placeItem->cellYTop() <= item->cellYBottom()) &&
1176 (placeItem->cellYBottom() >= item->cellYTop())) { 1180 (placeItem->cellYBottom() >= item->cellYTop())) {
1177 conflictItems.append(item); 1181 conflictItems.append(item);
1178 if (item->subCells() > maxSubCells) 1182 if (item->subCells() > maxSubCells)
1179 maxSubCells = item->subCells(); 1183 maxSubCells = item->subCells();
1180 subCellDict.insert(item->subCell(),item); 1184 subCellDict.insert(item->subCell(),item);
1181 } 1185 }
1182 } 1186 }
1183 } 1187 }
1184 } 1188 }
1185 1189
1186 if (conflictItems.count() > 0) { 1190 if (conflictItems.count() > 0) {
1187 // Look for unused sub cell and insert item 1191 // Look for unused sub cell and insert item
1188 int i; 1192 int i;
1189 for(i=0;i<maxSubCells;++i) { 1193 for(i=0;i<maxSubCells;++i) {
1190 if (!subCellDict.find(i)) { 1194 if (!subCellDict.find(i)) {
1191 placeItem->setSubCell(i); 1195 placeItem->setSubCell(i);
1192 break; 1196 break;
1193 } 1197 }
1194 } 1198 }
1195 if (i == maxSubCells) { 1199 if (i == maxSubCells) {
1196 placeItem->setSubCell(maxSubCells); 1200 placeItem->setSubCell(maxSubCells);
1197 maxSubCells++; // add new item to number of sub cells 1201 maxSubCells++; // add new item to number of sub cells
1198 } 1202 }
1199 1203
1200 // Prepare for sub cell geometry adjustment 1204 // Prepare for sub cell geometry adjustment
1201 int newSubCellWidth; 1205 int newSubCellWidth;
1202 if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells; 1206 if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells;
1203 else newSubCellWidth = mGridSpacingX / maxSubCells; 1207 else newSubCellWidth = mGridSpacingX / maxSubCells;
1204 conflictItems.append(placeItem); 1208 conflictItems.append(placeItem);
1205 1209
1206 1210
1207 // Adjust sub cell geometry of all direct conflict items 1211 // Adjust sub cell geometry of all direct conflict items
1208 for ( item=conflictItems.first(); item != 0; 1212 for ( item=conflictItems.first(); item != 0;
1209 item=conflictItems.next() ) { 1213 item=conflictItems.next() ) {
1210 item->setSubCells(maxSubCells); 1214 item->setSubCells(maxSubCells);
1211 if (mAllDayMode) { 1215 if (mAllDayMode) {
1212 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth); 1216 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
1213 } else { 1217 } else {
1214 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY); 1218 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
1215 } 1219 }
1216 int x,y; 1220 int x,y;
1217 gridToContents(item->cellX(),item->cellYTop(),x,y); 1221 gridToContents(item->cellX(),item->cellYTop(),x,y);
1218 if (mAllDayMode) { 1222 if (mAllDayMode) {
1219 y += item->subCell() * newSubCellWidth; 1223 y += item->subCell() * newSubCellWidth;
1220 } else { 1224 } else {
1221 x += item->subCell() * newSubCellWidth; 1225 x += item->subCell() * newSubCellWidth;
1222 } 1226 }
1223 moveChild(item,x,y); 1227 moveChild(item,x,y);
1224 // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y); 1228 // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y);
1225 //item->updateItem(); 1229 //item->updateItem();
1226 } 1230 }
1227 // Adjust sub cell geometry of all conflict items of all conflict items 1231 // Adjust sub cell geometry of all conflict items of all conflict items
1228 for ( item=conflictItems.first(); item != 0; 1232 for ( item=conflictItems.first(); item != 0;
1229 item=conflictItems.next() ) { 1233 item=conflictItems.next() ) {
1230 if ( placeItem != item ) { 1234 if ( placeItem != item ) {
1231 KOAgendaItem *item2; 1235 KOAgendaItem *item2;
1232 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems(); 1236 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
1233 for ( item2=conflictItems2.first(); item2 != 0; 1237 for ( item2=conflictItems2.first(); item2 != 0;
1234 item2=conflictItems2.next() ) { 1238 item2=conflictItems2.next() ) {
1235 if ( item2->subCells() != maxSubCells) { 1239 if ( item2->subCells() != maxSubCells) {
1236 item2->setSubCells(maxSubCells); 1240 item2->setSubCells(maxSubCells);
1237 if (mAllDayMode) { 1241 if (mAllDayMode) {
1238 item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth); 1242 item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth);
1239 } else { 1243 } else {
1240 item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY); 1244 item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY);
1241 } 1245 }
1242 int x,y; 1246 int x,y;
1243 gridToContents(item2->cellX(),item2->cellYTop(),x,y); 1247 gridToContents(item2->cellX(),item2->cellYTop(),x,y);
1244 if (mAllDayMode) { 1248 if (mAllDayMode) {
1245 y += item2->subCell() * newSubCellWidth; 1249 y += item2->subCell() * newSubCellWidth;
1246 } else { 1250 } else {
1247 x += item2->subCell() * newSubCellWidth; 1251 x += item2->subCell() * newSubCellWidth;
1248 } 1252 }
1249 moveChild(item2,x,y); 1253 moveChild(item2,x,y);
1250 //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() ); 1254 //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() );
1251 } 1255 }
1252 } 1256 }
1253 } 1257 }
1254 } 1258 }
1255 } else { 1259 } else {
1256 placeItem->setSubCell(0); 1260 placeItem->setSubCell(0);
1257 placeItem->setSubCells(1); 1261 placeItem->setSubCells(1);
1258 if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY); 1262 if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
1259 else placeItem->resize(mGridSpacingX,placeItem->height()); 1263 else placeItem->resize(mGridSpacingX,placeItem->height());
1260 int x,y; 1264 int x,y;
1261 gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y); 1265 gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
1262 moveChild(placeItem,x,y); 1266 moveChild(placeItem,x,y);
1263 } 1267 }
1264 placeItem->setConflictItems(conflictItems); 1268 placeItem->setConflictItems(conflictItems);
1265 // for ( item=conflictItems.first(); item != 0; 1269 // for ( item=conflictItems.first(); item != 0;
1266// item=conflictItems.next() ) { 1270// item=conflictItems.next() ) {
1267// //item->updateItem(); 1271// //item->updateItem();
1268// //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() ); 1272// //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );
1269// } 1273// }
1270// placeItem->updateItem(); 1274// placeItem->updateItem();
1271} 1275}
1272 1276
1273void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) 1277void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
1274{ 1278{
1275 if ( globalFlagBlockAgenda ) 1279 if ( globalFlagBlockAgenda )
1276 return; 1280 return;
1277 1281
1278 if ( mInvalidPixmap ) { 1282 if ( mInvalidPixmap ) {
1279 mInvalidPixmap = false; 1283 mInvalidPixmap = false;
1280 qDebug("KO: Upsizing Pixmaps "); 1284 qDebug("KO: Upsizing Pixmaps ");
1281 computeSizes(); 1285 computeSizes();
1282 emit updateViewSignal(); 1286 emit updateViewSignal();
1283 return; 1287 return;
1284 } 1288 }
1285 if ( ! mAllDayMode ) { 1289 if ( ! mAllDayMode ) {
1286 // currently not working for 1290 // currently not working for
1287 1291
1288 //qDebug("KOAgenda::drawContents "); 1292 //qDebug("KOAgenda::drawContents ");
1289#if 0 1293#if 0
1290 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) { 1294 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
1291 qDebug("WAU "); 1295 qDebug("WAU ");
1292 drawContentsToPainter(); 1296 drawContentsToPainter();
1293 } 1297 }
1294#endif 1298#endif
1295 QPaintDevice* pd = p->device(); 1299 QPaintDevice* pd = p->device();
1296 p->end(); 1300 p->end();
1297 int vx, vy; 1301 int vx, vy;
1298 int selectionX = KOGlobals::self()->reverseLayout() ? 1302 int selectionX = KOGlobals::self()->reverseLayout() ?
1299 (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 1303 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1300 mSelectionCellX * mGridSpacingX; 1304 mSelectionCellX * mGridSpacingX;
1301 contentsToViewport ( cx, cy, vx,vy); 1305 contentsToViewport ( cx, cy, vx,vy);
1302 //qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ; 1306 //qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ;
1303 1307
1304 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) { 1308 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
1305 if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1309 if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1306 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) { 1310 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
1307 1311
1308 int vxSel, vySel; 1312 int vxSel, vySel;
1309 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 1313 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel);
1310 int off = mSelectionHeight; 1314 int off = mSelectionHeight;
1311 if ( vySel < 0 ) 1315 if ( vySel < 0 )
1312 off += vySel; 1316 off += vySel;
1313 //qDebug("OFF %d %d %d", off,vySel, vy ); 1317 //qDebug("OFF %d %d %d", off,vySel, vy );
1314 bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP); 1318 bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP);
1315 } else { 1319 } else {
1316 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP); 1320 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
1317 } 1321 }
1318 } 1322 }
1319 if ( mSelectionHeight > 0 ) { 1323 if ( mSelectionHeight > 0 ) {
1320 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight ); 1324 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1321 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1325 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1322 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { 1326 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1323 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 1327 contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1324 // bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 1328 // bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1325 int hei = mSelectionHeight; 1329 int hei = mSelectionHeight;
1326 int offset = 0; 1330 int offset = 0;
1327 while ( hei > 0 ) { 1331 while ( hei > 0 ) {
1328 int p_hei = 5; 1332 int p_hei = 5;
1329 if ( hei < 5 ) p_hei = hei; 1333 if ( hei < 5 ) p_hei = hei;
1330 hei -= 5; 1334 hei -= 5;
1331 bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 1335 bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP);
1332 offset += 5; 1336 offset += 5;
1333 } 1337 }
1334 } 1338 }
1335 } 1339 }
1336 p->begin( pd ); 1340 p->begin( pd );
1337 } else { 1341 } else {
1338#if 0 1342#if 0
1339 qDebug("mCurPixWid %d %d ",mCurPixWid, contentsWidth() ); 1343 qDebug("mCurPixWid %d %d ",mCurPixWid, contentsWidth() );
1340 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) { 1344 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
1341 qDebug("WAUWAU "); 1345 qDebug("WAUWAU ");
1342 drawContentsToPainter(); 1346 drawContentsToPainter();
1343 } 1347 }
1344#endif 1348#endif
1345 QPaintDevice* pd = p->device(); 1349 QPaintDevice* pd = p->device();
1346 p->end(); 1350 p->end();
1347 int vx, vy; 1351 int vx, vy;
1348 int selectionX = KOGlobals::self()->reverseLayout() ? 1352 int selectionX = KOGlobals::self()->reverseLayout() ?
1349 (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 1353 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1350 mSelectionCellX * mGridSpacingX; 1354 mSelectionCellX * mGridSpacingX;
1351 contentsToViewport ( cx, cy, vx,vy); 1355 contentsToViewport ( cx, cy, vx,vy);
1352 // qDebug(" %d %d %d %d ", cx, cy, cw,ch) ; 1356 // qDebug(" %d %d %d %d ", cx, cy, cw,ch) ;
1353 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) 1357 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) )
1354 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP); 1358 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
1355 1359
1356 if ( mSelectionHeight > 0 ) { 1360 if ( mSelectionHeight > 0 ) {
1357 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight ); 1361 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1358 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1362 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1359 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { 1363 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1360 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 1364 contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1361 //bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 1365 //bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1362 int hei = mSelectionHeight; 1366 int hei = mSelectionHeight;
1363 int offset = 0; 1367 int offset = 0;
1364 while ( hei > 0 ) { 1368 while ( hei > 0 ) {
1365 int p_hei = 5; 1369 int p_hei = 5;
1366 if ( hei < 5 ) p_hei = hei; 1370 if ( hei < 5 ) p_hei = hei;
1367 hei -= 5; 1371 hei -= 5;
1368 bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 1372 bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP);
1369 offset += 5; 1373 offset += 5;
1370 } 1374 }
1371 } 1375 }
1372 } 1376 }
1373 p->begin( pd ); 1377 p->begin( pd );
1374 } 1378 }
1375 1379
1376} 1380}
1377 1381
1378void KOAgenda::finishUpdate() 1382void KOAgenda::finishUpdate()
1379{ 1383{
1380 1384
1381 KOAgendaItem *item; 1385 KOAgendaItem *item;
1382 globalFlagBlockAgendaItemPaint = 1; 1386 globalFlagBlockAgendaItemPaint = 1;
1383 // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems 1387 // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems
1384 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1388 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1385 if ( !item->checkLayout() ) { 1389 if ( !item->checkLayout() ) {
1386 //qDebug(" conflictitem found "); 1390 //qDebug(" conflictitem found ");
1387 int newSubCellWidth; 1391 int newSubCellWidth;
1388 if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells(); 1392 if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells();
1389 else newSubCellWidth = mGridSpacingX / item->subCells(); 1393 else newSubCellWidth = mGridSpacingX / item->subCells();
1390 1394
1391 if (mAllDayMode) { 1395 if (mAllDayMode) {
1392 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth); 1396 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
1393 } else { 1397 } else {
1394 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY); 1398 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
1395 } 1399 }
1396 int x,y; 1400 int x,y;
1397 gridToContents(item->cellX(),item->cellYTop(),x,y); 1401 gridToContents(item->cellX(),item->cellYTop(),x,y);
1398 if (mAllDayMode) { 1402 if (mAllDayMode) {
1399 y += item->subCell() * newSubCellWidth; 1403 y += item->subCell() * newSubCellWidth;
1400 } else { 1404 } else {
1401 x += item->subCell() * newSubCellWidth; 1405 x += item->subCell() * newSubCellWidth;
1402 } 1406 }
1403 moveChild(item,x,y); 1407 moveChild(item,x,y);
1404 } 1408 }
1405 } 1409 }
1406 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1410 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1407 if ( !item->isVisible() ) 1411 if ( !item->isVisible() )
1408 item->show(); 1412 item->show();
1409 1413
1410 } 1414 }
1411 globalFlagBlockAgendaItemUpdate = 0; 1415 globalFlagBlockAgendaItemUpdate = 0;
1412 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1416 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1413 item->repaintMe( ); 1417 item->repaintMe( );
1414 } 1418 }
1415 globalFlagBlockAgendaItemUpdate = 1; 1419 globalFlagBlockAgendaItemUpdate = 1;
1416 qApp->processEvents(); 1420 qApp->processEvents();
1417 globalFlagBlockAgendaItemPaint = 0; 1421 globalFlagBlockAgendaItemPaint = 0;
1418 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1422 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1419 item->repaint( false ); 1423 item->repaint( false );
1420 } 1424 }
1421 marcus_bains(); 1425 marcus_bains();
1422} 1426}
1423 1427
1424/* 1428/*
1425 Draw grid in the background of the agenda. 1429 Draw grid in the background of the agenda.
1426*/ 1430*/
1427void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch) 1431void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch)
1428{ 1432{
1429 1433
1430 1434
1431 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask ) 1435 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask )
1432 return; 1436 return;
1433 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 ) 1437 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 )
1434 return; 1438 return;
1435 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight(); 1439 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight();
1436 if ( ch < 1 ) 1440 if ( ch < 1 )
1437 ch = 1; 1441 ch = 1;
1438 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) { 1442 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) {
1439 mPaintPixmap.resize( contentsWidth()+42, ch ); 1443 mPaintPixmap.resize( contentsWidth()+42, ch );
1440 } 1444 }
1441 mCurPixWid = contentsWidth(); 1445 mCurPixWid = contentsWidth();
1442 mCurPixHei = ch; 1446 mCurPixHei = ch;
1443 if ( mHighlightPixmap.width() < mGridSpacingX-1 ) { 1447 if ( mHighlightPixmap.width() < mGridSpacingX-1 ) {
1444 mHighlightPixmap.resize( mGridSpacingX-1, 5 ); 1448 mHighlightPixmap.resize( mGridSpacingX-1, 5 );
1445 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor ); 1449 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor );
1446 } 1450 }
1447 mPixPainter.begin( &mPaintPixmap) ; 1451 mPixPainter.begin( &mPaintPixmap) ;
1448 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() ); 1452 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() );
1449 QPainter * p ; 1453 QPainter * p ;
1450 if (paint == 0) { 1454 if (paint == 0) {
1451 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor); 1455 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor);
1452 p = &mPixPainter; 1456 p = &mPixPainter;
1453 } 1457 }
1454 else 1458 else
1455 p = paint ; 1459 p = paint ;
1456 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch); 1460 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch);
1457 1461
1458 //--cx;++cw; 1462 //--cx;++cw;
1459 int lGridSpacingY = mGridSpacingY*2; 1463 int lGridSpacingY = mGridSpacingY*2;
1460 int selDay; 1464 int selDay;
1461 QDate curDate = QDate::currentDate(); 1465 QDate curDate = QDate::currentDate();
1462 if ( !backgroundOnly ) { 1466 if ( !backgroundOnly ) {
1463 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay) 1467 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay)
1464 { 1468 {
1465 if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) { 1469 if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) {
1466 int x1 = cx; 1470 int x1 = cx;
1467 int y1 = 0; 1471 int y1 = 0;
1468 if (y1 < cy) y1 = cy; 1472 if (y1 < cy) y1 = cy;
1469 int x2 = cx+cw-1; 1473 int x2 = cx+cw-1;
1470 int y2 = contentsHeight(); 1474 int y2 = contentsHeight();
1471 if (y2 > cy+ch-1) y2=cy+ch-1; 1475 if (y2 > cy+ch-1) y2=cy+ch-1;
1472 if (x2 >= x1 && y2 >= y1) { 1476 if (x2 >= x1 && y2 >= y1) {
1473 int gxStart = selDay; 1477 int gxStart = selDay;
1474 int gxEnd = gxStart ; 1478 int gxEnd = gxStart ;
1475 int xStart = KOGlobals::self()->reverseLayout() ? 1479 int xStart = KOGlobals::self()->reverseLayout() ?
1476 (mColumns - 1 - gxStart)*mGridSpacingX : 1480 (mColumns - 1 - gxStart)*mGridSpacingX :
1477 gxStart*mGridSpacingX; 1481 gxStart*mGridSpacingX;
1478 if (xStart < x1) xStart = x1; 1482 if (xStart < x1) xStart = x1;
1479 int xEnd = KOGlobals::self()->reverseLayout() ? 1483 int xEnd = KOGlobals::self()->reverseLayout() ?
1480 (mColumns - gxStart)*mGridSpacingX-1 : 1484 (mColumns - gxStart)*mGridSpacingX-1 :
1481 (gxStart+1)*mGridSpacingX-1; 1485 (gxStart+1)*mGridSpacingX-1;
1482 if (xEnd > x2) xEnd = x2; 1486 if (xEnd > x2) xEnd = x2;
1483 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1487 if ( KOPrefs::instance()->mUseHighlightLightColor )
1484 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1488 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1485 KOPrefs::instance()->mAgendaBgColor.light()); 1489 KOPrefs::instance()->mAgendaBgColor.light());
1486 else 1490 else
1487 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1491 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1488 KOPrefs::instance()->mAgendaBgColor.dark()); 1492 KOPrefs::instance()->mAgendaBgColor.dark());
1489 1493
1490 } 1494 }
1491 } 1495 }
1492 } 1496 }
1493 } 1497 }
1494 // Highlight working hours 1498 // Highlight working hours
1495 1499
1496 if ( !backgroundOnly ) 1500 if ( !backgroundOnly )
1497 if (mWorkingHoursEnable) { 1501 if (mWorkingHoursEnable) {
1498 int x1 = cx; 1502 int x1 = cx;
1499 int y1 = mWorkingHoursYTop; 1503 int y1 = mWorkingHoursYTop;
1500 if (y1 < cy) y1 = cy; 1504 if (y1 < cy) y1 = cy;
1501 int x2 = cx+cw-1; 1505 int x2 = cx+cw-1;
1502 // int x2 = mGridSpacingX * 5 - 1; 1506 // int x2 = mGridSpacingX * 5 - 1;
1503 // if (x2 > cx+cw-1) x2 = cx + cw - 1; 1507 // if (x2 > cx+cw-1) x2 = cx + cw - 1;
1504 int y2 = mWorkingHoursYBottom; 1508 int y2 = mWorkingHoursYBottom;
1505 if (y2 > cy+ch-1) y2=cy+ch-1; 1509 if (y2 > cy+ch-1) y2=cy+ch-1;
1506 1510
1507 if (x2 >= x1 && y2 >= y1) { 1511 if (x2 >= x1 && y2 >= y1) {
1508 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX ); 1512 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX );
1509 int gxStart = x1/mGridSpacingX; 1513 int gxStart = x1/mGridSpacingX;
1510 int gxEnd = x2/mGridSpacingX; 1514 int gxEnd = x2/mGridSpacingX;
1511 while(gxStart <= gxEnd) { 1515 while(gxStart <= gxEnd) {
1512 if (gxStart < int(mHolidayMask->count()) && 1516 if (gxStart < int(mHolidayMask->count()) &&
1513 !mHolidayMask->at(gxStart)) { 1517 !mHolidayMask->at(gxStart)) {
1514 int xStart = KOGlobals::self()->reverseLayout() ? 1518 int xStart = KOGlobals::self()->reverseLayout() ?
1515 (mColumns - 1 - gxStart)*mGridSpacingX : 1519 (mColumns - 1 - gxStart)*mGridSpacingX :
1516 gxStart*mGridSpacingX; 1520 gxStart*mGridSpacingX;
1517 if (xStart < x1) xStart = x1; 1521 if (xStart < x1) xStart = x1;
1518 int xEnd = KOGlobals::self()->reverseLayout() ? 1522 int xEnd = KOGlobals::self()->reverseLayout() ?
1519 (mColumns - gxStart)*mGridSpacingX-1 : 1523 (mColumns - gxStart)*mGridSpacingX-1 :
1520 (gxStart+1)*mGridSpacingX-1; 1524 (gxStart+1)*mGridSpacingX-1;
1521 if (xEnd > x2) xEnd = x2; 1525 if (xEnd > x2) xEnd = x2;
1522 if ( mSelectedDates[gxStart] == curDate && KOPrefs::instance()->mHighlightCurrentDay ) { 1526 if ( mSelectedDates[gxStart] == curDate && KOPrefs::instance()->mHighlightCurrentDay ) {
1523 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1527 if ( KOPrefs::instance()->mUseHighlightLightColor )
1524 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1528 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1525 KOPrefs::instance()->mWorkingHoursColor.light()); 1529 KOPrefs::instance()->mWorkingHoursColor.light());
1526 else 1530 else
1527 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1531 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1528 KOPrefs::instance()->mWorkingHoursColor.dark()); 1532 KOPrefs::instance()->mWorkingHoursColor.dark());
1529 } else { 1533 } else {
1530 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1534 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1531 KOPrefs::instance()->mWorkingHoursColor); 1535 KOPrefs::instance()->mWorkingHoursColor);
1532 } 1536 }
1533 } 1537 }
1534 ++gxStart; 1538 ++gxStart;
1535 } 1539 }
1536 } 1540 }
1537 } 1541 }
1538 /* 1542 /*
1539 int selectionX = KOGlobals::self()->reverseLayout() ? 1543 int selectionX = KOGlobals::self()->reverseLayout() ?
1540 (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 1544 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1541 mSelectionCellX * mGridSpacingX; 1545 mSelectionCellX * mGridSpacingX;
1542 1546
1543 // Draw selection 1547 // Draw selection
1544 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1548 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1545 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { 1549 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1546 // TODO: paint only part within cx,cy,cw,ch 1550 // TODO: paint only part within cx,cy,cw,ch
1547 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX, 1551 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX,
1548 mSelectionHeight, KOPrefs::instance()->mHighlightColor ); 1552 mSelectionHeight, KOPrefs::instance()->mHighlightColor );
1549 } 1553 }
1550 */ 1554 */
1551 // Draw vertical lines of grid 1555 // Draw vertical lines of grid
1552 1556
1553 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX; 1557 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX;
1554 if ( mGridSpacingX > 0 ) { 1558 if ( mGridSpacingX > 0 ) {
1555 while (x < cx + cw) { 1559 while (x < cx + cw) {
1556 p->drawLine(x,cy,x,cy+ch); 1560 p->drawLine(x,cy,x,cy+ch);
1557 x+=mGridSpacingX; 1561 x+=mGridSpacingX;
1558 } 1562 }
1559 } 1563 }
1560 // Draw horizontal lines of grid 1564 // Draw horizontal lines of grid
1561 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY; 1565 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY;
1562 if ( lGridSpacingY > 0 ) { 1566 if ( lGridSpacingY > 0 ) {
1563 while (y < cy + ch) { 1567 while (y < cy + ch) {
1564 p->setPen( SolidLine ); 1568 p->setPen( SolidLine );
1565 p->drawLine(cx,y,cx+cw,y); 1569 p->drawLine(cx,y,cx+cw,y);
1566 y+=lGridSpacingY; 1570 y+=lGridSpacingY;
1567 p->setPen( DotLine ); 1571 p->setPen( DotLine );
1568 p->drawLine(cx,y,cx+cw,y); 1572 p->drawLine(cx,y,cx+cw,y);
1569 y+=lGridSpacingY; 1573 y+=lGridSpacingY;
1570 } 1574 }
1571 p->setPen( SolidLine ); 1575 p->setPen( SolidLine );
1572 } 1576 }
1573 mPixPainter.end() ; 1577 mPixPainter.end() ;
1574} 1578}
1575 1579
1576/* 1580/*
1577 Convert srcollview contents coordinates to agenda grid coordinates. 1581 Convert srcollview contents coordinates to agenda grid coordinates.
1578*/ 1582*/
1579void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy) 1583void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy)
1580{ 1584{
1581 gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX : 1585 gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX :
1582 x/mGridSpacingX; 1586 x/mGridSpacingX;
1583 gy = y/mGridSpacingY; 1587 gy = y/mGridSpacingY;
1584} 1588}
1585 1589
1586/* 1590/*
1587 Convert agenda grid coordinates to scrollview contents coordinates. 1591 Convert agenda grid coordinates to scrollview contents coordinates.
1588*/ 1592*/
1589void KOAgenda::gridToContents (int gx, int gy, int& x, int& y) 1593void KOAgenda::gridToContents (int gx, int gy, int& x, int& y)
1590{ 1594{
1591 x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX: 1595 x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX:
1592 gx*mGridSpacingX; 1596 gx*mGridSpacingX;
1593 y = gy*mGridSpacingY; 1597 y = gy*mGridSpacingY;
1594} 1598}
1595 1599
1596 1600
1597/* 1601/*
1598 Return Y coordinate corresponding to time. Coordinates are rounded to fit into 1602 Return Y coordinate corresponding to time. Coordinates are rounded to fit into
1599 the grid. 1603 the grid.
1600*/ 1604*/
1601int KOAgenda::timeToY(const QTime &time) 1605int KOAgenda::timeToY(const QTime &time)
1602{ 1606{
1603 int minutesPerCell = 24 * 60 / mRows; 1607 int minutesPerCell = 24 * 60 / mRows;
1604 int timeMinutes = time.hour() * 60 + time.minute(); 1608 int timeMinutes = time.hour() * 60 + time.minute();
1605 int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell; 1609 int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell;
1606 return Y; 1610 return Y;
1607} 1611}
1608 1612
1609 1613
1610/* 1614/*
1611 Return time corresponding to cell y coordinate. Coordinates are rounded to 1615 Return time corresponding to cell y coordinate. Coordinates are rounded to
1612 fit into the grid. 1616 fit into the grid.
1613*/ 1617*/
1614QTime KOAgenda::gyToTime(int gy) 1618QTime KOAgenda::gyToTime(int gy)
1615{ 1619{
1616 1620
1617 int secondsPerCell = 24 * 60 * 60/ mRows; 1621 int secondsPerCell = 24 * 60 * 60/ mRows;
1618 1622
1619 int timeSeconds = secondsPerCell * gy; 1623 int timeSeconds = secondsPerCell * gy;
1620 1624
1621 QTime time( 0, 0, 0 ); 1625 QTime time( 0, 0, 0 );
1622 if ( timeSeconds < 24 * 60 * 60 ) { 1626 if ( timeSeconds < 24 * 60 * 60 ) {
1623 time = time.addSecs(timeSeconds); 1627 time = time.addSecs(timeSeconds);
1624 } else { 1628 } else {
1625 time.setHMS( 23, 59, 59 ); 1629 time.setHMS( 23, 59, 59 );
1626 } 1630 }
1627 1631
1628 return time; 1632 return time;
1629} 1633}
1630 1634
1631void KOAgenda::setStartHour(int startHour) 1635void KOAgenda::setStartHour(int startHour)
1632{ 1636{
1633 int startCell = startHour * mRows / 24; 1637 int startCell = startHour * mRows / 24;
1634 setContentsPos(0,startCell * gridSpacingY()); 1638 setContentsPos(0,startCell * gridSpacingY());
1635} 1639}
1636QTime KOAgenda::getEndTime() 1640QTime KOAgenda::getEndTime()
1637{ 1641{
1638 int tim = (contentsY ()+viewport()->height())*24/contentsHeight (); 1642 int tim = (contentsY ()+viewport()->height())*24/contentsHeight ();
1639 if ( tim > 23 ) 1643 if ( tim > 23 )
1640 return QTime ( 23,59,59); 1644 return QTime ( 23,59,59);
1641 return QTime ( tim,0,0); 1645 return QTime ( tim,0,0);
1642} 1646}
1643void KOAgenda::hideUnused() 1647void KOAgenda::hideUnused()
1644{ 1648{
1645 // experimental only 1649 // experimental only
1646 // return; 1650 // return;
1647 KOAgendaItem *item; 1651 KOAgendaItem *item;
1648 for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) { 1652 for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) {
1649 item->hide(); 1653 item->hide();
1650 } 1654 }
1651} 1655}
1652 1656
1653 1657
1654KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view) 1658KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view)
1655{ 1659{
1656 1660
1657 KOAgendaItem *fi; 1661 KOAgendaItem *fi;
1658 for ( fi=mUnusedItems.first(); fi != 0; fi=mUnusedItems.next() ) { 1662 for ( fi=mUnusedItems.first(); fi != 0; fi=mUnusedItems.next() ) {
1659 if ( fi->incidence() == event ) { 1663 if ( fi->incidence() == event ) {
1660 mUnusedItems.remove(); 1664 mUnusedItems.remove();
1661 fi->init( event, qd ); 1665 fi->init( event, qd );
1662 return fi; 1666 return fi;
1663 } 1667 }
1664 } 1668 }
1665 fi=mUnusedItems.first(); 1669 fi=mUnusedItems.first();
1666 if ( fi ) { 1670 if ( fi ) {
1667 mUnusedItems.remove(); 1671 mUnusedItems.remove();
1668 fi->init( event, qd ); 1672 fi->init( event, qd );
1669 return fi; 1673 return fi;
1670 } 1674 }
1671 // qDebug("new KOAgendaItem "); 1675 // qDebug("new KOAgendaItem ");
1672 1676
1673 KOAgendaItem* agendaItem = new KOAgendaItem( event, qd, view, mAllDayMode ); 1677 KOAgendaItem* agendaItem = new KOAgendaItem( event, qd, view, mAllDayMode );
1674 agendaItem->installEventFilter(this); 1678 agendaItem->installEventFilter(this);
1675 addChild(agendaItem,0,0); 1679 addChild(agendaItem,0,0);
1676 return agendaItem; 1680 return agendaItem;
1677} 1681}
1678KOAgendaItem * KOAgenda::getItemForTodo ( Todo * todo ) 1682KOAgendaItem * KOAgenda::getItemForTodo ( Todo * todo )
1679{ 1683{
1680 KOAgendaItem *item; 1684 KOAgendaItem *item;
1681 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1685 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1682 if ( item->incidence() == todo ) { 1686 if ( item->incidence() == todo ) {
1683 mItems.remove(); 1687 mItems.remove();
1684 return item; 1688 return item;
1685 } 1689 }
1686 } 1690 }
1687 return 0; 1691 return 0;
1688} 1692}
1689 1693
1690 1694
1691void KOAgenda::updateTodo( Todo * todo, int days, bool remove) 1695void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
1692{ 1696{
1693 // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )|| 1697 // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )||
1694 KOAgendaItem *item; 1698 KOAgendaItem *item;
1695 item = getItemForTodo ( todo ); 1699 item = getItemForTodo ( todo );
1696 //qDebug("KOAgenda::updateTodo %d %d %d %d", this, todo, days, remove); 1700 //qDebug("KOAgenda::updateTodo %d %d %d %d", this, todo, days, remove);
1697 if ( item ) { 1701 if ( item ) {
1698 blockSignals( true ); 1702 blockSignals( true );
1699 //qDebug("item found "); 1703 //qDebug("item found ");
1700 item->hide(); 1704 item->hide();
1701 item->setCellX(-2, -1 ); 1705 item->setCellX(-2, -1 );
1702 item->select(false); 1706 item->select(false);
1703 mUnusedItems.append( item ); 1707 mUnusedItems.append( item );
1704 mItems.remove( item ); 1708 mItems.remove( item );
1705 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); 1709 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
1706 KOAgendaItem *itemit; 1710 KOAgendaItem *itemit;
1707 //globalFlagBlockAgendaItemPaint = 1; 1711 //globalFlagBlockAgendaItemPaint = 1;
1708 for ( itemit=oldconflictItems.first(); itemit != 0; 1712 for ( itemit=oldconflictItems.first(); itemit != 0;
1709 itemit=oldconflictItems.next() ) { 1713 itemit=oldconflictItems.next() ) {
1710 if ( itemit != item ) 1714 if ( itemit != item )
1711 placeSubCells(itemit); 1715 placeSubCells(itemit);
1712 } 1716 }
1713 qApp->processEvents(); 1717 qApp->processEvents();
1714 //globalFlagBlockAgendaItemPaint = 0; 1718 //globalFlagBlockAgendaItemPaint = 0;
1715 for ( itemit=oldconflictItems.first(); itemit != 0; 1719 for ( itemit=oldconflictItems.first(); itemit != 0;
1716 itemit=oldconflictItems.next() ) { 1720 itemit=oldconflictItems.next() ) {
1717 globalFlagBlockAgendaItemUpdate = 0; 1721 globalFlagBlockAgendaItemUpdate = 0;
1718 if ( itemit != item ) 1722 if ( itemit != item )
1719 itemit->repaintMe(); 1723 itemit->repaintMe();
1720 globalFlagBlockAgendaItemUpdate = 1; 1724 globalFlagBlockAgendaItemUpdate = 1;
1721 //qDebug("sigleshot "); 1725 //qDebug("sigleshot ");
1722 QTimer::singleShot( 0, itemit, SLOT ( repaintItem() )); 1726 QTimer::singleShot( 0, itemit, SLOT ( repaintItem() ));
1723 //itemit->repaint( false ); repaintItem() 1727 //itemit->repaint( false ); repaintItem()
1724 } 1728 }
1725 blockSignals( false ); 1729 blockSignals( false );
1726 } 1730 }
1727 if ( remove ) { 1731 if ( remove ) {
1728 //qDebug("remove****************************************** "); 1732 //qDebug("remove****************************************** ");
1729 return; 1733 return;
1730 } 1734 }
1731 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) 1735 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
1732 return; 1736 return;
1733 //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ "); 1737 //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
1734 QDate currentDate = QDate::currentDate(); 1738 QDate currentDate = QDate::currentDate();
1735 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&& ( KOPrefs::instance()->mShowTodoInAgenda ); 1739 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&& ( KOPrefs::instance()->mShowTodoInAgenda );
1736 QDateTime dt; 1740 QDateTime dt;
1737 if ( todo->hasCompletedDate() ) 1741 if ( todo->hasCompletedDate() )
1738 dt = todo->completed(); 1742 dt = todo->completed();
1739 else 1743 else
1740 dt = todo->dtDue(); 1744 dt = todo->dtDue();
1741 if ( overdue ) { 1745 if ( overdue ) {
1742 days += todo->dtDue().date().daysTo( currentDate ); 1746 days += todo->dtDue().date().daysTo( currentDate );
1743 } 1747 }
1744 else 1748 else
1745 currentDate = dt.date(); 1749 currentDate = dt.date();
1746 1750
1747 if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) { 1751 if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) {
1748 if ( ! mAllDayMode ) return; 1752 if ( ! mAllDayMode ) return;
1749 // aldayagenda 1753 // aldayagenda
1750 globalFlagBlockAgendaItemPaint = 1; 1754 globalFlagBlockAgendaItemPaint = 1;
1751 item = insertAllDayItem(todo, currentDate,days, days); 1755 item = insertAllDayItem(todo, currentDate,days, days);
1752 item->show(); 1756 item->show();
1753 1757
1754 } 1758 }
1755 else { 1759 else {
1756 if ( mAllDayMode ) return; 1760 if ( mAllDayMode ) return;
1757 // mAgenda 1761 // mAgenda
1758 globalFlagBlockAgendaItemPaint = 1; 1762 globalFlagBlockAgendaItemPaint = 1;
1759 int endY = timeToY(dt.time()) - 1; 1763 int endY = timeToY(dt.time()) - 1;
1760 int hi = 12/KOPrefs::instance()->mHourSize; 1764 int hi = 12/KOPrefs::instance()->mHourSize;
1761 int startY = endY - 1-hi; 1765 int startY = endY - 1-hi;
1762 item = insertItem(todo,currentDate,days,startY,endY); 1766 item = insertItem(todo,currentDate,days,startY,endY);
1763 item->show(); 1767 item->show();
1764 } 1768 }
1765 qApp->processEvents(); 1769 qApp->processEvents();
1766 globalFlagBlockAgendaItemPaint = 0; 1770 globalFlagBlockAgendaItemPaint = 0;
1767 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); 1771 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
1768 KOAgendaItem *itemit; 1772 KOAgendaItem *itemit;
1769 for ( itemit=oldconflictItems.first(); itemit != 0; 1773 for ( itemit=oldconflictItems.first(); itemit != 0;
1770 itemit=oldconflictItems.next() ) { 1774 itemit=oldconflictItems.next() ) {
1771 globalFlagBlockAgendaItemUpdate = 0; 1775 globalFlagBlockAgendaItemUpdate = 0;
1772 itemit->repaintMe(); 1776 itemit->repaintMe();
1773 globalFlagBlockAgendaItemUpdate = 1; 1777 globalFlagBlockAgendaItemUpdate = 1;
1774 itemit->repaint(); 1778 itemit->repaint();
1775 } 1779 }
1776 globalFlagBlockAgendaItemUpdate = 0; 1780 globalFlagBlockAgendaItemUpdate = 0;
1777 item->repaintMe(); 1781 item->repaintMe();
1778 globalFlagBlockAgendaItemUpdate = 1; 1782 globalFlagBlockAgendaItemUpdate = 1;
1779 item->repaint(); 1783 item->repaint();
1780} 1784}
1781/* 1785/*
1782 Insert KOAgendaItem into agenda. 1786 Insert KOAgendaItem into agenda.
1783*/ 1787*/
1784KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom) 1788KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom)
1785{ 1789{
1786 if (mAllDayMode) { 1790 if (mAllDayMode) {
1787 qDebug("KOAgenda: calling insertItem in all-day mode is illegal. "); 1791 qDebug("KOAgenda: calling insertItem in all-day mode is illegal. ");
1788 return 0; 1792 return 0;
1789 } 1793 }
1790 1794
1791 KOAgendaItem *agendaItem = getNewItem(event,qd,viewport()); 1795 KOAgendaItem *agendaItem = getNewItem(event,qd,viewport());
1792 //agendaItem->setFrameStyle(WinPanel|Raised); 1796 //agendaItem->setFrameStyle(WinPanel|Raised);
1793 1797
1794 int YSize = YBottom - YTop + 1; 1798 int YSize = YBottom - YTop + 1;
1795 if (YSize < 0) { 1799 if (YSize < 0) {
1796 YSize = 1; 1800 YSize = 1;
1797 } 1801 }
1798 int iheight = mGridSpacingY * YSize; 1802 int iheight = mGridSpacingY * YSize;
1799 1803
1800 agendaItem->resize(mGridSpacingX,iheight ); 1804 agendaItem->resize(mGridSpacingX,iheight );
1801 agendaItem->setCellXY(X,YTop,YBottom); 1805 agendaItem->setCellXY(X,YTop,YBottom);
1802 agendaItem->setCellXWidth(X); 1806 agendaItem->setCellXWidth(X);
1803 1807
1804 //addChild(agendaItem,X*mGridSpacingX,YTop*mGridSpacingY); 1808 //addChild(agendaItem,X*mGridSpacingX,YTop*mGridSpacingY);
1805 mItems.append(agendaItem); 1809 mItems.append(agendaItem);
1806 1810
1807 placeSubCells(agendaItem); 1811 placeSubCells(agendaItem);
1808 1812
1809 //agendaItem->show(); 1813 //agendaItem->show();
1810 1814
1811 1815
1812 return agendaItem; 1816 return agendaItem;
1813} 1817}
1814 1818
1815 1819
1816/* 1820/*
1817 Insert all-day KOAgendaItem into agenda. 1821 Insert all-day KOAgendaItem into agenda.
1818*/ 1822*/
1819KOAgendaItem *KOAgenda::insertAllDayItem (Incidence *event,QDate qd,int XBegin,int XEnd) 1823KOAgendaItem *KOAgenda::insertAllDayItem (Incidence *event,QDate qd,int XBegin,int XEnd)
1820{ 1824{
1821 if (!mAllDayMode) { 1825 if (!mAllDayMode) {
1822 return 0; 1826 return 0;
1823 } 1827 }
1824 1828
1825 KOAgendaItem *agendaItem = getNewItem(event,qd,viewport()); 1829 KOAgendaItem *agendaItem = getNewItem(event,qd,viewport());
1826 1830
1827 agendaItem->setCellXY(XBegin,0,0); 1831 agendaItem->setCellXY(XBegin,0,0);
1828 agendaItem->setCellXWidth(XEnd); 1832 agendaItem->setCellXWidth(XEnd);
1829 agendaItem->resize(mGridSpacingX * agendaItem->cellWidth(),mGridSpacingY); 1833 agendaItem->resize(mGridSpacingX * agendaItem->cellWidth(),mGridSpacingY);
1830 1834
1831 //addChild(agendaItem,XBegin*mGridSpacingX,0); 1835 //addChild(agendaItem,XBegin*mGridSpacingX,0);
1832 mItems.append(agendaItem); 1836 mItems.append(agendaItem);
1833 1837
1834 placeSubCells(agendaItem); 1838 placeSubCells(agendaItem);
1835 1839
1836 //agendaItem->show(); 1840 //agendaItem->show();
1837 1841
1838 return agendaItem; 1842 return agendaItem;
1839} 1843}
1840 1844
1841 1845
1842void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd, 1846void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
1843 int YTop,int YBottom) 1847 int YTop,int YBottom)
1844{ 1848{
1845 if (mAllDayMode) { 1849 if (mAllDayMode) {
1846 ; 1850 ;
1847 return; 1851 return;
1848 } 1852 }
1849 1853
1850 int cellX,cellYTop,cellYBottom; 1854 int cellX,cellYTop,cellYBottom;
1851 QString newtext; 1855 QString newtext;
1852 int width = XEnd - XBegin + 1; 1856 int width = XEnd - XBegin + 1;
1853 int count = 0; 1857 int count = 0;
1854 KOAgendaItem *current = 0; 1858 KOAgendaItem *current = 0;
1855 QPtrList<KOAgendaItem> multiItems; 1859 QPtrList<KOAgendaItem> multiItems;
1856 for (cellX = XBegin;cellX <= XEnd;++cellX) { 1860 for (cellX = XBegin;cellX <= XEnd;++cellX) {
1857 if (cellX == XBegin) cellYTop = YTop; 1861 if (cellX == XBegin) cellYTop = YTop;
1858 else cellYTop = 0; 1862 else cellYTop = 0;
1859 if (cellX == XEnd) cellYBottom = YBottom; 1863 if (cellX == XEnd) cellYBottom = YBottom;
1860 else cellYBottom = rows() - 1; 1864 else cellYBottom = rows() - 1;
1861 newtext = QString("(%1/%2): ").arg(++count).arg(width); 1865 newtext = QString("(%1/%2): ").arg(++count).arg(width);
1862 newtext.append(event->summary()); 1866 newtext.append(event->summary());
1863 current = insertItem(event,qd,cellX,cellYTop,cellYBottom); 1867 current = insertItem(event,qd,cellX,cellYTop,cellYBottom);
1864 current->setText(newtext); 1868 current->setText(newtext);
1865 multiItems.append(current); 1869 multiItems.append(current);
1866 } 1870 }
1867 1871
1868 KOAgendaItem *next = 0; 1872 KOAgendaItem *next = 0;
1869 KOAgendaItem *last = multiItems.last(); 1873 KOAgendaItem *last = multiItems.last();
1870 KOAgendaItem *first = multiItems.first(); 1874 KOAgendaItem *first = multiItems.first();
1871 KOAgendaItem *setFirst,*setLast; 1875 KOAgendaItem *setFirst,*setLast;
1872 current = first; 1876 current = first;
1873 while (current) { 1877 while (current) {
1874 next = multiItems.next(); 1878 next = multiItems.next();
1875 if (current == first) setFirst = 0; 1879 if (current == first) setFirst = 0;
1876 else setFirst = first; 1880 else setFirst = first;
1877 if (current == last) setLast = 0; 1881 if (current == last) setLast = 0;
1878 else setLast = last; 1882 else setLast = last;
1879 1883
1880 current->setMultiItem(setFirst,next,setLast); 1884 current->setMultiItem(setFirst,next,setLast);
1881 current = next; 1885 current = next;
1882 } 1886 }
1883} 1887}
1884 1888
1885 1889
1886//QSizePolicy KOAgenda::sizePolicy() const 1890//QSizePolicy KOAgenda::sizePolicy() const
1887//{ 1891//{
1888 // Thought this would make the all-day event agenda minimum size and the 1892 // Thought this would make the all-day event agenda minimum size and the
1889 // normal agenda take the remaining space. But it doesn´t work. The QSplitter 1893 // normal agenda take the remaining space. But it doesn´t work. The QSplitter
1890 // don´t seem to think that an Expanding widget needs more space than a 1894 // don´t seem to think that an Expanding widget needs more space than a
1891 // Preferred one. 1895 // Preferred one.
1892 // But it doesn´t hurt, so it stays. 1896 // But it doesn´t hurt, so it stays.
1893// if (mAllDayMode) { 1897// if (mAllDayMode) {
1894// return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); 1898// return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
1895// } else { 1899// } else {
1896// return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); 1900// return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
1897// } 1901// }
1898//} 1902//}
1899void KOAgenda::finishResize ( ) 1903void KOAgenda::finishResize ( )
1900{ 1904{
1901 //qDebug("finishResize+++++++++++++++++++++++++++++++ ( ) "); 1905 //qDebug("finishResize+++++++++++++++++++++++++++++++ ( ) ");
1902 if ( globalFlagBlockAgenda == 0 ) { 1906 if ( globalFlagBlockAgenda == 0 ) {
1903 finishUpdate(); 1907 finishUpdate();
1904 //qDebug("finishUpdate() called "); 1908 //qDebug("finishUpdate() called ");
1905 } 1909 }
1906} 1910}
1907/* 1911/*
1908 Overridden from QScrollView to provide proper resizing of KOAgendaItems. 1912 Overridden from QScrollView to provide proper resizing of KOAgendaItems.
1909*/ 1913*/
1910void KOAgenda::resizeEvent ( QResizeEvent *ev ) 1914void KOAgenda::resizeEvent ( QResizeEvent *ev )
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 86cf2f4..59e7472 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -1,307 +1,307 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 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#ifndef KOAGENDA_H 23#ifndef KOAGENDA_H
24#define KOAGENDA_H 24#define KOAGENDA_H
25 25
26#include <qscrollview.h> 26#include <qscrollview.h>
27#include <qtimer.h> 27#include <qtimer.h>
28#include <qmemarray.h> 28#include <qmemarray.h>
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qpixmap.h> 30#include <qpixmap.h>
31#include <qguardedptr.h> 31#include <qguardedptr.h>
32 32
33#include "koagendaitem.h" 33#include "koagendaitem.h"
34#include "koeventview.h" 34#include "koeventview.h"
35 35
36class QPopupMenu; 36class QPopupMenu;
37class QTime; 37class QTime;
38class KConfig; 38class KConfig;
39class QFrame; 39class QFrame;
40class KOAgenda; 40class KOAgenda;
41class KCal::Event; 41class KCal::Event;
42class KCal::Todo; 42class KCal::Todo;
43 43
44using namespace KCal; 44using namespace KCal;
45 45
46class MarcusBains : public QFrame { 46class MarcusBains : public QFrame {
47 Q_OBJECT 47 Q_OBJECT
48 public: 48 public:
49 MarcusBains(KOAgenda *agenda=0,const char *name=0); 49 MarcusBains(KOAgenda *agenda=0,const char *name=0);
50 virtual ~MarcusBains(); 50 virtual ~MarcusBains();
51 51 void hideMe();
52 public slots: 52 public slots:
53 void updateLocation(bool recalculate=false); 53 void updateLocation(bool recalculate=false);
54 void updateLoc(); 54 void updateLoc();
55 55
56 private: 56 private:
57 int todayColumn(); 57 int todayColumn();
58 QTimer *minutes; 58 QTimer *minutes;
59 QLabel *mTimeBox; 59 QLabel *mTimeBox;
60 KOAgenda *agenda; 60 KOAgenda *agenda;
61 QTime oldTime; 61 QTime oldTime;
62 int oldToday; 62 int oldToday;
63}; 63};
64 64
65 65
66class KOAgenda : public QScrollView 66class KOAgenda : public QScrollView
67{ 67{
68 Q_OBJECT 68 Q_OBJECT
69 public: 69 public:
70 enum MouseActionType { NOP, MOVE, SELECT, 70 enum MouseActionType { NOP, MOVE, SELECT,
71 RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT }; 71 RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
72 72
73 KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0, 73 KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
74 const char * name=0, WFlags f=0 ); 74 const char * name=0, WFlags f=0 );
75 KOAgenda ( int columns, QWidget * parent=0, 75 KOAgenda ( int columns, QWidget * parent=0,
76 const char * name=0, WFlags f=0 ); 76 const char * name=0, WFlags f=0 );
77 virtual ~KOAgenda(); 77 virtual ~KOAgenda();
78 bool mInvalidPixmap; 78 bool mInvalidPixmap;
79 79
80 Incidence *selectedIncidence() const; 80 Incidence *selectedIncidence() const;
81 QDate selectedIncidenceDate() const; 81 QDate selectedIncidenceDate() const;
82 82
83 virtual bool eventFilter ( QObject *, QEvent * ); 83 virtual bool eventFilter ( QObject *, QEvent * );
84 84
85 void contentsToGrid (int x, int y, int& gx, int& gy); 85 void contentsToGrid (int x, int y, int& gx, int& gy);
86 void gridToContents (int gx, int gy, int& x, int& y); 86 void gridToContents (int gx, int gy, int& x, int& y);
87 87
88 int timeToY (const QTime &time); 88 int timeToY (const QTime &time);
89 QTime gyToTime (int y); 89 QTime gyToTime (int y);
90 90
91 void setStartHour(int startHour); 91 void setStartHour(int startHour);
92 92
93 KOAgendaItem *insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom); 93 KOAgendaItem *insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom);
94 KOAgendaItem *insertAllDayItem (Incidence *event,QDate qd,int XBegin,int XEnd); 94 KOAgendaItem *insertAllDayItem (Incidence *event,QDate qd,int XBegin,int XEnd);
95 void insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd, 95 void insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
96 int YTop,int YBottom); 96 int YTop,int YBottom);
97 97
98 void changeColumns(int columns); 98 void changeColumns(int columns);
99 99
100 int columns() { return mColumns; } 100 int columns() { return mColumns; }
101 int rows() { return mRows; } 101 int rows() { return mRows; }
102 102
103 int gridSpacingX() const { return mGridSpacingX; } 103 int gridSpacingX() const { return mGridSpacingX; }
104 int gridSpacingY() const { return mGridSpacingY; } 104 int gridSpacingY() const { return mGridSpacingY; }
105 105
106// virtual QSizePolicy sizePolicy() const; 106// virtual QSizePolicy sizePolicy() const;
107 107
108 void clear(); 108 void clear();
109 109
110 void clearSelection(); 110 void clearSelection();
111 void hideUnused(); 111 void hideUnused();
112 112
113 /** Calculates the minimum width */ 113 /** Calculates the minimum width */
114 virtual int minimumWidth() const; 114 virtual int minimumWidth() const;
115 /** Update configuration from preference settings */ 115 /** Update configuration from preference settings */
116 void updateConfig(); 116 void updateConfig();
117 117
118 void checkScrollBoundaries(); 118 void checkScrollBoundaries();
119 119
120 void setHolidayMask(QMemArray<bool> *); 120 void setHolidayMask(QMemArray<bool> *);
121 void setDateList(const DateList &selectedDates); 121 void setDateList(const DateList &selectedDates);
122 DateList dateList() const; 122 DateList dateList() const;
123 void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false); 123 void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
124 void finishUpdate(); 124 void finishUpdate();
125 void printSelection(); 125 void printSelection();
126 void storePosition(); 126 void storePosition();
127 void restorePosition(); 127 void restorePosition();
128 void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; } 128 void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
129 void shrinkPixmap(); 129 void shrinkPixmap();
130 QTime getEndTime(); 130 QTime getEndTime();
131 131
132 public slots: 132 public slots:
133 void slotContentMove(int,int); 133 void slotContentMove(int,int);
134 void categoryChanged(Incidence * inc); 134 void categoryChanged(Incidence * inc);
135 void slotClearSelection(); 135 void slotClearSelection();
136 void popupMenu(); 136 void popupMenu();
137 void newItem( int ); 137 void newItem( int );
138 void moveChild( QWidget *, int, int ); 138 void moveChild( QWidget *, int, int );
139 void scrollUp(); 139 void scrollUp();
140 void scrollDown(); 140 void scrollDown();
141 void updateTodo( Todo * t, int , bool ); 141 void updateTodo( Todo * t, int , bool );
142 void popupAlarm(); 142 void popupAlarm();
143 143
144 void checkScrollBoundaries(int); 144 void checkScrollBoundaries(int);
145 145
146 /** Deselect selected items. This function does not emit any signals. */ 146 /** Deselect selected items. This function does not emit any signals. */
147 void deselectItem(); 147 void deselectItem();
148 /** Select item. If the argument is 0, the currently selected item gets 148 /** Select item. If the argument is 0, the currently selected item gets
149 deselected. This function emits the itemSelected(bool) signal to inform 149 deselected. This function emits the itemSelected(bool) signal to inform
150 about selection/deseelction of events. */ 150 about selection/deseelction of events. */
151 void selectItem(KOAgendaItem *); 151 void selectItem(KOAgendaItem *);
152 void finishResize(); 152 void finishResize();
153 153
154 signals: 154 signals:
155 void signalClearSelection(); 155 void signalClearSelection();
156 void showDateView( int, int); 156 void showDateView( int, int);
157 void newEventSignal(); 157 void newEventSignal();
158 void newEventSignal(int gx,int gy); 158 void newEventSignal(int gx,int gy);
159 void newTodoSignal(int gx,int gy); 159 void newTodoSignal(int gx,int gy);
160 void newEventSignal(int gxStart, int gyStart, int gxEnd, int gyEnd); 160 void newEventSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
161 void newTimeSpanSignal(int gxStart, int gyStart, int gxEnd, int gyEnd); 161 void newTimeSpanSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
162 void newStartSelectSignal(); 162 void newStartSelectSignal();
163 void showIncidenceSignal(Incidence *); 163 void showIncidenceSignal(Incidence *);
164 void editIncidenceSignal(Incidence *); 164 void editIncidenceSignal(Incidence *);
165 void deleteIncidenceSignal(Incidence *); 165 void deleteIncidenceSignal(Incidence *);
166 void showIncidencePopupSignal(Incidence *); 166 void showIncidencePopupSignal(Incidence *);
167 167
168 void itemModified(KOAgendaItem *item, int ); 168 void itemModified(KOAgendaItem *item, int );
169 void incidenceSelected(Incidence *); 169 void incidenceSelected(Incidence *);
170 170
171 void lowerYChanged(int); 171 void lowerYChanged(int);
172 void upperYChanged(int); 172 void upperYChanged(int);
173 173
174 void startDragSignal(Incidence *); 174 void startDragSignal(Incidence *);
175 void addToCalSignal(Incidence *, Incidence *); 175 void addToCalSignal(Incidence *, Incidence *);
176 void resizedSignal(); 176 void resizedSignal();
177 void updateViewSignal(); 177 void updateViewSignal();
178 void sendPing(); 178 void sendPing();
179 179
180 protected: 180 protected:
181 KOEventPopupMenu * mAllAgendaPopup; 181 KOEventPopupMenu * mAllAgendaPopup;
182 QPainter mPixPainter; 182 QPainter mPixPainter;
183 QPixmap mPaintPixmap; 183 QPixmap mPaintPixmap;
184 QPixmap mHighlightPixmap; 184 QPixmap mHighlightPixmap;
185 void drawContents(QPainter *p,int cx, int cy, int cw, int ch); 185 void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
186 virtual void resizeEvent ( QResizeEvent * ); 186 virtual void resizeEvent ( QResizeEvent * );
187 187
188 /** Handles mouse events. Called from eventFilter */ 188 /** Handles mouse events. Called from eventFilter */
189 virtual bool eventFilter_mouse ( QObject *, QMouseEvent * ); 189 virtual bool eventFilter_mouse ( QObject *, QMouseEvent * );
190 190
191 /** Start selecting time span. */ 191 /** Start selecting time span. */
192 void startSelectAction(QPoint viewportPos); 192 void startSelectAction(QPoint viewportPos);
193 193
194 /** Select time span. */ 194 /** Select time span. */
195 void performSelectAction(QPoint viewportPos); 195 void performSelectAction(QPoint viewportPos);
196 196
197 /** Emd selecting time span. */ 197 /** Emd selecting time span. */
198 void endSelectAction( bool emitNewEvent = false ); 198 void endSelectAction( bool emitNewEvent = false );
199 199
200 /** Start moving/resizing agenda item */ 200 /** Start moving/resizing agenda item */
201 void startItemAction(QPoint viewportPos); 201 void startItemAction(QPoint viewportPos);
202 202
203 /** Move/resize agenda item */ 203 /** Move/resize agenda item */
204 void performItemAction(QPoint viewportPos); 204 void performItemAction(QPoint viewportPos);
205 205
206 /** End moving/resizing agenda item */ 206 /** End moving/resizing agenda item */
207 void endItemAction(); 207 void endItemAction();
208 208
209 /** Set cursor, when no item action is in progress */ 209 /** Set cursor, when no item action is in progress */
210 void setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos); 210 void setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos);
211 211
212 /** Place agenda item in agenda and adjust other cells if necessary */ 212 /** Place agenda item in agenda and adjust other cells if necessary */
213 void placeSubCells(KOAgendaItem *placeItem); 213 void placeSubCells(KOAgendaItem *placeItem);
214 214
215 /** Process the keyevent, including the ignored keyevents of eventwidgets. 215 /** Process the keyevent, including the ignored keyevents of eventwidgets.
216 * Implements pgup/pgdn and cursor key navigation in the view. 216 * Implements pgup/pgdn and cursor key navigation in the view.
217 */ 217 */
218 void keyPressEvent( QKeyEvent * ); 218 void keyPressEvent( QKeyEvent * );
219 219
220 void calculateWorkingHours(); 220 void calculateWorkingHours();
221 221
222 virtual void contentsMousePressEvent ( QMouseEvent * ); 222 virtual void contentsMousePressEvent ( QMouseEvent * );
223 223
224 private: 224 private:
225 void init(); 225 void init();
226 void marcus_bains(); 226 void marcus_bains();
227 bool mAllDayMode; 227 bool mAllDayMode;
228 bool blockResize; 228 bool blockResize;
229 bool mLeftMouseDown; 229 bool mLeftMouseDown;
230 KOAgendaItem *mPopupItem; 230 KOAgendaItem *mPopupItem;
231 QTimer* mPopupTimer; 231 QTimer* mPopupTimer;
232 int mPopupKind; 232 int mPopupKind;
233 QPoint mPopupPos; 233 QPoint mPopupPos;
234 QTimer mResizeTimer; 234 QTimer mResizeTimer;
235 double mContentPosition; 235 double mContentPosition;
236 236
237 // Width and height of agenda cells 237 // Width and height of agenda cells
238 int mGridSpacingX; 238 int mGridSpacingX;
239 int mGridSpacingY; 239 int mGridSpacingY;
240 240
241 // size of border, where mouse action will resize the KOAgendaItem 241 // size of border, where mouse action will resize the KOAgendaItem
242 int mResizeBorderWidth; 242 int mResizeBorderWidth;
243 243
244 // size of border, where mouse mve will cause a scroll of the agenda 244 // size of border, where mouse mve will cause a scroll of the agenda
245 int mScrollBorderWidth; 245 int mScrollBorderWidth;
246 int mScrollDelay; 246 int mScrollDelay;
247 int mScrollOffset; 247 int mScrollOffset;
248 248
249 QTimer mScrollUpTimer; 249 QTimer mScrollUpTimer;
250 QTimer mScrollDownTimer; 250 QTimer mScrollDownTimer;
251 251
252 // Number of Columns/Rows of agenda grid 252 // Number of Columns/Rows of agenda grid
253 int mColumns; 253 int mColumns;
254 int mRows; 254 int mRows;
255 255
256 // Cells to store Move and Resize coordiantes 256 // Cells to store Move and Resize coordiantes
257 int mStartCellX; 257 int mStartCellX;
258 int mStartCellY; 258 int mStartCellY;
259 int mCurrentCellX; 259 int mCurrentCellX;
260 int mCurrentCellY; 260 int mCurrentCellY;
261 261
262 // Working Hour coordiantes 262 // Working Hour coordiantes
263 bool mWorkingHoursEnable; 263 bool mWorkingHoursEnable;
264 int mWorkingHoursYTop; 264 int mWorkingHoursYTop;
265 int mWorkingHoursYBottom; 265 int mWorkingHoursYBottom;
266 266
267 // Selection 267 // Selection
268 int mSelectionCellX; 268 int mSelectionCellX;
269 int mSelectionYTop; 269 int mSelectionYTop;
270 int mSelectionHeight; 270 int mSelectionHeight;
271 271
272 // List of dates to be displayed 272 // List of dates to be displayed
273 DateList mSelectedDates; 273 DateList mSelectedDates;
274 274
275 // The KOAgendaItem, which has been right-clicked last 275 // The KOAgendaItem, which has been right-clicked last
276 KOAgendaItem *mClickedItem; 276 KOAgendaItem *mClickedItem;
277 277
278 // The KOAgendaItem, which is being moved/resized 278 // The KOAgendaItem, which is being moved/resized
279 QGuardedPtr<KOAgendaItem> mActionItem; 279 QGuardedPtr<KOAgendaItem> mActionItem;
280 280
281 // Currently selected item 281 // Currently selected item
282 QGuardedPtr<KOAgendaItem> mSelectedItem; 282 QGuardedPtr<KOAgendaItem> mSelectedItem;
283 283
284 // The Marcus Bains Line widget. 284 // The Marcus Bains Line widget.
285 MarcusBains *mMarcusBains; 285 MarcusBains *mMarcusBains;
286 void computeSizes(); 286 void computeSizes();
287 287
288 MouseActionType mActionType; 288 MouseActionType mActionType;
289 289
290 bool mItemMoved; 290 bool mItemMoved;
291 291
292 // List of all Items contained in agenda 292 // List of all Items contained in agenda
293 QPtrList<KOAgendaItem> mItems; 293 QPtrList<KOAgendaItem> mItems;
294 QPtrList<KOAgendaItem> mUnusedItems; 294 QPtrList<KOAgendaItem> mUnusedItems;
295 KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport); 295 KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
296 QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems 296 QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
297 QPopupMenu *mNewItemPopup; 297 QPopupMenu *mNewItemPopup;
298 298
299 int mOldLowerScrollValue; 299 int mOldLowerScrollValue;
300 int mOldUpperScrollValue; 300 int mOldUpperScrollValue;
301 KOAgendaItem * getItemForTodo ( Todo * todo ); 301 KOAgendaItem * getItemForTodo ( Todo * todo );
302 QMemArray<bool> *mHolidayMask; 302 QMemArray<bool> *mHolidayMask;
303 int mCurPixWid; 303 int mCurPixWid;
304 int mCurPixHei; 304 int mCurPixHei;
305}; 305};
306 306
307#endif // KOAGENDA_H 307#endif // KOAGENDA_H
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index f46a103..82c0f4c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1,1724 +1,1724 @@
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 <kdateedit.h> 39#include <kdateedit.h>
40#include "ktimeedit.h" 40#include "ktimeedit.h"
41#include <kiconloader.h> 41#include <kiconloader.h>
42#include <kmessagebox.h> 42#include <kmessagebox.h>
43 43
44#include <libkcal/icaldrag.h> 44#include <libkcal/icaldrag.h>
45#include <libkcal/vcaldrag.h> 45#include <libkcal/vcaldrag.h>
46#include <libkcal/calfilter.h> 46#include <libkcal/calfilter.h>
47#include <libkcal/dndfactory.h> 47#include <libkcal/dndfactory.h>
48#include <libkcal/calendarresources.h> 48#include <libkcal/calendarresources.h>
49#include <libkcal/resourcecalendar.h> 49#include <libkcal/resourcecalendar.h>
50#include <kresources/resourceselectdialog.h> 50#include <kresources/resourceselectdialog.h>
51#include <libkcal/kincidenceformatter.h> 51#include <libkcal/kincidenceformatter.h>
52#ifndef DESKTOP_VERSION 52#ifndef DESKTOP_VERSION
53#include <qpe/qpeapplication.h> 53#include <qpe/qpeapplication.h>
54#else 54#else
55#include <qapplication.h> 55#include <qapplication.h>
56#endif 56#endif
57#ifndef KORG_NOPRINTER 57#ifndef KORG_NOPRINTER
58#include "calprinter.h" 58#include "calprinter.h"
59#endif 59#endif
60#include "docprefs.h" 60#include "docprefs.h"
61 61
62#include "kotodoview.h" 62#include "kotodoview.h"
63using namespace KOrg; 63using namespace KOrg;
64 64
65 65
66KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *name ) : 66KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *name ) :
67 QDialog( parent, name, true ) 67 QDialog( parent, name, true )
68{ 68{
69 mStopAll = true; 69 mStopAll = true;
70 setCaption( i18n("Start todo") ); 70 setCaption( i18n("Start todo") );
71 QVBoxLayout* lay = new QVBoxLayout( this ); 71 QVBoxLayout* lay = new QVBoxLayout( this );
72 lay->setSpacing( 3 ); 72 lay->setSpacing( 3 );
73 lay->setMargin( 3 ); 73 lay->setMargin( 3 );
74 QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( sum ), this ); 74 QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( sum ), this );
75 lay->addWidget( lab ); 75 lay->addWidget( lab );
76 lab->setAlignment( AlignCenter ); 76 lab->setAlignment( AlignCenter );
77 77
78 QPushButton * ok = new QPushButton( i18n("Start this todo\nand stop all running"), this ); 78 QPushButton * ok = new QPushButton( i18n("Start this todo\nand stop all running"), this );
79 lay->addWidget( ok ); 79 lay->addWidget( ok );
80 ok->setDefault( true ); 80 ok->setDefault( true );
81 QPushButton * start = new QPushButton( i18n("Start todo"), this ); 81 QPushButton * start = new QPushButton( i18n("Start todo"), this );
82 lay->addWidget( start ); 82 lay->addWidget( start );
83 QPushButton * cancel = new QPushButton( i18n("Cancel - do not start"), this ); 83 QPushButton * cancel = new QPushButton( i18n("Cancel - do not start"), this );
84 lay->addWidget( cancel ); 84 lay->addWidget( cancel );
85 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 85 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
86 connect ( start,SIGNAL(clicked() ),this , SLOT ( doStop() ) ); 86 connect ( start,SIGNAL(clicked() ),this , SLOT ( doStop() ) );
87 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 87 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
88 resize( sizeHint() ); 88 resize( sizeHint() );
89 89
90} 90}
91void KOStartTodoPrefs::doStop() 91void KOStartTodoPrefs::doStop()
92{ 92{
93 mStopAll = false; 93 mStopAll = false;
94 accept(); 94 accept();
95} 95}
96KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) : 96KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) :
97 QDialog( parent, name, true ) 97 QDialog( parent, name, true )
98{ 98{
99 mTodo = todo; 99 mTodo = todo;
100 setCaption( i18n("Stop todo") ); 100 setCaption( i18n("Stop todo") );
101 QVBoxLayout* lay = new QVBoxLayout( this ); 101 QVBoxLayout* lay = new QVBoxLayout( this );
102 lay->setSpacing( 3 ); 102 lay->setSpacing( 3 );
103 lay->setMargin( 3 ); 103 lay->setMargin( 3 );
104 QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( todo->summary() ), this ); 104 QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( todo->summary() ), this );
105 lay->addWidget( lab ); 105 lay->addWidget( lab );
106 lab->setAlignment( AlignHCenter ); 106 lab->setAlignment( AlignHCenter );
107 lab = new QLabel( i18n("Additional Comment:"), this ); 107 lab = new QLabel( i18n("Additional Comment:"), this );
108 lay->addWidget( lab ); 108 lay->addWidget( lab );
109 mComment = new QLineEdit( this ); 109 mComment = new QLineEdit( this );
110 lay->addWidget( mComment ); 110 lay->addWidget( mComment );
111 QHBox * start = new QHBox ( this ); 111 QHBox * start = new QHBox ( this );
112 lay->addWidget( start ); 112 lay->addWidget( start );
113 lab = new QLabel( i18n("Start:"), start ); 113 lab = new QLabel( i18n("Start:"), start );
114 QHBox * end = new QHBox ( this ); 114 QHBox * end = new QHBox ( this );
115 lay->addWidget( end ); 115 lay->addWidget( end );
116 lab = new QLabel( i18n("End:"), end ); 116 lab = new QLabel( i18n("End:"), end );
117 sde = new KDateEdit( start ); 117 sde = new KDateEdit( start );
118 ste = new KOTimeEdit( start ); 118 ste = new KOTimeEdit( start );
119 connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime ) ) ); 119 connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime ) ) );
120 ede = new KDateEdit( end ); 120 ede = new KDateEdit( end );
121 ete = new KOTimeEdit(end ); 121 ete = new KOTimeEdit(end );
122 connect ( ede,SIGNAL(setTimeTo( QTime ) ),ete , SLOT ( setTime(QTime ) ) ); 122 connect ( ede,SIGNAL(setTimeTo( QTime ) ),ete , SLOT ( setTime(QTime ) ) );
123 sde->setDate( mTodo->runStart().date() ); 123 sde->setDate( mTodo->runStart().date() );
124 ste->setTime( mTodo->runStart().time() ); 124 ste->setTime( mTodo->runStart().time() );
125 ede->setDate( QDate::currentDate()); 125 ede->setDate( QDate::currentDate());
126 ete->setTime( QTime::currentTime() ); 126 ete->setTime( QTime::currentTime() );
127 QPushButton * ok = new QPushButton( i18n("Stop and save"), this ); 127 QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
128 lay->addWidget( ok ); 128 lay->addWidget( ok );
129 ok->setDefault( true ); 129 ok->setDefault( true );
130 QPushButton * cancel = new QPushButton( i18n("Continue running"), this ); 130 QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
131 lay->addWidget( cancel ); 131 lay->addWidget( cancel );
132 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 132 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
133 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 133 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
134 ok = new QPushButton( i18n("Stop - do not save"), this ); 134 ok = new QPushButton( i18n("Stop - do not save"), this );
135 connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() ) ); 135 connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() ) );
136 lay->addWidget( ok ); 136 lay->addWidget( ok );
137 if (QApplication::desktop()->width() < 320 ) 137 if (QApplication::desktop()->width() < 320 )
138 resize( 240, sizeHint().height() ); 138 resize( 240, sizeHint().height() );
139 else 139 else
140 resize( 320, sizeHint().height() ); 140 resize( 320, sizeHint().height() );
141 141
142} 142}
143 143
144void KOStopTodoPrefs::accept() 144void KOStopTodoPrefs::accept()
145{ 145{
146 QDateTime start = QDateTime( sde->date(), ste->getTime() ); 146 QDateTime start = QDateTime( sde->date(), ste->getTime() );
147 QDateTime stop = QDateTime( ede->date(), ete->getTime() ); 147 QDateTime stop = QDateTime( ede->date(), ete->getTime() );
148 if ( start > stop ) { 148 if ( start > stop ) {
149 KMessageBox::sorry(this, 149 KMessageBox::sorry(this,
150 i18n("The start time is\nafter the end time!"), 150 i18n("The start time is\nafter the end time!"),
151 i18n("Time mismatch!")); 151 i18n("Time mismatch!"));
152 return; 152 return;
153 } 153 }
154 mTodo->saveRunningInfo( mComment->text(), start, stop ); 154 mTodo->saveRunningInfo( mComment->text(), start, stop );
155 QDialog::accept(); 155 QDialog::accept();
156} 156}
157void KOStopTodoPrefs::doNotSave() 157void KOStopTodoPrefs::doNotSave()
158{ 158{
159 int result = KMessageBox::warningContinueCancel(this, 159 int result = KMessageBox::warningContinueCancel(this,
160 i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary(),i18n("Yes, stop todo") ); 160 i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary(),i18n("Yes, stop todo") );
161 if (result != KMessageBox::Continue) return; 161 if (result != KMessageBox::Continue) return;
162 mTodo->stopRunning(); 162 mTodo->stopRunning();
163 QDialog::accept(); 163 QDialog::accept();
164} 164}
165 165
166 166
167class KOTodoViewWhatsThis :public QWhatsThis 167class KOTodoViewWhatsThis :public QWhatsThis
168{ 168{
169public: 169public:
170 KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; 170 KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
171 171
172protected: 172protected:
173 virtual QString text( const QPoint& p) 173 virtual QString text( const QPoint& p)
174 { 174 {
175 return _view->getWhatsThisText(p) ; 175 return _view->getWhatsThisText(p) ;
176 } 176 }
177private: 177private:
178 QWidget* _wid; 178 QWidget* _wid;
179 KOTodoView * _view; 179 KOTodoView * _view;
180}; 180};
181 181
182KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent, 182KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
183 const char *name) : 183 const char *name) :
184 KListView(parent,name) 184 KListView(parent,name)
185{ 185{
186 mName = QString ( name ); 186 mName = QString ( name );
187 mCalendar = calendar; 187 mCalendar = calendar;
188#ifndef DESKTOP_VERSION 188#ifndef DESKTOP_VERSION
189 QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); 189 QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
190#endif 190#endif
191 mOldCurrent = 0; 191 mOldCurrent = 0;
192 mMousePressed = false; 192 mMousePressed = false;
193 193
194 setAcceptDrops(true); 194 setAcceptDrops(true);
195 viewport()->setAcceptDrops(true); 195 viewport()->setAcceptDrops(true);
196 int size = 16; 196 int size = 16;
197 if (qApp->desktop()->width() < 300 ) 197 if (qApp->desktop()->width() < 300 )
198 size = 12; 198 size = 12;
199 setTreeStepSize( size + 6 ); 199 setTreeStepSize( size + 6 );
200 200
201} 201}
202 202
203void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e) 203void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
204{ 204{
205#ifndef KORG_NODND 205#ifndef KORG_NODND
206// kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl; 206// kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
207 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 207 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
208 !QTextDrag::canDecode( e ) ) { 208 !QTextDrag::canDecode( e ) ) {
209 e->ignore(); 209 e->ignore();
210 return; 210 return;
211 } 211 }
212 212
213 mOldCurrent = currentItem(); 213 mOldCurrent = currentItem();
214#endif 214#endif
215} 215}
216 216
217 217
218void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e) 218void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
219{ 219{
220#ifndef KORG_NODND 220#ifndef KORG_NODND
221// kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl; 221// kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl;
222 222
223 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 223 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
224 !QTextDrag::canDecode( e ) ) { 224 !QTextDrag::canDecode( e ) ) {
225 e->ignore(); 225 e->ignore();
226 return; 226 return;
227 } 227 }
228 228
229 e->accept(); 229 e->accept();
230#endif 230#endif
231} 231}
232 232
233void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *) 233void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *)
234{ 234{
235#ifndef KORG_NODND 235#ifndef KORG_NODND
236// kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl; 236// kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl;
237 237
238 setCurrentItem(mOldCurrent); 238 setCurrentItem(mOldCurrent);
239 setSelected(mOldCurrent,true); 239 setSelected(mOldCurrent,true);
240#endif 240#endif
241} 241}
242 242
243void KOTodoListView::contentsDropEvent(QDropEvent *e) 243void KOTodoListView::contentsDropEvent(QDropEvent *e)
244{ 244{
245#ifndef KORG_NODND 245#ifndef KORG_NODND
246// kdDebug() << "KOTodoListView::contentsDropEvent" << endl; 246// kdDebug() << "KOTodoListView::contentsDropEvent" << endl;
247 247
248 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) && 248 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
249 !QTextDrag::canDecode( e ) ) { 249 !QTextDrag::canDecode( e ) ) {
250 e->ignore(); 250 e->ignore();
251 return; 251 return;
252 } 252 }
253 253
254 DndFactory factory( mCalendar ); 254 DndFactory factory( mCalendar );
255 Todo *todo = factory.createDropTodo(e); 255 Todo *todo = factory.createDropTodo(e);
256 256
257 if (todo) { 257 if (todo) {
258 e->acceptAction(); 258 e->acceptAction();
259 259
260 KOTodoViewItem *destination = 260 KOTodoViewItem *destination =
261 (KOTodoViewItem *)itemAt(contentsToViewport(e->pos())); 261 (KOTodoViewItem *)itemAt(contentsToViewport(e->pos()));
262 Todo *destinationEvent = 0; 262 Todo *destinationEvent = 0;
263 if (destination) destinationEvent = destination->todo(); 263 if (destination) destinationEvent = destination->todo();
264 264
265 Todo *existingTodo = mCalendar->todo(todo->uid()); 265 Todo *existingTodo = mCalendar->todo(todo->uid());
266 266
267 if(existingTodo) { 267 if(existingTodo) {
268 Incidence *to = destinationEvent; 268 Incidence *to = destinationEvent;
269 while(to) { 269 while(to) {
270 if (to->uid() == todo->uid()) { 270 if (to->uid() == todo->uid()) {
271 KMessageBox::sorry(this, 271 KMessageBox::sorry(this,
272 i18n("Cannot move Todo to itself\nor a child of itself"), 272 i18n("Cannot move Todo to itself\nor a child of itself"),
273 i18n("Drop Todo")); 273 i18n("Drop Todo"));
274 delete todo; 274 delete todo;
275 return; 275 return;
276 } 276 }
277 to = to->relatedTo(); 277 to = to->relatedTo();
278 } 278 }
279 internalDrop = true; 279 internalDrop = true;
280 if ( destinationEvent ) 280 if ( destinationEvent )
281 reparentTodoSignal( destinationEvent, existingTodo ); 281 reparentTodoSignal( destinationEvent, existingTodo );
282 else 282 else
283 unparentTodoSignal(existingTodo); 283 unparentTodoSignal(existingTodo);
284 delete todo; 284 delete todo;
285 } else { 285 } else {
286 mCalendar->addTodo(todo); 286 mCalendar->addTodo(todo);
287 emit todoDropped(todo, KOGlobals::EVENTADDED); 287 emit todoDropped(todo, KOGlobals::EVENTADDED);
288 if ( destinationEvent ) 288 if ( destinationEvent )
289 reparentTodoSignal( destinationEvent, todo ); 289 reparentTodoSignal( destinationEvent, todo );
290 } 290 }
291 } 291 }
292 else { 292 else {
293 QString text; 293 QString text;
294 if (QTextDrag::decode(e,text)) { 294 if (QTextDrag::decode(e,text)) {
295 //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) ); 295 //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
296 KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) )); 296 KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
297 qDebug("Dropped : " + text); 297 qDebug("Dropped : " + text);
298 QStringList emails = QStringList::split(",",text); 298 QStringList emails = QStringList::split(",",text);
299 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { 299 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
300 int pos = (*it).find("<"); 300 int pos = (*it).find("<");
301 QString name = (*it).left(pos); 301 QString name = (*it).left(pos);
302 QString email = (*it).mid(pos); 302 QString email = (*it).mid(pos);
303 if (!email.isEmpty() && todoi) { 303 if (!email.isEmpty() && todoi) {
304 todoi->todo()->addAttendee(new Attendee(name,email)); 304 todoi->todo()->addAttendee(new Attendee(name,email));
305 } 305 }
306 } 306 }
307 } 307 }
308 else { 308 else {
309 qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable "); 309 qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable ");
310 e->ignore(); 310 e->ignore();
311 } 311 }
312 } 312 }
313#endif 313#endif
314} 314}
315void KOTodoListView::wheelEvent (QWheelEvent *e) 315void KOTodoListView::wheelEvent (QWheelEvent *e)
316{ 316{
317 QListView::wheelEvent (e); 317 QListView::wheelEvent (e);
318} 318}
319 319
320void KOTodoListView::contentsMousePressEvent(QMouseEvent* e) 320void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
321{ 321{
322 322
323 QPoint p(contentsToViewport(e->pos())); 323 QPoint p(contentsToViewport(e->pos()));
324 QListViewItem *i = itemAt(p); 324 QListViewItem *i = itemAt(p);
325 bool rootClicked = true; 325 bool rootClicked = true;
326 if (i) { 326 if (i) {
327 // if the user clicked into the root decoration of the item, don't 327 // if the user clicked into the root decoration of the item, don't
328 // try to start a drag! 328 // try to start a drag!
329 int X = p.x(); 329 int X = p.x();
330 //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() ); 330 //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() );
331 if (X > header()->sectionPos(0) + 331 if (X > header()->sectionPos(0) +
332 treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + 332 treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
333 itemMargin() +i->height()|| 333 itemMargin() +i->height()||
334 X < header()->sectionPos(0)) { 334 X < header()->sectionPos(0)) {
335 rootClicked = false; 335 rootClicked = false;
336 } 336 }
337 } else { 337 } else {
338 rootClicked = false; 338 rootClicked = false;
339 } 339 }
340#ifndef KORG_NODND 340#ifndef KORG_NODND
341 mMousePressed = false; 341 mMousePressed = false;
342 if (! rootClicked && !( e->button() == RightButton) ) { 342 if (! rootClicked && !( e->button() == RightButton) ) {
343 mPressPos = e->pos(); 343 mPressPos = e->pos();
344 mMousePressed = true; 344 mMousePressed = true;
345 } else { 345 } else {
346 mMousePressed = false; 346 mMousePressed = false;
347 } 347 }
348#endif 348#endif
349 //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked); 349 //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked);
350#ifndef DESKTOP_VERSION 350#ifndef DESKTOP_VERSION
351 if (!( e->button() == RightButton && rootClicked) ) 351 if (!( e->button() == RightButton && rootClicked) )
352 QListView::contentsMousePressEvent(e); 352 QListView::contentsMousePressEvent(e);
353#else 353#else
354 QListView::contentsMousePressEvent(e); 354 QListView::contentsMousePressEvent(e);
355#endif 355#endif
356} 356}
357void KOTodoListView::paintEvent(QPaintEvent* e) 357void KOTodoListView::paintEvent(QPaintEvent* e)
358{ 358{
359 emit paintNeeded(); 359 emit paintNeeded();
360 QListView::paintEvent( e); 360 QListView::paintEvent( e);
361} 361}
362void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e) 362void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
363{ 363{
364 364
365#ifndef KORG_NODND 365#ifndef KORG_NODND
366 //QListView::contentsMouseMoveEvent(e); 366 //QListView::contentsMouseMoveEvent(e);
367 if (mMousePressed && (mPressPos - e->pos()).manhattanLength() > 367 if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
368 QApplication::startDragDistance()*3) { 368 QApplication::startDragDistance()*3) {
369 mMousePressed = false; 369 mMousePressed = false;
370 QListViewItem *item = itemAt(contentsToViewport(mPressPos)); 370 QListViewItem *item = itemAt(contentsToViewport(mPressPos));
371 if (item) { 371 if (item) {
372 DndFactory factory( mCalendar ); 372 DndFactory factory( mCalendar );
373 ICalDrag *vd = factory.createDrag( 373 ICalDrag *vd = factory.createDrag(
374 ((KOTodoViewItem *)item)->todo(),viewport()); 374 ((KOTodoViewItem *)item)->todo(),viewport());
375 internalDrop = false; 375 internalDrop = false;
376 // we cannot do any senseful here, because the DnD is still broken in Qt 376 // we cannot do any senseful here, because the DnD is still broken in Qt
377 if (vd->drag()) { 377 if (vd->drag()) {
378 if ( !internalDrop ) { 378 if ( !internalDrop ) {
379 //emit deleteTodo( ((KOTodoViewItem *)item)->todo() ); 379 //emit deleteTodo( ((KOTodoViewItem *)item)->todo() );
380 qDebug("Dnd: External move: Delete drag source "); 380 qDebug("Dnd: External move: Delete drag source ");
381 } else 381 } else
382 qDebug("Dnd: Internal move "); 382 qDebug("Dnd: Internal move ");
383 383
384 } else { 384 } else {
385 if ( !internalDrop ) { 385 if ( !internalDrop ) {
386 qDebug("Dnd: External Copy"); 386 qDebug("Dnd: External Copy");
387 } else 387 } else
388 qDebug("DnD: Internal copy: Copy pending"); 388 qDebug("DnD: Internal copy: Copy pending");
389 } 389 }
390 } 390 }
391 } 391 }
392#endif 392#endif
393} 393}
394void KOTodoListView::keyReleaseEvent ( QKeyEvent *e ) 394void KOTodoListView::keyReleaseEvent ( QKeyEvent *e )
395{ 395{
396 if ( !e->isAutoRepeat() ) { 396 if ( !e->isAutoRepeat() ) {
397 mFlagKeyPressed = false; 397 mFlagKeyPressed = false;
398 } 398 }
399} 399}
400 400
401 401
402void KOTodoListView::keyPressEvent ( QKeyEvent * e ) 402void KOTodoListView::keyPressEvent ( QKeyEvent * e )
403{ 403{
404 qApp->processEvents(); 404 qApp->processEvents();
405 if ( !isVisible() ) { 405 if ( !isVisible() ) {
406 e->ignore(); 406 e->ignore();
407 return; 407 return;
408 } 408 }
409 if ( e->isAutoRepeat() && !mFlagKeyPressed ) { 409 if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
410 e->ignore(); 410 e->ignore();
411 // qDebug(" ignore %d",e->isAutoRepeat() ); 411 // qDebug(" ignore %d",e->isAutoRepeat() );
412 return; 412 return;
413 } 413 }
414 if (! e->isAutoRepeat() ) 414 if (! e->isAutoRepeat() )
415 mFlagKeyPressed = true; 415 mFlagKeyPressed = true;
416 QListViewItem* cn; 416 QListViewItem* cn;
417 if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) { 417 if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
418 cn = currentItem(); 418 cn = currentItem();
419 if ( cn ) { 419 if ( cn ) {
420 KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 420 KOTodoViewItem* ci = (KOTodoViewItem*)( cn );
421 if ( ci ){ 421 if ( ci ){
422 if ( e->state() == ShiftButton ) 422 if ( e->state() == ShiftButton )
423 ci->setOn( false ); 423 ci->setOn( false );
424 else 424 else
425 ci->setOn( true ); 425 ci->setOn( true );
426 cn = cn->itemBelow(); 426 cn = cn->itemBelow();
427 if ( cn ) { 427 if ( cn ) {
428 setCurrentItem ( cn ); 428 setCurrentItem ( cn );
429 ensureItemVisible ( cn ); 429 ensureItemVisible ( cn );
430 } 430 }
431 431
432 } 432 }
433 } 433 }
434 434
435 e->accept(); 435 e->accept();
436 return; 436 return;
437 } 437 }
438 438
439 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { 439 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) {
440 switch ( e->key() ) { 440 switch ( e->key() ) {
441 case Qt::Key_Down: 441 case Qt::Key_Down:
442 case Qt::Key_Up: 442 case Qt::Key_Up:
443 QListView::keyPressEvent ( e ); 443 QListView::keyPressEvent ( e );
444 e->accept(); 444 e->accept();
445 break; 445 break;
446 case Qt::Key_Left: 446 case Qt::Key_Left:
447 case Qt::Key_Right: 447 case Qt::Key_Right:
448 QListView::keyPressEvent ( e ); 448 QListView::keyPressEvent ( e );
449 e->accept(); 449 e->accept();
450 return; 450 return;
451 break; 451 break;
452 default: 452 default:
453 e->ignore(); 453 e->ignore();
454 break; 454 break;
455 } 455 }
456 return; 456 return;
457 } 457 }
458 e->ignore(); 458 e->ignore();
459} 459}
460void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e) 460void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
461{ 461{
462 QListView::contentsMouseReleaseEvent(e); 462 QListView::contentsMouseReleaseEvent(e);
463 mMousePressed = false; 463 mMousePressed = false;
464} 464}
465 465
466void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e) 466void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
467{ 467{
468 if (!e) return; 468 if (!e) return;
469 469
470 QPoint vp = contentsToViewport(e->pos()); 470 QPoint vp = contentsToViewport(e->pos());
471 471
472 QListViewItem *item = itemAt(vp); 472 QListViewItem *item = itemAt(vp);
473 473
474 emit double_Clicked(item); 474 emit double_Clicked(item);
475 if (!item) return; 475 if (!item) return;
476 476
477 emit doubleClicked(item,vp,0); 477 emit doubleClicked(item,vp,0);
478} 478}
479 479
480///////////////////////////////////////////////////////////////////////////// 480/////////////////////////////////////////////////////////////////////////////
481 481
482KOQuickTodo::KOQuickTodo(QWidget *parent) : 482KOQuickTodo::KOQuickTodo(QWidget *parent) :
483 QLineEdit(parent) 483 QLineEdit(parent)
484{ 484{
485 setText(i18n("Click to add new Todo")); 485 setText(i18n("Click to add new Todo"));
486} 486}
487 487
488void KOQuickTodo::focusInEvent(QFocusEvent *ev) 488void KOQuickTodo::focusInEvent(QFocusEvent *ev)
489{ 489{
490 if ( text()==i18n("Click to add new Todo") ) 490 if ( text()==i18n("Click to add new Todo") )
491 setText(""); 491 setText("");
492 QLineEdit::focusInEvent(ev); 492 QLineEdit::focusInEvent(ev);
493} 493}
494 494
495void KOQuickTodo::focusOutEvent(QFocusEvent *ev) 495void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
496{ 496{
497 setText(i18n("Click to add new Todo")); 497 setText(i18n("Click to add new Todo"));
498 QLineEdit::focusOutEvent(ev); 498 QLineEdit::focusOutEvent(ev);
499} 499}
500 500
501///////////////////////////////////////////////////////////////////////////// 501/////////////////////////////////////////////////////////////////////////////
502 502
503KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : 503KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
504 KOrg::BaseView(calendar,parent,name) 504 KOrg::BaseView(calendar,parent,name)
505{ 505{
506 mCategoryPopupMenu = 0; 506 mCategoryPopupMenu = 0;
507 mPendingUpdateBeforeRepaint = false; 507 mPendingUpdateBeforeRepaint = false;
508 isFlatDisplay = false; 508 isFlatDisplay = false;
509 mNavigator = 0; 509 mNavigator = 0;
510 QBoxLayout *topLayout = new QVBoxLayout(this); 510 QBoxLayout *topLayout = new QVBoxLayout(this);
511 mName = QString ( name ); 511 mName = QString ( name );
512 mBlockUpdate = false; 512 mBlockUpdate = false;
513 mQuickBar = new QWidget( this ); 513 mQuickBar = new QWidget( this );
514 topLayout->addWidget(mQuickBar); 514 topLayout->addWidget(mQuickBar);
515 515
516 mQuickAdd = new KOQuickTodo(mQuickBar); 516 mQuickAdd = new KOQuickTodo(mQuickBar);
517 QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); 517 QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
518 quickLayout->addWidget( mQuickAdd ); 518 quickLayout->addWidget( mQuickAdd );
519 mNewSubBut = new QPushButton( "sub",mQuickBar ); 519 mNewSubBut = new QPushButton( "sub",mQuickBar );
520 QPushButton * s_done = new QPushButton( "D",mQuickBar ); 520 QPushButton * s_done = new QPushButton( "D",mQuickBar );
521 QPushButton * s_run = new QPushButton( "R",mQuickBar ); 521 QPushButton * s_run = new QPushButton( "R",mQuickBar );
522 QPushButton * allopen = new QPushButton( "O",mQuickBar ); 522 QPushButton * allopen = new QPushButton( "O",mQuickBar );
523 QPushButton * allclose = new QPushButton( "C",mQuickBar ); 523 QPushButton * allclose = new QPushButton( "C",mQuickBar );
524 QPushButton * flat = new QPushButton( "F",mQuickBar ); 524 QPushButton * flat = new QPushButton( "F",mQuickBar );
525 525
526 int fixwid = mQuickAdd->sizeHint().height(); 526 int fixwid = mQuickAdd->sizeHint().height();
527 int fixhei = fixwid; 527 int fixhei = fixwid;
528 if ( QApplication::desktop()->width() > 800 ) 528 if ( QApplication::desktop()->width() > 800 )
529 fixwid = (fixwid*3)/2; 529 fixwid = (fixwid*3)/2;
530 connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); 530 connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat()));
531 connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); 531 connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen()));
532 connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); 532 connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose()));
533 s_done->setPixmap( SmallIcon("greenhook16")); 533 s_done->setPixmap( SmallIcon("greenhook16"));
534 connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); 534 connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted()));
535 s_run->setPixmap( SmallIcon("ko16old")); 535 s_run->setPixmap( SmallIcon("ko16old"));
536 connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); 536 connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning()));
537 537
538 connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); 538 connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo()));
539 539
540 mNewSubBut->setFixedWidth(mNewSubBut->sizeHint().width() ); 540 mNewSubBut->setFixedWidth(mNewSubBut->sizeHint().width() );
541 mNewSubBut->setEnabled( false ); 541 mNewSubBut->setEnabled( false );
542 flat->setFixedWidth( fixwid ); 542 flat->setFixedWidth( fixwid );
543 s_done->setFixedWidth( fixwid ); 543 s_done->setFixedWidth( fixwid );
544 allopen->setFixedWidth( fixwid ); 544 allopen->setFixedWidth( fixwid );
545 allclose->setFixedWidth( fixwid ); 545 allclose->setFixedWidth( fixwid );
546 s_run->setFixedWidth( fixwid ); 546 s_run->setFixedWidth( fixwid );
547 547
548 flat->setFixedHeight(fixhei ); 548 flat->setFixedHeight(fixhei );
549 s_done->setFixedHeight(fixhei ); 549 s_done->setFixedHeight(fixhei );
550 allopen->setFixedHeight(fixhei ); 550 allopen->setFixedHeight(fixhei );
551 allclose->setFixedHeight(fixhei ); 551 allclose->setFixedHeight(fixhei );
552 s_run->setFixedHeight(fixhei ); 552 s_run->setFixedHeight(fixhei );
553 mNewSubBut->setFixedHeight(fixhei ); 553 mNewSubBut->setFixedHeight(fixhei );
554 554
555 quickLayout->addWidget( mNewSubBut ); 555 quickLayout->addWidget( mNewSubBut );
556 quickLayout->addWidget( s_done ); 556 quickLayout->addWidget( s_done );
557 quickLayout->addWidget( s_run ); 557 quickLayout->addWidget( s_run );
558 quickLayout->addWidget( allopen ); 558 quickLayout->addWidget( allopen );
559 quickLayout->addWidget( allclose ); 559 quickLayout->addWidget( allclose );
560 quickLayout->addWidget( flat ); 560 quickLayout->addWidget( flat );
561 561
562 if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide(); 562 if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide();
563 563
564 mTodoListView = new KOTodoListView(calendar,this, name ); 564 mTodoListView = new KOTodoListView(calendar,this, name );
565 topLayout->addWidget(mTodoListView); 565 topLayout->addWidget(mTodoListView);
566 //mTodoListView->header()->setMaximumHeight(30); 566 //mTodoListView->header()->setMaximumHeight(30);
567 mTodoListView->setRootIsDecorated(true); 567 mTodoListView->setRootIsDecorated(true);
568 mTodoListView->setAllColumnsShowFocus(true); 568 mTodoListView->setAllColumnsShowFocus(true);
569 569
570 mTodoListView->setShowSortIndicator(true); 570 mTodoListView->setShowSortIndicator(true);
571 571
572 mTodoListView->addColumn(i18n("Todo")); 572 mTodoListView->addColumn(i18n("Todo"));
573 mTodoListView->addColumn(i18n("Prio")); 573 mTodoListView->addColumn(i18n("Prio"));
574 mTodoListView->setColumnAlignment(1,AlignHCenter); 574 mTodoListView->setColumnAlignment(1,AlignHCenter);
575 mTodoListView->addColumn(i18n("Complete")); 575 mTodoListView->addColumn(i18n("Complete"));
576 mTodoListView->setColumnAlignment(2,AlignCenter); 576 mTodoListView->setColumnAlignment(2,AlignCenter);
577 577
578 mTodoListView->addColumn(i18n("Due Date")); 578 mTodoListView->addColumn(i18n("Due Date"));
579 mTodoListView->setColumnAlignment(3,AlignLeft); 579 mTodoListView->setColumnAlignment(3,AlignLeft);
580 mTodoListView->addColumn(i18n("Due Time")); 580 mTodoListView->addColumn(i18n("Due Time"));
581 mTodoListView->setColumnAlignment(4,AlignHCenter); 581 mTodoListView->setColumnAlignment(4,AlignHCenter);
582 582
583 mTodoListView->addColumn(i18n("Start Date")); 583 mTodoListView->addColumn(i18n("Start Date"));
584 mTodoListView->setColumnAlignment(5,AlignLeft); 584 mTodoListView->setColumnAlignment(5,AlignLeft);
585 mTodoListView->addColumn(i18n("Start Time")); 585 mTodoListView->addColumn(i18n("Start Time"));
586 mTodoListView->setColumnAlignment(6,AlignHCenter); 586 mTodoListView->setColumnAlignment(6,AlignHCenter);
587 587
588 //mTodoListView->addColumn(i18n("Cancelled")); 588 //mTodoListView->addColumn(i18n("Cancelled"));
589 mTodoListView->addColumn(i18n("Categories")); 589 mTodoListView->addColumn(i18n("Categories"));
590 mTodoListView->addColumn(i18n("Calendar")); 590 mTodoListView->addColumn(i18n("Calendar"));
591 mTodoListView->addColumn(i18n("Last Modified")); 591 mTodoListView->addColumn(i18n("Last Modified"));
592 mTodoListView->addColumn(i18n("Created")); 592 mTodoListView->addColumn(i18n("Created"));
593 mTodoListView->addColumn(i18n("Last Modified Sub")); 593 mTodoListView->addColumn(i18n("Last Modified Sub"));
594#if 0 594#if 0
595 mTodoListView->addColumn(i18n("Sort Id")); 595 mTodoListView->addColumn(i18n("Sort Id"));
596 mTodoListView->setColumnAlignment(4,AlignHCenter); 596 mTodoListView->setColumnAlignment(4,AlignHCenter);
597#endif 597#endif
598 598
599 mTodoListView->setMinimumHeight( 60 ); 599 mTodoListView->setMinimumHeight( 60 );
600 mTodoListView->setItemsRenameable( true ); 600 mTodoListView->setItemsRenameable( true );
601 mTodoListView->setRenameable( 0 ); 601 mTodoListView->setRenameable( 0 );
602 mTodoListView->setColumnWidth( 0, 120 ); 602 mTodoListView->setColumnWidth( 0, 120 );
603 int iii = 0; 603 int iii = 0;
604 for ( iii = 0; iii< 12 ; ++iii ) 604 for ( iii = 0; iii< 12 ; ++iii )
605 mTodoListView->setColumnWidthMode( iii, QListView::Manual ); 605 mTodoListView->setColumnWidthMode( iii, QListView::Manual );
606 606
607 607
608 mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); 608 mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
609 609
610 mPriorityPopupMenu = new QPopupMenu(this); 610 mPriorityPopupMenu = new QPopupMenu(this);
611 for (int i = 1; i <= 5; i++) { 611 for (int i = 1; i <= 5; i++) {
612 QString label = QString ("%1").arg (i); 612 QString label = QString ("%1").arg (i);
613 mPriority[mPriorityPopupMenu->insertItem (label)] = i; 613 mPriority[mPriorityPopupMenu->insertItem (label)] = i;
614 } 614 }
615 connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int))); 615 connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
616 616
617 mPercentageCompletedPopupMenu = new QPopupMenu(this); 617 mPercentageCompletedPopupMenu = new QPopupMenu(this);
618 for (int i = 0; i <= 100; i+=20) { 618 for (int i = 0; i <= 100; i+=20) {
619 QString label = QString ("%1 %").arg (i); 619 QString label = QString ("%1 %").arg (i);
620 mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; 620 mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
621 } 621 }
622 connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int))); 622 connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
623 623
624 624
625 mCategoryPopupMenu = new QPopupMenu (this); 625 mCategoryPopupMenu = new QPopupMenu (this);
626 mCategoryPopupMenu->setCheckable (true); 626 mCategoryPopupMenu->setCheckable (true);
627 connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int))); 627 connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
628 connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ())); 628 connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ()));
629 629
630 mCalPopupMenu = new QPopupMenu (this); 630 mCalPopupMenu = new QPopupMenu (this);
631 mCalPopupMenu->setCheckable (true); 631 mCalPopupMenu->setCheckable (true);
632 connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int))); 632 connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int)));
633 connect (mCalPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCal ())); 633 connect (mCalPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCal ()));
634 634
635 635
636 636
637 637
638 mItemPopupMenu = new QPopupMenu(this); 638 mItemPopupMenu = new QPopupMenu(this);
639 mItemPopupMenu->insertItem(i18n("Show"), this, 639 mItemPopupMenu->insertItem(i18n("Show"), this,
640 SLOT (showTodo())); 640 SLOT (showTodo()));
641 mItemPopupMenu->insertItem(i18n("Edit..."), this, 641 mItemPopupMenu->insertItem(i18n("Edit..."), this,
642 SLOT (editTodo())); 642 SLOT (editTodo()));
643 mItemPopupMenu->insertItem( i18n("Delete..."), this, 643 mItemPopupMenu->insertItem( i18n("Delete..."), this,
644 SLOT (deleteTodo())); 644 SLOT (deleteTodo()));
645 mItemPopupMenu->insertItem( i18n("Clone..."), this, 645 mItemPopupMenu->insertItem( i18n("Clone..."), this,
646 SLOT (cloneTodo())); 646 SLOT (cloneTodo()));
647 mItemPopupMenu->insertItem( i18n("Move..."), this, 647 mItemPopupMenu->insertItem( i18n("Move..."), this,
648 SLOT (moveTodo())); 648 SLOT (moveTodo()));
649#ifndef DESKTOP_VERSION 649#ifndef DESKTOP_VERSION
650 mItemPopupMenu->insertItem( i18n("Beam..."), this, 650 mItemPopupMenu->insertItem( i18n("Beam..."), this,
651 SLOT (beamTodo())); 651 SLOT (beamTodo()));
652#endif 652#endif
653 mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, 653 mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
654 SLOT (cancelTodo())); 654 SLOT (cancelTodo()));
655 mItemPopupMenu->insertItem( i18n("Categories"), mCategoryPopupMenu); 655 mItemPopupMenu->insertItem( i18n("Categories"), mCategoryPopupMenu);
656 mItemPopupMenu->insertItem( i18n("Calendar"), mCalPopupMenu); 656 mItemPopupMenu->insertItem( i18n("Calendar"), mCalPopupMenu);
657 mItemPopupMenu->insertSeparator(); 657 mItemPopupMenu->insertSeparator();
658 mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, 658 mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
659 SLOT (toggleRunningItem())); 659 SLOT (toggleRunningItem()));
660 mItemPopupMenu->insertSeparator(); 660 mItemPopupMenu->insertSeparator();
661 /* 661 /*
662 mItemPopupMenu->insertItem( i18n("New Todo..."), this, 662 mItemPopupMenu->insertItem( i18n("New Todo..."), this,
663 SLOT (newTodo())); 663 SLOT (newTodo()));
664 */ 664 */
665 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, 665 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
666 SLOT (newSubTodo())); 666 SLOT (newSubTodo()));
667 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, 667 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
668 SLOT (unparentTodo()),0,21); 668 SLOT (unparentTodo()),0,21);
669 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, 669 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
670 SLOT (reparentTodo()),0,22); 670 SLOT (reparentTodo()),0,22);
671 mItemPopupMenu->insertSeparator(); 671 mItemPopupMenu->insertSeparator();
672#if 0 672#if 0
673 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."), 673 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."),
674 this, SLOT( purgeCompleted() ) ); 674 this, SLOT( purgeCompleted() ) );
675 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), 675 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
676 this, SLOT( toggleCompleted() ),0, 33 ); 676 this, SLOT( toggleCompleted() ),0, 33 );
677 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), 677 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
678 this, SLOT( toggleQuickTodo() ),0, 34 ); 678 this, SLOT( toggleQuickTodo() ),0, 34 );
679 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 679 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
680 this, SLOT( toggleRunning() ),0, 35 ); 680 this, SLOT( toggleRunning() ),0, 35 );
681 681
682#endif 682#endif
683 mPopupMenu = new QPopupMenu(this); 683 mPopupMenu = new QPopupMenu(this);
684 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, 684 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
685 SLOT (newTodo()),0,1); 685 SLOT (newTodo()),0,1);
686 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."), 686 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."),
687 this, SLOT(purgeCompleted()),0,2); 687 this, SLOT(purgeCompleted()),0,2);
688 mPopupMenu->insertItem(i18n("Show Completed"), 688 mPopupMenu->insertItem(i18n("Show Completed"),
689 this, SLOT( toggleCompleted() ),0,3 ); 689 this, SLOT( toggleCompleted() ),0,3 );
690 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 690 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
691 this, SLOT( toggleRunning() ),0,5 ); 691 this, SLOT( toggleRunning() ),0,5 );
692 mPopupMenu->insertItem(i18n(" set all open","Display all opened"), 692 mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
693 this, SLOT( setAllOpen() ),0,6 ); 693 this, SLOT( setAllOpen() ),0,6 );
694 mPopupMenu->insertItem(i18n(" set all close","Display all closed"), 694 mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
695 this, SLOT( setAllClose() ),0,7 ); 695 this, SLOT( setAllClose() ),0,7 );
696 mPopupMenu->insertItem(i18n(" set all flat","Display all flat"), 696 mPopupMenu->insertItem(i18n(" set all flat","Display all flat"),
697 this, SLOT( setAllFlat() ),0,8 ); 697 this, SLOT( setAllFlat() ),0,8 );
698 mPopupMenu->insertSeparator(); 698 mPopupMenu->insertSeparator();
699 mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), 699 mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
700 this, SLOT( toggleQuickTodo() ),0,4 ); 700 this, SLOT( toggleQuickTodo() ),0,4 );
701 mDocPrefs = new DocPrefs( name ); 701 mDocPrefs = new DocPrefs( name );
702 702
703 mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu ); 703 mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu );
704 mPopupMenu->setCheckable( true ); 704 mPopupMenu->setCheckable( true );
705 mItemPopupMenu->setCheckable( true ); 705 mItemPopupMenu->setCheckable( true );
706 706
707 707
708 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo ); 708 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo );
709 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo ); 709 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo );
710 710
711 mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo); 711 mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
712 mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo ); 712 mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
713 713
714 mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos); 714 mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
715 mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos ); 715 mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
716 716
717 717
718 // Double clicking conflicts with opening/closing the subtree 718 // Double clicking conflicts with opening/closing the subtree
719 connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ), 719 connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
720 SLOT( editItem( QListViewItem *) ) ); 720 SLOT( editItem( QListViewItem *) ) );
721 /* 721 /*
722 connect( mTodoListView, SIGNAL( rightButtonClicked ( QListViewItem *, 722 connect( mTodoListView, SIGNAL( rightButtonClicked ( QListViewItem *,
723 const QPoint &,int ) ), 723 const QPoint &,int ) ),
724 SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); 724 SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
725 */ 725 */
726 connect( mTodoListView, SIGNAL( contextRequest ( QListViewItem *, 726 connect( mTodoListView, SIGNAL( contextRequest ( QListViewItem *,
727 const QPoint &,int ) ), 727 const QPoint &,int ) ),
728 SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); 728 SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
729 connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ), 729 connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
730 SLOT( itemClicked( QListViewItem * ) ) ); 730 SLOT( itemClicked( QListViewItem * ) ) );
731 connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ), 731 connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
732 SLOT( itemDoubleClicked( QListViewItem * ) ) ); 732 SLOT( itemDoubleClicked( QListViewItem * ) ) );
733 connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), 733 connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
734 SLOT( updateView() ) ); 734 SLOT( updateView() ) );
735 connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), 735 connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
736 SLOT( todoModified(Todo *, int) ) ); 736 SLOT( todoModified(Todo *, int) ) );
737 connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ), 737 connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
738 SLOT( itemStateChanged( QListViewItem * ) ) ); 738 SLOT( itemStateChanged( QListViewItem * ) ) );
739 connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ), 739 connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
740 SLOT( itemStateChanged( QListViewItem * ) ) ); 740 SLOT( itemStateChanged( QListViewItem * ) ) );
741 connect( mTodoListView, SIGNAL( paintNeeded() ), 741 connect( mTodoListView, SIGNAL( paintNeeded() ),
742 SLOT( paintNeeded()) ); 742 SLOT( paintNeeded()) );
743 743
744#if 0 744#if 0
745 connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)), 745 connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
746 SLOT(selectionChanged(QListViewItem *))); 746 SLOT(selectionChanged(QListViewItem *)));
747 connect(mTodoListView,SIGNAL(clicked(QListViewItem *)), 747 connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
748 SLOT(selectionChanged(QListViewItem *))); 748 SLOT(selectionChanged(QListViewItem *)));
749 connect(mTodoListView,SIGNAL(pressed(QListViewItem *)), 749 connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
750 SLOT(selectionChanged(QListViewItem *))); 750 SLOT(selectionChanged(QListViewItem *)));
751#endif 751#endif
752 752
753 connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) )); 753 connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) ));
754 connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *) ), SIGNAL(unparentTodoSignal(Todo *) )); 754 connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *) ), SIGNAL(unparentTodoSignal(Todo *) ));
755 connect( mTodoListView, SIGNAL( deleteTodo(Todo *) ), SIGNAL(deleteTodoSignal(Todo *) )); 755 connect( mTodoListView, SIGNAL( deleteTodo(Todo *) ), SIGNAL(deleteTodoSignal(Todo *) ));
756 756
757 connect( mTodoListView, SIGNAL(selectionChanged() ), 757 connect( mTodoListView, SIGNAL(selectionChanged() ),
758 SLOT( processSelectionChange() ) ); 758 SLOT( processSelectionChange() ) );
759 connect( mQuickAdd, SIGNAL( returnPressed () ), 759 connect( mQuickAdd, SIGNAL( returnPressed () ),
760 SLOT( addQuickTodo() ) ); 760 SLOT( addQuickTodo() ) );
761 761
762} 762}
763 763
764KOTodoView::~KOTodoView() 764KOTodoView::~KOTodoView()
765{ 765{
766 766
767#if QT_VERSION >= 0x030000 767#if QT_VERSION >= 0x030000
768 768
769#else 769#else
770 delete mKOTodoViewWhatsThis; 770 delete mKOTodoViewWhatsThis;
771#endif 771#endif
772 772
773 delete mDocPrefs; 773 delete mDocPrefs;
774} 774}
775QString KOTodoView::getWhatsThisText(QPoint p) 775QString KOTodoView::getWhatsThisText(QPoint p)
776{ 776{
777 KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p ); 777 KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p );
778 if ( item ) 778 if ( item )
779 return KIncidenceFormatter::instance()->getFormattedText( item->todo(), 779 return KIncidenceFormatter::instance()->getFormattedText( item->todo(),
780 KOPrefs::instance()->mWTshowDetails, 780 KOPrefs::instance()->mWTshowDetails,
781 KOPrefs::instance()->mWTshowCreated, 781 KOPrefs::instance()->mWTshowCreated,
782 KOPrefs::instance()->mWTshowChanged); 782 KOPrefs::instance()->mWTshowChanged);
783 return i18n("That is the todo view" ); 783 return i18n("That is the todo view" );
784 784
785} 785}
786 786
787void KOTodoView::jumpToDate () 787void KOTodoView::jumpToDate ()
788{ 788{
789 // if (mActiveItem) { 789 // if (mActiveItem) {
790// mActiveItem->todo()); 790// mActiveItem->todo());
791// if ( mActiveItem->todo()->hasDueDate() ) 791// if ( mActiveItem->todo()->hasDueDate() )
792// emit mActiveItem->todo()jumpToTime( mTodo->dtDue().date() ); 792// emit mActiveItem->todo()jumpToTime( mTodo->dtDue().date() );
793} 793}
794void KOTodoView::paintNeeded() 794void KOTodoView::paintNeeded()
795{ 795{
796 if ( mPendingUpdateBeforeRepaint ) { 796 if ( mPendingUpdateBeforeRepaint ) {
797 updateView(); 797 updateView();
798 mPendingUpdateBeforeRepaint = false; 798 mPendingUpdateBeforeRepaint = false;
799 } 799 }
800} 800}
801void KOTodoView::paintEvent(QPaintEvent * pevent) 801void KOTodoView::paintEvent(QPaintEvent * pevent)
802{ 802{
803 if ( mPendingUpdateBeforeRepaint ) { 803 if ( mPendingUpdateBeforeRepaint ) {
804 updateView(); 804 updateView();
805 mPendingUpdateBeforeRepaint = false; 805 mPendingUpdateBeforeRepaint = false;
806 } 806 }
807 KOrg::BaseView::paintEvent( pevent); 807 KOrg::BaseView::paintEvent( pevent);
808} 808}
809 809
810void KOTodoView::updateView() 810void KOTodoView::updateView()
811{ 811{
812 pendingSubtodo = 0; 812 pendingSubtodo = 0;
813 if ( mBlockUpdate ) { 813 if ( mBlockUpdate ) {
814 return; 814 return;
815 } 815 }
816 if ( !isVisible() ) { 816 if ( !isVisible() ) {
817 mPendingUpdateBeforeRepaint = true; 817 mPendingUpdateBeforeRepaint = true;
818 return; 818 return;
819 } 819 }
820 //qDebug("KOTodoView::updateView() %x", this); 820 //qDebug("KOTodoView::updateView() %x", this);
821 if ( isFlatDisplay ) { 821 if ( isFlatDisplay ) {
822 displayAllFlat(); 822 displayAllFlat();
823 return; 823 return;
824 } 824 }
825 storeCurrentItem(); 825 storeCurrentItem();
826 //qDebug("update "); 826 //qDebug("update ");
827// kdDebug() << "KOTodoView::updateView()" << endl; 827// kdDebug() << "KOTodoView::updateView()" << endl;
828 QFont fo = KOPrefs::instance()->mTodoViewFont; 828 QFont fo = KOPrefs::instance()->mTodoViewFont;
829 829
830 830
831 mTodoListView->clear(); 831 mTodoListView->clear();
832 if ( mName == "todolistsmall" ) { 832 if ( mName == "todolistsmall" ) {
833 if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) { 833 if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
834 int ps = fo.pointSize() -2; 834 int ps = fo.pointSize() -2;
835 if ( ps > 12 ) 835 if ( ps > 12 )
836 ps -= 2; 836 ps -= 2;
837 fo.setPointSize( ps ); 837 fo.setPointSize( ps );
838 } 838 }
839 } 839 }
840 840
841 mTodoListView->setFont( fo ); 841 mTodoListView->setFont( fo );
842 // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont ); 842 // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
843 //mTodoListView->header()->setMaximumHeight(fm.height()); 843 //mTodoListView->header()->setMaximumHeight(fm.height());
844 QPtrList<Todo> todoList = calendar()->todos(); 844 QPtrList<Todo> todoList = calendar()->todos();
845 845
846/* 846/*
847 kdDebug() << "KOTodoView::updateView(): Todo List:" << endl; 847 kdDebug() << "KOTodoView::updateView(): Todo List:" << endl;
848 Event *t; 848 Event *t;
849 for(t = todoList.first(); t; t = todoList.next()) { 849 for(t = todoList.first(); t; t = todoList.next()) {
850 kdDebug() << " " << t->getSummary() << endl; 850 kdDebug() << " " << t->getSummary() << endl;
851 851
852 if (t->getRelatedTo()) { 852 if (t->getRelatedTo()) {
853 kdDebug() << " (related to " << t->getRelatedTo()->getSummary() << ")" << endl; 853 kdDebug() << " (related to " << t->getRelatedTo()->getSummary() << ")" << endl;
854 } 854 }
855 855
856 QPtrList<Event> l = t->getRelations(); 856 QPtrList<Event> l = t->getRelations();
857 Event *c; 857 Event *c;
858 for(c=l.first();c;c=l.next()) { 858 for(c=l.first();c;c=l.next()) {
859 kdDebug() << " - relation: " << c->getSummary() << endl; 859 kdDebug() << " - relation: " << c->getSummary() << endl;
860 } 860 }
861 } 861 }
862*/ 862*/
863 863
864 // Put for each Event a KOTodoViewItem in the list view. Don't rely on a 864 // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
865 // specific order of events. That means that we have to generate parent items 865 // specific order of events. That means that we have to generate parent items
866 // recursively for proper hierarchical display of Todos. 866 // recursively for proper hierarchical display of Todos.
867 mTodoMap.clear(); 867 mTodoMap.clear();
868 Todo *todo; 868 Todo *todo;
869 todo = todoList.first();// todo; todo = todoList.next()) { 869 todo = todoList.first();// todo; todo = todoList.next()) {
870 while ( todo ) { 870 while ( todo ) {
871 bool next = true; 871 bool next = true;
872 // qDebug("todo %s ", todo->summary().latin1()); 872 // qDebug("todo %s ", todo->summary().latin1());
873 Incidence *incidence = todo->relatedTo(); 873 Incidence *incidence = todo->relatedTo();
874 while ( incidence ) { 874 while ( incidence ) {
875 if ( incidence->typeID() == todoID ) { 875 if ( incidence->typeID() == todoID ) {
876 //qDebug("related %s ",incidence->summary().latin1() ); 876 //qDebug("related %s ",incidence->summary().latin1() );
877 if ( !(todoList.contains ( ((Todo* )incidence ) ) ) && incidence->calEnabled() ) { 877 if ( !(todoList.contains ( ((Todo* )incidence ) ) ) && incidence->calEnabled() ) {
878 //qDebug("related not found "); 878 //qDebug("related not found ");
879 todoList.remove( ); 879 todoList.remove( );
880 todo = todoList.current(); 880 todo = todoList.current();
881 next = false; 881 next = false;
882 incidence = 0; 882 incidence = 0;
883 883
884 } else { 884 } else {
885 //qDebug("related found "); 885 //qDebug("related found ");
886 incidence = incidence->relatedTo(); 886 incidence = incidence->relatedTo();
887 } 887 }
888 } else 888 } else
889 incidence = 0; 889 incidence = 0;
890 } 890 }
891 if ( next ) 891 if ( next )
892 todo = todoList.next(); 892 todo = todoList.next();
893 } 893 }
894 894
895 for(todo = todoList.first(); todo; todo = todoList.next()) { 895 for(todo = todoList.first(); todo; todo = todoList.next()) {
896 if (!mTodoMap.contains(todo) && checkTodo( todo ) ) 896 if (!mTodoMap.contains(todo) && checkTodo( todo ) )
897 { 897 {
898 insertTodoItem(todo); 898 insertTodoItem(todo);
899 } 899 }
900 } 900 }
901 // Restore opened/closed state 901 // Restore opened/closed state
902 mTodoListView->blockSignals( true ); 902 mTodoListView->blockSignals( true );
903 if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() ); 903 if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
904 mTodoListView->blockSignals( false ); 904 mTodoListView->blockSignals( false );
905 resetCurrentItem(); 905 resetCurrentItem();
906} 906}
907 907
908void KOTodoView::storeCurrentItem() 908void KOTodoView::storeCurrentItem()
909{ 909{
910 mCurItem = 0; 910 mCurItem = 0;
911 mCurItemRootParent = 0; 911 mCurItemRootParent = 0;
912 mCurItemParent = 0; 912 mCurItemParent = 0;
913 mCurItemAbove = 0; 913 mCurItemAbove = 0;
914 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 914 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
915 if (mActiveItem) { 915 if (mActiveItem) {
916 mCurItem = mActiveItem->todo(); 916 mCurItem = mActiveItem->todo();
917 KOTodoViewItem* activeItemAbove = (KOTodoViewItem*)mActiveItem->itemAbove (); 917 KOTodoViewItem* activeItemAbove = (KOTodoViewItem*)mActiveItem->itemAbove ();
918 if ( activeItemAbove ) 918 if ( activeItemAbove )
919 mCurItemAbove = activeItemAbove->todo(); 919 mCurItemAbove = activeItemAbove->todo();
920 mCurItemRootParent = mCurItem; 920 mCurItemRootParent = mCurItem;
921 mCurItemParent = mCurItemRootParent->relatedTo(); 921 mCurItemParent = mCurItemRootParent->relatedTo();
922 while ( mCurItemRootParent->relatedTo() != 0 ) 922 while ( mCurItemRootParent->relatedTo() != 0 )
923 mCurItemRootParent = mCurItemRootParent->relatedTo(); 923 mCurItemRootParent = mCurItemRootParent->relatedTo();
924 } 924 }
925 mActiveItem = 0; 925 mActiveItem = 0;
926} 926}
927 927
928void KOTodoView::resetCurrentItem() 928void KOTodoView::resetCurrentItem()
929{ 929{
930 //mTodoListView->setFocus(); 930 //mTodoListView->setFocus();
931 KOTodoViewItem* foundItem = 0; 931 KOTodoViewItem* foundItem = 0;
932 KOTodoViewItem* foundItemRoot = 0; 932 KOTodoViewItem* foundItemRoot = 0;
933 KOTodoViewItem* foundItemParent = 0; 933 KOTodoViewItem* foundItemParent = 0;
934 KOTodoViewItem* foundItemAbove = 0; 934 KOTodoViewItem* foundItemAbove = 0;
935 if ( mTodoListView->firstChild () ) { 935 if ( mTodoListView->firstChild () ) {
936 if ( mCurItem ) { 936 if ( mCurItem ) {
937 KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild (); 937 KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
938 while ( item ) { 938 while ( item ) {
939 if ( item->todo() == mCurItem ) { 939 if ( item->todo() == mCurItem ) {
940 foundItem = item; 940 foundItem = item;
941 break; 941 break;
942 } else if ( item->todo() == mCurItemAbove ) { 942 } else if ( item->todo() == mCurItemAbove ) {
943 foundItemAbove = item; 943 foundItemAbove = item;
944 944
945 } 945 }
946 if ( item->todo() == mCurItemRootParent ) { 946 if ( item->todo() == mCurItemRootParent ) {
947 foundItemRoot = item; 947 foundItemRoot = item;
948 } 948 }
949 if ( item->todo() == mCurItemParent ) { 949 if ( item->todo() == mCurItemParent ) {
950 foundItemParent = item; 950 foundItemParent = item;
951 } 951 }
952 item = (KOTodoViewItem*)item->itemBelow(); 952 item = (KOTodoViewItem*)item->itemBelow();
953 } 953 }
954 if ( ! foundItem ) { 954 if ( ! foundItem ) {
955 if ( foundItemParent ) { 955 if ( foundItemParent ) {
956 foundItem = foundItemParent; 956 foundItem = foundItemParent;
957 } else { 957 } else {
958 if ( foundItemRoot ) 958 if ( foundItemRoot )
959 foundItem = foundItemRoot; 959 foundItem = foundItemRoot;
960 else 960 else
961 foundItem = foundItemAbove; 961 foundItem = foundItemAbove;
962 } 962 }
963 } 963 }
964 } 964 }
965 if ( foundItem ) { 965 if ( foundItem ) {
966 mTodoListView->setSelected ( foundItem, true ); 966 mTodoListView->setSelected ( foundItem, true );
967 mTodoListView->setCurrentItem( foundItem ); 967 mTodoListView->setCurrentItem( foundItem );
968 mTodoListView->ensureItemVisible( foundItem ); 968 mTodoListView->ensureItemVisible( foundItem );
969 } else { 969 } else {
970 if ( mTodoListView->firstChild () ) { 970 if ( mTodoListView->firstChild () ) {
971 mTodoListView->setSelected ( mTodoListView->firstChild (), true ); 971 mTodoListView->setSelected ( mTodoListView->firstChild (), true );
972 mTodoListView->setCurrentItem( mTodoListView->firstChild () ); 972 mTodoListView->setCurrentItem( mTodoListView->firstChild () );
973 } 973 }
974 } 974 }
975 } 975 }
976 processSelectionChange(); 976 processSelectionChange();
977 QTimer::singleShot( 100, this, SLOT ( resetFocusToList() )); 977 QTimer::singleShot( 100, this, SLOT ( resetFocusToList() ));
978} 978}
979void KOTodoView::resetFocusToList() 979void KOTodoView::resetFocusToList()
980{ 980{
981 topLevelWidget()->setActiveWindow(); 981 topLevelWidget()->setActiveWindow();
982 mTodoListView->setFocus(); 982 mTodoListView->setFocus();
983} 983}
984//Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; 984//Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove;
985bool KOTodoView::checkTodo( Todo * todo ) 985bool KOTodoView::checkTodo( Todo * todo )
986{ 986{
987 987
988 if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() ) 988 if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() )
989 return false; 989 return false;
990 if ( !todo->isCompleted() ) { 990 if ( !todo->isCompleted() ) {
991 if ( todo->hasDueDate() && todo->dtDue().date() <= QDate::currentDate() ) 991 if ( todo->hasDueDate() && todo->dtDue().date() <= QDate::currentDate() )
992 return true; 992 return true;
993 } 993 }
994 if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) { 994 if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) {
995 if ( todo->hasStartDate() ) 995 if ( todo->hasStartDate() )
996 if ( mNavigator->selectedDates().last() < todo->dtStart().date() ) 996 if ( mNavigator->selectedDates().last() < todo->dtStart().date() )
997 return false; 997 return false;
998 if ( todo->hasDueDate() ) 998 if ( todo->hasDueDate() )
999 if ( mNavigator->selectedDates().first() > todo->dtDue().date() ) 999 if ( mNavigator->selectedDates().first() > todo->dtDue().date() )
1000 return false; 1000 return false;
1001 } 1001 }
1002 return true; 1002 return true;
1003} 1003}
1004 1004
1005void KOTodoView::restoreItemState( QListViewItem *item ) 1005void KOTodoView::restoreItemState( QListViewItem *item )
1006{ 1006{
1007 pendingSubtodo = 0; 1007 pendingSubtodo = 0;
1008 while( item ) { 1008 while( item ) {
1009 KOTodoViewItem *todoItem = (KOTodoViewItem *)item; 1009 KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
1010 todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) ); 1010 todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) );
1011 if( item->childCount() > 0 ) restoreItemState( item->firstChild() ); 1011 if( item->childCount() > 0 ) restoreItemState( item->firstChild() );
1012 item = item->nextSibling(); 1012 item = item->nextSibling();
1013 } 1013 }
1014} 1014}
1015 1015
1016 1016
1017QMap<Todo *,KOTodoViewItem *>::ConstIterator 1017QMap<Todo *,KOTodoViewItem *>::ConstIterator
1018KOTodoView::insertTodoItem(Todo *todo) 1018KOTodoView::insertTodoItem(Todo *todo)
1019{ 1019{
1020 1020
1021 // kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl; 1021 // kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl;
1022 // TODO: Check, if dynmaic cast is necessary 1022 // TODO: Check, if dynmaic cast is necessary
1023 1023
1024 pendingSubtodo = 0; 1024 pendingSubtodo = 0;
1025 Incidence *incidence = todo->relatedTo(); 1025 Incidence *incidence = todo->relatedTo();
1026 while ( incidence && !incidence->calEnabled() ) 1026 while ( incidence && !incidence->calEnabled() )
1027 incidence = incidence->relatedTo(); 1027 incidence = incidence->relatedTo();
1028 if (incidence && incidence->typeID() == todoID ) { 1028 if (incidence && incidence->typeID() == todoID ) {
1029 Todo *relatedTodo = static_cast<Todo *>(incidence); 1029 Todo *relatedTodo = static_cast<Todo *>(incidence);
1030 1030
1031 // kdDebug() << " has Related" << endl; 1031 // kdDebug() << " has Related" << endl;
1032 QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator; 1032 QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
1033 itemIterator = mTodoMap.find(relatedTodo); 1033 itemIterator = mTodoMap.find(relatedTodo);
1034 if (itemIterator == mTodoMap.end()) { 1034 if (itemIterator == mTodoMap.end()) {
1035 // kdDebug() << " related not yet in list" << endl; 1035 // kdDebug() << " related not yet in list" << endl;
1036 itemIterator = insertTodoItem (relatedTodo); 1036 itemIterator = insertTodoItem (relatedTodo);
1037 } 1037 }
1038 // isn't this pretty stupid? We give one Todo to the KOTodoViewItem 1038 // isn't this pretty stupid? We give one Todo to the KOTodoViewItem
1039 // and one into the map. Sure finding is more easy but why? -zecke 1039 // and one into the map. Sure finding is more easy but why? -zecke
1040 KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this); 1040 KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this);
1041 return mTodoMap.insert(todo,todoItem); 1041 return mTodoMap.insert(todo,todoItem);
1042 } else { 1042 } else {
1043 // kdDebug() << " no Related" << endl; 1043 // kdDebug() << " no Related" << endl;
1044 // see above -zecke 1044 // see above -zecke
1045 KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this); 1045 KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
1046 return mTodoMap.insert(todo,todoItem); 1046 return mTodoMap.insert(todo,todoItem);
1047 } 1047 }
1048} 1048}
1049 1049
1050 1050
1051void KOTodoView::updateConfig() 1051void KOTodoView::updateConfig()
1052{ 1052{
1053 updateView(); 1053 updateView();
1054 mTodoListView->repaintContents(); 1054 mTodoListView->repaintContents();
1055} 1055}
1056 1056
1057QPtrList<Incidence> KOTodoView::selectedIncidences() 1057QPtrList<Incidence> KOTodoView::selectedIncidences()
1058{ 1058{
1059 QPtrList<Incidence> selected; 1059 QPtrList<Incidence> selected;
1060 1060
1061 KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); 1061 KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
1062// if (!item) item = mActiveItem; 1062// if (!item) item = mActiveItem;
1063 if (item) selected.append(item->todo()); 1063 if (item) selected.append(item->todo());
1064 1064
1065 return selected; 1065 return selected;
1066} 1066}
1067 1067
1068QPtrList<Todo> KOTodoView::selectedTodos() 1068QPtrList<Todo> KOTodoView::selectedTodos()
1069{ 1069{
1070 QPtrList<Todo> selected; 1070 QPtrList<Todo> selected;
1071 1071
1072 KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); 1072 KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
1073// if (!item) item = mActiveItem; 1073// if (!item) item = mActiveItem;
1074 if (item) selected.append(item->todo()); 1074 if (item) selected.append(item->todo());
1075 1075
1076 return selected; 1076 return selected;
1077} 1077}
1078 1078
1079void KOTodoView::changeEventDisplay(Event *, int) 1079void KOTodoView::changeEventDisplay(Event *, int)
1080{ 1080{
1081 updateView(); 1081 updateView();
1082} 1082}
1083 1083
1084void KOTodoView::showDates(const QDate &, const QDate &) 1084void KOTodoView::showDates(const QDate &, const QDate &)
1085{ 1085{
1086} 1086}
1087 1087
1088void KOTodoView::showEvents(QPtrList<Event>) 1088void KOTodoView::showEvents(QPtrList<Event>)
1089{ 1089{
1090 kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl; 1090 kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl;
1091} 1091}
1092 1092
1093void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd, 1093void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1094 const QDate &td) 1094 const QDate &td)
1095{ 1095{
1096#ifndef KORG_NOPRINTER 1096#ifndef KORG_NOPRINTER
1097 calPrinter->preview(CalPrinter::Todolist, fd, td); 1097 calPrinter->preview(CalPrinter::Todolist, fd, td);
1098#endif 1098#endif
1099} 1099}
1100 1100
1101void KOTodoView::editItem(QListViewItem *item ) 1101void KOTodoView::editItem(QListViewItem *item )
1102{ 1102{
1103 emit editTodoSignal(((KOTodoViewItem *)item)->todo()); 1103 emit editTodoSignal(((KOTodoViewItem *)item)->todo());
1104} 1104}
1105 1105
1106void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) 1106void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
1107{ 1107{
1108 emit showTodoSignal(((KOTodoViewItem *)item)->todo()); 1108 emit showTodoSignal(((KOTodoViewItem *)item)->todo());
1109} 1109}
1110 1110
1111void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) 1111void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
1112{ 1112{
1113 pendingSubtodo = 0; 1113 pendingSubtodo = 0;
1114 mActiveItem = (KOTodoViewItem *)item; 1114 mActiveItem = (KOTodoViewItem *)item;
1115 if (item) { 1115 if (item) {
1116 switch (column){ 1116 switch (column){
1117 case 1: 1117 case 1:
1118 mPriorityPopupMenu->popup(QCursor::pos ()); break; 1118 mPriorityPopupMenu->popup(QCursor::pos ()); break;
1119 case 2: 1119 case 2:
1120 mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break; 1120 mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break;
1121 case 3: 1121 case 3:
1122 moveTodo(); 1122 moveTodo();
1123 break; 1123 break;
1124 case 7: 1124 case 7:
1125 mCategoryPopupMenu->popup(QCursor::pos ()); break; 1125 mCategoryPopupMenu->popup(QCursor::pos ()); break;
1126 case 8: 1126 case 8:
1127 mCalPopupMenu->popup(QCursor::pos ()); break; 1127 mCalPopupMenu->popup(QCursor::pos ()); break;
1128 default: 1128 default:
1129 mItemPopupMenu->popup(QCursor::pos()); 1129 mItemPopupMenu->popup(QCursor::pos());
1130 } 1130 }
1131 } else mPopupMenu->popup(QCursor::pos()); 1131 } else mPopupMenu->popup(QCursor::pos());
1132} 1132}
1133void KOTodoView::newTodo() 1133void KOTodoView::newTodo()
1134{ 1134{
1135 emit newTodoSignal(); 1135 emit newTodoSignal();
1136} 1136}
1137 1137
1138void KOTodoView::newSubTodo() 1138void KOTodoView::newSubTodo()
1139{ 1139{
1140 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1140 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
1141 if (mActiveItem) { 1141 if (mActiveItem) {
1142 if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add new Todo") ) { 1142 if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add new Todo") ) {
1143 addQuickTodoPar( mActiveItem->todo()); 1143 addQuickTodoPar( mActiveItem->todo());
1144 } else 1144 } else
1145 emit newSubTodoSignal(mActiveItem->todo()); 1145 emit newSubTodoSignal(mActiveItem->todo());
1146 } 1146 }
1147} 1147}
1148void KOTodoView::unparentTodo() 1148void KOTodoView::unparentTodo()
1149{ 1149{
1150 if (mActiveItem) { 1150 if (mActiveItem) {
1151 emit unparentTodoSignal(mActiveItem->todo()); 1151 emit unparentTodoSignal(mActiveItem->todo());
1152 } 1152 }
1153} 1153}
1154 1154
1155void KOTodoView::reparentTodo() 1155void KOTodoView::reparentTodo()
1156{ 1156{
1157 if (mActiveItem) { 1157 if (mActiveItem) {
1158 topLevelWidget()->setCaption(i18n("Click on new parent item")); 1158 topLevelWidget()->setCaption(i18n("Click on new parent item"));
1159 pendingSubtodo = mActiveItem; 1159 pendingSubtodo = mActiveItem;
1160 } 1160 }
1161} 1161}
1162void KOTodoView::editTodo() 1162void KOTodoView::editTodo()
1163{ 1163{
1164 if (mActiveItem) { 1164 if (mActiveItem) {
1165 emit editTodoSignal(mActiveItem->todo()); 1165 emit editTodoSignal(mActiveItem->todo());
1166 } 1166 }
1167} 1167}
1168void KOTodoView::cloneTodo() 1168void KOTodoView::cloneTodo()
1169{ 1169{
1170 if (mActiveItem) { 1170 if (mActiveItem) {
1171 emit cloneTodoSignal((Incidence*)mActiveItem->todo()); 1171 emit cloneTodoSignal((Incidence*)mActiveItem->todo());
1172 } 1172 }
1173} 1173}
1174void KOTodoView::cancelTodo() 1174void KOTodoView::cancelTodo()
1175{ 1175{
1176 if (mActiveItem) { 1176 if (mActiveItem) {
1177 emit cancelTodoSignal((Incidence*)mActiveItem->todo()); 1177 emit cancelTodoSignal((Incidence*)mActiveItem->todo());
1178 } 1178 }
1179} 1179}
1180void KOTodoView::moveTodo() 1180void KOTodoView::moveTodo()
1181{ 1181{
1182 if (mActiveItem) { 1182 if (mActiveItem) {
1183 emit moveTodoSignal((Incidence*)mActiveItem->todo()); 1183 emit moveTodoSignal((Incidence*)mActiveItem->todo());
1184 } 1184 }
1185} 1185}
1186void KOTodoView::beamTodo() 1186void KOTodoView::beamTodo()
1187{ 1187{
1188 if (mActiveItem) { 1188 if (mActiveItem) {
1189 emit beamTodoSignal((Incidence*)mActiveItem->todo()); 1189 emit beamTodoSignal((Incidence*)mActiveItem->todo());
1190 } 1190 }
1191} 1191}
1192 1192
1193 1193
1194void KOTodoView::showTodo() 1194void KOTodoView::showTodo()
1195{ 1195{
1196 if (mActiveItem) { 1196 if (mActiveItem) {
1197 emit showTodoSignal(mActiveItem->todo()); 1197 emit showTodoSignal(mActiveItem->todo());
1198 } 1198 }
1199} 1199}
1200 1200
1201void KOTodoView::deleteTodo() 1201void KOTodoView::deleteTodo()
1202{ 1202{
1203 if (mActiveItem) { 1203 if (mActiveItem) {
1204 emit deleteTodoSignal(mActiveItem->todo()); 1204 emit deleteTodoSignal(mActiveItem->todo());
1205 } 1205 }
1206} 1206}
1207 1207
1208void KOTodoView::setNewPriority(int index) 1208void KOTodoView::setNewPriority(int index)
1209{ 1209{
1210 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { 1210 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
1211 mActiveItem->todo()->setPriority(mPriority[index]); 1211 mActiveItem->todo()->setPriority(mPriority[index]);
1212 mActiveItem->construct(); 1212 mActiveItem->construct();
1213 todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED); 1213 todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED);
1214 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); 1214 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 );
1215 } 1215 }
1216 processSelectionChange(); 1216 processSelectionChange();
1217} 1217}
1218 1218
1219void KOTodoView::setNewPercentage(int index) 1219void KOTodoView::setNewPercentage(int index)
1220{ 1220{
1221 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { 1221 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
1222 1222
1223 if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { 1223 if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) {
1224 mActiveItem->setOn( true ); 1224 mActiveItem->setOn( true );
1225 processSelectionChange(); 1225 processSelectionChange();
1226 return; 1226 return;
1227 } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { 1227 } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) {
1228 KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent())); 1228 KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent()));
1229 if ( par && par->isOn() ) 1229 if ( par && par->isOn() )
1230 par->setOn( false ); 1230 par->setOn( false );
1231 } 1231 }
1232 if (mPercentage[index] == 100) { 1232 if (mPercentage[index] == 100) {
1233 mActiveItem->todo()->setCompleted(QDateTime::currentDateTime()); 1233 mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
1234 } else { 1234 } else {
1235 mActiveItem->todo()->setCompleted(false); 1235 mActiveItem->todo()->setCompleted(false);
1236 } 1236 }
1237 mActiveItem->todo()->setPercentComplete(mPercentage[index]); 1237 mActiveItem->todo()->setPercentComplete(mPercentage[index]);
1238 mActiveItem->construct(); 1238 mActiveItem->construct();
1239 todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED); 1239 todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
1240 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); 1240 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 );
1241 } 1241 }
1242 processSelectionChange(); 1242 processSelectionChange();
1243} 1243}
1244 1244
1245void KOTodoView::fillCategories () 1245void KOTodoView::fillCategories ()
1246{ 1246{
1247 mCategoryPopupMenu->clear(); 1247 mCategoryPopupMenu->clear();
1248 if ( ! mActiveItem ) return; 1248 if ( ! mActiveItem ) return;
1249 QStringList checkedCategories = mActiveItem->todo()->categories (); 1249 QStringList checkedCategories = mActiveItem->todo()->categories ();
1250 for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin (); 1250 for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
1251 it != KOPrefs::instance()->mCustomCategories.end (); 1251 it != KOPrefs::instance()->mCustomCategories.end ();
1252 ++it) { 1252 ++it) {
1253 int index = mCategoryPopupMenu->insertItem (*it); 1253 int index = mCategoryPopupMenu->insertItem (*it);
1254 mCategory[index] = *it; 1254 mCategory[index] = *it;
1255 if (checkedCategories.find (*it) != checkedCategories.end ()) mCategoryPopupMenu->setItemChecked (index, true); 1255 if (checkedCategories.find (*it) != checkedCategories.end ()) mCategoryPopupMenu->setItemChecked (index, true);
1256 } 1256 }
1257} 1257}
1258void KOTodoView::fillCal () 1258void KOTodoView::fillCal ()
1259{ 1259{
1260 mCalPopupMenu->clear(); 1260 mCalPopupMenu->clear();
1261 if (!mActiveItem) return; 1261 if (!mActiveItem) return;
1262 bool readO = mActiveItem->todo()->isReadOnly(); 1262 bool readO = mActiveItem->todo()->isReadOnly();
1263 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 1263 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
1264 while ( kkf ) { 1264 while ( kkf ) {
1265 int index = mCalPopupMenu->insertItem( kkf->mName, kkf->mCalNumber); 1265 int index = mCalPopupMenu->insertItem( kkf->mName, kkf->mCalNumber);
1266 if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO ) 1266 if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO )
1267 mCalPopupMenu->setItemEnabled( index, false ); 1267 mCalPopupMenu->setItemEnabled( index, false );
1268 mCalPopupMenu->setItemChecked (index, kkf->mCalNumber == mActiveItem->todo()->calID()); 1268 mCalPopupMenu->setItemChecked (index, kkf->mCalNumber == mActiveItem->todo()->calID());
1269 kkf = KOPrefs::instance()->mCalendars.next(); 1269 kkf = KOPrefs::instance()->mCalendars.next();
1270 } 1270 }
1271} 1271}
1272void KOTodoView::changedCal (int index ) 1272void KOTodoView::changedCal (int index )
1273{ 1273{
1274 if (!mActiveItem) return; 1274 if (!mActiveItem) return;
1275 mActiveItem->todo()->setCalID( index ); 1275 mActiveItem->todo()->setCalID( index );
1276 mActiveItem->construct(); 1276 mActiveItem->construct();
1277} 1277}
1278void KOTodoView::changedCategories(int index) 1278void KOTodoView::changedCategories(int index)
1279{ 1279{
1280 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { 1280 if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
1281 QStringList categories = mActiveItem->todo()->categories (); 1281 QStringList categories = mActiveItem->todo()->categories ();
1282 QString colcat = categories.first(); 1282 QString colcat = categories.first();
1283 if (categories.find (mCategory[index]) != categories.end ()) 1283 if (categories.find (mCategory[index]) != categories.end ())
1284 categories.remove (mCategory[index]); 1284 categories.remove (mCategory[index]);
1285 else 1285 else
1286 categories.insert (categories.end(), mCategory[index]); 1286 categories.insert (categories.end(), mCategory[index]);
1287 categories.sort (); 1287 categories.sort ();
1288 if ( !colcat.isEmpty() ) { 1288 if ( !colcat.isEmpty() ) {
1289 if ( categories.find ( colcat ) != categories.end () ) { 1289 if ( categories.find ( colcat ) != categories.end () ) {
1290 categories.remove( colcat ); 1290 categories.remove( colcat );
1291 categories.prepend( colcat ); 1291 categories.prepend( colcat );
1292 } 1292 }
1293 } 1293 }
1294 mActiveItem->todo()->setCategories (categories); 1294 mActiveItem->todo()->setCategories (categories);
1295 mActiveItem->construct(); 1295 mActiveItem->construct();
1296 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); 1296 mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 );
1297 todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED); 1297 todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
1298 } 1298 }
1299} 1299}
1300void KOTodoView::itemDoubleClicked(QListViewItem *item) 1300void KOTodoView::itemDoubleClicked(QListViewItem *item)
1301{ 1301{
1302 if ( pendingSubtodo != 0 ) { 1302 if ( pendingSubtodo != 0 ) {
1303 topLevelWidget()->setCaption(i18n("Reparenting aborted!")); 1303 topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
1304 } 1304 }
1305 pendingSubtodo = 0; 1305 pendingSubtodo = 0;
1306 //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); 1306 //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
1307 int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() ); 1307 int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
1308 //qDebug("ROW %d ", row); 1308 //qDebug("ROW %d ", row);
1309 if (!item) { 1309 if (!item) {
1310 newTodo(); 1310 newTodo();
1311 return; 1311 return;
1312 } else { 1312 } else {
1313 if ( row == 1 ) { 1313 if ( row == 1 ) {
1314 mActiveItem = (KOTodoViewItem *) item; 1314 mActiveItem = (KOTodoViewItem *) item;
1315 newSubTodo(); 1315 newSubTodo();
1316 return; 1316 return;
1317 } 1317 }
1318 if ( row == 5 || row == 6 || row == 2) { 1318 if ( row == 5 || row == 6 || row == 2) {
1319 mActiveItem = (KOTodoViewItem *) item; 1319 mActiveItem = (KOTodoViewItem *) item;
1320 Todo * t = mActiveItem->todo(); 1320 Todo * t = mActiveItem->todo();
1321 if ( t->isRunning() ) { 1321 if ( t->isRunning() ) {
1322 if ( t->runTime() < 15) { 1322 if ( t->runTime() < 15) {
1323 t->stopRunning(); 1323 t->stopRunning();
1324 mActiveItem->construct(); 1324 mActiveItem->construct();
1325 topLevelWidget()->setCaption(i18n("Todo stopped - no data saved because runtime was < 15 sec!")); 1325 topLevelWidget()->setCaption(i18n("Todo stopped - no data saved because runtime was < 15 sec!"));
1326 return; 1326 return;
1327 } 1327 }
1328 else 1328 else
1329 toggleRunningItem(); 1329 toggleRunningItem();
1330 return; 1330 return;
1331 } else { 1331 } else {
1332 t->setRunning( true ); 1332 t->setRunning( true );
1333 mActiveItem->construct(); 1333 mActiveItem->construct();
1334 topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!")); 1334 topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!"));
1335 return; 1335 return;
1336 } 1336 }
1337 } 1337 }
1338 } 1338 }
1339 if ( KOPrefs::instance()->mEditOnDoubleClick ) 1339 if ( KOPrefs::instance()->mEditOnDoubleClick )
1340 editItem( item ); 1340 editItem( item );
1341 else 1341 else
1342 showItem( item , QPoint(), 0 ); 1342 showItem( item , QPoint(), 0 );
1343} 1343}
1344void KOTodoView::toggleRunningItem() 1344void KOTodoView::toggleRunningItem()
1345{ 1345{
1346 // qDebug("KOTodoView::toggleRunning() "); 1346 // qDebug("KOTodoView::toggleRunning() ");
1347 if ( ! mActiveItem ) 1347 if ( ! mActiveItem )
1348 return; 1348 return;
1349 Todo * t = mActiveItem->todo(); 1349 Todo * t = mActiveItem->todo();
1350 if ( t->isRunning() ) { 1350 if ( t->isRunning() ) {
1351 KOStopTodoPrefs tp ( t, this ); 1351 KOStopTodoPrefs tp ( t, this );
1352 if (QApplication::desktop()->width() <= 800 ){ 1352 if (QApplication::desktop()->width() <= 800 ){
1353 int wid = tp.width(); 1353 int wid = tp.width();
1354 int hei = tp.height(); 1354 int hei = tp.height();
1355 int xx = (QApplication::desktop()->width()-wid)/2; 1355 int xx = (QApplication::desktop()->width()-wid)/2;
1356 int yy = (QApplication::desktop()->height()-hei)/2; 1356 int yy = (QApplication::desktop()->height()-hei)/2;
1357 tp.setGeometry( xx,yy,wid,hei ); 1357 tp.setGeometry( xx,yy,wid,hei );
1358 } 1358 }
1359 tp.exec(); 1359 tp.exec();
1360 mActiveItem->construct(); 1360 updateTodo ( t, 0 );
1361 } else { 1361 } else {
1362 KOStartTodoPrefs tp ( t->summary(), this ); 1362 KOStartTodoPrefs tp ( t->summary(), this );
1363 if (QApplication::desktop()->width() <= 800 ){ 1363 if (QApplication::desktop()->width() <= 800 ){
1364 int wid = tp.width(); 1364 int wid = tp.width();
1365 int hei = tp.height(); 1365 int hei = tp.height();
1366 int xx = (QApplication::desktop()->width()-wid)/2; 1366 int xx = (QApplication::desktop()->width()-wid)/2;
1367 int yy = (QApplication::desktop()->height()-hei)/2; 1367 int yy = (QApplication::desktop()->height()-hei)/2;
1368 tp.setGeometry( xx,yy,wid,hei ); 1368 tp.setGeometry( xx,yy,wid,hei );
1369 } 1369 }
1370 if ( !tp.exec() ) return; 1370 if ( !tp.exec() ) return;
1371 if ( tp.stopAll() ) { 1371 if ( tp.stopAll() ) {
1372 mCalendar->stopAllTodos(); 1372 mCalendar->stopAllTodos();
1373 t->setRunning( true ); 1373 t->setRunning( true );
1374 updateView(); 1374 updateView();
1375 } else { 1375 } else {
1376 t->setRunning( true ); 1376 t->setRunning( true );
1377 mActiveItem->construct(); 1377 updateTodo ( t, 0 );
1378 } 1378 }
1379 } 1379 }
1380} 1380}
1381 1381
1382void KOTodoView::itemClicked(QListViewItem *item) 1382void KOTodoView::itemClicked(QListViewItem *item)
1383{ 1383{
1384 //qDebug("KOTodoView::itemClicked %d", item); 1384 //qDebug("KOTodoView::itemClicked %d", item);
1385 if (!item) { 1385 if (!item) {
1386 if ( pendingSubtodo != 0 ) { 1386 if ( pendingSubtodo != 0 ) {
1387 topLevelWidget()->setCaption(i18n("Reparenting aborted!")); 1387 topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
1388 } 1388 }
1389 pendingSubtodo = 0; 1389 pendingSubtodo = 0;
1390 return; 1390 return;
1391 } 1391 }
1392 KOTodoViewItem *todoItem = (KOTodoViewItem *)item; 1392 KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
1393 if ( pendingSubtodo != 0 ) { 1393 if ( pendingSubtodo != 0 ) {
1394 bool allowReparent = true; 1394 bool allowReparent = true;
1395 QListViewItem *par = item; 1395 QListViewItem *par = item;
1396 while ( par ) { 1396 while ( par ) {
1397 if ( par == pendingSubtodo ) { 1397 if ( par == pendingSubtodo ) {
1398 allowReparent = false; 1398 allowReparent = false;
1399 break; 1399 break;
1400 } 1400 }
1401 par = par->parent(); 1401 par = par->parent();
1402 } 1402 }
1403 if ( !allowReparent ) { 1403 if ( !allowReparent ) {
1404 topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!")); 1404 topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
1405 pendingSubtodo = 0; 1405 pendingSubtodo = 0;
1406 } else { 1406 } else {
1407 Todo* newParent = todoItem->todo(); 1407 Todo* newParent = todoItem->todo();
1408 Todo* newSub = pendingSubtodo->todo(); 1408 Todo* newSub = pendingSubtodo->todo();
1409 pendingSubtodo = 0; 1409 pendingSubtodo = 0;
1410 emit reparentTodoSignal( newParent,newSub ); 1410 emit reparentTodoSignal( newParent,newSub );
1411 return; 1411 return;
1412 } 1412 }
1413 } 1413 }
1414 1414
1415} 1415}
1416 1416
1417void KOTodoView::setDocumentId( const QString &id ) 1417void KOTodoView::setDocumentId( const QString &id )
1418{ 1418{
1419 1419
1420 mDocPrefs->setDoc( id ); 1420 mDocPrefs->setDoc( id );
1421} 1421}
1422 1422
1423void KOTodoView::itemStateChanged( QListViewItem *item ) 1423void KOTodoView::itemStateChanged( QListViewItem *item )
1424{ 1424{
1425 if (!item) return; 1425 if (!item) return;
1426 1426
1427 KOTodoViewItem *todoItem = (KOTodoViewItem *)item; 1427 KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
1428 1428
1429// kdDebug() << "KOTodoView::itemStateChanged(): " << todoItem->todo()->summary() << endl; 1429// kdDebug() << "KOTodoView::itemStateChanged(): " << todoItem->todo()->summary() << endl;
1430 1430
1431 if( mDocPrefs ) mDocPrefs->writeEntry( todoItem->todo()->uid(), todoItem->isOpen() ); 1431 if( mDocPrefs ) mDocPrefs->writeEntry( todoItem->todo()->uid(), todoItem->isOpen() );
1432} 1432}
1433 1433
1434void KOTodoView::saveLayout(KConfig *config, const QString &group) const 1434void KOTodoView::saveLayout(KConfig *config, const QString &group) const
1435{ 1435{
1436 mTodoListView->saveLayout(config,group); 1436 mTodoListView->saveLayout(config,group);
1437} 1437}
1438 1438
1439void KOTodoView::restoreLayout(KConfig *config, const QString &group) 1439void KOTodoView::restoreLayout(KConfig *config, const QString &group)
1440{ 1440{
1441 mTodoListView->restoreLayout(config,group); 1441 mTodoListView->restoreLayout(config,group);
1442} 1442}
1443 1443
1444void KOTodoView::processSelectionChange() 1444void KOTodoView::processSelectionChange()
1445{ 1445{
1446// kdDebug() << "KOTodoView::processSelectionChange()" << endl; 1446// kdDebug() << "KOTodoView::processSelectionChange()" << endl;
1447 1447
1448 KOTodoViewItem *item = 1448 KOTodoViewItem *item =
1449 static_cast<KOTodoViewItem *>( mTodoListView->selectedItem() ); 1449 static_cast<KOTodoViewItem *>( mTodoListView->selectedItem() );
1450 1450
1451 if ( !item ) { 1451 if ( !item ) {
1452 emit incidenceSelected( 0 ); 1452 emit incidenceSelected( 0 );
1453 mNewSubBut->setEnabled( false ); 1453 mNewSubBut->setEnabled( false );
1454 } else { 1454 } else {
1455 emit incidenceSelected( item->todo() ); 1455 emit incidenceSelected( item->todo() );
1456 mNewSubBut->setEnabled( true ); 1456 mNewSubBut->setEnabled( true );
1457 } 1457 }
1458} 1458}
1459 1459
1460void KOTodoView::modified(bool b) 1460void KOTodoView::modified(bool b)
1461{ 1461{
1462 emit isModified(b); 1462 emit isModified(b);
1463} 1463}
1464void KOTodoView::setTodoModified( Todo* todo ) 1464void KOTodoView::setTodoModified( Todo* todo )
1465{ 1465{
1466 todoModified( todo, KOGlobals::UNKNOWN_MODIFIED ); 1466 todoModified( todo, KOGlobals::UNKNOWN_MODIFIED );
1467} 1467}
1468void KOTodoView::clearSelection() 1468void KOTodoView::clearSelection()
1469{ 1469{
1470 mTodoListView->selectAll( false ); 1470 mTodoListView->selectAll( false );
1471} 1471}
1472void KOTodoView::setAllOpen() 1472void KOTodoView::setAllOpen()
1473{ 1473{
1474 if ( isFlatDisplay ) { 1474 if ( isFlatDisplay ) {
1475 isFlatDisplay = false; 1475 isFlatDisplay = false;
1476 mPopupMenu->setItemChecked( 8,false ); 1476 mPopupMenu->setItemChecked( 8,false );
1477 updateView(); 1477 updateView();
1478 } else { 1478 } else {
1479 storeCurrentItem(); 1479 storeCurrentItem();
1480 } 1480 }
1481 setOpen(mTodoListView->firstChild(), true); 1481 setOpen(mTodoListView->firstChild(), true);
1482 resetCurrentItem(); 1482 resetCurrentItem();
1483} 1483}
1484void KOTodoView::setAllClose() 1484void KOTodoView::setAllClose()
1485{ 1485{
1486 if ( isFlatDisplay ) { 1486 if ( isFlatDisplay ) {
1487 isFlatDisplay = false; 1487 isFlatDisplay = false;
1488 mPopupMenu->setItemChecked( 8,false ); 1488 mPopupMenu->setItemChecked( 8,false );
1489 updateView(); 1489 updateView();
1490 } else { 1490 } else {
1491 storeCurrentItem(); 1491 storeCurrentItem();
1492 } 1492 }
1493 setOpen(mTodoListView->firstChild(), false); 1493 setOpen(mTodoListView->firstChild(), false);
1494 resetCurrentItem(); 1494 resetCurrentItem();
1495} 1495}
1496void KOTodoView::setOpen( QListViewItem* item, bool setOpenI) 1496void KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
1497{ 1497{
1498 1498
1499 while ( item ) { 1499 while ( item ) {
1500 setOpen( item->firstChild(), setOpenI ); 1500 setOpen( item->firstChild(), setOpenI );
1501 item->setOpen( setOpenI ); 1501 item->setOpen( setOpenI );
1502 item = item->nextSibling(); 1502 item = item->nextSibling();
1503 } 1503 }
1504} 1504}
1505 1505
1506void KOTodoView::displayAllFlat() 1506void KOTodoView::displayAllFlat()
1507{ 1507{
1508 storeCurrentItem(); 1508 storeCurrentItem();
1509 pendingSubtodo = 0; 1509 pendingSubtodo = 0;
1510 if ( mBlockUpdate ) { 1510 if ( mBlockUpdate ) {
1511 return; 1511 return;
1512 } 1512 }
1513 mPopupMenu->setItemChecked( 8,true ); 1513 mPopupMenu->setItemChecked( 8,true );
1514 isFlatDisplay = true; 1514 isFlatDisplay = true;
1515 QPtrList<Todo> todoList = calendar()->todos(); 1515 QPtrList<Todo> todoList = calendar()->todos();
1516 mTodoMap.clear(); 1516 mTodoMap.clear();
1517 mTodoListView->clear(); 1517 mTodoListView->clear();
1518 Todo *todo; 1518 Todo *todo;
1519 for(todo = todoList.first(); todo; todo = todoList.next()) { 1519 for(todo = todoList.first(); todo; todo = todoList.next()) {
1520 if ( checkTodo( todo ) ) { 1520 if ( checkTodo( todo ) ) {
1521 KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this); 1521 KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
1522 mTodoMap.insert(todo,todoItem); 1522 mTodoMap.insert(todo,todoItem);
1523 } 1523 }
1524 } 1524 }
1525 resetCurrentItem(); 1525 resetCurrentItem();
1526} 1526}
1527 1527
1528void KOTodoView::setAllFlat() 1528void KOTodoView::setAllFlat()
1529{ 1529{
1530 if ( isFlatDisplay ) { 1530 if ( isFlatDisplay ) {
1531 isFlatDisplay = false; 1531 isFlatDisplay = false;
1532 mPopupMenu->setItemChecked( 8,false ); 1532 mPopupMenu->setItemChecked( 8,false );
1533 updateView(); 1533 updateView();
1534 return; 1534 return;
1535 } 1535 }
1536 displayAllFlat(); 1536 displayAllFlat();
1537} 1537}
1538 1538
1539void KOTodoView::purgeCompleted() 1539void KOTodoView::purgeCompleted()
1540{ 1540{
1541 emit purgeCompletedSignal(); 1541 emit purgeCompletedSignal();
1542 1542
1543} 1543}
1544void KOTodoView::toggleQuickTodo() 1544void KOTodoView::toggleQuickTodo()
1545{ 1545{
1546 if ( mQuickBar->isVisible() ) { 1546 if ( mQuickBar->isVisible() ) {
1547 mQuickBar->hide(); 1547 mQuickBar->hide();
1548 KOPrefs::instance()->mEnableQuickTodo = false; 1548 KOPrefs::instance()->mEnableQuickTodo = false;
1549 } 1549 }
1550 else { 1550 else {
1551 mQuickBar->show(); 1551 mQuickBar->show();
1552 KOPrefs::instance()->mEnableQuickTodo = true; 1552 KOPrefs::instance()->mEnableQuickTodo = true;
1553 } 1553 }
1554 mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo); 1554 mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
1555 mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo ); 1555 mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
1556} 1556}
1557 1557
1558void KOTodoView::toggleRunning() 1558void KOTodoView::toggleRunning()
1559{ 1559{
1560 KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos; 1560 KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
1561 mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos); 1561 mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
1562 mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos ); 1562 mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
1563 updateView(); 1563 updateView();
1564 if ( KOPrefs::instance()->mHideNonStartedTodos ) 1564 if ( KOPrefs::instance()->mHideNonStartedTodos )
1565 topLevelWidget()->setCaption(i18n("Hide not Running")); 1565 topLevelWidget()->setCaption(i18n("Hide not Running"));
1566 else 1566 else
1567 topLevelWidget()->setCaption(i18n("Show not Running")); 1567 topLevelWidget()->setCaption(i18n("Show not Running"));
1568} 1568}
1569 1569
1570void KOTodoView::toggleCompleted() 1570void KOTodoView::toggleCompleted()
1571{ 1571{
1572 KOPrefs::instance()->mShowCompletedTodo = !KOPrefs::instance()->mShowCompletedTodo; 1572 KOPrefs::instance()->mShowCompletedTodo = !KOPrefs::instance()->mShowCompletedTodo;
1573 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo ); 1573 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo );
1574 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo ); 1574 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo );
1575 updateView(); 1575 updateView();
1576 if ( KOPrefs::instance()->mShowCompletedTodo ) 1576 if ( KOPrefs::instance()->mShowCompletedTodo )
1577 topLevelWidget()->setCaption(i18n("Show Completed")); 1577 topLevelWidget()->setCaption(i18n("Show Completed"));
1578 else 1578 else
1579 topLevelWidget()->setCaption(i18n("Hide Completed")); 1579 topLevelWidget()->setCaption(i18n("Hide Completed"));
1580} 1580}
1581 1581
1582void KOTodoView::addQuickTodo() 1582void KOTodoView::addQuickTodo()
1583{ 1583{
1584 addQuickTodoPar( 0 ); 1584 addQuickTodoPar( 0 );
1585} 1585}
1586void KOTodoView::addQuickTodoPar( Todo * parentTodo) 1586void KOTodoView::addQuickTodoPar( Todo * parentTodo)
1587{ 1587{
1588 Todo *todo = new Todo(); 1588 Todo *todo = new Todo();
1589 todo->setSummary(mQuickAdd->text()); 1589 todo->setSummary(mQuickAdd->text());
1590 todo->setOrganizer(KOPrefs::instance()->email()); 1590 todo->setOrganizer(KOPrefs::instance()->email());
1591 if ( parentTodo ) { 1591 if ( parentTodo ) {
1592 todo->setRelatedTo(parentTodo); 1592 todo->setRelatedTo(parentTodo);
1593 1593
1594 todo->setCategories (parentTodo->categoriesStr ()); 1594 todo->setCategories (parentTodo->categoriesStr ());
1595 todo->setSecrecy (parentTodo->secrecy ()); 1595 todo->setSecrecy (parentTodo->secrecy ());
1596 if ( parentTodo->priority() < 3 ) 1596 if ( parentTodo->priority() < 3 )
1597 todo->setPriority( parentTodo->priority() ); 1597 todo->setPriority( parentTodo->priority() );
1598 todo->setCalID( parentTodo->calID() ); 1598 todo->setCalID( parentTodo->calID() );
1599 } else { 1599 } else {
1600 CalFilter * cf = mCalendar->filter(); 1600 CalFilter * cf = mCalendar->filter();
1601 if ( cf ) { 1601 if ( cf ) {
1602 if ( cf->isEnabled()&& cf->showCategories()) { 1602 if ( cf->isEnabled()&& cf->showCategories()) {
1603 todo->setCategories(cf->categoryList()); 1603 todo->setCategories(cf->categoryList());
1604 } 1604 }
1605 if ( cf->isEnabled() ) 1605 if ( cf->isEnabled() )
1606 todo->setSecrecy( cf->getSecrecy()); 1606 todo->setSecrecy( cf->getSecrecy());
1607 } 1607 }
1608 } 1608 }
1609 mCalendar->addTodo(todo); 1609 mCalendar->addTodo(todo);
1610 mQuickAdd->setText(""); 1610 mQuickAdd->setText("");
1611 todoModified (todo, KOGlobals::EVENTADDED ); 1611 todoModified (todo, KOGlobals::EVENTADDED );
1612 updateView(); 1612 updateView();
1613 1613
1614} 1614}
1615void KOTodoView::keyPressEvent ( QKeyEvent * e ) 1615void KOTodoView::keyPressEvent ( QKeyEvent * e )
1616{ 1616{
1617 // e->ignore(); 1617 // e->ignore();
1618 //return; 1618 //return;
1619 if ( !isVisible() ) { 1619 if ( !isVisible() ) {
1620 e->ignore(); 1620 e->ignore();
1621 return; 1621 return;
1622 } 1622 }
1623 switch ( e->key() ) { 1623 switch ( e->key() ) {
1624 case Qt::Key_Down: 1624 case Qt::Key_Down:
1625 case Qt::Key_Up: 1625 case Qt::Key_Up:
1626 // KOrg::BaseView::keyPressEvent ( e ); 1626 // KOrg::BaseView::keyPressEvent ( e );
1627 e->ignore(); 1627 e->ignore();
1628 break; 1628 break;
1629 1629
1630 case Qt::Key_Q: 1630 case Qt::Key_Q:
1631 1631
1632 1632
1633 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { 1633 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) {
1634 e->ignore(); 1634 e->ignore();
1635 break; 1635 break;
1636 } 1636 }
1637 toggleQuickTodo(); 1637 toggleQuickTodo();
1638 break; 1638 break;
1639 case Qt::Key_U: 1639 case Qt::Key_U:
1640 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) { 1640 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) {
1641 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1641 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
1642 unparentTodo(); 1642 unparentTodo();
1643 e->accept(); 1643 e->accept();
1644 } else 1644 } else
1645 e->ignore(); 1645 e->ignore();
1646 break; 1646 break;
1647 case Qt::Key_S: 1647 case Qt::Key_S:
1648 if ( e->state() == Qt::ControlButton ) { 1648 if ( e->state() == Qt::ControlButton ) {
1649 e->ignore(); 1649 e->ignore();
1650 break; 1650 break;
1651 } 1651 }
1652 if ( e->state() == Qt::ShiftButton ) { 1652 if ( e->state() == Qt::ShiftButton ) {
1653 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1653 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
1654 reparentTodo(); 1654 reparentTodo();
1655 e->accept(); 1655 e->accept();
1656 } else 1656 } else
1657 e->ignore(); 1657 e->ignore();
1658 break; 1658 break;
1659 case Qt::Key_P: 1659 case Qt::Key_P:
1660 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) { 1660 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) {
1661 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1661 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
1662 if ( pendingSubtodo ) 1662 if ( pendingSubtodo )
1663 itemClicked(mActiveItem); 1663 itemClicked(mActiveItem);
1664 e->accept(); 1664 e->accept();
1665 } else 1665 } else
1666 e->ignore(); 1666 e->ignore();
1667 break; 1667 break;
1668 case Qt::Key_Escape: 1668 case Qt::Key_Escape:
1669 if ( pendingSubtodo ) { 1669 if ( pendingSubtodo ) {
1670 itemClicked(0); 1670 itemClicked(0);
1671 e->accept(); 1671 e->accept();
1672 } else 1672 } else
1673 e->ignore(); 1673 e->ignore();
1674 break; 1674 break;
1675 default: 1675 default:
1676 e->ignore(); 1676 e->ignore();
1677 } 1677 }
1678 1678
1679 if ( true ) { 1679 if ( true ) {
1680 if ( e->key() == Qt::Key_I ) { 1680 if ( e->key() == Qt::Key_I ) {
1681 KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem(); 1681 KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem();
1682 if ( cn ) { 1682 if ( cn ) {
1683 mActiveItem = cn; 1683 mActiveItem = cn;
1684 KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 1684 KOTodoViewItem* ci = (KOTodoViewItem*)( cn );
1685 if ( ci ){ 1685 if ( ci ){
1686 showTodo(); 1686 showTodo();
1687 cn = (KOTodoViewItem*)cn->itemBelow(); 1687 cn = (KOTodoViewItem*)cn->itemBelow();
1688 if ( cn ) { 1688 if ( cn ) {
1689 mTodoListView->setCurrentItem ( cn ); 1689 mTodoListView->setCurrentItem ( cn );
1690 mTodoListView->ensureItemVisible ( cn ); 1690 mTodoListView->ensureItemVisible ( cn );
1691 } 1691 }
1692 1692
1693 } 1693 }
1694 } 1694 }
1695 e->accept(); 1695 e->accept();
1696 1696
1697 } 1697 }
1698 1698
1699 } 1699 }
1700 1700
1701} 1701}
1702void KOTodoView::updateTodo( Todo * t, int type ) 1702void KOTodoView::updateTodo( Todo * t, int type )
1703{ 1703{
1704 if ( mBlockUpdate) 1704 if ( mBlockUpdate)
1705 return; 1705 return;
1706 1706
1707 QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator; 1707 QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
1708 itemIterator = mTodoMap.find(t); 1708 itemIterator = mTodoMap.find(t);
1709 if (itemIterator != mTodoMap.end()) { 1709 if (itemIterator != mTodoMap.end()) {
1710 (*itemIterator)->construct(); 1710 (*itemIterator)->construct();
1711 } else { 1711 } else {
1712 if ( type == KOGlobals::EVENTADDED ) { 1712 if ( type == KOGlobals::EVENTADDED ) {
1713 insertTodoItem( t ); 1713 insertTodoItem( t );
1714 } 1714 }
1715 } 1715 }
1716 1716
1717} 1717}
1718 1718
1719void KOTodoView::todoModified(Todo * t , int p ) 1719void KOTodoView::todoModified(Todo * t , int p )
1720{ 1720{
1721 mBlockUpdate = true; 1721 mBlockUpdate = true;
1722 emit todoModifiedSignal ( t, p ); 1722 emit todoModifiedSignal ( t, p );
1723 mBlockUpdate = false; 1723 mBlockUpdate = false;
1724} 1724}