-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/today.h | 2 | ||||
-rw-r--r-- | core/pim/today/todayconfigwidget.h | 21 | ||||
-rw-r--r-- | core/pim/today/todayplugininterface.h | 79 |
12 files changed, 11 insertions, 113 deletions
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 625c7cd..4d0f8e6 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h @@ -1,44 +1,43 @@ /* * datebookplugin.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_H #define DATEBOOK_PLUGIN_H #include <qstring.h> #include <qwidget.h> #include <opie/oclickablelabel.h> - -#include "../../todayplugininterface.h" +#include <opie/todayplugininterface.h> class DatebookPlugin : public TodayPluginObject { public: DatebookPlugin(); ~DatebookPlugin(); QString pluginName() const; double versionNumber() const; QString pixmapNameWidget() const; QWidget* widget( QWidget *); QString pixmapNameConfig() const; TodayConfigWidget* configWidget( QWidget *); QString appName() const; }; #endif diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 99aa76c..feba9ee 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h @@ -1,33 +1,33 @@ #ifndef DATEBOOK_PLUGIN_CONFIG_H #define DATEBOOK_PLUGIN_CONFIG_H #include <qcheckbox.h> #include <qspinbox.h> -#include "../../todayconfigwidget.h" +#include <opie/todayconfigwidget.h> class DatebookPluginConfig : public TodayConfigWidget { public: DatebookPluginConfig( QWidget *parent, const char *name ); ~DatebookPluginConfig(); void writeConfig(); private: /** * if changed then save */ bool changed(); void readConfig(); QCheckBox* CheckBox2; QCheckBox* CheckBox1; QCheckBox* CheckBox3; QSpinBox* SpinBox1; // how many lines should be showed in the datebook section int m_max_lines_meet; diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h index 037dff4..4dbb318 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.h +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h @@ -1,42 +1,42 @@ /* * datebookpluginimpl.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_IMPL_H #define DATEBOOK_PLUGIN_IMPL_H -#include "../../todayplugininterface.h" +#include <opie/todayplugininterface.h> class DatebookPlugin; class DatebookPluginImpl : public TodayPluginInterface{ public: DatebookPluginImpl(); virtual ~DatebookPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); Q_REFCOUNT virtual TodayPluginObject *guiPart(); private: DatebookPlugin *datebookPlugin; ulong ref; }; #endif diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index a27f4c7..d2a3dcb 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h @@ -3,45 +3,45 @@ * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef MAIL_PLUGIN_H #define MAIL_PLUGIN_H #include <qstring.h> #include <qwidget.h> #include <opie/tododb.h> #include <opie/oclickablelabel.h> -#include "../../todayplugininterface.h" -#include "../../todayconfigwidget.h" +#include <opie/todayplugininterface.h> +#include <opie/todayconfigwidget.h> class MailPlugin : public TodayPluginObject { public: MailPlugin(); ~MailPlugin(); QString pluginName() const; double versionNumber() const; QString pixmapNameWidget() const; QWidget* widget(QWidget *); QString pixmapNameConfig() const; TodayConfigWidget* configWidget(QWidget *); QString appName() const; }; #endif diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h index 9930e6e..54412b2 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.h +++ b/core/pim/today/plugins/mail/mailpluginimpl.h @@ -1,40 +1,40 @@ /* * mailpluginimpl.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef MAIL_PLUGIN_IMPL_H #define MAIL_PLUGIN_IMPL_H -#include "../../todayplugininterface.h" +#include <opie/todayplugininterface.h> class MailPlugin; class MailPluginImpl : public TodayPluginInterface{ public: MailPluginImpl(); virtual ~MailPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); Q_REFCOUNT virtual TodayPluginObject *guiPart(); private: MailPlugin *mailPlugin; ulong ref; }; #endif diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 2c03389..0a6669f 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h @@ -1,44 +1,43 @@ /* * todoplugin.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_H #define TODOLIST_PLUGIN_H #include <qstring.h> #include <qwidget.h> #include <opie/tododb.h> #include <opie/oclickablelabel.h> - -#include "../../todayplugininterface.h" +#include <opie/todayplugininterface.h> class TodolistPlugin : public TodayPluginObject { public: TodolistPlugin(); ~TodolistPlugin(); QString pluginName() const; double versionNumber() const; QString pixmapNameWidget() const; QWidget* widget(QWidget *); QString pixmapNameConfig() const; TodayConfigWidget* configWidget(QWidget *); QString appName() const; }; #endif diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index 26557d5..4584ebe 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h @@ -1,47 +1,47 @@ /* * todopluginconfig.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_CONFIG_H #define TODOLIST_PLUGIN_CONFIG_H #include <qwidget.h> #include <qspinbox.h> -#include "../../todayconfigwidget.h" +#include <opie/todayconfigwidget.h> class TodolistPluginConfig : public TodayConfigWidget { public: TodolistPluginConfig( QWidget *parent, const char *name ); ~TodolistPluginConfig(); private: /** * if changed then save */ bool changed(); void readConfig(); void writeConfig(); QSpinBox* SpinBox2; QSpinBox* SpinBoxClip; // how many lines should be showed in the todolist section int m_max_lines_task; // clip the lines after X chars int m_maxCharClip; diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h index 29e0294..c119be2 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.h +++ b/core/pim/today/plugins/todolist/todopluginimpl.h @@ -1,40 +1,40 @@ /* * todopluginimpl.h * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_IMPL_H #define TODOLIST_PLUGIN_IMPL_H -#include "../../todayplugininterface.h" +#include <opie/todayplugininterface.h> class TodolistPlugin; class TodolistPluginImpl : public TodayPluginInterface{ public: TodolistPluginImpl(); virtual ~TodolistPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); Q_REFCOUNT virtual TodayPluginObject *guiPart(); private: TodolistPlugin *todolistPlugin; ulong ref; }; #endif diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index f5f88f8..35758d5 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -1,43 +1,43 @@ /* * today.cpp * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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 "todayconfigwidget.h" +#include <opie/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> #include <qdir.h> #include <qfile.h> #include <qpushbutton.h> #include <qlabel.h> #include <qtimer.h> #include <qpixmap.h> #include <qlayout.h> #include <qhbox.h> #include <opie/otabwidget.h> #include <qdialog.h> struct TodayPlugin { QLibrary *library; TodayPluginInterface *iface; TodayPluginObject *guiPart; diff --git a/core/pim/today/today.h b/core/pim/today/today.h index b35c9b1..92512b9 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -8,49 +8,49 @@ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * 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. * * * ***************************************************************************/ #ifndef TODAY_H #define TODAY_H #include <opie/tododb.h> #include <qdatetime.h> #include <qlist.h> #include <qhbox.h> #include <qpe/qlibrary.h> #include <qpe/event.h> #include "todayconfig.h" #include "todaybase.h" -#include "todayplugininterface.h" +#include <opie/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(); diff --git a/core/pim/today/todayconfigwidget.h b/core/pim/today/todayconfigwidget.h deleted file mode 100644 index 48cf379..0000000 --- a/core/pim/today/todayconfigwidget.h +++ b/dev/null @@ -1,21 +0,0 @@ - -#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 deleted file mode 100644 index becb79c..0000000 --- a/core/pim/today/todayplugininterface.h +++ b/dev/null @@ -1,79 +0,0 @@ - -#ifndef TODAY_PLUGIN_INTERFACE -#define TODAY_PLUGIN_INTERFACE - -#include <qpe/qcom.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 - -/** - * - * - * - */ -class TodayPluginObject { - - Q_OBJECT - -public: - - virtual ~TodayPluginObject() {}; - - /** - * The name if the plugin - */ - virtual QString pluginName() const = 0; - - /** - * Version numbering - */ - virtual double versionNumber() const = 0; - - - 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 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; - - /** - * maximum height that should be used before starting scrolling - */ - // virtual int maxHeight() const = 0; - -}; - - -struct TodayPluginInterface : public QUnknownInterface { - virtual TodayPluginObject *guiPart() = 0; -}; - -#endif |