summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-03-22 21:37:48 (UTC)
committer zautrix <zautrix>2005-03-22 21:37:48 (UTC)
commit53ac6d1f931c50d89a44d9d46daceb7ed9d4ddc6 (patch) (unidiff)
treea6a9f1e42252edec30b334d2ae6df245d69912b2 /korganizer
parentcce0a3b5e884db3d2d7d84a347e14f8694b556e2 (diff)
downloadkdepimpi-53ac6d1f931c50d89a44d9d46daceb7ed9d4ddc6.zip
kdepimpi-53ac6d1f931c50d89a44d9d46daceb7ed9d4ddc6.tar.gz
kdepimpi-53ac6d1f931c50d89a44d9d46daceb7ed9d4ddc6.tar.bz2
fix
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kdatenavigator.cpp16
-rw-r--r--korganizer/koviewmanager.cpp5
2 files changed, 20 insertions, 1 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 83a57ca..1474e4b 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -83,6 +83,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
83 headings[i] = new QLabel("",this); 83 headings[i] = new QLabel("",this);
84 //headings[i]->setFont(QFont("Arial", 10, QFont::Bold)); 84 //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
85 headings[i]->setAlignment(AlignCenter); 85 headings[i]->setAlignment(AlignCenter);
86 headings[i]->installEventFilter(this);
86 87
87 topLayout->addWidget(headings[i],1,i+1); 88 topLayout->addWidget(headings[i],1,i+1);
88 } 89 }
@@ -439,6 +440,21 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e)
439 break; 440 break;
440 } 441 }
441 } 442 }
443 for(i=0;i<7;++i) {
444 if (o == headings[i]) {
445 KCal::DateList selDays;
446 QDate date = daymatrix->getDate(14);
447 int dio = date.daysInMonth();
448 int j;
449 int ye = date.year();
450 int mo = date.month();
451 for ( j = 1; j <= dio; ++j ) {
452 selDays.append( QDate( ye, mo, j ) );
453 }
454 emit datesSelected( selDays );
455 break;
456 }
457 }
442 return true; 458 return true;
443 } else { 459 } else {
444 return false; 460 return false;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index a9f5a41..cc0ce9b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -420,7 +420,8 @@ void KOViewManager::showAgendaView( bool fullScreen )
420} 420}
421 421
422void KOViewManager::showDayView() 422void KOViewManager::showDayView()
423{ 423{
424 mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
424 mFlagShowNextxDays = false; 425 mFlagShowNextxDays = false;
425 globalFlagBlockLabel = 1; 426 globalFlagBlockLabel = 1;
426 globalFlagBlockAgenda = 1; 427 globalFlagBlockAgenda = 1;
@@ -437,6 +438,7 @@ void KOViewManager::showDayView()
437 438
438void KOViewManager::showWorkWeekView() 439void KOViewManager::showWorkWeekView()
439{ 440{
441 mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
440 mFlagShowNextxDays = false; 442 mFlagShowNextxDays = false;
441 globalFlagBlockAgenda = 1; 443 globalFlagBlockAgenda = 1;
442 globalFlagBlockLabel = 1; 444 globalFlagBlockLabel = 1;
@@ -462,6 +464,7 @@ void KOViewManager::showWeekView()
462 */ 464 */
463 465
464 466
467 mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
465 mFlagShowNextxDays = false; 468 mFlagShowNextxDays = false;
466 globalFlagBlockAgenda = 1; 469 globalFlagBlockAgenda = 1;
467 globalFlagBlockLabel = 1; 470 globalFlagBlockLabel = 1;