Diffstat (limited to 'korganizer/datenavigatorcontainer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 548c364..d1caff3 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -29,48 +29,50 @@ | |||
29 | //#include "koglobals.h" | 29 | //#include "koglobals.h" |
30 | #include "navigatorbar.h" | 30 | #include "navigatorbar.h" |
31 | #include "kdatenavigator.h" | 31 | #include "kdatenavigator.h" |
32 | 32 | ||
33 | #include <kcalendarsystem.h> | 33 | #include <kcalendarsystem.h> |
34 | 34 | ||
35 | #include "datenavigatorcontainer.h" | 35 | #include "datenavigatorcontainer.h" |
36 | #include "koprefs.h" | 36 | #include "koprefs.h" |
37 | 37 | ||
38 | DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, | 38 | DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, |
39 | const char *name ) | 39 | const char *name ) |
40 | : QWidget( parent, name ), mCalendar( 0 ), | 40 | : QWidget( parent, name ), mCalendar( 0 ), |
41 | mHorizontalCount( 1 ), mVerticalCount( 1 ) | 41 | mHorizontalCount( 1 ), mVerticalCount( 1 ) |
42 | { | 42 | { |
43 | mExtraViews.setAutoDelete( true ); | 43 | mExtraViews.setAutoDelete( true ); |
44 | 44 | ||
45 | mNavigatorView = new KDateNavigator( this, name ); | 45 | mNavigatorView = new KDateNavigator( this, name ); |
46 | 46 | ||
47 | connectNavigatorView( mNavigatorView ); | 47 | connectNavigatorView( mNavigatorView ); |
48 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 48 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
49 | mLastDisplayedDN = 0; | 49 | mLastDisplayedDN = 0; |
50 | mUpdateTimer; | 50 | mUpdateTimer; |
51 | mUpdateTimer = new QTimer( this ); | 51 | mUpdateTimer = new QTimer( this ); |
52 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); | 52 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); |
53 | mFirstSelectedDate = QDate::currentDate(); | ||
54 | mSelectedDateCount = 1; | ||
53 | } | 55 | } |
54 | 56 | ||
55 | DateNavigatorContainer::~DateNavigatorContainer() | 57 | DateNavigatorContainer::~DateNavigatorContainer() |
56 | { | 58 | { |
57 | } | 59 | } |
58 | 60 | ||
59 | void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) | 61 | void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) |
60 | { | 62 | { |
61 | connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ), | 63 | connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ), |
62 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); | 64 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); |
63 | #if 0 | 65 | #if 0 |
64 | connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ), | 66 | connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ), |
65 | SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) ); | 67 | SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) ); |
66 | connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ), | 68 | connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ), |
67 | SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) ); | 69 | SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) ); |
68 | #endif | 70 | #endif |
69 | connect( v, SIGNAL( weekClicked( const QDate & ) ), | 71 | connect( v, SIGNAL( weekClicked( const QDate & ) ), |
70 | SIGNAL( weekClicked( const QDate & ) ) ); | 72 | SIGNAL( weekClicked( const QDate & ) ) ); |
71 | 73 | ||
72 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); | 74 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); |
73 | connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); | 75 | connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); |
74 | 76 | ||
75 | connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); | 77 | connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); |
76 | connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); | 78 | connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); |
@@ -119,57 +121,57 @@ void DateNavigatorContainer::slotMonthSelected( int month ) | |||
119 | 121 | ||
120 | QDate selFirst = mFirstSelectedDate; | 122 | QDate selFirst = mFirstSelectedDate; |
121 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); | 123 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); |
122 | if ( selFirst >= first && selLast <= last ) { | 124 | if ( selFirst >= first && selLast <= last ) { |
123 | setBaseDates(); | 125 | setBaseDates(); |
124 | updateDayMatrixDates(); | 126 | updateDayMatrixDates(); |
125 | } | 127 | } |
126 | else { | 128 | else { |
127 | setBaseDates(); | 129 | setBaseDates(); |
128 | updateDayMatrixDates(); | 130 | updateDayMatrixDates(); |
129 | emit monthSelected( month ); | 131 | emit monthSelected( month ); |
130 | } | 132 | } |
131 | } | 133 | } |
132 | void DateNavigatorContainer::setCalendar( Calendar *cal ) | 134 | void DateNavigatorContainer::setCalendar( Calendar *cal ) |
133 | { | 135 | { |
134 | mCalendar = cal; | 136 | mCalendar = cal; |
135 | mNavigatorView->setCalendar( cal ); | 137 | mNavigatorView->setCalendar( cal ); |
136 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 138 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
137 | KDateNavigator *n = mExtraViews.at( i ); | 139 | KDateNavigator *n = mExtraViews.at( i ); |
138 | n->setCalendar( cal ); | 140 | n->setCalendar( cal ); |
139 | } | 141 | } |
140 | } | 142 | } |
141 | void DateNavigatorContainer::checkUpdateDayMatrixDates() | 143 | void DateNavigatorContainer::checkUpdateDayMatrixDates() |
142 | { | 144 | { |
143 | qDebug("wid %d hei %d ", width(), height()); | 145 | //qDebug("KODNC: wid %d hei %d ", width(), height()); |
144 | mUpdateTimer->stop(); | 146 | mUpdateTimer->stop(); |
145 | //return; | 147 | //return; |
146 | if ( width() < 3 || height() < 3 ) | 148 | if ( width() < 3 || height() < 3 ) |
147 | return; | 149 | return; |
148 | static int lastWid = 0; | 150 | static int lastWid = 0; |
149 | static int lastHei = 0; | 151 | static int lastHei = 0; |
150 | if ( lastWid == width() && height() == lastHei ) { | 152 | if ( lastWid == width() && height() == lastHei ) { |
151 | qDebug("no layout computing needed. "); | 153 | qDebug("KODNC: No layout computing needed. "); |
152 | } else { | 154 | } else { |
153 | lastWid = width(); | 155 | lastWid = width(); |
154 | lastHei = height(); | 156 | lastHei = height(); |
155 | 157 | ||
156 | QSize minSize = mNavigatorView->yourSizeHint(); | 158 | QSize minSize = mNavigatorView->yourSizeHint(); |
157 | 159 | ||
158 | int verticalCount = size().height() / minSize.height(); | 160 | int verticalCount = size().height() / minSize.height(); |
159 | int horizontalCount = size().width() / minSize.width(); | 161 | int horizontalCount = size().width() / minSize.width(); |
160 | //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() ); | 162 | //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() ); |
161 | //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount ); | 163 | //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount ); |
162 | bool fontchange = false; | 164 | bool fontchange = false; |
163 | if ( horizontalCount == 1) | 165 | if ( horizontalCount == 1) |
164 | horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width(); | 166 | horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width(); |
165 | QFont fo; | 167 | QFont fo; |
166 | if ( horizontalCount != mHorizontalCount || | 168 | if ( horizontalCount != mHorizontalCount || |
167 | verticalCount != mVerticalCount ) { | 169 | verticalCount != mVerticalCount ) { |
168 | uint count = horizontalCount * verticalCount; | 170 | uint count = horizontalCount * verticalCount; |
169 | if ( count == 0 ) { | 171 | if ( count == 0 ) { |
170 | bool ok; | 172 | bool ok; |
171 | fo = mNavigatorView->yourFontHint( size() , &ok ); | 173 | fo = mNavigatorView->yourFontHint( size() , &ok ); |
172 | //mNavigatorView->resize( size() ); | 174 | //mNavigatorView->resize( size() ); |
173 | //if ( ! ok ) | 175 | //if ( ! ok ) |
174 | // return; | 176 | // return; |
175 | int butt = 2; | 177 | int butt = 2; |