6 files changed, 20 insertions, 5 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5ef61b1..e34951a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -394,17 +394,17 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );  
   mBRdisabled = false;
 #ifndef DESKTOP_VERSION
   infrared  = 0;
 #endif
   //toggleBeamReceive( );
-  //mMainWindow->toolBar()->show();
+  mMainWindow->toolBar()->show();
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
     QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
 }
 
 void KABCore::updateToolBar()
 {
     static int iii = 0;
     ++iii;
@@ -2168,16 +2168,17 @@ void KABCore::addActionsManually()
       mViewManager->getFilterAction()->plug ( popupBarTB);
       //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
       popupBarTB->insertItem( i18n("&Help"), helpMenu );
       if (QApplication::desktop()->width() > 320 ) {
           // mViewManager->getFilterAction()->plug ( tb);
       }
   }
 #endif
+  mIncSearchWidget->setSize();
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
 #ifdef DESKTOP_VERSION
   mActionPrint->plug( fileMenu );
   mActionPrintDetails->plug( fileMenu );
@@ -2290,17 +2291,17 @@ void KABCore::addActionsManually()
       mActionUndo->plug( tb );
       mActionDelete->plug( tb );
       mActionRedo->plug( tb );
   } else {
       mActionSave->plug( tb );
       tb->enableMoving(false);
   }
   //mActionQuit->plug ( tb );
-  // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
+  //tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 86f0f3d..0614d06 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -699,17 +699,17 @@ void ViewManager::initActions()
                SLOT( refreshView(const QString &) ), mCore->actionCollection(),
                "view_refresh" );
   action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
 #else //KAB_EMBEDDED
   action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
                SLOT( refreshView()), mCore->actionCollection(),
                "view_refresh" );
   action->plug(viewmenu);
-  viewmenu->insertSeparator();
+  //viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
   action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
                SLOT( configureFilters() ), mCore->actionCollection(),
                "options_edit_filters" );
 
   mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" );
 #if KDE_VERSION >= 309
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index c243fa0..7386207 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -27,16 +27,17 @@
 #endif //KAB_EMBEDDED
 
 #include "colorlistbox.h"
 
 ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f )
   :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) );
+  connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) );
   setAcceptDrops( true);
 }
 
 
 void ColorListBox::setEnabled( bool state )
 {
   if( state == isEnabled() )
   {
@@ -69,17 +70,21 @@ QColor ColorListBox::color( uint index ) const
     ColorListItem *colorItem = (ColorListItem*)item(index);
     return( colorItem->color() );
   }
   else
   {
     return( black );
   }
 }
-
+void ColorListBox::slotNewColor(QListBoxItem * i)
+{
+    if ( i )
+        newColor( index( i ) );
+}
 
 void ColorListBox::newColor( int index )
 {
   if( isEnabled() == false )
   {
     return;
   }
 
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 4a0e705..bb91484 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -43,16 +43,17 @@ class ColorListBox : public KListBox
   protected:
     void dragEnterEvent( QDragEnterEvent *e );
     void dragLeaveEvent( QDragLeaveEvent *e );
     void dragMoveEvent( QDragMoveEvent *e );
     void dropEvent( QDropEvent *e );
 
   private slots:
     void newColor( int index );
+    void slotNewColor(QListBoxItem * i);
 
   private:
     int mCurrentOnDragEnter;
 
 };
 
 
 class ColorListItem : public QListBoxItem
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 366e54c..e0fbd21 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -210,21 +210,25 @@ void CardViewLookNFeelPage::setHeaderFont()
   if ( ok )
     updateFontLabel( fout, lHeaderFont );
 #endif //KAB_EMBEDDED  
 }
 
 void CardViewLookNFeelPage::enableFonts()
 {
   vbFonts->setEnabled( cbEnableCustomFonts->isChecked() );
+  if ( cbEnableCustomFonts->isChecked() )
+      vbFonts->setFocus();
 }
 
 void CardViewLookNFeelPage::enableColors()
 {
   lbColors->setEnabled( cbEnableCustomColors->isChecked() );
+  if ( cbEnableCustomColors->isChecked() )
+      lbColors->setFocus();
 }
 
 void CardViewLookNFeelPage::initGUI()
 {
   int spacing = KDialog::spacingHint();
   int margin = KDialog::marginHint();
   
   QTabWidget *tabs = new QTabWidget( this );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 8bcceb2..0e36abd 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -205,21 +205,25 @@ void LookAndFeelPage::setHeaderFont()
   if ( ok )
     updateFontLabel( fout, lHeaderFont );
 #endif //KAB_EMBEDDED  
 }
 
 void LookAndFeelPage::enableFonts()
 {
   vbFonts->setEnabled( cbEnableCustomFonts->isChecked() );
+  if ( cbEnableCustomFonts->isChecked() )
+      vbFonts->setFocus();
 }
 
 void LookAndFeelPage::enableColors()
 {
-  lbColors->setEnabled( cbEnableCustomColors->isChecked() );
+    lbColors->setEnabled( cbEnableCustomColors->isChecked() );
+    if ( cbEnableCustomColors->isChecked() )
+        lbColors->setFocus();
 }
     
 void LookAndFeelPage::initGUI()
 {
   int spacing = KDialog::spacingHint();
   int margin = KDialog::marginHint();
   
   QTabWidget *tabs = new QTabWidget( this );