-Fix layout for http://handhelds.org/scap/port.32003.png

-Remove old code
-Remove bogus code as commented by Stefan Eilers

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
@@ -22,75 +22,53 @@
 
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 #include <qvgroupbox.h>
 
 
 AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char* name)
     : TodayConfigWidget(parent,  name ) {
 
     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
     QVGroupBox* b_group = new QVGroupBox( this, "name" );
     b_group -> setTitle( tr("Enable/Disable Views") );
     m_showBirthdayButton = new QRadioButton( b_group );
     m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) );
     m_showAnniversaryButton = new QRadioButton( b_group );
     m_showAnniversaryButton -> setText( tr( "Show &Anniveraries" ) );
 
     QWhatsThis::add( m_showBirthdayButton , tr( "The next birthdays will just be shown, if enabled!" ) );
     QWhatsThis::add( m_showAnniversaryButton , tr( "The next anniversaries will just be shown, if enabled !" ) );
 
     // Max lines settings
     QHBox *box1 = new QHBox( this );
     QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" );
     TextLabel6->setText( tr( "Max Lines: " ) );
     SpinBox2 = new QSpinBox( box1, "SpinBox2" );
     SpinBox2->setMaxValue( 40 );
     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 );
     QLabel* daysLabel = new QLabel( box3, "" );
     daysLabel->setText( tr( "Days look ahead: " ) );
     SpinDaysClip = new QSpinBox( box3, "SpinDays" );
     SpinDaysClip->setMaxValue( 200 );
     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 );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     colorLabel2->setText( tr( "Set Headline Color: " ) );
     headlineColor = new Opie::OColorButton( box5, black , "headlineColor" );
     QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
     QHBox *box6 = new QHBox( this );
 
     // Entry color settings
     QLabel* colorLabel3= new QLabel( box6, "" );
     colorLabel3->setText( tr( "Set Entry Color: " ) );
     entryColor = new Opie::OColorButton( box6, black , "entryColor" );
@@ -100,31 +78,37 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     QHBox *box7 = new QHBox( this );
     QLabel* colorLabel5 = new QLabel( box7, "" );
     colorLabel5->setText( tr( "Set Urgent\nColor if below " ) );
     SpinUrgentClip = new QSpinBox( box7, "SpinDays" );
     SpinUrgentClip->setMaxValue( 200 );
     QLabel* colorLabel6 = new QLabel( box7, "" );
     colorLabel6->setText( tr( " days: " ) );
     urgentColor = new Opie::OColorButton( box7, red , "urgentColor" );
     QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
     QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
 
 
-    //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();
 
 }
 
 void AddressBookPluginConfig::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_max_lines_task = cfg.readNumEntry( "maxlinestask", 5 );
     SpinBox2->setValue( m_max_lines_task );
 //     m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
 //     SpinBoxClip->setValue( m_maxCharClip );
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
@@ -21,29 +21,24 @@
 #include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
 
 #include <qpe/config.h>
 
 AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char* name )
     : QWidget( parent, name ) {
 
     addressLabel = 0l;
     m_contactdb = 0l;
     layoutTodo = 0l;
 
-    // Hä ? Nonsense ! (se)
-    if ( m_contactdb ) {
-        delete m_contactdb;
-    }
-
     m_contactdb = new Opie::OPimContactAccess("addressplugin");
 
     connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
              this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
 
 
     readConfig();
     getAddress();
 }
 
 AddressBookPluginWidget::~AddressBookPluginWidget() {
     delete m_contactdb;
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
@@ -19,25 +19,24 @@
 #ifndef ADDRESSBOOK_PLUGIN_WIDGET_H
 #define ADDRESSBOOK_PLUGIN_WIDGET_H
 
 #include <opie2/ocontactaccess.h>
 #include <opie2/oclickablelabel.h>
 
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlayout.h>
 
 
 class AddressBookPluginWidget : public QWidget {
-
     Q_OBJECT
 
 public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
     void reinitialize();
 public slots:
     void refresh( const Opie::OPimContactAccess* db );
 
 protected slots:
     void  startAddressBook();