4 files changed, 16 insertions, 2 deletions

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
@@ -29,12 +29,13 @@
 #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 )
 {
@@ -71,13 +72,17 @@ QColor ColorListBox::color( uint index ) const
   }
   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
@@ -45,12 +45,13 @@ class ColorListBox : public KListBox
     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;
 
 };
 
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
@@ -212,17 +212,21 @@ void CardViewLookNFeelPage::setHeaderFont()
 #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();
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
@@ -207,17 +207,21 @@ void LookAndFeelPage::setHeaderFont()
 #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();