author | harlekin <harlekin> | 2003-02-10 21:28:14 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-10 21:28:14 (UTC) |
commit | bbb3cdf8f91d567f6c2e786bd144b64bd679ff9a (patch) (unidiff) | |
tree | 9c622e670cab66c44d9bd079707945cf3c9bcb89 | |
parent | de272b8c47c3960a3fe574317fe2e6fb0c32e4af (diff) | |
download | opie-bbb3cdf8f91d567f6c2e786bd144b64bd679ff9a.zip opie-bbb3cdf8f91d567f6c2e786bd144b64bd679ff9a.tar.gz opie-bbb3cdf8f91d567f6c2e786bd144b64bd679ff9a.tar.bz2 |
adapted to new refresh, datebookplugin still need some work
-rw-r--r-- | core/pim/today/TODO | 2 | ||||
-rw-r--r-- | core/pim/today/changelog | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 14 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 53 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.h | 8 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.cpp | 17 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.cpp | 33 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 16 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 8 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.cpp | 34 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.h | 4 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 42 |
15 files changed, 174 insertions, 76 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO index 4dc22aa..04354e7 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO | |||
@@ -6,4 +6,2 @@ TODO for today: | |||
6 | 6 | ||
7 | * show "upcoming appointents the next days | ||
8 | |||
9 | * show alarm icons on alarm events (partly done) | 7 | * show alarm icons on alarm events (partly done) |
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index ea618c8..500090d 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog | |||
@@ -3,2 +3,3 @@ | |||
3 | * datebook plugin now can now also show following days | 3 | * datebook plugin now can now also show following days |
4 | + changed refresh | ||
4 | * fixed one mem leak | 5 | * fixed one mem leak |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index eda84be..2ac7d01 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -21,3 +21,2 @@ | |||
21 | #include "datebookplugin.h" | 21 | #include "datebookplugin.h" |
22 | #include "datebookpluginwidget.h" | ||
23 | #include "datebookpluginconfig.h" | 22 | #include "datebookpluginconfig.h" |
@@ -26,2 +25,3 @@ | |||
26 | DatebookPlugin::DatebookPlugin() { | 25 | DatebookPlugin::DatebookPlugin() { |
26 | m_widget = 0; | ||
27 | } | 27 | } |
@@ -29,2 +29,3 @@ DatebookPlugin::DatebookPlugin() { | |||
29 | DatebookPlugin::~DatebookPlugin() { | 29 | DatebookPlugin::~DatebookPlugin() { |
30 | delete m_widget; | ||
30 | } | 31 | } |
@@ -44,3 +45,6 @@ QString DatebookPlugin::pixmapNameWidget() const { | |||
44 | QWidget* DatebookPlugin::widget( QWidget* wid ) { | 45 | QWidget* DatebookPlugin::widget( QWidget* wid ) { |
45 | return new DatebookPluginWidget( wid, "Datebook" ); | 46 | if(!m_widget) { |
47 | m_widget = new DatebookPluginWidget( wid, "Datebook" ); | ||
48 | } | ||
49 | return m_widget; | ||
46 | } | 50 | } |
@@ -62 +66,7 @@ bool DatebookPlugin::excludeFromRefresh() const { | |||
62 | } | 66 | } |
67 | |||
68 | void DatebookPlugin::refresh() { | ||
69 | if ( m_widget ) { | ||
70 | m_widget->refresh(); | ||
71 | } | ||
72 | } | ||
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 13c62a9..644a614 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -25,2 +25,4 @@ | |||
25 | 25 | ||
26 | #include "datebookpluginwidget.h" | ||
27 | |||
26 | class DatebookPlugin : public TodayPluginObject { | 28 | class DatebookPlugin : public TodayPluginObject { |
@@ -39,2 +41,6 @@ public: | |||
39 | bool excludeFromRefresh() const; | 41 | bool excludeFromRefresh() const; |
42 | void refresh(); | ||
43 | |||
44 | private: | ||
45 | DatebookPluginWidget *m_widget; | ||
40 | }; | 46 | }; |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index c6aa2a6..e2f492e 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -1,2 +1,2 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginwidget.cpp | 2 | * datebookpluginwidget.cpp |
@@ -18,3 +18,2 @@ | |||
18 | #include "datebookpluginwidget.h" | 18 | #include "datebookpluginwidget.h" |
19 | #include "datebookevent.h" | ||
20 | 19 | ||
@@ -32,3 +31,17 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name) | |||
32 | : QWidget(parent, name ) { | 31 | : QWidget(parent, name ) { |
32 | |||
33 | db = 0l; | 33 | db = 0l; |
34 | m_layoutDates = 0l; | ||
35 | |||
36 | if ( db ) { | ||
37 | delete db; | ||
38 | } | ||
39 | db = new DateBookDB; | ||
40 | |||
41 | if ( m_layoutDates ) { | ||
42 | delete m_layoutDates; | ||
43 | } | ||
44 | m_layoutDates = new QVBoxLayout( this ); | ||
45 | m_layoutDates->setAutoAdd( true ); | ||
46 | |||
34 | readConfig(); | 47 | readConfig(); |
@@ -39,2 +52,3 @@ DatebookPluginWidget::~DatebookPluginWidget() { | |||
39 | delete db; | 52 | delete db; |
53 | delete m_layoutDates; | ||
40 | } | 54 | } |
@@ -52,2 +66,9 @@ void DatebookPluginWidget::readConfig() { | |||
52 | 66 | ||
67 | void DatebookPluginWidget::refresh() { | ||
68 | DateBookEvent* ev; | ||
69 | for ( ev = m_eventsList.first(); ev != 0; ev = m_eventsList.next() ) { | ||
70 | delete ev; | ||
71 | } | ||
72 | getDates(); | ||
73 | } | ||
53 | 74 | ||
@@ -58,21 +79,7 @@ void DatebookPluginWidget::getDates() { | |||
58 | 79 | ||
59 | |||
60 | QDate date = QDate::currentDate(); | 80 | QDate date = QDate::currentDate(); |
61 | 81 | ||
62 | QVBoxLayout* layoutDates = new QVBoxLayout( this ); | ||
63 | layoutDates->setSpacing( 1 ); | ||
64 | layoutDates->setMargin( 1 ); | ||
65 | |||
66 | if ( db ) { | ||
67 | delete db; | ||
68 | } | ||
69 | |||
70 | db = new DateBookDB; | ||
71 | |||
72 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); | 82 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); |
73 | |||
74 | qBubbleSort( list ); | 83 | qBubbleSort( list ); |
75 | 84 | //Config config( "qpe" ); | |
76 | Config config( "qpe" ); | ||
77 | |||
78 | int count=0; | 85 | int count=0; |
@@ -81,3 +88,3 @@ void DatebookPluginWidget::getDates() { | |||
81 | 88 | ||
82 | for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) { | 89 | for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { |
83 | 90 | ||
@@ -89,4 +96,4 @@ void DatebookPluginWidget::getDates() { | |||
89 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | 96 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); |
90 | layoutDates->addWidget( l ); | 97 | m_eventsList.append( l ); |
91 | QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) ); | 98 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
92 | } else if ( ( time.toString() <= TimeString::dateString( (*it).event().end() ) ) ) { | 99 | } else if ( ( time.toString() <= TimeString::dateString( (*it).event().end() ) ) ) { |
@@ -95,4 +102,4 @@ void DatebookPluginWidget::getDates() { | |||
95 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | 102 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); |
96 | layoutDates->addWidget( l ); | 103 | m_eventsList.append( l ); |
97 | QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) ); | 104 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
98 | } | 105 | } |
@@ -103,3 +110,2 @@ void DatebookPluginWidget::getDates() { | |||
103 | noMoreEvents->setText( QObject::tr( "No more appointments today" ) ); | 110 | noMoreEvents->setText( QObject::tr( "No more appointments today" ) ); |
104 | layoutDates->addWidget( noMoreEvents ); | ||
105 | } | 111 | } |
@@ -108,3 +114,2 @@ void DatebookPluginWidget::getDates() { | |||
108 | noEvents->setText( QObject::tr( "No appointments today" ) ); | 114 | noEvents->setText( QObject::tr( "No appointments today" ) ); |
109 | layoutDates->addWidget( noEvents ); | ||
110 | } | 115 | } |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 3ebbc3d..8380bc7 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -21,2 +21,4 @@ | |||
21 | #include <qwidget.h> | 21 | #include <qwidget.h> |
22 | #include <qlayout.h> | ||
23 | #include <qlist.h> | ||
22 | 24 | ||
@@ -25,2 +27,3 @@ | |||
25 | 27 | ||
28 | #include "datebookevent.h" | ||
26 | 29 | ||
@@ -33,3 +36,3 @@ public: | |||
33 | ~DatebookPluginWidget(); | 36 | ~DatebookPluginWidget(); |
34 | 37 | void refresh(); | |
35 | 38 | ||
@@ -37,2 +40,4 @@ private: | |||
37 | DateBookDB* db; | 40 | DateBookDB* db; |
41 | QVBoxLayout* m_layoutDates; | ||
42 | QList<DateBookEvent> m_eventsList; | ||
38 | void readConfig(); | 43 | void readConfig(); |
@@ -40,2 +45,3 @@ private: | |||
40 | 45 | ||
46 | |||
41 | // how many lines should be showed in the datebook section | 47 | // how many lines should be showed in the datebook section |
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp index d497970..a37d506 100644 --- a/core/pim/today/plugins/mail/mailplugin.cpp +++ b/core/pim/today/plugins/mail/mailplugin.cpp | |||
@@ -18,6 +18,5 @@ | |||
18 | #include "mailplugin.h" | 18 | #include "mailplugin.h" |
19 | #include "mailpluginwidget.h" | ||
20 | |||
21 | 19 | ||
22 | MailPlugin::MailPlugin() { | 20 | MailPlugin::MailPlugin() { |
21 | m_widget = 0l; | ||
23 | } | 22 | } |
@@ -25,2 +24,3 @@ MailPlugin::MailPlugin() { | |||
25 | MailPlugin::~MailPlugin() { | 24 | MailPlugin::~MailPlugin() { |
25 | delete m_widget; | ||
26 | } | 26 | } |
@@ -40,5 +40,9 @@ QString MailPlugin::pixmapNameWidget() const { | |||
40 | QWidget* MailPlugin::widget( QWidget * wid ) { | 40 | QWidget* MailPlugin::widget( QWidget * wid ) { |
41 | return new MailPluginWidget( wid, "Mail" ); | 41 | if(!m_widget) { |
42 | m_widget = new MailPluginWidget( wid, "Datebook" ); | ||
43 | } | ||
44 | return m_widget; | ||
42 | } | 45 | } |
43 | 46 | ||
47 | |||
44 | QString MailPlugin::pixmapNameConfig() const { | 48 | QString MailPlugin::pixmapNameConfig() const { |
@@ -47,3 +51,3 @@ QString MailPlugin::pixmapNameConfig() const { | |||
47 | 51 | ||
48 | TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) { | 52 | TodayConfigWidget* MailPlugin::configWidget( QWidget* ) { |
49 | return 0l; | 53 | return 0l; |
@@ -60 +64,6 @@ bool MailPlugin::excludeFromRefresh() const { | |||
60 | 64 | ||
65 | void MailPlugin::refresh() { | ||
66 | if ( m_widget ) { | ||
67 | m_widget->refresh(); | ||
68 | } | ||
69 | } | ||
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index c937b9e..67fac0c 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -29,2 +29,4 @@ | |||
29 | 29 | ||
30 | #include "mailpluginwidget.h" | ||
31 | |||
30 | class MailPlugin : public TodayPluginObject { | 32 | class MailPlugin : public TodayPluginObject { |
@@ -43,2 +45,6 @@ public: | |||
43 | bool excludeFromRefresh() const; | 45 | bool excludeFromRefresh() const; |
46 | void refresh(); | ||
47 | |||
48 | private: | ||
49 | MailPluginWidget *m_widget; | ||
44 | }; | 50 | }; |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index a6f3562..aad1d07 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp | |||
@@ -32,2 +32,18 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | |||
32 | 32 | ||
33 | m_mailLabel = 0l; | ||
34 | m_layout = 0l; | ||
35 | |||
36 | if ( m_mailLabel ) { | ||
37 | delete m_mailLabel; | ||
38 | } | ||
39 | m_mailLabel = new OClickableLabel( this ); | ||
40 | m_mailLabel->setMaximumHeight( 15 ); | ||
41 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); | ||
42 | |||
43 | if ( m_layout ) { | ||
44 | delete m_layout; | ||
45 | } | ||
46 | m_layout = new QHBoxLayout( this ); | ||
47 | m_layout->setAutoAdd( true ); | ||
48 | |||
33 | readConfig(); | 49 | readConfig(); |
@@ -37,2 +53,4 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | |||
37 | MailPluginWidget::~MailPluginWidget() { | 53 | MailPluginWidget::~MailPluginWidget() { |
54 | delete m_mailLabel; | ||
55 | delete m_layout; | ||
38 | } | 56 | } |
@@ -46,9 +64,7 @@ void MailPluginWidget::readConfig() { | |||
46 | 64 | ||
47 | void MailPluginWidget::getInfo() { | 65 | void MailPluginWidget::refresh() { |
48 | 66 | getInfo(); | |
49 | QHBoxLayout* layout = new QHBoxLayout( this ); | 67 | } |
50 | 68 | ||
51 | mailLabel = new OClickableLabel( this ); | 69 | void MailPluginWidget::getInfo() { |
52 | mailLabel->setMaximumHeight( 15 ); | ||
53 | connect( mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); | ||
54 | 70 | ||
@@ -60,6 +76,5 @@ void MailPluginWidget::getInfo() { | |||
60 | 76 | ||
61 | QString output = QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ); | 77 | //QString output = QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ); |
62 | 78 | ||
63 | mailLabel->setText( output ); | 79 | m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ) ); |
64 | layout->addWidget( mailLabel ); | ||
65 | } | 80 | } |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h index 2feef80..c678833 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.h +++ b/core/pim/today/plugins/mail/mailpluginwidget.h | |||
@@ -22,2 +22,3 @@ | |||
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | #include <qlayout.h> | ||
23 | 24 | ||
@@ -34,2 +35,4 @@ public: | |||
34 | ~MailPluginWidget(); | 35 | ~MailPluginWidget(); |
36 | |||
37 | void refresh(); | ||
35 | 38 | ||
@@ -39,3 +42,4 @@ protected slots: | |||
39 | private: | 42 | private: |
40 | OClickableLabel *mailLabel; | 43 | OClickableLabel* m_mailLabel; |
44 | QHBoxLayout* m_layout; | ||
41 | void readConfig(); | 45 | void readConfig(); |
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index b5abbd3..1238f92 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp | |||
@@ -20,3 +20,2 @@ | |||
20 | #include "todopluginconfig.h" | 20 | #include "todopluginconfig.h" |
21 | #include "todopluginwidget.h" | ||
22 | 21 | ||
@@ -24,2 +23,3 @@ | |||
24 | TodolistPlugin::TodolistPlugin() { | 23 | TodolistPlugin::TodolistPlugin() { |
24 | m_widget = 0l; | ||
25 | } | 25 | } |
@@ -27,2 +27,3 @@ TodolistPlugin::TodolistPlugin() { | |||
27 | TodolistPlugin::~TodolistPlugin() { | 27 | TodolistPlugin::~TodolistPlugin() { |
28 | delete m_widget; | ||
28 | } | 29 | } |
@@ -34,3 +35,3 @@ QString TodolistPlugin::pluginName() const { | |||
34 | double TodolistPlugin::versionNumber() const { | 35 | double TodolistPlugin::versionNumber() const { |
35 | return 0.8; | 36 | return 0.9; |
36 | } | 37 | } |
@@ -42,3 +43,6 @@ QString TodolistPlugin::pixmapNameWidget() const { | |||
42 | QWidget* TodolistPlugin::widget( QWidget *wid ) { | 43 | QWidget* TodolistPlugin::widget( QWidget *wid ) { |
43 | return new TodolistPluginWidget( wid, "Todolist" ); | 44 | if(!m_widget) { |
45 | m_widget = new TodolistPluginWidget( wid, "Todolist" ); | ||
46 | } | ||
47 | return m_widget; | ||
44 | } | 48 | } |
@@ -61 +65,7 @@ bool TodolistPlugin::excludeFromRefresh() const { | |||
61 | } | 65 | } |
66 | |||
67 | void TodolistPlugin::refresh() { | ||
68 | if ( m_widget ) { | ||
69 | m_widget->refresh(); | ||
70 | } | ||
71 | } | ||
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index f98afdb..6106d0c 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -26,2 +26,4 @@ | |||
26 | 26 | ||
27 | #include "todopluginwidget.h" | ||
28 | |||
27 | class TodolistPlugin : public TodayPluginObject { | 29 | class TodolistPlugin : public TodayPluginObject { |
@@ -31,3 +33,3 @@ public: | |||
31 | ~TodolistPlugin(); | 33 | ~TodolistPlugin(); |
32 | 34 | ||
33 | QString pluginName() const; | 35 | QString pluginName() const; |
@@ -40,2 +42,6 @@ public: | |||
40 | bool excludeFromRefresh() const; | 42 | bool excludeFromRefresh() const; |
43 | void refresh(); | ||
44 | |||
45 | private: | ||
46 | TodolistPluginWidget *m_widget; | ||
41 | }; | 47 | }; |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 773e5cf..3242dac 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp | |||
@@ -32,4 +32,5 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) | |||
32 | 32 | ||
33 | todoLabel = 0l; | ||
34 | todo = 0l; | 33 | todo = 0l; |
34 | layoutTodo = 0l; | ||
35 | todoLabel = 0l; | ||
35 | 36 | ||
@@ -38,3 +39,2 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) | |||
38 | } | 39 | } |
39 | |||
40 | todo = new OTodoAccess(); | 40 | todo = new OTodoAccess(); |
@@ -42,2 +42,16 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) | |||
42 | 42 | ||
43 | if ( layoutTodo ) { | ||
44 | delete layoutTodo; | ||
45 | } | ||
46 | layoutTodo = new QVBoxLayout( this ); | ||
47 | layoutTodo->setAutoAdd( true ); | ||
48 | |||
49 | |||
50 | if ( todoLabel ) { | ||
51 | delete todoLabel; | ||
52 | } | ||
53 | todoLabel = new OClickableLabel( this ); | ||
54 | |||
55 | connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) ); | ||
56 | |||
43 | readConfig(); | 57 | readConfig(); |
@@ -48,2 +62,4 @@ TodolistPluginWidget::~TodolistPluginWidget() { | |||
48 | delete todo; | 62 | delete todo; |
63 | delete todoLabel; | ||
64 | delete layoutTodo; | ||
49 | } | 65 | } |
@@ -58,2 +74,5 @@ void TodolistPluginWidget::readConfig() { | |||
58 | 74 | ||
75 | void TodolistPluginWidget:: refresh() { | ||
76 | getTodo(); | ||
77 | } | ||
59 | 78 | ||
@@ -64,10 +83,2 @@ void TodolistPluginWidget::getTodo() { | |||
64 | 83 | ||
65 | QVBoxLayout* layoutTodo = new QVBoxLayout( this ); | ||
66 | |||
67 | if ( todoLabel ) { | ||
68 | delete todoLabel; | ||
69 | } | ||
70 | |||
71 | todoLabel = new OClickableLabel( this ); | ||
72 | connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) ); | ||
73 | 84 | ||
@@ -88,3 +99,3 @@ void TodolistPluginWidget::getTodo() { | |||
88 | tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; | 99 | tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; |
89 | ammount++; | 100 | ammount++ ; |
90 | } | 101 | } |
@@ -120,3 +131,2 @@ void TodolistPluginWidget::getTodo() { | |||
120 | todoLabel->setText( output ); | 131 | todoLabel->setText( output ); |
121 | layoutTodo->addWidget( todoLabel ); | ||
122 | } | 132 | } |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index 37b0ee1..0d0deb5 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h | |||
@@ -21,2 +21,3 @@ | |||
21 | #include <qwidget.h> | 21 | #include <qwidget.h> |
22 | #include <qlayout.h> | ||
22 | 23 | ||
@@ -35,2 +36,4 @@ public: | |||
35 | 36 | ||
37 | void refresh(); | ||
38 | |||
36 | protected slots: | 39 | protected slots: |
@@ -40,2 +43,3 @@ private: | |||
40 | OClickableLabel *todoLabel; | 43 | OClickableLabel *todoLabel; |
44 | QVBoxLayout* layoutTodo; | ||
41 | 45 | ||
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 91028c8..1f758f2 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -72,3 +72,4 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) | |||
72 | m_refreshTimer->start( 15000 ); | 72 | m_refreshTimer->start( 15000 ); |
73 | refresh(); | 73 | init(); |
74 | loadPlugins(); | ||
74 | showMaximized(); | 75 | showMaximized(); |
@@ -138,2 +139,17 @@ void Today::init() { | |||
138 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); | 139 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); |
140 | |||
141 | |||
142 | // qDebug(" refresh "); | ||
143 | // set the date in top label | ||
144 | QDate date = QDate::currentDate(); | ||
145 | QString time = ( tr( date.toString() ) ); | ||
146 | |||
147 | DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) ); | ||
148 | |||
149 | if ( layout ) { | ||
150 | delete layout; | ||
151 | } | ||
152 | layout = new QVBoxLayout( this ); | ||
153 | layout->addWidget( Frame ); | ||
154 | layout->addWidget( OwnerField ); | ||
139 | } | 155 | } |
@@ -268,2 +284,3 @@ void Today::loadPlugins() { | |||
268 | } | 284 | } |
285 | draw(); | ||
269 | } | 286 | } |
@@ -342,3 +359,3 @@ void Today::startConfig() { | |||
342 | } | 359 | } |
343 | refresh(); | 360 | loadPlugins(); |
344 | } else { | 361 | } else { |
@@ -357,18 +374,9 @@ void Today::refresh() { | |||
357 | 374 | ||
358 | // qDebug(" refresh "); | 375 | QValueList<TodayPlugin>::Iterator it; |
359 | // set the date in top label | 376 | for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { |
360 | QDate date = QDate::currentDate(); | 377 | if ( !(*it).excludeRefresh ) { |
361 | QString time = ( tr( date.toString() ) ); | 378 | (*it).guiPart->refresh(); |
362 | 379 | qDebug( "refresh" ); | |
363 | DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) ); | 380 | } |
364 | |||
365 | if ( layout ) { | ||
366 | delete layout; | ||
367 | } | 381 | } |
368 | layout = new QVBoxLayout( this ); | ||
369 | layout->addWidget( Frame ); | ||
370 | layout->addWidget( OwnerField ); | ||
371 | |||
372 | loadPlugins(); | ||
373 | draw(); | ||
374 | } | 382 | } |