-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 10 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.cpp | 11 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 7 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 9 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 5 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 4 |
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 @@ -48,20 +48,12 @@ QWidget* DatebookPlugin::widget( QWidget* wid ) { 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 @@ -34,12 +34,10 @@ public: 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; }; 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 @@ -10,9 +10,9 @@ #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 ); 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,15 +1,15 @@ #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: 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 @@ -29,9 +29,9 @@ QString MailPlugin::pluginName() const { return "Mail plugin"; } double MailPlugin::versionNumber() const { - return 0.1; + return 0.5; } QString MailPlugin::pixmapNameWidget() const { return "mail/desktopicon"; @@ -44,20 +44,13 @@ QWidget* MailPlugin::widget( QWidget * wid ) { 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 @@ -24,9 +24,9 @@ #include <opie/tododb.h> #include <opie/oclickablelabel.h> #include "../../todayplugininterface.h" -#include "../../configwidget.h" +#include "../../todayconfigwidget.h" class MailPlugin : public TodayPluginObject { public: @@ -37,12 +37,11 @@ public: 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 @@ -46,20 +46,13 @@ QWidget* TodolistPlugin::widget( QWidget *wid ) { 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 @@ -35,11 +35,10 @@ public: 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 @@ -25,9 +25,9 @@ TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) - : ConfigWidget(parent, name ) { + : TodayConfigWidget(parent, name ) { QVBoxLayout * layout = new QVBoxLayout( this ); layout->setMargin( 20 ); 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 @@ -19,11 +19,11 @@ #include <qwidget.h> #include <qspinbox.h> -#include "../../configwidget.h" +#include "../../todayconfigwidget.h" -class TodolistPluginConfig : public ConfigWidget { +class TodolistPluginConfig : public TodayConfigWidget { public: |