10 files changed, 17 insertions, 43 deletions

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
@@ -50,5 +50,5 @@ QString DatebookPlugin::pixmapNameConfig() const {
 }
 
-ConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
     return new DatebookPluginConfig( wid , "Datebook" );
 }
@@ -58,10 +58,2 @@ QString DatebookPlugin::appName()  const {
 }
 
-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
@@ -36,8 +36,6 @@ public:
     QWidget* widget( QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget( QWidget *);
+    TodayConfigWidget* configWidget( QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
 
 };
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
@@ -12,5 +12,5 @@
 
 DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name)
-    : ConfigWidget( parent, name ) {
+    : TodayConfigWidget( parent, name ) {
 
     QVBoxLayout * layout = new QVBoxLayout( this );
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
@@ -3,11 +3,11 @@
 #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 {
 
 
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
@@ -31,5 +31,5 @@ QString MailPlugin::pluginName() const {
 
 double MailPlugin::versionNumber() const {
-    return 0.1;
+    return 0.5;
 }
 
@@ -46,5 +46,5 @@ QString MailPlugin::pixmapNameConfig() const {
 }
 
-ConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
     return 0l;
 }
@@ -54,10 +54,3 @@ QString MailPlugin::appName() const {
 }
 
-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
@@ -26,5 +26,5 @@
 
 #include "../../todayplugininterface.h"
-#include "../../configwidget.h"
+#include "../../todayconfigwidget.h"
 
 class MailPlugin : public TodayPluginObject {
@@ -39,8 +39,7 @@ public:
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget(QWidget *);
+    TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
+
 
 };
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
@@ -48,5 +48,5 @@ QString TodolistPlugin::pixmapNameConfig() const {
 }
 
-ConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
     return new TodolistPluginConfig( wid , "Todolist" );
 }
@@ -56,10 +56,3 @@ QString TodolistPlugin::appName() const {
 }
 
-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
@@ -37,8 +37,7 @@ public:
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
-    ConfigWidget* configWidget(QWidget *);
+    TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-    virtual int minHeight()  const;
-    virtual int maxHeight()  const;
+
 };
 
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
@@ -27,5 +27,5 @@
 
 TodolistPluginConfig::TodolistPluginConfig( QWidget *parent,  const char* name)
-    : ConfigWidget(parent,  name ) {
+    : TodayConfigWidget(parent,  name ) {
 
     QVBoxLayout * layout = new QVBoxLayout( this );
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
@@ -21,7 +21,7 @@
 #include <qspinbox.h>
 
-#include "../../configwidget.h"
+#include "../../todayconfigwidget.h"
 
-class TodolistPluginConfig : public ConfigWidget {
+class TodolistPluginConfig : public TodayConfigWidget {