Made configure kaddressbook dialog fitting on 5500 display

3 files changed, 25 insertions, 9 deletions

diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 0f3c353..f84b2ba 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -37,49 +37,49 @@
 #include <kstandarddirs.h>
 
 #include "addresseewidget.h"
 
 NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
                                 const char *name )
   : QWidget( parent, name )
 {
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
     QGridLayout* layout = new QGridLayout( this, 1, 1, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
     
     QLabel *label = new QLabel( i18n( title ), this );
     layout->addWidget( label, 0, 1 );
     
     mBox = new QListBox( this );
     mBox->setMaximumSize(70, 70);
     layout->addMultiCellWidget( mBox, 0, 1, 0, 0 );
 
     KButtonBox *bbox = new KButtonBox( this, Qt::Vertical );
     mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
     mRemoveButton = bbox->addButton( i18n( "Rem" ), this,  SLOT( remove() ) );
     bbox->layout();
-    layout->addMultiCellWidget( bbox, 0, 2, 2,2);
+    layout->addMultiCellWidget( bbox, 0, 1, 2,2);
 
     mEdit = new KLineEdit( this );
     layout->addWidget( mEdit, 1, 1 );
     //mEdit->setMinimumWidth(50);
 
 //    layout->addWidget( group );
       
   }
   else
   {
     QHBoxLayout *layout = new QHBoxLayout( this );
 
     QGroupBox *group = new QGroupBox( 0, Qt::Vertical, title, this );
     QGridLayout *groupLayout = new QGridLayout( group->layout(), 2, 2,
                                               KDialog::spacingHint() );
 
     mBox = new QListBox( group );
     
     groupLayout->addWidget( mBox, 0, 0 );
 
     KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
     mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
     mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  SLOT( remove() ) );
     bbox->layout();
@@ -140,60 +140,66 @@ void NamePartWidget::remove()
     selectionChanged( 0 );
 
   emit modified();
 }
 
 void NamePartWidget::selectionChanged( QListBoxItem *item )
 {
   mRemoveButton->setEnabled( item != 0 );
 }
 
 void NamePartWidget::textChanged( const QString& text )
 {
   mAddButton->setEnabled( !text.isEmpty() );
 }
 
 
 AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QGridLayout *layout;
 
   mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
   mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
-  QLabel *label = new QLabel( i18n( "Default formatted name:" ), this );
+  QString dfn;
+  if (QApplication::desktop()->width() > 320 )
+      dfn = i18n( "Default formatted name:" );
+  else
+      dfn = i18n( "Def. formatted name:" );
+      
+  QLabel *label = new QLabel( dfn, this );
 
   mFormattedNameCombo = new KComboBox( this );
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
   mFormattedNameCombo->insertItem( i18n( "Simple Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
     
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHint(),
-                                         KDialog::spacingHint() );
+    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+                                         KDialog::spacingHintSmall() );
 
     layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
     layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
     layout->addMultiCellWidget( mSuffix, 2, 2, 0, 1 );
     layout->addWidget( label, 3, 0 );
     layout->addWidget( mFormattedNameCombo, 3, 1 );
     
   }
   else
   {
     layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
     layout->addWidget( mPrefix, 0, 0 );
     layout->addWidget( mInclusion, 0, 1 );
     layout->addWidget( mSuffix, 0, 2 );
     layout->addWidget( label, 1, 0 );
     layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
   }
 
   connect( mPrefix, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mInclusion, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mSuffix, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mFormattedNameCombo, SIGNAL( activated( int ) ), SIGNAL( modified() ) );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 7b3e5c6..38c7946 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -70,67 +70,73 @@ class ExtensionItem : public QCheckListItem
 
   private:
 #ifndef KAB_EMBEDDED
     KService::Ptr mPtr;
 #else //KAB_EMBEDDED
     ExtensionFactory* mFactory;
     QString mName;
     QString mComment;
     
 #endif //KAB_EMBEDDED
   
 };
 
 KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // General page
   QWidget *generalPage = new QWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHint(),
-                                            KDialog::spacingHint() );
+  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
 
   QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
   QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( Qt::AlignTop );
-
+  boxLayout->setMargin(KDialog::marginHintSmall() );
+  groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
+  groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
+  boxLayout->setSpacing( KDialog::spacingHintSmall() );
   mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
 
   mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" );
   boxLayout->addWidget( mNameParsing );
 
   layout->addWidget( groupBox );
 
   groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage );
   boxLayout = new QVBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( Qt::AlignTop );
-
+  boxLayout->setMargin(KDialog::marginHintSmall());
+  boxLayout->setSpacing(KDialog::spacingHintSmall());
+  groupBox->layout()->setMargin(1) ;
+  groupBox->layout()->setSpacing(0);
   mExtensionView = new KListView( groupBox );
   mExtensionView->setAllColumnsShowFocus( true );
   mExtensionView->addColumn( i18n( "Name" ) );
   mExtensionView->addColumn( i18n( "Description" ) );
   mExtensionView->setMaximumHeight(80);
   
   boxLayout->addWidget( mExtensionView );
 
   mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
   mConfigureButton->setEnabled( false );
   boxLayout->addWidget( mConfigureButton );
 
   layout->addWidget( groupBox );
 
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
            SLOT( selectionChanged( QListViewItem* ) ) );
   connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
            SLOT( itemClicked( QListViewItem* ) ) );
   connect( mConfigureButton, SIGNAL( clicked() ),
            SLOT( configureExtension() ) );
 
   tabWidget->addTab( generalPage, i18n( "General" ) );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 791a940..a278042 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -7,67 +7,71 @@
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 
 #ifndef KAB_EMBEDDED
 #include <kaboutdata.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <klocale.h>
+#include <stdlib.h>
 
 #include "kabconfigwidget.h"
 
 #include "kcmkabconfig.h"
 
 extern "C"
 {
   KCModule *create_kabconfig( QWidget *parent, const char * ) {
     return new KCMKabConfig( parent, "kcmkabconfig" );
   }
 }
 
 KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
   : KCModule( parent, name )
 {
+    //abort();
   QVBoxLayout *layout = new QVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
   layout->addWidget( mConfigWidget );
-
+  layout->setSpacing( 0 );
+  layout->setMargin( 0 );
+  
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
   load();
 }
 
 void KCMKabConfig::load()
 {
   mConfigWidget->restoreSettings();
 }
 
 void KCMKabConfig::save()
 {
   mConfigWidget->saveSettings();
 }
 
 void KCMKabConfig::defaults()
 {
   mConfigWidget->defaults();
 }
 
 #ifndef KAB_EMBEDDED
 const KAboutData* KCMKabConfig::aboutData() const
 {
   KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ),
                                       I18N_NOOP( "KAddressBook Configure Dialog" ),