From a26d188b7b91f9bdce1e6a44c40ce874cd50abde Mon Sep 17 00:00:00 2001 From: harlekin Date: Sun, 22 Sep 2002 22:29:34 +0000 Subject: interface updates --- 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 @@ -49,7 +49,7 @@ QString DatebookPlugin::pixmapNameConfig() const { return "DateBook"; } -ConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { +TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { return new DatebookPluginConfig( wid , "Datebook" ); } @@ -57,11 +57,3 @@ 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 @@ -35,10 +35,8 @@ public: 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 @@ -11,7 +11,7 @@ #include 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 @@ -2,13 +2,13 @@ #ifndef DATEBOOK_PLUGIN_CONFIG_H #define DATEBOOK_PLUGIN_CONFIG_H -//#include + #include #include -#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 @@ -30,7 +30,7 @@ QString MailPlugin::pluginName() const { } double MailPlugin::versionNumber() const { - return 0.1; + return 0.5; } QString MailPlugin::pixmapNameWidget() const { @@ -45,7 +45,7 @@ QString MailPlugin::pixmapNameConfig() const { return 0l; } -ConfigWidget* MailPlugin::configWidget( QWidget* wid ) { +TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) { return 0l; } @@ -53,11 +53,4 @@ 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 @@ -25,7 +25,7 @@ #include #include "../../todayplugininterface.h" -#include "../../configwidget.h" +#include "../../todayconfigwidget.h" class MailPlugin : public TodayPluginObject { @@ -38,10 +38,9 @@ public: 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/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 @@ -47,7 +47,7 @@ QString TodolistPlugin::pixmapNameConfig() const { return "TodoList"; } -ConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { +TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { return new TodolistPluginConfig( wid , "Todolist" ); } @@ -55,11 +55,4 @@ 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 @@ -36,10 +36,9 @@ public: 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 @@ -26,7 +26,7 @@ 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 @@ -20,9 +20,9 @@ #include #include -#include "../../configwidget.h" +#include "../../todayconfigwidget.h" -class TodolistPluginConfig : public ConfigWidget { +class TodolistPluginConfig : public TodayConfigWidget { public: 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 @@ -16,7 +16,7 @@ #include "today.h" -#include "configwidget.h" +#include "todayconfigwidget.h" #include #include @@ -169,7 +169,8 @@ void Today::loadPlugins() { // 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 ); @@ -251,14 +252,14 @@ void Today::startConfig() { TodayConfig conf( this, "dialog", true ); TodayPlugin plugin; - QList configWidgetList; + QList 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() ); @@ -270,7 +271,7 @@ void Today::startConfig() { if ( conf.exec() == QDialog::Accepted ) { conf.writeConfig(); - ConfigWidget *confWidget; + TodayConfigWidget *confWidget; for ( confWidget = configWidgetList.first(); confWidget != 0; confWidget = configWidgetList.next() ) { confWidget->writeConfig(); 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 @@ -3,7 +3,7 @@ #define TODAY_PLUGIN_INTERFACE #include -#include "configwidget.h" +#include "todayconfigwidget.h" class QString; class QWidget; @@ -35,10 +35,7 @@ public: */ 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 @@ -55,7 +52,7 @@ public: * 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) @@ -65,12 +62,12 @@ public: /** * 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; }; -- cgit v0.9.0.2