fixes for the new exclude from refresh system

1 files changed, 18 insertions, 3 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 3eda5c0..01ef02d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -59,272 +59,287 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
 
 #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();
     m_refreshTimer = new QTimer( this );
     connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     m_refreshTimer->start( 15000 );
     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 );
     }
 }
 
 void Today::setRefreshTimer( int interval ) {
 
 
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
 
     // 0 is "never" case
     if ( !interval == 0 ) {
         connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
         m_refreshTimer->changeInterval( interval );
     }
 }
 
 
 /**
  * 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() {
     // read config
     Config cfg( "today" );
 
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
     m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     setRefreshTimer(  cfg.readNumEntry( "checkinterval", 15000 ) );
 }
 
 
 /**
  * Load the plugins
  */
 void Today::loadPlugins() {
 
     // extra list for plugins that exclude themself from periodic refresh
     QMap<QString, TodayPlugin> pluginListRefreshExclude;
 
     QValueList<TodayPlugin>::Iterator tit;
     if ( !pluginList.isEmpty() ) {
         for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
             if ( (*tit).excludeRefresh ) {
                 pluginListRefreshExclude.insert( (*tit).name , (*tit) );
-                qDebug( "Found an plug that does not want refresh feature" );
+                qDebug( "Found an plugin that does not want refresh feature" );
             } else {
                 (*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;
 
     QMap<QString, TodayPlugin> tempList;
 
     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) );
 
             // If plugin is exludes from refresh, get it in the list again here.
 
             if ( pluginListRefreshExclude.contains( (*it) ) ) {
-                tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] );
-                qDebug( "TEST2 " +  pluginListRefreshExclude[(*it)].name );
+
+                // if its not in allApplets list, add it to a layout
+                if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) {
+                    qDebug( "NUGASDA" );
+                    layout->addWidget( pluginListRefreshExclude[(*it)].guiBox );
+                    pluginList.append( pluginListRefreshExclude[(*it)] );
+                } else {
+                    tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] );
+                    qDebug( "TEST2 " +  pluginListRefreshExclude[(*it)].name );
+                }
             } else {
 
                 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();
                 plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
 
                 // 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( m_iconSize, m_iconSize ), 0 );
                 OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
                 plugIcon->setPixmap( plugPix );
                 QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") );
                 plugIcon->setName( plugin.guiPart->appName() );
                 connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) );
                 // a scrollview for each plugin
                 QScrollView* sv = new QScrollView( plugin.guiBox );
                 QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() );
                 // not sure if that is good .-)
                 sv->setMinimumHeight( 10 );
                 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 );
                 // "prebuffer" it in one more list, to get the sorting done
                 tempList.insert( plugin.name, plugin );
 
                 // on first start the list is off course empty
                 if ( m_allApplets.isEmpty() ) {
                     layout->addWidget( plugin.guiBox );
                     pluginList.append( plugin );
                 }
+
+                // if plugin is not yet in the list, add it to the layout too
+                if ( !m_allApplets.contains( plugin.name ) ) {
+                    layout->addWidget( plugin.guiBox );
+                    pluginList.append( plugin );
+                }
             }
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
             delete lib;
         }
     }
 
     if ( !m_allApplets.isEmpty() ) {
         TodayPlugin tempPlugin;
         QStringList::Iterator stringit;
 
         for( stringit = m_allApplets.begin(); stringit !=  m_allApplets.end(); ++stringit ) {
             tempPlugin = ( tempList.find( *stringit ) ).data();
             if ( !( (tempPlugin.name).isEmpty() ) ) {
                 layout->addWidget( tempPlugin.guiBox );
                 pluginList.append( tempPlugin );
             }
         }
     }
 }
 
 
 /**
  * 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->addStretch(0);
 }
 
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     // disconnect timer to prevent problems while being on config dialog
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
     QList<TodayConfigWidget> configWidgetList;
 
     for ( int i = pluginList.count() - 1  ; i >= 0; i-- ) {
         plugin = pluginList[i];
 
         // load the config widgets in the tabs
         if ( plugin.guiPart->configWidget( this ) != 0l ) {
             TodayConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
             configWidgetList.append( widget );
             conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig()
                                      , 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();
         TodayConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
         refresh();
     } else {
         // since refresh is not called in that case , reconnect the signal