interface updates

14 files changed, 49 insertions, 73 deletions

diff --git a/core/pim/today/configwidget.h b/core/pim/today/configwidget.h
deleted file mode 100644
index 02ce37a..0000000
--- a/core/pim/today/configwidget.h
+++ b/dev/null
@@ -1,17 +0,0 @@
-
-#ifndef CONFIG_WIDGET_H
-#define CONFIG_WIDGET_H
-
-
-class ConfigWidget : public QWidget {
-
-
-public:
-
-    ConfigWidget( QWidget *parent,  const char *name ) : QWidget( parent,  name ) {} ;
-    virtual ~ConfigWidget() {};
-
-    virtual void  writeConfig() = 0;
-};
-
-#endif
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index a1721f6..4ebb178 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -44,24 +44,16 @@ QString DatebookPlugin::pixmapNameWidget() const {
 QWidget* DatebookPlugin::widget( QWidget* wid ) {
     return new DatebookPluginWidget( wid,  "Datebook" );
 }
 
 QString DatebookPlugin::pixmapNameConfig() const {
     return "DateBook";
 }
 
-ConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
     return new DatebookPluginConfig( wid , "Datebook" );
 }
 
 QString DatebookPlugin::appName()  const {
     return QObject::tr( "Datebook" );
 }
 
-int DatebookPlugin::minHeight()  const {
-    return 10;
-}
-
-int DatebookPlugin::maxHeight()  const {
-    return 100;
-}
-
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 61dc9f3..625c7cd 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -30,17 +30,15 @@ public:
     DatebookPlugin();
     ~DatebookPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget( QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget( QWidget *);
+    TodayConfigWidget* configWidget( QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
 
 };
 
 
 #endif
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
index 0f60c28..606916b 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
@@ -6,17 +6,17 @@
 
 #include <qlayout.h>
 #include <qtoolbutton.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qvbox.h>
 
 DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name)
-    : ConfigWidget( parent, name ) {
+    : TodayConfigWidget( parent, name ) {
 
     QVBoxLayout * layout = new QVBoxLayout( this );
     layout->setMargin( 20 );
 
     QHBox *box1 = new QHBox( this );
     QLabel* TextLabel4 = new QLabel( box1, "TextLabel4" );
     TextLabel4->setText( tr( "Show location" ) );
     CheckBox1 = new QCheckBox( box1, "CheckBox1" );
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index 9505a2d..99aa76c 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -1,19 +1,19 @@
 
 #ifndef DATEBOOK_PLUGIN_CONFIG_H
 #define DATEBOOK_PLUGIN_CONFIG_H
 
-//#include <qwidget.h>
+
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
-#include "../../configwidget.h"
+#include "../../todayconfigwidget.h"
 
-class DatebookPluginConfig : public ConfigWidget {
+class DatebookPluginConfig : public TodayConfigWidget {
 
 
 
 public:
     DatebookPluginConfig( QWidget *parent,  const char *name );
    ~DatebookPluginConfig();
 
     void writeConfig();
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp
index 4241228..3ddf16e 100644
--- a/core/pim/today/plugins/mail/mailplugin.cpp
+++ b/core/pim/today/plugins/mail/mailplugin.cpp
@@ -25,39 +25,32 @@ MailPlugin::MailPlugin() {
 MailPlugin::~MailPlugin() {
 }
 
 QString MailPlugin::pluginName() const {
     return "Mail plugin";
 }
 
 double MailPlugin::versionNumber() const {
-    return 0.1;
+    return 0.5;
 }
 
 QString MailPlugin::pixmapNameWidget() const {
     return "mail/desktopicon";
 }
 
 QWidget* MailPlugin::widget( QWidget * wid ) {
     return new MailPluginWidget( wid, "Mail" );
 }
 
 QString MailPlugin::pixmapNameConfig() const {
     return 0l;
 }
 
-ConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
     return 0l;
 }
 
 QString MailPlugin::appName() const {
     return "Mail";
 }
 
-int MailPlugin::minHeight()  const {
-    return 10;
-}
-
-int MailPlugin::maxHeight()  const {
-    return 10;
-}
 
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index 96c73ed..a27f4c7 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -20,29 +20,28 @@
 
 #include <qstring.h>
 #include <qwidget.h>
 
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
 
 #include "../../todayplugininterface.h"
-#include "../../configwidget.h"
+#include "../../todayconfigwidget.h"
 
 class MailPlugin : public TodayPluginObject {
 
 public:
     MailPlugin();
     ~MailPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget(QWidget *);
+    TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
+
 
 };
 
 #endif
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 7ab27a0..19d9f37 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -42,24 +42,17 @@ QString TodolistPlugin::pixmapNameWidget() const {
 QWidget* TodolistPlugin::widget( QWidget *wid ) {
     return new TodolistPluginWidget( wid, "Todolist" );
 }
 
 QString TodolistPlugin::pixmapNameConfig() const {
     return "TodoList";
 }
 
-ConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
     return new TodolistPluginConfig( wid , "Todolist" );
 }
 
 QString TodolistPlugin::appName() const {
     return  QObject::tr( "Todolist" );
 }
 
-int TodolistPlugin::minHeight()  const {
-    return 10;
-}
-
-int TodolistPlugin::maxHeight()  const {
-    return 100;
-}
 
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index 7e5006f..2c03389 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -31,15 +31,14 @@ public:
     TodolistPlugin();
     ~TodolistPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget(QWidget *);
+    TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
+
 };
 
 #endif
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.cpp b/core/pim/today/plugins/todolist/todopluginconfig.cpp
index 69ad727..110b2e0 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.cpp
+++ b/core/pim/today/plugins/todolist/todopluginconfig.cpp
@@ -21,17 +21,17 @@
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qtoolbutton.h>
 #include <qlabel.h>
 
 
 
 TodolistPluginConfig::TodolistPluginConfig( QWidget *parent,  const char* name)
-    : ConfigWidget(parent,  name ) {
+    : TodayConfigWidget(parent,  name ) {
 
     QVBoxLayout * layout = new QVBoxLayout( this );
     layout->setMargin( 20 );
 
     QHBox *box1 = new QHBox( this );
 
     QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" );
     TextLabel6->setText( tr( "How many\n tasks should \n"
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index 934b319..26557d5 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -15,19 +15,19 @@
  ***************************************************************************/
 
 #ifndef TODOLIST_PLUGIN_CONFIG_H
 #define TODOLIST_PLUGIN_CONFIG_H
 
 #include <qwidget.h>
 #include <qspinbox.h>
 
-#include "../../configwidget.h"
+#include "../../todayconfigwidget.h"
 
-class TodolistPluginConfig : public ConfigWidget {
+class TodolistPluginConfig : public TodayConfigWidget {
 
 
 public:
 
     TodolistPluginConfig( QWidget *parent,  const char *name );
     ~TodolistPluginConfig();
 
 private:
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 7673df5..f5f88f8 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -11,17 +11,17 @@
  *   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 "todayconfigwidget.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>
 
@@ -164,17 +164,18 @@ void Today::loadPlugins() {
             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() );
+            // 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 );
@@ -246,36 +247,36 @@ void Today::draw() {
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
-    QList<ConfigWidget> configWidgetList;
+    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 ) {
-            ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
+            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();
-        ConfigWidget *confWidget;
+        TodayConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
         refresh();
     }
 }
 
diff --git a/core/pim/today/todayconfigwidget.h b/core/pim/today/todayconfigwidget.h
new file mode 100644
index 0000000..48cf379
--- a/dev/null
+++ b/core/pim/today/todayconfigwidget.h
@@ -0,0 +1,21 @@
+
+#ifndef CONFIG_WIDGET_H
+#define CONFIG_WIDGET_H
+
+
+class TodayConfigWidget : public QWidget {
+
+
+public:
+
+    TodayConfigWidget( QWidget *parent,  const char *name ) : QWidget( parent,  name ) {} ;
+    virtual ~TodayConfigWidget() {};
+
+    /**
+     * Plugins need to reimplement this in the config widget
+     * Used when the config dialog is closed to write config stuff
+     */
+    virtual void  writeConfig() = 0;
+};
+
+#endif
diff --git a/core/pim/today/todayplugininterface.h b/core/pim/today/todayplugininterface.h
index 01e7d58..becb79c 100644
--- a/core/pim/today/todayplugininterface.h
+++ b/core/pim/today/todayplugininterface.h
@@ -1,14 +1,14 @@
 
 #ifndef TODAY_PLUGIN_INTERFACE
 #define TODAY_PLUGIN_INTERFACE
 
 #include <qpe/qcom.h>
-#include "configwidget.h"
+#include "todayconfigwidget.h"
 
 class QString;
 class QWidget;
 
 #ifndef IID_TodayPluginInterface
 #define IID_TodayPluginInterface QUuid( 0x70481804, 0x2b50, 0x4fba, 0x80, 0xbb, 0x0b, 0xf8, 0xdc, 0x72, 0x04, 0x14)
 #endif
 
@@ -30,52 +30,49 @@ public:
      */
     virtual QString pluginName() const = 0;
 
     /**
      * Version numbering
      */
     virtual double versionNumber() const = 0;
 
-    /**
-     * the path and name of the identifer icon that should be shown
-     * in "Resource" notation, that means only subdir/picname form $QPEDIR/pics
-     */
+
     virtual  QString pixmapNameWidget() const = 0;
 
     /**    widget for the today view
      * It _needs_ a parent here.
      */
     virtual QWidget* widget( QWidget * ) = 0;
 
     /**
      * Pixmap used in the config widget
      */
     virtual QString pixmapNameConfig() const = 0;
 
     /**
      * Config plugin widget - optional
      * If the plugin has a config widget, it  _needs_  a parent here.
      */
-    virtual ConfigWidget* configWidget( QWidget * ) = 0;
+    virtual TodayConfigWidget* configWidget( QWidget * ) = 0;
 
     /**
      * The application that should be assigned to the button (pixmap)
      */
     virtual QString appName() const = 0;
 
     /**
      * minimum height the plugin at least should have
      */
-    virtual int minHeight()  const = 0;
+    // virtual int minHeight()  const = 0;
 
     /**
      *  maximum height that should be used before starting scrolling
      */
-    virtual int maxHeight() const = 0;
+    // virtual int maxHeight() const = 0;
 
 };
 
 
 struct TodayPluginInterface : public QUnknownInterface {
     virtual TodayPluginObject *guiPart() = 0;
 };