author | zautrix <zautrix> | 2005-01-20 01:24:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-20 01:24:07 (UTC) |
commit | dbb59deb5c0949f83b2d6fd79ec599e7b9e8ebf1 (patch) (unidiff) | |
tree | 3fac729225892ee1a4570a5852ee287f35e74ce7 /korganizer | |
parent | ade7e8fcdcf45d5bc73ea73da6f9a1b06964a64e (diff) | |
download | kdepimpi-dbb59deb5c0949f83b2d6fd79ec599e7b9e8ebf1.zip kdepimpi-dbb59deb5c0949f83b2d6fd79ec599e7b9e8ebf1.tar.gz kdepimpi-dbb59deb5c0949f83b2d6fd79ec599e7b9e8ebf1.tar.bz2 |
more view fixes
-rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 26 | ||||
-rw-r--r-- | korganizer/komonthview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
4 files changed, 23 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f9af769..8f05276 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -503,4 +503,4 @@ void CalendarView::showDay( QDate d ) | |||
503 | dateNavigator()->blockSignals( false ); | 503 | dateNavigator()->blockSignals( false ); |
504 | mViewManager->showWeekView(); | 504 | mViewManager->showDayView(); |
505 | dateNavigator()->selectDate( d ); | 505 | //dateNavigator()->selectDate( d ); |
506 | } | 506 | } |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 842f6eb..b819eec 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -76,3 +76,3 @@ private: | |||
76 | KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) | 76 | KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) |
77 | : QListBox(parent, name) | 77 | : QListBox(parent, name, WRepaintNoErase) |
78 | { | 78 | { |
@@ -384,2 +384,9 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e ) | |||
384 | } | 384 | } |
385 | void MonthViewCell::clear() | ||
386 | { | ||
387 | mItemList->clear(); | ||
388 | QApplication::removePostedEvents ( mItemList ); | ||
389 | QApplication::removePostedEvents ( mLabel ); | ||
390 | QApplication::removePostedEvents ( this ); | ||
391 | } | ||
385 | void MonthViewCell::updateCell() | 392 | void MonthViewCell::updateCell() |
@@ -388,5 +395,8 @@ void MonthViewCell::updateCell() | |||
388 | return; | 395 | return; |
389 | if ( !isVisible() ){ | 396 | /* |
397 | if ( !isVisible() ){ | ||
390 | return; | 398 | return; |
391 | } | 399 | } |
400 | */ | ||
401 | // qDebug("MonthViewCell::updateCell() "); | ||
392 | setPrimary( mDate.month()%2 ); | 402 | setPrimary( mDate.month()%2 ); |
@@ -400,4 +410,2 @@ void MonthViewCell::updateCell() | |||
400 | 410 | ||
401 | |||
402 | |||
403 | #ifdef DESKTOP_VERSION | 411 | #ifdef DESKTOP_VERSION |
@@ -568,2 +576,3 @@ void MonthViewCell::updateCell() | |||
568 | } | 576 | } |
577 | |||
569 | mLabel->setText( text ); | 578 | mLabel->setText( text ); |
@@ -571,3 +580,3 @@ void MonthViewCell::updateCell() | |||
571 | // if ( isVisible()) | 580 | // if ( isVisible()) |
572 | qApp->processEvents(); | 581 | //qApp->processEvents(); |
573 | } | 582 | } |
@@ -938,7 +947,6 @@ void KOMonthView::updateView() | |||
938 | { | 947 | { |
939 | static int iii = 0; | ||
940 | ++iii; | ||
941 | if ( !updatePossible ) | 948 | if ( !updatePossible ) |
942 | return; | 949 | return; |
943 | uint i; | 950 | //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ "); |
951 | int i; | ||
944 | for( i = 0; i < mCells.count(); ++i ) { | 952 | for( i = 0; i < mCells.count(); ++i ) { |
@@ -946,4 +954,6 @@ void KOMonthView::updateView() | |||
946 | } | 954 | } |
955 | |||
947 | //qDebug("KOMonthView::updateView() "); | 956 | //qDebug("KOMonthView::updateView() "); |
948 | processSelectionChange(); | 957 | processSelectionChange(); |
958 | // qDebug("---------------------------------------------------------------------+ "); | ||
949 | } | 959 | } |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 727f511..a965bf3 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -149,2 +149,3 @@ class MonthViewCell : public QWidget | |||
149 | void select(); | 149 | void select(); |
150 | void clear(); | ||
150 | 151 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 00a5842..f6b7718 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -155,5 +155,6 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
155 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 155 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
156 | raiseCurrentView( full ); | 156 | //raiseCurrentView( full ); |
157 | mMainView->processIncidenceSelection( 0 ); | 157 | mMainView->processIncidenceSelection( 0 ); |
158 | mMainView->updateView(); | 158 | mMainView->updateView(); |
159 | raiseCurrentView( full ); | ||
159 | mMainView->adaptNavigationUnits(); | 160 | mMainView->adaptNavigationUnits(); |