double items prob + qWarning output

1 files changed, 3 insertions, 1 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 09540bd..7decf8e 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,305 +1,307 @@
 /*
  * today.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 "today.h"
 #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 <qtabwidget.h>
 #include <qdialog.h>
 
 
 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
 
     pluginLayout = 0l;
 
     setOwnerField();
     init();
     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() {
-
+    qWarning("pluginList count %d", pluginList.count() );
     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).latin1() );
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it).latin1();
 
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
             plugin.guiPart = plugin.iface->guiPart();
             pluginList.append( plugin );
             count++;
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
             delete lib;
         }
     }
+    qWarning("pluginList count end %d", pluginList.count() );
 }
 
 
 /**
  * Repaint method. Reread all fields.
  */
 void Today::draw() {
 
     if ( pluginLayout ) {
         delete pluginLayout;
     }
     pluginLayout = new QVBoxLayout( layout );
 
     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 ) {
             QHBoxLayout* plugLayout = new QHBoxLayout( this );
             QPixmap plugPix;
             plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 );
             OClickableLabel* plugIcon = new OClickableLabel( this );
             plugIcon->setPixmap( plugPix );
             QScrollView* sv = new QScrollView( this  );
             QWidget* plugWidget = plugin.guiPart->widget( sv->viewport() );
             //  plugWidget->reparent( sv->viewport(), QPoint( 0, 0 ) );
             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 );
 
             plugLayout->addWidget( plugIcon, 0, AlignTop );
             plugLayout->addWidget( sv, 0, AlignTop );
             plugLayout->setStretchFactor( plugIcon, 1 );
             plugLayout->setStretchFactor( sv, 9 );
             pluginLayout->addLayout( plugLayout );
             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 ) );
 
 
     // how often refresh - later have qcop update calls in *db
     //  QTimer::singleShot( 20*1000, this, SLOT( draw() ) );
 }
 
 
 void Today::refresh() {
     loadPlugins();
     draw();
     qDebug( "redraw" );
 //    QTimer::singleShot( 30*1000, this, SLOT( refresh() ) );
 }
 
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
   conf = new TodayConfig ( this, "", true );
 
   uint count = 0;
   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 );
           widget->reparent( conf , QPoint( 0,0 ) );
           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() ) );
       count++;
   }
 
   conf->showMaximized();
 
   if ( conf->exec() == QDialog::Accepted ) {
       ConfigWidget *confWidget;
       for ( confWidget=configWidgetList.first(); confWidget != 0;
             confWidget = configWidgetList.next() ) {
           confWidget->writeConfig();
       }
       conf->writeConfig();
 
       init();
       loadPlugins();
       draw();
   }
   delete conf;
 }
 
 
 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() {
 }