summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp22
-rw-r--r--korganizer/koeditordetails.cpp4
2 files changed, 12 insertions, 14 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index f9c8b73..ea510f1 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -45,13 +45,12 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
45 45
46 mNavigatorView = new KDateNavigator( this, name ); 46 mNavigatorView = new KDateNavigator( this, name );
47 mNavigatorView->hide(); 47 mNavigatorView->hide();
48 connectNavigatorView( mNavigatorView ); 48 connectNavigatorView( mNavigatorView );
49 //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); 49 //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) );
50 mLastDisplayedDN = 0; 50 mLastDisplayedDN = 0;
51 mUpdateTimer;
52 mUpdateTimer = new QTimer( this ); 51 mUpdateTimer = new QTimer( this );
53 connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); 52 connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
54 mFirstSelectedDate = QDate::currentDate(); 53 mFirstSelectedDate = QDate::currentDate();
55 mSelectedDateCount = 1; 54 mSelectedDateCount = 1;
56} 55}
57 56
@@ -148,13 +147,13 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
148 } 147 }
149} 148}
150void DateNavigatorContainer::setCalendar( Calendar *cal ) 149void DateNavigatorContainer::setCalendar( Calendar *cal )
151{ 150{
152 mCalendar = cal; 151 mCalendar = cal;
153 mNavigatorView->setCalendar( cal ); 152 mNavigatorView->setCalendar( cal );
154 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 153 for( int i = 0; i < mLastDisplayedDN; ++i ) {
155 KDateNavigator *n = mExtraViews.at( i ); 154 KDateNavigator *n = mExtraViews.at( i );
156 n->setCalendar( cal ); 155 n->setCalendar( cal );
157 } 156 }
158} 157}
159void DateNavigatorContainer::checkUpdateDayMatrixDates() 158void DateNavigatorContainer::checkUpdateDayMatrixDates()
160{ 159{
@@ -187,13 +186,12 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
187 if ( count == 0 ) { 186 if ( count == 0 ) {
188 bool ok; 187 bool ok;
189 fo = mNavigatorView->yourFontHint( size() , &ok ); 188 fo = mNavigatorView->yourFontHint( size() , &ok );
190 //mNavigatorView->resize( size() ); 189 //mNavigatorView->resize( size() );
191 //if ( ! ok ) 190 //if ( ! ok )
192 // return; 191 // return;
193 int butt = 2;
194 horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); 192 horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
195 if ( horizontalCount <= 1 ) 193 if ( horizontalCount <= 1 )
196 minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 194 minSize = mNavigatorView->sizeHintTwoButtons( 4 );
197 else 195 else
198 minSize = mNavigatorView->sizeHintTwoButtons(); 196 minSize = mNavigatorView->sizeHintTwoButtons();
199 verticalCount = size().height() / minSize.height(); 197 verticalCount = size().height() / minSize.height();
@@ -252,13 +250,13 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
252 NavigatorBar *bar = mNavigatorView->navigatorBar(); 250 NavigatorBar *bar = mNavigatorView->navigatorBar();
253 if ( mHorizontalCount > 1 ) bar->showButtons( true, false ); 251 if ( mHorizontalCount > 1 ) bar->showButtons( true, false );
254 else bar->showButtons( true, true ); 252 else bar->showButtons( true, true );
255 253
256 mNavigatorView->setGeometry(0, 254 mNavigatorView->setGeometry(0,
257 0, twidth, theight ); 255 0, twidth, theight );
258 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 256 for( int i = 0; i < mLastDisplayedDN; ++i ) {
259 int x = ( i + 1 ) % mHorizontalCount; 257 int x = ( i + 1 ) % mHorizontalCount;
260 int y = ( i + 1 ) / mHorizontalCount; 258 int y = ( i + 1 ) / mHorizontalCount;
261 259
262 KDateNavigator *view = mExtraViews.at( i ); 260 KDateNavigator *view = mExtraViews.at( i );
263 bar = view->navigatorBar(); 261 bar = view->navigatorBar();
264 if ( y > 0 ) bar->showButtons( false, false ); 262 if ( y > 0 ) bar->showButtons( false, false );
@@ -266,14 +264,14 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
266 if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true ); 264 if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true );
267 else bar->showButtons( false, false ); 265 else bar->showButtons( false, false );
268 } 266 }
269 view->setGeometry( x * twidth, 267 view->setGeometry( x * twidth,
270 y * theight, twidth, theight ); 268 y * theight, twidth, theight );
271 } 269 }
272 int iii = 0; 270 uint iii = 0;
273 int ccc = mHorizontalCount * mVerticalCount; 271 uint ccc = mHorizontalCount * mVerticalCount;
274 mNavigatorView->show(); 272 mNavigatorView->show();
275 while ( iii < ( mExtraViews.count() ) ) { 273 while ( iii < ( mExtraViews.count() ) ) {
276 if ( iii < ccc-1 ) 274 if ( iii < ccc-1 )
277 mExtraViews.at( iii )->show(); 275 mExtraViews.at( iii )->show();
278 else 276 else
279 mExtraViews.at( iii )->hide(); 277 mExtraViews.at( iii )->hide();
@@ -297,24 +295,24 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
297void DateNavigatorContainer::updateDayMatrixDates() 295void DateNavigatorContainer::updateDayMatrixDates()
298{ 296{
299 QDate fDate = mFirstSelectedDate; 297 QDate fDate = mFirstSelectedDate;
300 QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); 298 QDate lDate = fDate.addDays( mSelectedDateCount - 1 );
301 mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); 299 mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
302 mNavigatorView->dayMatrix()->repaint( false ); 300 mNavigatorView->dayMatrix()->repaint( false );
303 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 301 for( int i = 0; i < mLastDisplayedDN; ++i ) {
304 KDateNavigator *n = mExtraViews.at( i ); 302 KDateNavigator *n = mExtraViews.at( i );
305 if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { 303 if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
306 n->dayMatrix()->repaint( false ); 304 n->dayMatrix()->repaint( false );
307 } 305 }
308 } 306 }
309} 307}
310 308
311void DateNavigatorContainer::updateDayMatrix() 309void DateNavigatorContainer::updateDayMatrix()
312{ 310{
313 mNavigatorView->updateDayMatrix(); 311 mNavigatorView->updateDayMatrix();
314 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 312 for( int i = 0; i < mLastDisplayedDN; ++i ) {
315 KDateNavigator *n = mExtraViews.at( i ); 313 KDateNavigator *n = mExtraViews.at( i );
316 n->updateDayMatrix(); 314 n->updateDayMatrix();
317 } 315 }
318} 316}
319 317
320void DateNavigatorContainer::updateToday() 318void DateNavigatorContainer::updateToday()
@@ -329,22 +327,22 @@ void DateNavigatorContainer::updateToday()
329#endif 327#endif
330} 328}
331 329
332void DateNavigatorContainer::updateView() 330void DateNavigatorContainer::updateView()
333{ 331{
334 mNavigatorView->updateView(); 332 mNavigatorView->updateView();
335 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 333 for( int i = 0; i < mLastDisplayedDN; ++i ) {
336 KDateNavigator *n = mExtraViews.at( i ); 334 KDateNavigator *n = mExtraViews.at( i );
337 n->updateView(); 335 n->updateView();
338 } 336 }
339} 337}
340 338
341void DateNavigatorContainer::updateConfig() 339void DateNavigatorContainer::updateConfig()
342{ 340{
343 mNavigatorView->updateConfig(); 341 mNavigatorView->updateConfig();
344 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 342 for( int i = 0; i < mLastDisplayedDN; ++i ) {
345 KDateNavigator *n = mExtraViews.at( i ); 343 KDateNavigator *n = mExtraViews.at( i );
346 n->updateConfig(); 344 n->updateConfig();
347 } 345 }
348} 346}
349QDate DateNavigatorContainer::lastAvailableDate() const 347QDate DateNavigatorContainer::lastAvailableDate() const
350{ 348{
@@ -397,25 +395,25 @@ void DateNavigatorContainer::selectDates( const DateList &dateList )
397} 395}
398 396
399void DateNavigatorContainer::setBaseDates() 397void DateNavigatorContainer::setBaseDates()
400{ 398{
401 QDate baseDate = mNavigatorView->baseDate(); 399 QDate baseDate = mNavigatorView->baseDate();
402 bool doRepaint = true; 400 bool doRepaint = true;
403 for( uint i = 0; i < mLastDisplayedDN; ++i ) { 401 for( int i = 0; i < mLastDisplayedDN; ++i ) {
404 KDateNavigator *n = mExtraViews.at( i ); 402 KDateNavigator *n = mExtraViews.at( i );
405 baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); 403 baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 );
406 n->setBaseDate( baseDate, doRepaint ); 404 n->setBaseDate( baseDate, doRepaint );
407 } 405 }
408} 406}
409void DateNavigatorContainer::setResizeEnabled() 407void DateNavigatorContainer::setResizeEnabled()
410{ 408{
411 mResizeEnabled = true; 409 mResizeEnabled = true;
412 //qDebug("DateNavigatorContainer::setResizeEnabled "); 410 //qDebug("DateNavigatorContainer::setResizeEnabled ");
413 checkUpdateDayMatrixDates(); 411 checkUpdateDayMatrixDates();
414} 412}
415void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) 413void DateNavigatorContainer::resizeEvent( QResizeEvent * )
416{ 414{
417 415
418 //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height()); 416 //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height());
419 //qDebug("COUNT %d ", mExtraViews.count()); 417 //qDebug("COUNT %d ", mExtraViews.count());
420 if ( ! mResizeEnabled ) { 418 if ( ! mResizeEnabled ) {
421 //qDebug("NOT ResizeEnabled"); 419 //qDebug("NOT ResizeEnabled");
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b90b9eb..9a4b4ec 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -51,19 +51,19 @@
51 51
52#include "koprefs.h" 52#include "koprefs.h"
53 53
54#include "koeditordetails.h" 54#include "koeditordetails.h"
55 55
56template <> 56template <>
57CustomListViewItem<class Attendee *>::~CustomListViewItem() 57CustomListViewItem<Attendee *>::~CustomListViewItem()
58{ 58{
59 delete mData; 59 delete mData;
60} 60}
61 61
62template <> 62template <>
63void CustomListViewItem<class Attendee *>::updateItem() 63void CustomListViewItem<Attendee *>::updateItem()
64{ 64{
65 setText(0,mData->name()); 65 setText(0,mData->name());
66 setText(1,mData->email()); 66 setText(1,mData->email());
67 setText(2,mData->roleStr()); 67 setText(2,mData->roleStr());
68 setText(3,mData->statusStr()); 68 setText(3,mData->statusStr());
69 if (mData->RSVP() && !mData->email().isEmpty()) { 69 if (mData->RSVP() && !mData->email().isEmpty()) {