summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp74
-rw-r--r--korganizer/datenavigatorcontainer.h8
-rw-r--r--korganizer/kdatenavigator.cpp2
-rw-r--r--korganizer/koagendaitem.cpp4
-rw-r--r--korganizer/koprefsdialog.cpp18
-rw-r--r--korganizer/mainwindow.cpp4
6 files changed, 65 insertions, 45 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index d1caff3..2290c53 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -75,15 +75,47 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
75 connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); 75 connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
76 76
77 connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); 77 connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) );
78 connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); 78 connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) );
79 connect( v, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); 79 connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) );
80 connect( v, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) ); 80 connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) );
81 81
82 connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); 82 connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
83} 83}
84void DateNavigatorContainer::slotgoNextYear()
85{
86 jumpMonth( 12 );
87 emit goNextYear();
88
89}
90void DateNavigatorContainer::slotgoPrevYear()
91{
92 jumpMonth( -12 );
93 emit goPrevYear();
94
95}
96void DateNavigatorContainer::slotgoPrevMonth()
97{
98 jumpMonth( -1 );
99 emit goPrevMonth();
100
101}
102void DateNavigatorContainer::slotgoNextMonth()
103{
104 jumpMonth( 1 );
105 emit goNextMonth();
106}
107void DateNavigatorContainer::jumpMonth( int month )
108{
84 109
110 QDate baseDate = mNavigatorView->baseDate();
111 computeMonthSelected( baseDate.month() + month, false );
112}
85void DateNavigatorContainer::slotMonthSelected( int month ) 113void DateNavigatorContainer::slotMonthSelected( int month )
86{ 114{
87 //qDebug("slotMonthSelected %d ", month); 115 computeMonthSelected( month, true );
116}
117void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
118{
119 //qDebug("slotMonthSelected %d ", month);
88 QDate baseDate = mNavigatorView->baseDate(); 120 QDate baseDate = mNavigatorView->baseDate();
89 if ( baseDate.month() == month ) 121 if ( baseDate.month() == month )
@@ -94,25 +126,4 @@ void DateNavigatorContainer::slotMonthSelected( int month )
94 QDate newBase = QDate ( date.year(), date.month() , baseDate.day() ); 126 QDate newBase = QDate ( date.year(), date.month() , baseDate.day() );
95 127
96#if 0
97 mFirstSelectedDate = dateList.first() ;
98 mSelectedDateCount = dateList.count() ;
99
100 KDateNavigator *view = mExtraViews.at( 0 );
101 QDate date = view->baseDate();
102
103 QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7);
104 //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1() );
105 if ( lDate < curEnd && date.addDays( -30 ) < fDate) {
106 mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
107 mNavigatorView->dayMatrix()->repaint( false );
108 for( uint i = 0; i < mLastDisplayedDN; ++i ) {
109 KDateNavigator *n = mExtraViews.at( i );
110 if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
111 n->dayMatrix()->repaint( false );
112 }
113 }
114 return;
115 }
116#endif
117 //qDebug("NEW BASE %s", newBase.toString().latin1()); 128 //qDebug("NEW BASE %s", newBase.toString().latin1());
118 mNavigatorView->setBaseDate( newBase ); 129 mNavigatorView->setBaseDate( newBase );
@@ -122,12 +133,15 @@ void DateNavigatorContainer::slotMonthSelected( int month )
122 QDate selFirst = mFirstSelectedDate; 133 QDate selFirst = mFirstSelectedDate;
123 QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); 134 QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
124 if ( selFirst >= first && selLast <= last ) { 135 if ( selFirst >= first && selLast <= last ) {
125 setBaseDates(); 136 setBaseDates();
126 updateDayMatrixDates(); 137 if ( forceEmit )
138 updateDayMatrixDates();
127 } 139 }
128 else { 140 else {
129 setBaseDates(); 141 setBaseDates();
130 updateDayMatrixDates(); 142 if ( forceEmit )
131 emit monthSelected( month ); 143 updateDayMatrixDates();
144 if ( forceEmit )
145 emit monthSelected( month );
132 } 146 }
133} 147}
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 9a64720..d2f397d 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -59,5 +59,9 @@ class DateNavigatorContainer: public QWidget
59 void checkUpdateDayMatrixDates(); 59 void checkUpdateDayMatrixDates();
60 void updateToday(); 60 void updateToday();
61 void slotMonthSelected( int month ); 61 void slotMonthSelected( int month );
62 void slotgoNextMonth();
63 void slotgoPrevMonth();
64 void slotgoNextYear();
65 void slotgoPrevYear();
62 66
63 signals: 67 signals:
@@ -78,4 +82,6 @@ class DateNavigatorContainer: public QWidget
78 82
79 protected: 83 protected:
84 void computeMonthSelected( int month , bool forceEmit );
85 void jumpMonth( int month );
80 void resizeEvent( QResizeEvent * ); 86 void resizeEvent( QResizeEvent * );
81 87
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index d62402f..6438c9a 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -120,5 +120,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
120 myFullSizeHint = sizeHintTwoButtons( 4 ); 120 myFullSizeHint = sizeHintTwoButtons( 4 );
121 mFontChanged = false; 121 mFontChanged = false;
122 resize ( mySizeHint ); 122 resize ( 0,0 );
123} 123}
124void KDateNavigator::changeFont ( QFont fo ) 124void KDateNavigator::changeFont ( QFont fo )
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 82d1eab..b30ad75 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -506,5 +506,5 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
506 xx = 0; 506 xx = 0;
507 if ( rw <= 1 ) { 507 if ( rw <= 1 ) {
508 qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1()); 508 //qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
509 return; 509 return;
510 } 510 }
@@ -513,5 +513,5 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
513 rw = paintFrom->width() - xx; 513 rw = paintFrom->width() - xx;
514 if ( rw <= 1 ) { 514 if ( rw <= 1 ) {
515 qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() ); 515 //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
516 return; 516 return;
517 } 517 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 40e8a99..74037e6 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -591,13 +591,5 @@ void KOPrefsDialog::setupViewsTab()
591 591
592 592
593 if ( QApplication::desktop()->width() > 640 ) { 593
594
595 KPrefsDialogWidBool *enableToolTips =
596 addWidBool(i18n("Enable tooltips displaying summary of ev."),
597 &(KOPrefs::instance()->mEnableToolTips),topFrame);
598 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
599
600 }
601
602 594
603 595
@@ -662,4 +654,12 @@ void KOPrefsDialog::setupViewsTab()
662 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 654 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
663 655
656
657 KPrefsDialogWidBool *enableToolTips =
658 addWidBool(i18n("Enable tooltips displaying summary of ev."),
659 &(KOPrefs::instance()->mEnableToolTips),topFrame);
660 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
661
662 // *********************************************************
663
664 topFrame = addPage(i18n("Agenda View"),0,0); 664 topFrame = addPage(i18n("Agenda View"),0,0);
665 // DesktopIcon("viewmag",KIcon::SizeMedium)); 665 // DesktopIcon("viewmag",KIcon::SizeMedium));
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bd9efc8..7faf675 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1001,4 +1001,6 @@ void MainWindow::initActions()
1001 if (p-> mShowIconSearch) 1001 if (p-> mShowIconSearch)
1002 search_action->addTo( iconToolBar ); 1002 search_action->addTo( iconToolBar );
1003 if (p-> mShowIconWhatsThis)
1004 QWhatsThis::whatsThisButton ( iconToolBar );
1003 if (p-> mShowIconNext) 1005 if (p-> mShowIconNext)
1004 whatsnext_action->addTo( iconToolBar ); 1006 whatsnext_action->addTo( iconToolBar );
@@ -1107,6 +1109,4 @@ void MainWindow::initActions()
1107 else 1109 else
1108 configureToolBarMenu->setItemChecked( 5, true ); 1110 configureToolBarMenu->setItemChecked( 5, true );
1109 if (p-> mShowIconWhatsThis)
1110 QWhatsThis::whatsThisButton ( iconToolBar );
1111 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); 1111 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) );
1112 configureAgenda( p->mHourSize ); 1112 configureAgenda( p->mHourSize );