| -rw-r--r-- | kaddressbook/kabcore.cpp | 22 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index af12f2b..4e2523e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -614,3 +614,3 @@ void KABCore::saveSettings() KABPrefs::instance()->writeConfig(); - qDebug("KA: KABCore::saveSettings() "); + //qDebug("KA: KABCore::saveSettings() "); } @@ -846,3 +846,3 @@ void KABCore::updateMainWindow() mMainWindow->showMaximized(); - mMainWindow->update(); + //mMainWindow->repaint(); } @@ -852,7 +852,10 @@ void KABCore::resizeEvent(QResizeEvent* e ) return; - //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); - if ( e->oldSize().width() != e->size().width() ) + static int desktop_width = 0; + //qDebug("KABCore::resizeEvent %d %d ",desktop_width,QApplication::desktop()->width() ); + if ( desktop_width != QApplication::desktop()->width() ) if ( QApplication::desktop()->width() >= 480 ) { if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 + //qDebug("640 "); if ( mMiniSplitter->orientation() == Qt::Vertical ) { + //qDebug("switch V->H "); mMiniSplitter->setOrientation( Qt::Horizontal); @@ -861,2 +864,3 @@ void KABCore::resizeEvent(QResizeEvent* e ) if ( QApplication::desktop()->width() <= 640 ) { + bool shot = mMainWindow->isVisible(); mMainWindow->showMinimized(); @@ -866,3 +870,4 @@ void KABCore::resizeEvent(QResizeEvent* e ) mIncSearchWidget->setSize(); - QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); + if ( shot ) + QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); } @@ -870,3 +875,5 @@ void KABCore::resizeEvent(QResizeEvent* e ) } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 + //qDebug("480 "); if ( mMiniSplitter->orientation() == Qt::Horizontal ) { + //qDebug("switch H->V "); mMiniSplitter->setOrientation( Qt::Vertical ); @@ -876,2 +883,3 @@ void KABCore::resizeEvent(QResizeEvent* e ) //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); + bool shot = mMainWindow->isVisible(); mMainWindow->showMinimized(); @@ -884,3 +892,4 @@ void KABCore::resizeEvent(QResizeEvent* e ) } - QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); + if ( shot ) + QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); } @@ -888,2 +897,3 @@ void KABCore::resizeEvent(QResizeEvent* e ) } + desktop_width = QApplication::desktop()->width(); QWidget::resizeEvent( e ); diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 02fc40a..272f2eb 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -336,3 +336,4 @@ void KAddressBookTableView::refresh(QString uid) mListView->repaint(); - + if ( !currentItem ) + currentItem = (ContactListViewItem *)mListView->firstChild(); if ( currentItem ) { @@ -340,2 +341,3 @@ void KAddressBookTableView::refresh(QString uid) mListView->ensureItemVisible( currentItem ); + mListView->setSelected( currentItem, true ); } |