author | zautrix <zautrix> | 2005-01-20 01:24:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-20 01:24:07 (UTC) |
commit | dbb59deb5c0949f83b2d6fd79ec599e7b9e8ebf1 (patch) (side-by-side diff) | |
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 | 24 | ||||
-rw-r--r-- | korganizer/komonthview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
4 files changed, 22 insertions, 10 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 ) dateNavigator()->blockSignals( false ); - mViewManager->showWeekView(); - dateNavigator()->selectDate( d ); + mViewManager->showDayView(); + //dateNavigator()->selectDate( d ); } 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: KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) - : QListBox(parent, name) + : QListBox(parent, name, WRepaintNoErase) { @@ -384,2 +384,9 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e ) } +void MonthViewCell::clear() +{ + mItemList->clear(); + QApplication::removePostedEvents ( mItemList ); + QApplication::removePostedEvents ( mLabel ); + QApplication::removePostedEvents ( this ); +} void MonthViewCell::updateCell() @@ -388,2 +395,3 @@ void MonthViewCell::updateCell() return; + /* if ( !isVisible() ){ @@ -391,2 +399,4 @@ void MonthViewCell::updateCell() } + */ + // qDebug("MonthViewCell::updateCell() "); setPrimary( mDate.month()%2 ); @@ -400,4 +410,2 @@ void MonthViewCell::updateCell() - - #ifdef DESKTOP_VERSION @@ -568,2 +576,3 @@ void MonthViewCell::updateCell() } + mLabel->setText( text ); @@ -571,3 +580,3 @@ void MonthViewCell::updateCell() // if ( isVisible()) - qApp->processEvents(); + //qApp->processEvents(); } @@ -938,7 +947,6 @@ void KOMonthView::updateView() { - static int iii = 0; - ++iii; if ( !updatePossible ) return; - uint i; + //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ "); + int i; for( i = 0; i < mCells.count(); ++i ) { @@ -946,4 +954,6 @@ void KOMonthView::updateView() } + //qDebug("KOMonthView::updateView() "); processSelectionChange(); + // qDebug("---------------------------------------------------------------------+ "); } 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 void select(); + void clear(); 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 ) if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); - raiseCurrentView( full ); + //raiseCurrentView( full ); mMainView->processIncidenceSelection( 0 ); mMainView->updateView(); + raiseCurrentView( full ); mMainView->adaptNavigationUnits(); |