author | zautrix <zautrix> | 2005-07-01 06:40:20 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-01 06:40:20 (UTC) |
commit | 409f5296344084e22833b35c03923b89d7be653b (patch) (side-by-side diff) | |
tree | 5332c1a045c6fece04a38313cac18485380259c6 | |
parent | a7924287e231b461585c4121f6ee2ce32f955089 (diff) | |
download | kdepimpi-409f5296344084e22833b35c03923b89d7be653b.zip kdepimpi-409f5296344084e22833b35c03923b89d7be653b.tar.gz kdepimpi-409f5296344084e22833b35c03923b89d7be653b.tar.bz2 |
fixxx
-rw-r--r-- | kaddressbook/incsearchwidget.cpp | 7 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index b1ffe04..5f8b83d 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -105,35 +105,38 @@ void IncSearchWidget::announceDoSearch2() } void IncSearchWidget::announceDoSearch() { emit doSearch( mSearchText->text() ); // qDebug("emit dosreach "); } void IncSearchWidget::announceFieldChanged() { emit fieldChanged(); } void IncSearchWidget::setSize() { if ( KABPrefs::instance()->mHideSearchOnSwitch && QApplication::desktop()->width() == 480) { - mFieldCombo->setMaximumWidth( 40 ); - mSearchText->setMaximumWidth( 30 ); + setCurrentItem( 0 ); + //mFieldCombo->setMaximumWidth( 0 ); + mFieldCombo->hide(); + mSearchText->setMaximumWidth( 200 ); } else { + mFieldCombo->show(); QFontMetrics fm ( mFieldCombo->font() ); int wid = fm.width(i18n( "All Fields" ) ); #ifdef DESKTOP_VERSION mFieldCombo->setMinimumWidth( wid+60 ); wid = wid * 2; #endif mFieldCombo->setMaximumWidth( wid+60 ); mSearchText->setMaximumWidth( 1024 ); } } void IncSearchWidget::setFields( const KABC::Field::List &list ) { mFieldCombo->clear(); mFieldCombo->insertItem( i18n( "All Fields" ) ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 046cb63..b4e0b07 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -815,32 +815,33 @@ void KABCore::beamMySelf() } else { KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); } } void KABCore::updateMainWindow() { mMainWindow->showMaximized(); mMainWindow->update(); } void KABCore::resizeEvent(QResizeEvent* e ) { if ( !mMiniSplitter ) return; //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); + if ( e->oldSize().width() != e->size().width() ) if ( QApplication::desktop()->width() >= 480 ) { if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 if ( mMiniSplitter->orientation() == Qt::Vertical ) { mMiniSplitter->setOrientation( Qt::Horizontal); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); } if ( QApplication::desktop()->width() <= 640 ) { mMainWindow->showMinimized(); //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 |