4 files changed, 24 insertions, 20 deletions

diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 7577079..b1ffe04 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -126,2 +126,3 @@ void IncSearchWidget::setSize()
 #ifdef DESKTOP_VERSION
+        mFieldCombo->setMinimumWidth( wid+60 );
         wid = wid * 2;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index a4f3579..cba5850 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -587,20 +587,3 @@ void KABCore::saveSettings()
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
-#ifdef DESKTOP_VERSION
-  KConfig *config = KABPrefs::instance()->getConfig();
-  config->setGroup("WidgetLayout");
-  QStringList list ;//= config->readListEntry("MainLayout");
-  int x,y,w,h;
-  QWidget* wid;
-  wid = topLevelWidget();
-  x = wid->geometry().x();
-  y = wid->geometry().y();
-  w = wid->width();
-  h = wid->height();
-  list.clear();
-  list << QString::number( x );
-  list << QString::number( y );
-  list << QString::number( w );
-  list << QString::number( h );
-  config->writeEntry("MainLayout",list );
-#endif
+
   KABPrefs::instance()->writeConfig();
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 336e350..50db377 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -91,3 +91,2 @@ int main( int argc, char **argv )
       a.setMainWidget( &m );
-      m.resize (640, 480 );
       m.show();
@@ -95,3 +94,20 @@ int main( int argc, char **argv )
       a.exec();
-
+#ifdef DESKTOP_VERSION
+  KConfig *config = KABPrefs::instance()->getConfig();
+  config->setGroup("WidgetLayout");
+  QStringList list ;//= config->readListEntry("MainLayout");
+  int x,y,w,h;
+  QWidget* wid;
+  wid = &m;
+  x = wid->geometry().x();
+  y = wid->geometry().y();
+  w = wid->width();
+  h = wid->height();
+  list.clear();
+  list << QString::number( x );
+  list << QString::number( y );
+  list << QString::number( w );
+  list << QString::number( h );
+  config->writeEntry("MainLayout",list );
+#endif
       dumpMissing();
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 0614d06..c738ad8 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -110,2 +110,4 @@ void ViewManager::restoreSettings()
   int cw = 150;
+  if ( QApplication::desktop()->width() >= 800 )
+      cw = 200;
   if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch)
@@ -606,2 +608,4 @@ void ViewManager::configureFilters()
   int cw = 150;
+  if ( QApplication::desktop()->width() >= 800 )
+      cw = 200;
   if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch)