author | harlekin <harlekin> | 2002-09-22 22:29:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-22 22:29:34 (UTC) |
commit | a26d188b7b91f9bdce1e6a44c40ce874cd50abde (patch) (unidiff) | |
tree | 26a7efeca0a0778d3a96f876cb030dd414a177be /core/pim/today | |
parent | e49230a12104b718c46a34c81b6c0e608c9d40be (diff) | |
download | opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.zip opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.tar.gz opie-a26d188b7b91f9bdce1e6a44c40ce874cd50abde.tar.bz2 |
interface updates
-rw-r--r-- | core/pim/today/configwidget.h | 17 | ||||
-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 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 11 | ||||
-rw-r--r-- | core/pim/today/todayconfigwidget.h | 21 | ||||
-rw-r--r-- | core/pim/today/todayplugininterface.h | 13 |
14 files changed, 49 insertions, 73 deletions
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 @@ | |||
1 | |||
2 | #ifndef CONFIG_WIDGET_H | ||
3 | #define CONFIG_WIDGET_H | ||
4 | |||
5 | |||
6 | class ConfigWidget : public QWidget { | ||
7 | |||
8 | |||
9 | public: | ||
10 | |||
11 | ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {} ; | ||
12 | virtual ~ConfigWidget() {}; | ||
13 | |||
14 | virtual void writeConfig() = 0; | ||
15 | }; | ||
16 | |||
17 | #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 | |||
@@ -51,3 +51,3 @@ QString DatebookPlugin::pixmapNameConfig() const { | |||
51 | 51 | ||
52 | ConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { | 52 | TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { |
53 | return new DatebookPluginConfig( wid , "Datebook" ); | 53 | return new DatebookPluginConfig( wid , "Datebook" ); |
@@ -59,9 +59 @@ QString DatebookPlugin::appName() const { | |||
59 | |||
60 | int DatebookPlugin::minHeight() const { | ||
61 | return 10; | ||
62 | } | ||
63 | |||
64 | int DatebookPlugin::maxHeight() const { | ||
65 | return 100; | ||
66 | } | ||
67 | |||
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 | |||
@@ -37,6 +37,4 @@ public: | |||
37 | QString pixmapNameConfig() const; | 37 | QString pixmapNameConfig() const; |
38 | ConfigWidget* configWidget( QWidget *); | 38 | TodayConfigWidget* configWidget( QWidget *); |
39 | QString appName() const; | 39 | QString appName() const; |
40 | virtual int minHeight() const; | ||
41 | virtual int maxHeight() const; | ||
42 | 40 | ||
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 | |||
@@ -13,3 +13,3 @@ | |||
13 | DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) | 13 | DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) |
14 | : ConfigWidget( parent, name ) { | 14 | : TodayConfigWidget( parent, name ) { |
15 | 15 | ||
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 | |||
@@ -4,3 +4,3 @@ | |||
4 | 4 | ||
5 | //#include <qwidget.h> | 5 | |
6 | #include <qcheckbox.h> | 6 | #include <qcheckbox.h> |
@@ -8,5 +8,5 @@ | |||
8 | 8 | ||
9 | #include "../../configwidget.h" | 9 | #include "../../todayconfigwidget.h" |
10 | 10 | ||
11 | class DatebookPluginConfig : public ConfigWidget { | 11 | class DatebookPluginConfig : public TodayConfigWidget { |
12 | 12 | ||
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 | |||
@@ -32,3 +32,3 @@ QString MailPlugin::pluginName() const { | |||
32 | double MailPlugin::versionNumber() const { | 32 | double MailPlugin::versionNumber() const { |
33 | return 0.1; | 33 | return 0.5; |
34 | } | 34 | } |
@@ -47,3 +47,3 @@ QString MailPlugin::pixmapNameConfig() const { | |||
47 | 47 | ||
48 | ConfigWidget* MailPlugin::configWidget( QWidget* wid ) { | 48 | TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) { |
49 | return 0l; | 49 | return 0l; |
@@ -55,9 +55,2 @@ QString MailPlugin::appName() const { | |||
55 | 55 | ||
56 | int MailPlugin::minHeight() const { | ||
57 | return 10; | ||
58 | } | ||
59 | |||
60 | int MailPlugin::maxHeight() const { | ||
61 | return 10; | ||
62 | } | ||
63 | 56 | ||
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 | |||
@@ -27,3 +27,3 @@ | |||
27 | #include "../../todayplugininterface.h" | 27 | #include "../../todayplugininterface.h" |
28 | #include "../../configwidget.h" | 28 | #include "../../todayconfigwidget.h" |
29 | 29 | ||
@@ -40,6 +40,5 @@ public: | |||
40 | QString pixmapNameConfig() const; | 40 | QString pixmapNameConfig() const; |
41 | ConfigWidget* configWidget(QWidget *); | 41 | TodayConfigWidget* configWidget(QWidget *); |
42 | QString appName() const; | 42 | QString appName() const; |
43 | virtual int minHeight() const; | 43 | |
44 | virtual int maxHeight() const; | ||
45 | 44 | ||
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 | |||
@@ -49,3 +49,3 @@ QString TodolistPlugin::pixmapNameConfig() const { | |||
49 | 49 | ||
50 | ConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { | 50 | TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { |
51 | return new TodolistPluginConfig( wid , "Todolist" ); | 51 | return new TodolistPluginConfig( wid , "Todolist" ); |
@@ -57,9 +57,2 @@ QString TodolistPlugin::appName() const { | |||
57 | 57 | ||
58 | int TodolistPlugin::minHeight() const { | ||
59 | return 10; | ||
60 | } | ||
61 | |||
62 | int TodolistPlugin::maxHeight() const { | ||
63 | return 100; | ||
64 | } | ||
65 | 58 | ||
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 | |||
@@ -38,6 +38,5 @@ public: | |||
38 | QString pixmapNameConfig() const; | 38 | QString pixmapNameConfig() const; |
39 | ConfigWidget* configWidget(QWidget *); | 39 | TodayConfigWidget* configWidget(QWidget *); |
40 | QString appName() const; | 40 | QString appName() const; |
41 | virtual int minHeight() const; | 41 | |
42 | virtual int maxHeight() const; | ||
43 | }; | 42 | }; |
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 | |||
@@ -28,3 +28,3 @@ | |||
28 | TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) | 28 | TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) |
29 | : ConfigWidget(parent, name ) { | 29 | : TodayConfigWidget(parent, name ) { |
30 | 30 | ||
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 | |||
@@ -22,5 +22,5 @@ | |||
22 | 22 | ||
23 | #include "../../configwidget.h" | 23 | #include "../../todayconfigwidget.h" |
24 | 24 | ||
25 | class TodolistPluginConfig : public ConfigWidget { | 25 | class TodolistPluginConfig : public TodayConfigWidget { |
26 | 26 | ||
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 | |||
@@ -18,3 +18,3 @@ | |||
18 | #include "today.h" | 18 | #include "today.h" |
19 | #include "configwidget.h" | 19 | #include "todayconfigwidget.h" |
20 | 20 | ||
@@ -171,3 +171,4 @@ void Today::loadPlugins() { | |||
171 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); | 171 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); |
172 | sv->setMinimumHeight( plugin.guiPart->minHeight() ); | 172 | // not sure if that is good .-) |
173 | sv->setMinimumHeight( 10 ); | ||
173 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 174 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
@@ -253,3 +254,3 @@ void Today::startConfig() { | |||
253 | TodayPlugin plugin; | 254 | TodayPlugin plugin; |
254 | QList<ConfigWidget> configWidgetList; | 255 | QList<TodayConfigWidget> configWidgetList; |
255 | 256 | ||
@@ -260,3 +261,3 @@ void Today::startConfig() { | |||
260 | if ( plugin.guiPart->configWidget( this ) != 0l ) { | 261 | if ( plugin.guiPart->configWidget( this ) != 0l ) { |
261 | ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); | 262 | TodayConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); |
262 | configWidgetList.append( widget ); | 263 | configWidgetList.append( widget ); |
@@ -272,3 +273,3 @@ void Today::startConfig() { | |||
272 | conf.writeConfig(); | 273 | conf.writeConfig(); |
273 | ConfigWidget *confWidget; | 274 | TodayConfigWidget *confWidget; |
274 | for ( confWidget = configWidgetList.first(); confWidget != 0; | 275 | for ( confWidget = configWidgetList.first(); confWidget != 0; |
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 @@ | |||
1 | |||
2 | #ifndef CONFIG_WIDGET_H | ||
3 | #define CONFIG_WIDGET_H | ||
4 | |||
5 | |||
6 | class TodayConfigWidget : public QWidget { | ||
7 | |||
8 | |||
9 | public: | ||
10 | |||
11 | TodayConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {} ; | ||
12 | virtual ~TodayConfigWidget() {}; | ||
13 | |||
14 | /** | ||
15 | * Plugins need to reimplement this in the config widget | ||
16 | * Used when the config dialog is closed to write config stuff | ||
17 | */ | ||
18 | virtual void writeConfig() = 0; | ||
19 | }; | ||
20 | |||
21 | #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 | |||
@@ -5,3 +5,3 @@ | |||
5 | #include <qpe/qcom.h> | 5 | #include <qpe/qcom.h> |
6 | #include "configwidget.h" | 6 | #include "todayconfigwidget.h" |
7 | 7 | ||
@@ -37,6 +37,3 @@ public: | |||
37 | 37 | ||
38 | /** | 38 | |
39 | * the path and name of the identifer icon that should be shown | ||
40 | * in "Resource" notation, that means only subdir/picname form $QPEDIR/pics | ||
41 | */ | ||
42 | virtual QString pixmapNameWidget() const = 0; | 39 | virtual QString pixmapNameWidget() const = 0; |
@@ -57,3 +54,3 @@ public: | |||
57 | */ | 54 | */ |
58 | virtual ConfigWidget* configWidget( QWidget * ) = 0; | 55 | virtual TodayConfigWidget* configWidget( QWidget * ) = 0; |
59 | 56 | ||
@@ -67,3 +64,3 @@ public: | |||
67 | */ | 64 | */ |
68 | virtual int minHeight() const = 0; | 65 | // virtual int minHeight() const = 0; |
69 | 66 | ||
@@ -72,3 +69,3 @@ public: | |||
72 | */ | 69 | */ |
73 | virtual int maxHeight() const = 0; | 70 | // virtual int maxHeight() const = 0; |
74 | 71 | ||