1 files changed, 5 insertions, 1 deletions

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
@@ -117,197 +117,201 @@ qDebug("LookAndFeelPage::restoreSettings make base color configurable");
   
   c = colorGroup().background();
   lbColors->insertItem( new ColorListItem( i18n("Background Color"),
         config->readColorEntry( "BackgroundColor", &c ) ) );
   c = colorGroup().foreground();
   lbColors->insertItem( new ColorListItem( i18n("Text Color"),
         config->readColorEntry( "TextColor", &c ) ) );
   c = colorGroup().button();
   lbColors->insertItem( new ColorListItem( i18n("Header Background Color"),
         config->readColorEntry( "HeaderBackgroundColor", &c ) ) );
   c = colorGroup().buttonText();
   lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
         config->readColorEntry( "HeaderTextColor", &c ) ) );
   c = colorGroup().highlight();
   lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
         config->readColorEntry( "HighlightColor", &c ) ) );
   c = colorGroup().highlightedText();
   lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
         config->readColorEntry( "HighlightedTextColor", &c ) ) );  
   c = colorGroup().background();
   lbColors->insertItem( new ColorListItem( i18n("Alternating Background Color"),
         config->readColorEntry( "AlternatingBackgroundColor", &c ) ) );
   
   enableColors();
   
   // fonts
   QFont fnt = font();
   updateFontLabel( config->readFontEntry( "TextFont", &fnt ), (QLabel*)lTextFont );
   fnt.setBold( true );
   updateFontLabel( config->readFontEntry( "HeaderFont",  &fnt ), (QLabel*)lHeaderFont );
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
   enableFonts();
 
 }
     
 void LookAndFeelPage::saveSettings( KConfig *config )
 {
   config->writeEntry("ABackground", mAlternateButton->isChecked());
   config->writeEntry("SingleLine", mLineButton->isChecked());
   config->writeEntry("ToolTips", mToolTipBox->isChecked());
   config->writeEntry("Background", mBackgroundBox->isChecked());
   config->writeEntry("BackgroundName", mBackgroundName->lineEdit()->text());
 
   // colors
   config->writeEntry( "EnableCustomColors", cbEnableCustomColors->isChecked() );
   if ( cbEnableCustomColors->isChecked() ) // ?? - Hmmm.
   {
     config->writeEntry( "BackgroundColor", lbColors->color( 0 ) );
     config->writeEntry( "TextColor", lbColors->color( 1 ) );
     config->writeEntry( "HeaderBackgroundColor", lbColors->color( 2 ) );
     config->writeEntry( "HeaderTextColor", lbColors->color( 3 ) );
     config->writeEntry( "HighlightColor", lbColors->color( 4 ) );
     config->writeEntry( "HighlightedTextColor", lbColors->color( 5 ) );
     config->writeEntry( "AlternatingBackgroundColor", lbColors->color( 6 ) );
   }
   // fonts
   config->writeEntry( "EnableCustomFonts", cbEnableCustomFonts->isChecked() );
   if ( cbEnableCustomFonts->isChecked() )
   {
     config->writeEntry( "TextFont", lTextFont->font() );
     config->writeEntry( "HeaderFont", lHeaderFont->font() );
   }
 
 }
 
 void LookAndFeelPage::setTextFont()
 {
   QFont f( lTextFont->font() );
 #ifndef KAB_EMBEDDED  
   if ( KFontDialog::getFont( f, false, this ) == QDialog::Accepted )
     updateFontLabel( f, lTextFont );
 #else //KAB_EMBEDDED  
   bool ok;
   QFont fout = KFontDialog::getFont( f, ok);
   if ( ok )
     updateFontLabel( fout, lTextFont );
 #endif //KAB_EMBEDDED  
 }
 
 void LookAndFeelPage::setHeaderFont()
 {
   QFont f( lHeaderFont->font() );
 #ifndef KAB_EMBEDDED  
   if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
     updateFontLabel( f, lHeaderFont );
 #else //KAB_EMBEDDED  
   bool ok;
   QFont fout = KFontDialog::getFont( f, ok);
   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 );
 
   // General
   QVBox *generalTab = new QVBox( this, "generaltab" );
   
   generalTab->setSpacing( spacing );
   generalTab->setMargin( margin );
 
   QButtonGroup *group = new QButtonGroup(1, Qt::Horizontal, 
                                          i18n("Row Separator"), generalTab);
       
   mAlternateButton = new QRadioButton(i18n("Alternating backgrounds"),
                                       group, "mAlternateButton");
   mLineButton = new QRadioButton(i18n("Single line"), group, "mLineButton");
   mNoneButton = new QRadioButton(i18n("None"), group, "mNoneButton");
       
   mBackgroundBox = new QCheckBox(i18n("Enable background image:"), generalTab,
                                  "mBackgroundBox");
   connect(mBackgroundBox, SIGNAL(toggled(bool)),
           SLOT(enableBackgroundToggled(bool)));
   // LR image not implemented
   mBackgroundBox->setEnabled( false );
   mBackgroundName = new KURLRequester(generalTab, "mBackgroundName");
 #ifndef KAB_EMBEDDED    
   mBackgroundName->setMode(KFile::File | KFile::ExistingOnly |
                            KFile::LocalOnly);
   mBackgroundName->setFilter(KImageIO::pattern(KImageIO::Reading));
 #endif //KAB_EMBEDDED    
   
   // ToolTip Checkbox
   mToolTipBox = new QCheckBox(i18n("Enable contact tooltips"), generalTab,
                               "mToolTipBox");
 
   tabs->addTab( generalTab, i18n("&General") );
     
   // Colors
   QVBox *colorTab = new QVBox( this, "colortab" );
   colorTab->setSpacing( spacing );
   colorTab->setMargin( spacing );
   cbEnableCustomColors = new QCheckBox( i18n("&Enable custom Colors"), colorTab );
   connect( cbEnableCustomColors, SIGNAL(clicked()), this, SLOT(enableColors()) );
   lbColors = new ColorListBox( colorTab );
   tabs->addTab( colorTab, i18n("&Colors") );
   
   QWhatsThis::add( cbEnableCustomColors, i18n(
         "If custom colors are enabled, you may choose the colors for the view below. "
         "Otherwise colors from your current KDE color scheme are used."
         ) );
   QWhatsThis::add( lbColors, i18n(
         "Double click or press RETURN on a item to select a color for the related strings in the view."
         ) );
   
   // Fonts
   QVBox *fntTab = new QVBox( this, "fonttab" );
   
   fntTab->setSpacing( spacing );
   fntTab->setMargin( spacing );
   
   cbEnableCustomFonts = new QCheckBox( i18n("&Enable custom fonts"), fntTab );
   connect( cbEnableCustomFonts, SIGNAL(clicked()), this, SLOT(enableFonts()) );
   
   vbFonts = new QWidget( fntTab );
   QGridLayout *gFnts = new QGridLayout( vbFonts, 2, 3 );
   gFnts->setSpacing( spacing );
   gFnts->setAutoAdd( true );
   gFnts->setColStretch( 1, 1 );  
   QLabel *lTFnt = new QLabel( i18n("&Text font:"), vbFonts );
   lTextFont = new QLabel( vbFonts );
   lTextFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   
   lTFnt->setBuddy( btnFont );
   
   connect( btnFont, SIGNAL(clicked()), this, SLOT(setTextFont()) );
   
   QLabel *lHFnt = new QLabel( i18n("&Header font:"), vbFonts );
   lHeaderFont = new QLabel( vbFonts );
   lHeaderFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnHeaderFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   lHFnt->setBuddy( btnHeaderFont );
   connect( btnHeaderFont, SIGNAL(clicked()), this, SLOT(setHeaderFont()) );