author | harlekin <harlekin> | 2002-09-22 22:29:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-22 22:29:34 (UTC) |
commit | a26d188b7b91f9bdce1e6a44c40ce874cd50abde (patch) (side-by-side diff) | |
tree | 26a7efeca0a0778d3a96f876cb030dd414a177be /core/pim/today/plugins | |
parent | e49230a12104b718c46a34c81b6c0e608c9d40be (diff) | |
download | opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.zip opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.tar.gz opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.tar.bz2 |
interface updates
-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 @@ -28,40 +28,32 @@ DatebookPlugin::DatebookPlugin() { DatebookPlugin::~DatebookPlugin() { } QString DatebookPlugin::pluginName() const { return "Datebook plugin"; } double DatebookPlugin::versionNumber() const { return 1.0; } QString DatebookPlugin::pixmapNameWidget() const { return "DateBook"; } 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 @@ -14,33 +14,31 @@ * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_H #define DATEBOOK_PLUGIN_H #include <qstring.h> #include <qwidget.h> #include <opie/oclickablelabel.h> #include "../../todayplugininterface.h" class DatebookPlugin : public TodayPluginObject { 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 @@ -1,38 +1,38 @@ #include "datebookpluginconfig.h" #include <qpe/config.h> #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" ); QHBox *box2 = new QHBox( this ); QLabel* TextLabel5 = new QLabel( box2 , "TextLabel5" ); TextLabel5->setText( tr( "Show notes" ) ); CheckBox2 = new QCheckBox( box2, "CheckBox2" ); QHBox *box3 = new QHBox( this ); QLabel* TextLabel6 = new QLabel( box3, "All Day"); TextLabel6->setText( tr( "Show only later\n appointments") ); CheckBox3 = new QCheckBox ( box3, "CheckBox3" ); QHBox *box4 = new QHBox( this ); QLabel *TextLabel3 = new QLabel( box4, "TextLabel3" ); TextLabel3->setText( tr( "How many \nappointment\n" "should be \nshown?" ) ); SpinBox1 = new QSpinBox( box4, "SpinBox1" ); 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,35 +1,35 @@ #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(); 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; // If location is to be showed too, 1 to activate it. int m_show_location; 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 @@ -9,55 +9,48 @@ * * * 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 "mailplugin.h" #include "mailpluginwidget.h" 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 @@ -4,45 +4,44 @@ * 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 "../../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 @@ -26,40 +26,33 @@ TodolistPlugin::TodolistPlugin() { TodolistPlugin::~TodolistPlugin() { } QString TodolistPlugin::pluginName() const { return "Todolist plugin"; } double TodolistPlugin::versionNumber() const { return 0.7; } QString TodolistPlugin::pixmapNameWidget() const { return "TodoList"; } 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 @@ -15,31 +15,30 @@ ***************************************************************************/ #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" class TodolistPlugin : public TodayPluginObject { 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 @@ -5,49 +5,49 @@ * 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 "todopluginconfig.h" #include <qpe/config.h> #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" "be shown?" ) ); SpinBox2 = new QSpinBox( box1, "SpinBox2" ); SpinBox2->setMaxValue( 40 ); QHBox *box2 = new QHBox( this ); QLabel* clipLabel = new QLabel( box2, "" ); clipLabel->setText( tr( "Clip line after\n X chars" ) ); SpinBoxClip = new QSpinBox( box2, "SpinClip" ); SpinBoxClip->setMaxValue( 200 ); layout->addWidget( box1 ); layout->addWidget( box2 ); 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 @@ -1,49 +1,49 @@ /* * 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 "../../configwidget.h" +#include "../../todayconfigwidget.h" -class TodolistPluginConfig : public ConfigWidget { +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; |