kapi fixes

8 files changed, 57 insertions, 14 deletions

diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index dd2121a..cd198c4 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -113,31 +113,37 @@ void IncSearchWidget::announceDoSearch()
 void IncSearchWidget::announceFieldChanged()
 {
   emit fieldChanged();
 }
-
+void IncSearchWidget::setSize()
+{
+    if ( KABPrefs::instance()->mHideSearchOnSwitch && QApplication::desktop()->width() == 480) {
+        mFieldCombo->setMaximumWidth( 40 );
+        mSearchText->setMaximumWidth( 30 );
+    } else {
+        QFontMetrics fm ( mFieldCombo->font() );
+        int wid = fm.width(i18n( "All Fields" ) );
+        int max = wid;
+        mFieldCombo->setMaximumWidth( wid+60 );
+        mSearchText->setMaximumWidth( 1024 );
+    }
+}
 void IncSearchWidget::setFields( const KABC::Field::List &list )
 {
    
   mFieldCombo->clear();
   mFieldCombo->insertItem( i18n( "All Fields" ) );
-  QFontMetrics fm ( mFieldCombo->font() );
-  int wid = fm.width(i18n( "All Fields" ) );
-  int max = wid;
    
   KABC::Field::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     mFieldCombo->insertItem( (*it)->label() );
-    // wid = fm.width((*it)->label()  );
-    //if ( wid > max ) 
-    //   max = wid;
   }
 
   mFieldList = list;
 
   announceDoSearch();
   announceFieldChanged();
-  mFieldCombo->setMaximumWidth( wid+60 );
+  setSize();
 }
 
 KABC::Field::List IncSearchWidget::fields() const
 {
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 1546a51..cae55cd 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -45,8 +45,9 @@ class IncSearchWidget : public QWidget
     KABC::Field *currentField() const;
 
     void setCurrentItem( int pos );
     int currentItem() const;
+    void setSize();
 
   signals:
     void scrollUP();
     void scrollDOWN();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 59aa5a5..09d8523 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -297,8 +297,9 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 #endif //KAB_EMBEDDED
 {
   //  syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   //  syncManager->setBlockSave(false);
+  mIncSearchWidget = 0;
     mMiniSplitter = 0;
   mExtensionBarSplitter = 0;
   mIsPart = !parent->inherits( "KAddressBookMain" );
   mAddressBook = KABC::StdAddressBook::self();
@@ -818,9 +819,8 @@ void KABCore::beamMySelf()
   }
 }
 void  KABCore::updateMainWindow()
 {
-                  
     mMainWindow->showMaximized();
     mMainWindow->update();
 }
 void KABCore::resizeEvent(QResizeEvent* e )
@@ -832,24 +832,33 @@ void KABCore::resizeEvent(QResizeEvent* e )
         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->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()));
             }
         }
     }
 
@@ -1152,9 +1161,15 @@ 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() );
 }
 
 void KABCore::setModified()
 {
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index b96d28a..ea254b7 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -59,8 +59,10 @@ KABPrefs::KABPrefs()
   addItemBool("AskForQuit",&mAskForQuit,true);
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("SearchWithReturn",&mSearchWithReturn, false );
+  addItemBool("AutoSearchWithWildcard",&mAutoSearchWithWildcard, false );
+  addItemBool("HideSearchOnSwitch",&mHideSearchOnSwitch, false );
   addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
 
 
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index 1e3b48f..2bb173d 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -69,8 +69,10 @@ class KABPrefs : public KPimPrefs
     bool mJumpButtonBarVisible;
     bool mDetailsPageVisible;
     bool mMultipleViewsAtOnce;
     bool mSearchWithReturn;
+    bool mAutoSearchWithWildcard;
+    bool mHideSearchOnSwitch;
     QValueList<int> mExtensionsSplitter;
     QValueList<int> mDetailsSplitter;
 
     // Extensions stuff
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 3ad2f74..986c9b8 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -122,8 +122,16 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" );
   boxLayout->addWidget( mMenuBarBox );
   mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" );
   boxLayout->addWidget( mSearchReturnBox );
+  mAutoSearchWithWildcardBox = new QCheckBox( i18n( "Search with '*' prefix (wildcard)" ), vBox, "mwildcard" );
+  boxLayout->addWidget( mAutoSearchWithWildcardBox);
+  mHideSearchOnSwitchBox = new QCheckBox( i18n( "Shrink searchfield in portrait view" ), vBox, "mswitch" );
+  boxLayout->addWidget( mHideSearchOnSwitchBox );
+
+#ifdef DESKTOP_VERSION
+  mHideSearchOnSwitchBox->hide();
+#endif
   mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
 
   mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), vBox, "mparse" );
@@ -170,8 +178,10 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
+  connect( mAutoSearchWithWildcardBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
+  connect( mHideSearchOnSwitchBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
            SLOT( selectionChanged( QListViewItem* ) ) );
@@ -198,8 +208,10 @@ void KABConfigWidget::usrReadConfig()
   mMenuBarBox->setChecked( prefs->mFullMenuBarVisible);
   mNameParsing->setChecked( prefs->mAutomaticNameParsing );
   mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
   mSearchReturnBox->setChecked( prefs->mSearchWithReturn );
+  mAutoSearchWithWildcardBox->setChecked( prefs->mAutoSearchWithWildcard );
+  mHideSearchOnSwitchBox->setChecked( prefs->mHideSearchOnSwitch );
   mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce );
   mAskForQuit->setChecked( prefs->mAskForQuit );
 
   mAddresseeWidget->restoreSettings();
@@ -216,8 +228,11 @@ void KABConfigWidget::usrWriteConfig()
   prefs->mFullMenuBarVisible = mMenuBarBox->isChecked();
   prefs->mAutomaticNameParsing = mNameParsing->isChecked();
   prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked();
   prefs->mSearchWithReturn = mSearchReturnBox->isChecked();
+  prefs->mAutoSearchWithWildcard = mAutoSearchWithWildcardBox->isChecked();
+  prefs->mHideSearchOnSwitch = mHideSearchOnSwitchBox->isChecked();
+
   prefs->mMultipleViewsAtOnce = mMultipleViewsAtOnce->isChecked();
   prefs->mAskForQuit = mAskForQuit->isChecked();
 
   mAddresseeWidget->saveSettings();
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 08d71b4..a172e97 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -63,8 +63,10 @@ class KABConfigWidget : public KPrefsWidget
     KListView *mExtensionView;
     QCheckBox *mSearchReturnBox;
     QCheckBox *mNameParsing;
     QCheckBox *mViewsSingleClickBox;
+    QCheckBox *mAutoSearchWithWildcardBox;
+    QCheckBox *mHideSearchOnSwitchBox;
     QCheckBox *mMultipleViewsAtOnce;
     QCheckBox *mAskForQuit;
     QCheckBox *mMenuBarBox;
     QPushButton *mConfigureButton;
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 04759a7..c2b1bb0 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -107,9 +107,9 @@ void ViewManager::restoreSettings()
   mFilterList = Filter::restore( mCore->config(), "Filter" );
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter );
   int cw = 150;
-  if (QApplication::desktop()->width() == 480 )
+  if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch)
       cw = 0; 
   mActionSelectFilter->setComboWidth( cw );
   // Tell the views to reread their config, since they may have
   // been modified by global settings
@@ -603,9 +603,9 @@ void ViewManager::configureFilters()
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( pos );
   setActiveFilter( pos );
   int cw = 150;
-  if (QApplication::desktop()->width() == 480 )
+  if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch)
       cw = 0; 
   mActionSelectFilter->setComboWidth( cw );
   saveSettings();
 }