icons back to the to

1 files changed, 13 insertions, 9 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 2095174..f052a9f 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -36,17 +36,17 @@
 #include <qtabwidget.h>
 #include <qdialog.h>
 
 
 struct TodayPlugin {
     QLibrary *library;
     TodayPluginInterface *iface;
     TodayPluginObject *guiPart;
-    QHBox *guiBox;
+    QWidget *guiBox;
     QString name;
     bool active;
     int pos;
 };
 
 static QValueList<TodayPlugin> pluginList;
 
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
@@ -58,18 +58,16 @@ 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
 
-    // pluginLayout = 0l;
-
     setOwnerField();
     init();
     loadPlugins();
     draw();
     showMaximized();
 }
 
 /**
@@ -160,34 +158,40 @@ void Today::loadPlugins() {
 
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
             plugin.guiPart = plugin.iface->guiPart();
 
-            plugin.guiBox = new QHBox( this );
+            // 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 );
+            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 );
 
-            //plugin.guiBox->addWidget( plugIcon, 0, AlignTop );
-            //plugin.guiBox->addWidget( sv, 0, AlignTop );
-            plugin.guiBox->setStretchFactor( plugIcon, 1 );
-            plugin.guiBox->setStretchFactor( sv, 9 );
+            // 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;
         }