3 files changed, 9 insertions, 31 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index 81bb8fd..7b6117e 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp @@ -32,12 +32,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QVBoxLayout * layout = new QVBoxLayout( this ); - layout->setMargin( 20 ); - -#if 0 - // Informational stuff - QHBox *box4 = new QHBox( this ); - QLabel* colorLabel = new QLabel( box4, "" ); - colorLabel->setText( tr( "To activate settings: Restart application !" ) ); -#endif + layout->setMargin( 5 ); // Buttongroup to enable/disable shown stuff @@ -60,14 +53,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of lines that should be shown for each anniversaries/birthdays" ) ); -#if 0 - // Clip settings (currently not used) - QHBox *box2 = new QHBox( this ); - QLabel* clipLabel = new QLabel( box2, "" ); - clipLabel->setText( tr( "Clip line after X chars: " ) ); - SpinBoxClip = new QSpinBox( box2, "SpinClip" ); - SpinBoxClip->setMaxValue( 200 ); - QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) ); -#endif - // Look ahead settings QHBox *box3 = new QHBox( this ); @@ -78,9 +61,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); -// QHBox *box4 = new QHBox( this ); - -// QLabel* colorLabel = new QLabel( box4, "" ); -// colorLabel->setText( tr( "To activate settings: Restart application !" ) ); - QHBox *box5 = new QHBox( this ); @@ -110,11 +88,17 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* - //layout->addWidget( box4 ); + layout->addWidget( b_group ); layout->addWidget( box1 ); - //layout->addWidget( box2 ); layout->addWidget( box3 ); layout->addWidget( box5 ); layout->addWidget( box6 ); layout->addWidget( box7 ); + + /* + * pack the widgets together + */ + QSpacerItem *item = new QSpacerItem( 1, 2, QSizePolicy::Minimum, + QSizePolicy::MinimumExpanding ); + layout->addItem( item ); readConfig(); diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index d76a29a..df7c5e1 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp @@ -31,9 +31,4 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* layoutTodo = 0l; - // Hä ? Nonsense ! (se) - if ( m_contactdb ) { - delete m_contactdb; - } - m_contactdb = new Opie::OPimContactAccess("addressplugin"); diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h index b1c690d..25b3098 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.h +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h @@ -29,5 +29,4 @@ class AddressBookPluginWidget : public QWidget { - Q_OBJECT |