reload plugins now on config change

6 files changed, 40 insertions, 57 deletions

diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 1caf061..d4e8e1e 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -1,118 +1,118 @@
 /*
  * datebookevent.cpp
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "datebookevent.h"
 #include <qpe/config.h>
 #include <qpe/timestring.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 			     QWidget* parent,
 			     int show_location,
 			     int show_notes,
                              //  int onlyLater,
                              int maxCharClip,
                              const char* name,
 			     WFlags fl) :
     OClickableLabel(parent,name,fl), event(ev) {
 
+    setAlignment( AlignTop );
+
     QString msg;
 
     Config config( "qpe" );
     config.setGroup( "Time" );
     // if 24 h format
     ampm = config.readBoolEntry( "AMPM", TRUE );
 
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
         msg += " <b>[with alarm]</b>";
     }
 
     // include location or not
     if ( show_location == 1) {
         msg += "<BR><i>" + (ev).location() + "</i>";
     }
 
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
          &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59") ) {
         msg += "<br>All day";
     }  else {
         // start time of event
         msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) )
                // end time of event
                + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) );
     }
 
     // include possible note or not
     if ( show_notes == 1) {
         msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
     }
 
     setText( msg );
     connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
     setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
 QString DateBookEvent::ampmTime( QTime tm ) {
 
     QString s;
     if( ampm ) {
         int hour = tm.hour();
         if ( hour == 0 ) {
             hour = 12;
         }
         if ( hour > 12 ) {
             hour -= 12;
         }
         s.sprintf( "%2d:%02d %s", hour, tm.minute(),
                    (tm.hour() >= 12) ? "PM" : "AM" );
         return s;
     } else {
         s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
         return s;
     }
 
 }
 
 
-//extern QPEApplication *todayApp;
-
 /*
  * starts the edit dialog as known from datebook
  */
 void DateBookEvent::editEventSlot( const Event &e ) {
   startDatebook();
 
   while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents();
   QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
   env << e.uid();
 }
 
 
 /**
  * launches datebook
  */
 void DateBookEvent::startDatebook() {
     QCopEnvelope e("QPE/System", "execute(QString)");
     e << QString("datebook");
 }
 
 void DateBookEvent::editMe() {
   emit editEvent(event.event());
 }
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index e4667ae..7948656 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -14,101 +14,103 @@
  *                                                                         *
  ***************************************************************************/
 
 
 #include "datebookpluginwidget.h"
 #include "datebookevent.h"
 
 #include <qpe/timestring.h>
 #include <qpe/config.h>
 
 #include <qdatetime.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtl.h>
 #include <qscrollview.h>
 #include <qtimer.h>
 
 DatebookPluginWidget::DatebookPluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  name ) {
     db = 0l;
     readConfig();
     getDates();
 }
 
 DatebookPluginWidget::~DatebookPluginWidget() {
     delete db;
 }
 
 
 void DatebookPluginWidget::readConfig() {
     Config cfg( "todaydatebookplugin" );
     cfg.setGroup( "config" );
     m_max_lines_meet = cfg.readNumEntry( "maxlinesmeet", 5 );
     m_show_location = cfg.readNumEntry( "showlocation", 1 );
     m_show_notes = cfg.readNumEntry( "shownotes", 0 );
     m_onlyLater = cfg.readNumEntry( "onlylater", 1 );
 }
 
 
 /**
  *  Get all events that are in the datebook xml file for today
  */
 void DatebookPluginWidget::getDates() {
 
 
     QDate date = QDate::currentDate();
 
      QVBoxLayout* layoutDates = new QVBoxLayout( this );
+     layoutDates->setSpacing( 1 );
+     layoutDates->setMargin( 1 );
 
     if ( db ) {
         delete db;
     }
 
     db = new DateBookDB;
 
     QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date );
 
     qBubbleSort( list );
 
     Config config( "qpe" );
 
     int count=0;
 
     if ( list.count() > 0 ) {
 
         for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) {
 
             if ( count <= m_max_lines_meet ) {
                 QTime time = QTime::currentTime();
 
                 if ( !m_onlyLater ) {
                     count++;
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     layoutDates->addWidget( l );
                     QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) );
                 } else if ( ( time.toString() <= TimeString::dateString( (*it).event().end() ) ) ) {
                     count++;
                     // show only later appointments
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     layoutDates->addWidget( l );
                     QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) );
                 }
             }
         }
         if ( m_onlyLater && count == 0 ) {
             QLabel* noMoreEvents = new QLabel( this );
             noMoreEvents->setText( QObject::tr( "No more appointments today" ) );
             layoutDates->addWidget( noMoreEvents );
         }
     } else {
         QLabel* noEvents = new QLabel( this );
         noEvents->setText( QObject::tr( "No appointments today" ) );
         layoutDates->addWidget( noEvents );
     }
-
-    layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+    //layoutDates->addStretch(0);
+//     layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
     // how often refresh - later have qcop update calls in *db
     //QTimer::singleShot( 20*1000, this  , SLOT( getDates() ) );
 }
 
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index f052a9f..7537631 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -19,303 +19,289 @@
 #include "configwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/contact.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qtabwidget.h>
 #include <qdialog.h>
 
 
 struct TodayPlugin {
     QLibrary *library;
     TodayPluginInterface *iface;
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
     bool active;
     int pos;
 };
 
 static QValueList<TodayPlugin> pluginList;
 
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
     : TodayBase( parent, name, fl ) {
 
     QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) );
     QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this,  SLOT( editCard() ) );
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this );
     connect ( todayChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
               this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
 #endif
 #endif
 
     setOwnerField();
-    init();
-    loadPlugins();
-    draw();
+    refresh();
     showMaximized();
 }
 
 /**
  * Qcop receive method.
  */
 void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
   QDataStream stream( data, IO_ReadOnly );
   if ( msg == "message(QString)" ) {
       QString message;
       stream >> message;
       setOwnerField( message );
   }
 }
 
 /**
  * Initialises the owner field with the default value, the username
  */
 void Today::setOwnerField() {
     QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" );
     if ( QFile::exists( file ) ) {
     Contact cont = Contact::readVCard( file )[0];
     QString returnString = cont.fullName();
     OwnerField->setText( "<b>" + tr ( "Owned by " ) + returnString + "</b>" );
   } else {
     OwnerField->setText( "<b>" + tr ( "Please fill out the business card" ) + " </b>" );
   }
 }
 
 /**
  * Set the owner field with a given QString, for example per qcop.
  */
 void Today::setOwnerField( QString &message ) {
     if ( !message.isEmpty() ) {
         OwnerField->setText( "<b>" + message + "</b>" );
     }
 }
 
 
 /**
  * Init stuff needed for today. Reads the config file.
  */
 void Today::init() {
 
     QDate date = QDate::currentDate();
     QString time = ( tr( date.toString() ) );
 
     DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
 
     // read config
     Config cfg( "today" );
-
     cfg.setGroup( "Applets" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 
 
 /**
  * Load the plugins
  */
 void Today::loadPlugins() {
 
     QValueList<TodayPlugin>::Iterator tit;
     for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
 	(*tit).library->unload();
 	delete (*tit).library;
     }
     pluginList.clear();
 
+
     QString path = QPEApplication::qpeDir() + "/plugins/today";
     QDir dir( path, "lib*.so" );
 
     QStringList list = dir.entryList();
     QStringList::Iterator it;
 
-    uint count = 0;
     for ( it = list.begin(); it != list.end(); ++it ) {
 	TodayPluginInterface *iface = 0;
 	QLibrary *lib = new QLibrary( path + "/" + *it );
 
 	qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
         if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
 	    qDebug( "loading: %s", QString( path + "/" + *it ).latin1() );
             qDebug( QString(*it) );
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
 
+            // find out if plugins should be shown
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
             plugin.guiPart = plugin.iface->guiPart();
 
             // package the whole thing into a qwidget so it can be shown and hidden
             plugin.guiBox = new QWidget( this );
             QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
 
             QPixmap plugPix;
             plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 );
             OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox  );
             plugIcon->setPixmap( plugPix );
 
             // a scrollview for each plugin
             QScrollView* sv = new QScrollView( plugin.guiBox );
             QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() );
             sv->setMinimumHeight( plugin.guiPart->minHeight() );
-            //sv->setMaximumHeight( plugin.guiPart->maxHeight() );
             sv->setResizePolicy( QScrollView::AutoOneFit );
             sv->setHScrollBarMode( QScrollView::AlwaysOff );
             sv->setFrameShape( QFrame::NoFrame );
             sv->addChild( plugWidget );
 
             // make sure the icon is on the top alligned
             boxLayout->addWidget( plugIcon, 0, AlignTop );
             boxLayout->addWidget( sv, 0, AlignTop );
             boxLayout->setStretchFactor( plugIcon, 1 );
             boxLayout->setStretchFactor( sv, 9 );
             layout->addWidget( plugin.guiBox );
 
             pluginList.append( plugin );
-            count++;
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
             delete lib;
         }
     }
 }
 
 
 /**
  * Repaint method. Reread all fields.
  */
 void Today::draw() {
 
     if ( pluginList.count() == 0 ) {
         QLabel *noPlugins = new QLabel( this );
         noPlugins->setText( tr( "No plugins found" ) );
         layout->addWidget( noPlugins );
         return;
     }
 
     uint count = 0;
     TodayPlugin plugin;
     for ( uint i = 0; i < pluginList.count(); i++ ) {
 	plugin = pluginList[i];
 
     	if ( plugin.active ) {
             qDebug( plugin.name + " is ACTIVE " );
             plugin.guiBox->show();
         } else {
             qDebug( plugin.name + " is INACTIVE" );
             plugin.guiBox->hide();
         }
         count++;
     }
 
     if ( count == 0 ) {
         QLabel *noPluginsActive = new QLabel( this );
         noPluginsActive->setText( tr( "No plugins activated" ) );
         layout->addWidget( noPluginsActive );
     }
-
-    layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+    //layout->addStretch(0);
+    //layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 }
 
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
-
     QList<ConfigWidget> configWidgetList;
     for ( uint i = 0; i < pluginList.count(); i++ ) {
         plugin = pluginList[i];
 
         // load the config widgets in the tabs
         if ( plugin.guiPart->configWidget( this ) != 0l ) {
             ConfigWidget* widget = plugin.guiPart->configWidget( this );
             configWidgetList.append( widget );
             conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() );
         }
         // set the order/activate tab
         conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
                               Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
     }
 
     if ( conf.exec() == QDialog::Accepted ) {
         conf.writeConfig();
         ConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
+        refresh();
+    }
+}
 
-        init();
-
-        TodayPlugin plugin;
-        QValueList<TodayPlugin> plugList;
-        for ( uint i = 0; i < pluginList.count(); i++ ) {
-            plugin = pluginList[i];
 
-            if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) {
-                qDebug("CONFIG " + plugin.name + " ACTIVE");
-                plugin.active = true;
-            } else {
-                qDebug("CONFIG " + plugin.name + " INACTIVE");
-                plugin.active = false;
-            }
-            plugList.append( plugin );
-        }
-        pluginList = plugList;
+/**
+ * Refresh for the view. Reload all applets
+ *
+ */
+void Today::refresh() {
+    init();
 
-        draw();
+    if ( layout ) {
+        delete layout;
     }
-}
+    layout = new QVBoxLayout( this );
+    layout->addWidget( Frame );
+    layout->addWidget( OwnerField );
 
+    loadPlugins();
+    draw();
+}
 
 void Today::startAddressbook() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( "addressbook" );
 }
 
 
 /**
  * launch addressbook (personal card)
  */
 void Today::editCard() {
     startAddressbook();
     while( !QCopChannel::isRegistered( "QPE/Addressbook" ) ) {
         qApp->processEvents();
     }
     QCopEnvelope v( "QPE/Addressbook", "editPersonalAndClose()" );
 }
 
-/*
- * launches an App
- */
-void Today::launchApp( QString appName ) {
-    QCopEnvelope e( "QPE/System", "execute(QString)" );
-    e << QString( appName );
-}
-
 Today::~Today() {
 }
 
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 0a9a705..672adc4 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,73 +1,72 @@
 /*
  * today.h
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef TODAY_H
 #define TODAY_H
 
 #include <opie/tododb.h>
 
 #include <qdatetime.h>
 #include <qlist.h>
 #include <qhbox.h>
 
 #include <qpe/qlibrary.h>
 #include <qpe/event.h>
 
 #include "todayconfig.h"
 #include "todaybase.h"
 #include "todayplugininterface.h"
 
 class QVBoxLayout;
 
 
 class Today : public TodayBase {
 
     Q_OBJECT
 
   public:
     Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Today();
 
-  private slots:
+private slots:
     void startConfig();
     void startAddressbook();
-    void launchApp( QString appName );
     void editCard();
-    void draw();
+    void refresh();
 
 private:
     void init();
     void setOwnerField();
     void setOwnerField(QString &string);
     void loadPlugins();
+    void draw();
+
 
 private slots:
     void channelReceived(const QCString &msg, const QByteArray & data);
 
  private:
     TodayConfig *conf;
     QStringList m_excludeApplets;
 
-    QVBoxLayout *pluginLayout;
-
     // QString m_autoStartTimer;
     int m_newStart;
     //  int m_autoStart;
     int m_maxCharClip;
 };
 
 #endif
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 74f4fa0..800ca5d 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,107 +1,105 @@
 /*
  * todaybase.cpp
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "todaybase.h"
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qapplication.h>
 
 #include <qpe/resource.h>
 
 
 TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl ) {
 
   QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
   QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
   QPixmap config = Resource::loadPixmap( "today/config" );  // config icon
 
   layout = new QVBoxLayout( this );
 
+  QVBoxLayout *mainLayout = new QVBoxLayout( this );
+
   QPalette pal = this->palette();
   QColor col = pal.color( QPalette::Active, QColorGroup::Background );
   pal.setColor( QPalette::Active, QColorGroup::Button, col );
   pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
   pal.setColor( QPalette::Normal, QColorGroup::Button, col );
   pal.setColor( QPalette::Disabled, QColorGroup::Button, col );
   this->setPalette( pal );
 
   // --- logo Section ---
   QPalette pal2;
   QColorGroup cg;
   cg.setColor( QColorGroup::Text, white );
   cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) );
   pal2.setActive( cg );
   // today logo
   Frame = new QLabel( this, "Frame" );
   Frame->setPalette( pal2 );
   Frame->setFrameShape( QFrame::StyledPanel );
   Frame->setFrameShadow( QFrame::Raised );
   Frame->setLineWidth( 0 );
   Frame->setMaximumHeight( 50 );
   Frame->setMinimumHeight( 50 );
 
     // Today text
   QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
   TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) );
   QFont TodayLabel_font(  TodayLabel->font() );
   TodayLabel_font.setBold( TRUE );
   TodayLabel_font.setPointSize( 40 );
   TodayLabel->setFont( TodayLabel_font );
   TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
   TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today²") +"</font>" );
 
   // date
   DateLabel = new QLabel( Frame, "TextLabel1" );
   DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) );
   QFont DateLabel_font( DateLabel->font() );
   DateLabel_font.setBold( TRUE );
   DateLabel->setFont( DateLabel_font );
   DateLabel->setBackgroundOrigin( QLabel::ParentOrigin );
   DateLabel->setTextFormat( RichText );
 
   // Opiezilla
-  QLabel* Opiezilla = new QLabel( Frame, "OpieZilla");
+  QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" );
   Opiezilla->setPixmap( opiezilla );
-  Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47);
+  Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 );
   Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
 
   // Ownerfield
   OwnerField = new OClickableLabel( this , "Owner" );
-  OwnerField->setGeometry( QRect( 0,0, this->width(), 12 ));
+  OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) );
   OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) );
   OwnerField->setMaximumHeight(12);
 
   // config
   ConfigButton = new OClickableLabel ( Frame, "PushButton1" );
-  ConfigButton->setGeometry( QRect(  QApplication::desktop()->width()-80, 30, 25, 21 ) );
-  ConfigButton->setPixmap( config  );
+  ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) );
+  ConfigButton->setPixmap( config );
   ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin );
-
-  // -- layout --
-  layout->addWidget( Frame );
-  layout->addWidget( OwnerField );
 }
 
 /**
  *  D' tor
  */
 TodayBase::~TodayBase() {
 }
 
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 79c4d1f..4f23471 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -12,162 +12,160 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "todayconfig.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qheader.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 
 class ToolButton : public QToolButton {
 
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
         : QToolButton( parent, name ) {
         // setTextLabel( name );
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
     }
 };
 
 
 /**
  * The class has currently quite some duplicate code.
  * By that way it would be real easy to have it as seperate app in settings tab
  *
  */
 TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
 
     setCaption( tr( "Today config" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     TabWidget3 = new QTabWidget( this, "TabWidget3" );
-    // TabWidget3->setFrameShape( QFrame::NoFrame );
-    //TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) );
     TabWidget3->setAutoMask( FALSE );
     TabWidget3->setTabShape( QTabWidget::Rounded );
     layout->addWidget( TabWidget3 );
 
     tab_2 = new QWidget( TabWidget3, "tab_2" );
     QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
     QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 );
     tab2Layout->addWidget( l );
     QHBox *hbox1 = new QHBox( tab_2 );
     m_appletListView = new QListView( hbox1 );
     m_appletListView->addColumn( "PluginList" );
     m_appletListView->header()->hide();
     QVBox *vbox1 = new QVBox( hbox1 );
     new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up",  this , SLOT( moveSelectedUp() ) );
     new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) );
     tab2Layout->addWidget( hbox1 );
 
     TabWidget3->insertTab( tab_2, tr( "active/order" ) );
     tab_3 = new QWidget( TabWidget3, "tab_3" );
     QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
     QHBox *hbox_clip = new QHBox( tab_3 );
     TextLabel1 = new QLabel( hbox_clip, "TextLabel1" );
     TextLabel1->setText( tr( "Clip after how\n"
                              "many letters" ) );
     SpinBox7 = new QSpinBox( hbox_clip, "SpinBox7" );
     SpinBox7->setMaxValue( 80 );
     QHBox *hbox_auto = new QHBox( tab_3 );
     TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
     TextLabel2->setText( tr( "autostart on \nresume? (Opie only)" ) );
     CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
     QHBox *hbox_inactive = new QHBox( tab_3 );
     TimeLabel = new QLabel( hbox_inactive  , "TimeLabel" );
     TimeLabel->setText( tr( "minutes inactive" ) );
     SpinBoxTime = new QSpinBox(  hbox_inactive, "TimeSpinner");
     tab3Layout->addWidget( hbox_clip );
     tab3Layout->addWidget( hbox_auto );
     tab3Layout->addWidget( hbox_inactive );
     TabWidget3->insertTab( tab_3, tr( "Misc" ) );
 
     m_applets_changed = false;
 
     connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
 
     readConfig();
     showMaximized();
 }
 
 
 /**
  * Autostart, uses the new (opie only) autostart method in the launcher code.
  * If registered against that today ist started on each resume.
  */
 void TodayConfig::setAutoStart() {
     Config cfg( "today" );
     cfg.setGroup( "Autostart" );
     int autostart = cfg.readNumEntry( "autostart", 1);
     if ( autostart ) {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
         e << QString( "add" );
         e << QString( "today" );
         e << m_autoStartTimer;
     } else {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
-        e << QString( "remove");
+        e << QString( "remove" );
         e << QString( "today" );
     }
 }
 
 /**
  * Read the config part
  */
 void TodayConfig::readConfig() {
     Config cfg( "today" );
     cfg.setGroup( "Autostart" );
     m_autoStart = cfg.readNumEntry( "autostart", 1 );
     CheckBoxAuto->setChecked( m_autoStart );
     m_autoStartTimer = cfg.readEntry( "autostartdelay", "0" );
     SpinBoxTime->setValue( m_autoStartTimer.toInt() );
 
     cfg.setGroup( "Applets" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 
 /**
  * Write the config part
  */
 void TodayConfig::writeConfig() {
     Config cfg( "today" );
     cfg. setGroup ( "Applets" );
     if ( m_applets_changed ) {
         QStringList exclude;
         QStringList include;
         QMap <QString, QCheckListItem *>::Iterator it;
         for ( it = m_applets.begin(); it != m_applets. end (); ++it ) {
             if ( !(*it)-> isOn () ) {
                 exclude << it.key();
             } else {
                 include << it.key();
             }
         }
         cfg.writeEntry( "ExcludeApplets", exclude, ',' );
         cfg.writeEntry( "IncludeApplets", include, ',' );
     }
 
     cfg.setGroup( "Autostart" );
     m_autoStart = CheckBoxAuto->isChecked();
     cfg.writeEntry( "autostart",  m_autoStart  );
     m_autoStartTimer = SpinBoxTime->value();
     cfg.readEntry( "autostartdelay", m_autoStartTimer );
 }