author | zautrix <zautrix> | 2005-03-25 15:07:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-25 15:07:31 (UTC) |
commit | 3326831dbf6f962e97a978781361db5198f6a035 (patch) (unidiff) | |
tree | 9bf6e78ba06b0db2e321ee8f8b95e66b66cca852 /korganizer | |
parent | 5a0130ffdbf03fa5b881f856b41d081e91e1958b (diff) | |
download | kdepimpi-3326831dbf6f962e97a978781361db5198f6a035.zip kdepimpi-3326831dbf6f962e97a978781361db5198f6a035.tar.gz kdepimpi-3326831dbf6f962e97a978781361db5198f6a035.tar.bz2 |
layout fix
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 40 | ||||
-rw-r--r-- | korganizer/datenavigatorcontainer.h | 2 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 3 |
4 files changed, 32 insertions, 15 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9a4e719..6ed6a1c 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1913,24 +1913,24 @@ void CalendarView::readSettings() | |||
1913 | maxVal = QApplication::desktop()->height()-10; | 1913 | maxVal = QApplication::desktop()->height()-10; |
1914 | } | 1914 | } |
1915 | sizes << resetval; | 1915 | sizes << resetval; |
1916 | if ( maxVal < resetval + resetval) | 1916 | if ( maxVal < resetval + resetval) |
1917 | resetval = maxVal - resetval; | 1917 | resetval = maxVal - resetval; |
1918 | sizes << resetval; | 1918 | sizes << resetval; |
1919 | } | 1919 | } |
1920 | mMainFrame->setSizes(sizes); | 1920 | mMainFrame->setSizes(sizes); |
1921 | |||
1922 | if ( dateCount == 5 ) mNavigator->selectWorkWeek(); | 1921 | if ( dateCount == 5 ) mNavigator->selectWorkWeek(); |
1923 | else if ( dateCount == 7 ) mNavigator->selectWeek(); | 1922 | else if ( dateCount == 7 ) mNavigator->selectWeek(); |
1924 | else mNavigator->selectDates( dateCount ); | 1923 | else mNavigator->selectDates( dateCount ); |
1925 | // mViewManager->readSettings( config ); | 1924 | // mViewManager->readSettings( config ); |
1926 | updateConfig(); | 1925 | updateConfig(); |
1927 | globalFlagBlockAgenda = 2; | 1926 | globalFlagBlockAgenda = 2; |
1928 | mViewManager->readSettings( config ); | 1927 | mViewManager->readSettings( config ); |
1928 | QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); | ||
1929 | } | 1929 | } |
1930 | 1930 | ||
1931 | 1931 | ||
1932 | void CalendarView::writeSettings() | 1932 | void CalendarView::writeSettings() |
1933 | { | 1933 | { |
1934 | // kdDebug() << "CalendarView::writeSettings" << endl; | 1934 | // kdDebug() << "CalendarView::writeSettings" << endl; |
1935 | 1935 | ||
1936 | KConfig *config = KOGlobals::config(); | 1936 | KConfig *config = KOGlobals::config(); |
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 2290c53..11dc592 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -35,20 +35,21 @@ | |||
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 | mResizeEnabled = false; | ||
43 | mExtraViews.setAutoDelete( true ); | 44 | mExtraViews.setAutoDelete( true ); |
44 | 45 | ||
45 | mNavigatorView = new KDateNavigator( this, name ); | 46 | mNavigatorView = new KDateNavigator( this, name ); |
46 | 47 | mNavigatorView->hide(); | |
47 | connectNavigatorView( mNavigatorView ); | 48 | connectNavigatorView( mNavigatorView ); |
48 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 49 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
49 | mLastDisplayedDN = 0; | 50 | mLastDisplayedDN = 0; |
50 | mUpdateTimer; | 51 | mUpdateTimer; |
51 | mUpdateTimer = new QTimer( this ); | 52 | mUpdateTimer = new QTimer( this ); |
52 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); | 53 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); |
53 | mFirstSelectedDate = QDate::currentDate(); | 54 | mFirstSelectedDate = QDate::currentDate(); |
54 | mSelectedDateCount = 1; | 55 | mSelectedDateCount = 1; |
@@ -213,27 +214,20 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
213 | 214 | ||
214 | mLastDisplayedDN = horizontalCount*verticalCount-1; | 215 | mLastDisplayedDN = horizontalCount*verticalCount-1; |
215 | while ( count > ( mExtraViews.count() + 1 ) ) { | 216 | while ( count > ( mExtraViews.count() + 1 ) ) { |
216 | KDateNavigator *n = new KDateNavigator( this ); | 217 | KDateNavigator *n = new KDateNavigator( this ); |
217 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); | 218 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); |
218 | mExtraViews.append( n ); | 219 | mExtraViews.append( n ); |
219 | n->setCalendar( mCalendar ); | 220 | n->setCalendar( mCalendar ); |
220 | connectNavigatorView( n ); | 221 | connectNavigatorView( n ); |
221 | n->show(); | 222 | // n->show(); |
222 | } | ||
223 | int iii = 0; | ||
224 | while ( iii < ( mExtraViews.count() ) ) { | ||
225 | if ( iii < count-1 ) | ||
226 | mExtraViews.at( iii )->show(); | ||
227 | else | ||
228 | mExtraViews.at( iii )->hide(); | ||
229 | ++iii; | ||
230 | } | 223 | } |
231 | 224 | ||
225 | |||
232 | setBaseDates(); | 226 | setBaseDates(); |
233 | if ( fontchange ) { | 227 | if ( fontchange ) { |
234 | //mNavigatorView->changeFont( fo ); | 228 | //mNavigatorView->changeFont( fo ); |
235 | uint i; | 229 | uint i; |
236 | for( i = 0; i < mExtraViews.count(); ++i ) { | 230 | for( i = 0; i < mExtraViews.count(); ++i ) { |
237 | KDateNavigator *view = mExtraViews.at( i ); | 231 | KDateNavigator *view = mExtraViews.at( i ); |
238 | view->changeFont( fo ); | 232 | view->changeFont( fo ); |
239 | } | 233 | } |
@@ -261,16 +255,26 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
261 | if ( y > 0 ) bar->showButtons( false, false ); | 255 | if ( y > 0 ) bar->showButtons( false, false ); |
262 | else { | 256 | else { |
263 | if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true ); | 257 | if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true ); |
264 | else bar->showButtons( false, false ); | 258 | else bar->showButtons( false, false ); |
265 | } | 259 | } |
266 | view->setGeometry( x * twidth, | 260 | view->setGeometry( x * twidth, |
267 | y * theight, twidth, theight ); | 261 | y * theight, twidth, theight ); |
268 | } | 262 | } |
263 | int iii = 0; | ||
264 | int ccc = mHorizontalCount * mVerticalCount; | ||
265 | mNavigatorView->show(); | ||
266 | while ( iii < ( mExtraViews.count() ) ) { | ||
267 | if ( iii < ccc-1 ) | ||
268 | mExtraViews.at( iii )->show(); | ||
269 | else | ||
270 | mExtraViews.at( iii )->hide(); | ||
271 | ++iii; | ||
272 | } | ||
269 | } | 273 | } |
270 | 274 | ||
271 | QDate last = lastAvailableDate(); | 275 | QDate last = lastAvailableDate(); |
272 | QDate first = firstAvailableDate(); | 276 | QDate first = firstAvailableDate(); |
273 | 277 | ||
274 | QDate selFirst = mFirstSelectedDate; | 278 | QDate selFirst = mFirstSelectedDate; |
275 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); | 279 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); |
276 | if ( selFirst >= first && selLast <= last ) { | 280 | if ( selFirst >= first && selLast <= last ) { |
@@ -388,24 +392,34 @@ void DateNavigatorContainer::setBaseDates() | |||
388 | QDate baseDate = mNavigatorView->baseDate(); | 392 | QDate baseDate = mNavigatorView->baseDate(); |
389 | bool doRepaint = true; | 393 | bool doRepaint = true; |
390 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 394 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
391 | KDateNavigator *n = mExtraViews.at( i ); | 395 | KDateNavigator *n = mExtraViews.at( i ); |
392 | baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); | 396 | baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); |
393 | n->setBaseDate( baseDate, doRepaint ); | 397 | n->setBaseDate( baseDate, doRepaint ); |
394 | } | 398 | } |
395 | } | 399 | } |
396 | 400 | void DateNavigatorContainer::setResizeEnabled() | |
401 | { | ||
402 | mResizeEnabled = true; | ||
403 | //qDebug("DateNavigatorContainer::setResizeEnabled "); | ||
404 | checkUpdateDayMatrixDates(); | ||
405 | } | ||
397 | void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) | 406 | void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) |
398 | { | 407 | { |
399 | 408 | ||
400 | 409 | //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height()); | |
401 | //qDebug("COUNT %d ", mExtraViews.count()); | 410 | //qDebug("COUNT %d ", mExtraViews.count()); |
402 | 411 | if ( ! mResizeEnabled ) { | |
412 | //qDebug("NOT ResizeEnabled"); | ||
413 | return; | ||
414 | } | ||
415 | else | ||
403 | mUpdateTimer->start( 250 ); | 416 | mUpdateTimer->start( 250 ); |
417 | |||
404 | //updateDayMatrixDates(); | 418 | //updateDayMatrixDates(); |
405 | } | 419 | } |
406 | 420 | ||
407 | QSize DateNavigatorContainer::minimumSizeHint() const | 421 | QSize DateNavigatorContainer::minimumSizeHint() const |
408 | { | 422 | { |
409 | return mNavigatorView->minimumSizeHint(); | 423 | return mNavigatorView->minimumSizeHint(); |
410 | } | 424 | } |
411 | 425 | ||
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index d2f397d..ac9745d 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h | |||
@@ -58,16 +58,17 @@ class DateNavigatorContainer: public QWidget | |||
58 | void updateDayMatrixDates(); | 58 | void updateDayMatrixDates(); |
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(); | 62 | void slotgoNextMonth(); |
63 | void slotgoPrevMonth(); | 63 | void slotgoPrevMonth(); |
64 | void slotgoNextYear(); | 64 | void slotgoNextYear(); |
65 | void slotgoPrevYear(); | 65 | void slotgoPrevYear(); |
66 | void setResizeEnabled(); | ||
66 | 67 | ||
67 | signals: | 68 | signals: |
68 | void datesSelected( const KCal::DateList & ); | 69 | void datesSelected( const KCal::DateList & ); |
69 | void incidenceDropped( Incidence *, const QDate & ); | 70 | void incidenceDropped( Incidence *, const QDate & ); |
70 | void incidenceDroppedMove( Incidence *, const QDate & ); | 71 | void incidenceDroppedMove( Incidence *, const QDate & ); |
71 | void weekClicked( const QDate &); | 72 | void weekClicked( const QDate &); |
72 | 73 | ||
73 | void goPrevious(); | 74 | void goPrevious(); |
@@ -84,16 +85,17 @@ class DateNavigatorContainer: public QWidget | |||
84 | void computeMonthSelected( int month , bool forceEmit ); | 85 | void computeMonthSelected( int month , bool forceEmit ); |
85 | void jumpMonth( int month ); | 86 | void jumpMonth( int month ); |
86 | void resizeEvent( QResizeEvent * ); | 87 | void resizeEvent( QResizeEvent * ); |
87 | 88 | ||
88 | void setBaseDates(); | 89 | void setBaseDates(); |
89 | void connectNavigatorView( KDateNavigator *v ); | 90 | void connectNavigatorView( KDateNavigator *v ); |
90 | 91 | ||
91 | private: | 92 | private: |
93 | bool mResizeEnabled; | ||
92 | QTimer* mUpdateTimer; | 94 | QTimer* mUpdateTimer; |
93 | int mLastDisplayedDN; | 95 | int mLastDisplayedDN; |
94 | QDate mFirstSelectedDate; | 96 | QDate mFirstSelectedDate; |
95 | int mSelectedDateCount; | 97 | int mSelectedDateCount; |
96 | KDateNavigator *mNavigatorView; | 98 | KDateNavigator *mNavigatorView; |
97 | 99 | ||
98 | KCal::Calendar *mCalendar; | 100 | KCal::Calendar *mCalendar; |
99 | 101 | ||
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 0cb767f..5eccfd6 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -114,17 +114,17 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
114 | topLayout->addMultiCellWidget(daymatrix,2,7,1,7); | 114 | topLayout->addMultiCellWidget(daymatrix,2,7,1,7); |
115 | 115 | ||
116 | // read settings from configuration file. | 116 | // read settings from configuration file. |
117 | updateConfig(); | 117 | updateConfig(); |
118 | enableRollover(FollowMonth); | 118 | enableRollover(FollowMonth); |
119 | mySizeHint = sizeHintTwoButtons(); | 119 | mySizeHint = sizeHintTwoButtons(); |
120 | myFullSizeHint = sizeHintTwoButtons( 4 ); | 120 | myFullSizeHint = sizeHintTwoButtons( 4 ); |
121 | mFontChanged = false; | 121 | mFontChanged = false; |
122 | resize ( 3,3 ); | 122 | //resize ( 3,3 ); |
123 | 123 | ||
124 | } | 124 | } |
125 | void KDateNavigator::changeFont ( QFont fo ) | 125 | void KDateNavigator::changeFont ( QFont fo ) |
126 | { | 126 | { |
127 | setFont( fo ); | 127 | setFont( fo ); |
128 | mNavigatorBar->resetFont( fo ); | 128 | mNavigatorBar->resetFont( fo ); |
129 | } | 129 | } |
130 | QFont KDateNavigator::yourFontHint( QSize si , bool *b) | 130 | QFont KDateNavigator::yourFontHint( QSize si , bool *b) |
@@ -366,16 +366,17 @@ void KDateNavigator::updateConfig() | |||
366 | headings[i]->setText( dayName ); | 366 | headings[i]->setText( dayName ); |
367 | } | 367 | } |
368 | updateDates(); | 368 | updateDates(); |
369 | updateView(); | 369 | updateView(); |
370 | } | 370 | } |
371 | 371 | ||
372 | void KDateNavigator::setShowWeekNums(bool enabled) | 372 | void KDateNavigator::setShowWeekNums(bool enabled) |
373 | { | 373 | { |
374 | qDebug("KDateNavigator::setShowWeekNums***************************** "); | ||
374 | m_bShowWeekNums = enabled; | 375 | m_bShowWeekNums = enabled; |
375 | for(int i=0; i<6; i++) { | 376 | for(int i=0; i<6; i++) { |
376 | if(enabled) | 377 | if(enabled) |
377 | weeknos[i]->show(); | 378 | weeknos[i]->show(); |
378 | else | 379 | else |
379 | weeknos[i]->hide(); | 380 | weeknos[i]->hide(); |
380 | } | 381 | } |
381 | resize(size()); | 382 | resize(size()); |