summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-03 22:32:36 (UTC)
committer zautrix <zautrix>2004-07-03 22:32:36 (UTC)
commit00fe3539778c859d22f595e516733b3cc792e167 (patch) (unidiff)
tree0970b0a64c63395a0d66f1debe8226501b08e7ea
parent5e59162e6eb6603610d1ca4c96d5d97acae0f60b (diff)
downloadkdepimpi-00fe3539778c859d22f595e516733b3cc792e167.zip
kdepimpi-00fe3539778c859d22f595e516733b3cc792e167.tar.gz
kdepimpi-00fe3539778c859d22f595e516733b3cc792e167.tar.bz2
Made configure kaddressbook dialog fitting on 5500 display
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp1
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp14
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp14
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp4
4 files changed, 25 insertions, 8 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7bf1a2f..a6d722d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1008,6 +1008,7 @@ void KABCore::openConfigDialog()
1008 connect( ConfigureDialog, SIGNAL( okClicked() ), 1008 connect( ConfigureDialog, SIGNAL( okClicked() ),
1009 this, SLOT( configurationChanged() ) ); 1009 this, SLOT( configurationChanged() ) );
1010 saveSettings(); 1010 saveSettings();
1011 ConfigureDialog->showMaximized();
1011 ConfigureDialog->exec(); 1012 ConfigureDialog->exec();
1012 delete ConfigureDialog; 1013 delete ConfigureDialog;
1013} 1014}
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
@@ -58,7 +58,7 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
58 mAddButton = bbox->addButton( i18n( "Add" ), this, SLOT( add() ) ); 58 mAddButton = bbox->addButton( i18n( "Add" ), this, SLOT( add() ) );
59 mRemoveButton = bbox->addButton( i18n( "Rem" ), this, SLOT( remove() ) ); 59 mRemoveButton = bbox->addButton( i18n( "Rem" ), this, SLOT( remove() ) );
60 bbox->layout(); 60 bbox->layout();
61 layout->addMultiCellWidget( bbox, 0, 2, 2,2); 61 layout->addMultiCellWidget( bbox, 0, 1, 2,2);
62 62
63 mEdit = new KLineEdit( this ); 63 mEdit = new KLineEdit( this );
64 layout->addWidget( mEdit, 1, 1 ); 64 layout->addWidget( mEdit, 1, 1 );
@@ -161,7 +161,13 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
161 mPrefix = new NamePartWidget( i18n( "Prefixes" ), this ); 161 mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
162 mInclusion = new NamePartWidget( i18n( "Inclusions" ), this ); 162 mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
163 mSuffix = new NamePartWidget( i18n( "Suffixes" ), this ); 163 mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
164 QLabel *label = new QLabel( i18n( "Default formatted name:" ), this ); 164 QString dfn;
165 if (QApplication::desktop()->width() > 320 )
166 dfn = i18n( "Default formatted name:" );
167 else
168 dfn = i18n( "Def. formatted name:" );
169
170 QLabel *label = new QLabel( dfn, this );
165 171
166 mFormattedNameCombo = new KComboBox( this ); 172 mFormattedNameCombo = new KComboBox( this );
167 mFormattedNameCombo->insertItem( i18n( "Empty" ) ); 173 mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -171,8 +177,8 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
171 177
172 if (KGlobal::getOrientation() == KGlobal::Portrait) 178 if (KGlobal::getOrientation() == KGlobal::Portrait)
173 { 179 {
174 layout = new QGridLayout( this, 4, 2, KDialog::marginHint(), 180 layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
175 KDialog::spacingHint() ); 181 KDialog::spacingHintSmall() );
176 182
177 layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 ); 183 layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
178 layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 ); 184 layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
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
@@ -91,13 +91,16 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
91 91
92 // General page 92 // General page
93 QWidget *generalPage = new QWidget( this ); 93 QWidget *generalPage = new QWidget( this );
94 QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHint(), 94 QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
95 KDialog::spacingHint() ); 95 KDialog::spacingHintSmall() );
96 96
97 QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); 97 QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
98 QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() ); 98 QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() );
99 boxLayout->setAlignment( Qt::AlignTop ); 99 boxLayout->setAlignment( Qt::AlignTop );
100 100 boxLayout->setMargin(KDialog::marginHintSmall() );
101 groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
102 groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
103 boxLayout->setSpacing( KDialog::spacingHintSmall() );
101 mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); 104 mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
102 boxLayout->addWidget( mViewsSingleClickBox ); 105 boxLayout->addWidget( mViewsSingleClickBox );
103 106
@@ -109,7 +112,10 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
109 groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage ); 112 groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage );
110 boxLayout = new QVBoxLayout( groupBox->layout() ); 113 boxLayout = new QVBoxLayout( groupBox->layout() );
111 boxLayout->setAlignment( Qt::AlignTop ); 114 boxLayout->setAlignment( Qt::AlignTop );
112 115 boxLayout->setMargin(KDialog::marginHintSmall());
116 boxLayout->setSpacing(KDialog::spacingHintSmall());
117 groupBox->layout()->setMargin(1) ;
118 groupBox->layout()->setSpacing(0);
113 mExtensionView = new KListView( groupBox ); 119 mExtensionView = new KListView( groupBox );
114 mExtensionView->setAllColumnsShowFocus( true ); 120 mExtensionView->setAllColumnsShowFocus( true );
115 mExtensionView->addColumn( i18n( "Name" ) ); 121 mExtensionView->addColumn( i18n( "Name" ) );
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
@@ -28,6 +28,7 @@
28#endif //KAB_EMBEDDED 28#endif //KAB_EMBEDDED
29#include <kdebug.h> 29#include <kdebug.h>
30#include <klocale.h> 30#include <klocale.h>
31#include <stdlib.h>
31 32
32#include "kabconfigwidget.h" 33#include "kabconfigwidget.h"
33 34
@@ -43,9 +44,12 @@ extern "C"
43KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name ) 44KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
44 : KCModule( parent, name ) 45 : KCModule( parent, name )
45{ 46{
47 //abort();
46 QVBoxLayout *layout = new QVBoxLayout( this ); 48 QVBoxLayout *layout = new QVBoxLayout( this );
47 mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); 49 mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
48 layout->addWidget( mConfigWidget ); 50 layout->addWidget( mConfigWidget );
51 layout->setSpacing( 0 );
52 layout->setMargin( 0 );
49 53
50 connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); 54 connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
51 load(); 55 load();