fixed the crash when closing config dialog and also sorting of the plugins is working now

3 files changed, 56 insertions, 32 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 7537631..d8b427d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -99,108 +99,120 @@ void Today::setOwnerField() {
  */
 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" );
+    cfg.setGroup( "Plugins" );
+
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
+    m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 }
 
 
 /**
  * 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;
 
+
+    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) );
             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->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 );
+            // "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 );
+            }
         } 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 );
@@ -218,44 +230,44 @@ void Today::draw() {
         } 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);
-    //layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+    layout->addStretch(0);
 }
 
 
 /**
  * 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++ ) {
+
+    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 ) {
-            ConfigWidget* widget = plugin.guiPart->configWidget( this );
+            ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
             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;
@@ -265,24 +277,30 @@ void Today::startConfig() {
         refresh();
     }
 }
 
 
 /**
  * Refresh for the view. Reload all applets
  *
  */
 void Today::refresh() {
     init();
 
+    // set the date in top label
+    QDate date = QDate::currentDate();
+    QString time = ( tr( date.toString() ) );
+
+    DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
+
     if ( layout ) {
         delete layout;
     }
     layout = new QVBoxLayout( this );
     layout->addWidget( Frame );
     layout->addWidget( OwnerField );
 
     loadPlugins();
     draw();
 }
 
 void Today::startAddressbook() {
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 672adc4..b35c9b1 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -25,48 +25,49 @@
 #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:
     void startConfig();
     void startAddressbook();
     void editCard();
     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;
+    QStringList m_allApplets;
 
     // QString m_autoStartTimer;
     int m_newStart;
     //  int m_autoStart;
     int m_maxCharClip;
 };
 
 #endif
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 4f23471..532d126 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -26,25 +26,24 @@
 #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
@@ -60,47 +59,42 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
     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();
+    m_appletListView->setSorting( -1 );
     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 );
+    tab3Layout->setMargin( 20 );
     QHBox *hbox_auto = new QHBox( tab_3 );
     TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
-    TextLabel2->setText( tr( "autostart on \nresume? (Opie only)" ) );
+    TextLabel2->setText( tr( "autostart on \nresume?\n (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();
 }
 
@@ -127,47 +121,58 @@ void TodayConfig::setAutoStart() {
 
 /**
  * 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" );
+    cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 
 /**
  * Write the config part
  */
 void TodayConfig::writeConfig() {
     Config cfg( "today" );
-    cfg. setGroup ( "Applets" );
+    cfg.setGroup( "Plugins" );
     if ( m_applets_changed ) {
         QStringList exclude;
         QStringList include;
+        QStringList all_applets;
+
+        QListViewItemIterator list_it( m_appletListView );
+
+        // this makes sure the names get saved in the order selected
+        for ( ; list_it.current(); ++list_it ) {
         QMap <QString, QCheckListItem *>::Iterator it;
         for ( it = m_applets.begin(); it != m_applets. end (); ++it ) {
-            if ( !(*it)-> isOn () ) {
+                if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
                 exclude << it.key();
-            } else {
+                } else if ( list_it.current() == (*it) && (*it)-> isOn () ){
                 include << it.key();
             }
+                if ( list_it.current() == (*it) ) {
+                    all_applets << it.key();
+                }
+            }
         }
         cfg.writeEntry( "ExcludeApplets", exclude, ',' );
         cfg.writeEntry( "IncludeApplets", include, ',' );
+        cfg.writeEntry( "AllApplets",  all_applets, ',' );
     }
 
     cfg.setGroup( "Autostart" );
     m_autoStart = CheckBoxAuto->isChecked();
     cfg.writeEntry( "autostart",  m_autoStart  );
     m_autoStartTimer = SpinBoxTime->value();
     cfg.readEntry( "autostartdelay", m_autoStartTimer );
 }
 
 
 void TodayConfig::moveSelectedUp() {
     QListViewItem *item = m_appletListView->selectedItem();
@@ -188,28 +193,28 @@ void TodayConfig::moveSelectedDown() {
 /**
  * Set up the
  */
 void TodayConfig::pluginManagement( QString libName, QString name, QPixmap icon ) {
 
 	QCheckListItem *item;
     	item = new QCheckListItem( m_appletListView, name, QCheckListItem::CheckBox );
 
         if ( !icon.isNull() ) {
 	    item->setPixmap( 0, icon );
         }
 
-        qDebug (" SUCHNAME: " + name );
         if ( m_excludeApplets.find( libName ) == m_excludeApplets.end() ) {
 	    item->setOn( TRUE );
         }
+
 	m_applets[libName] = item;
 }
 
 
 void TodayConfig::appletChanged() {
     m_applets_changed = true;
 }
 
 
 TodayConfig::~TodayConfig() {
 }