| -rw-r--r-- | kaddressbook/kabcore.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 59aa5a5..09d8523 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -299,4 +299,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); // syncManager->setBlockSave(false); + mIncSearchWidget = 0; mMiniSplitter = 0; mExtensionBarSplitter = 0; @@ -820,5 +821,4 @@ void KABCore::beamMySelf() void KABCore::updateMainWindow() { - mMainWindow->showMaximized(); mMainWindow->update(); @@ -834,20 +834,29 @@ void KABCore::resizeEvent(QResizeEvent* e ) mMiniSplitter->setOrientation( Qt::Horizontal); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); + } if ( QApplication::desktop()->width() <= 640 ) { //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); mViewManager->getFilterAction()->setComboWidth( 150 ); + if ( mIncSearchWidget ) + mIncSearchWidget->setSize(); QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); } - } + } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 if ( mMiniSplitter->orientation() == Qt::Horizontal ) { mMiniSplitter->setOrientation( Qt::Vertical ); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); + } if ( QApplication::desktop()->width() <= 640 ) { //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); mMainWindow->showMinimized(); + if ( KABPrefs::instance()->mHideSearchOnSwitch ) { + if ( mIncSearchWidget ) { + mIncSearchWidget->setSize(); + } + } else { mViewManager->getFilterAction()->setComboWidth( 0 ); - QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); } + QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); } } @@ -1154,5 +1163,11 @@ void KABCore::setSearchFields( const KABC::Field::List &fields ) void KABCore::incrementalSearch( const QString& text ) { - mViewManager->doSearch( text, mIncSearchWidget->currentField() ); + QString stext; + if ( KABPrefs::instance()->mAutoSearchWithWildcard ) { + stext = "*" + text; + } else { + stext = text; + } + mViewManager->doSearch( stext, mIncSearchWidget->currentField() ); } |