author | harlekin <harlekin> | 2003-02-10 23:42:49 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-10 23:42:49 (UTC) |
commit | 4abed72fea334ebfda6b146f70542dad522424b7 (patch) (unidiff) | |
tree | fc106623928f2fabc604d06f1c73b73ae9811512 | |
parent | 871eadc731c0c05c553b8edc8c0e3198127057b6 (diff) | |
download | opie-4abed72fea334ebfda6b146f70542dad522424b7.zip opie-4abed72fea334ebfda6b146f70542dad522424b7.tar.gz opie-4abed72fea334ebfda6b146f70542dad522424b7.tar.bz2 |
fix refresh
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 12 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 9a18408..3a7360d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -37,9 +37,8 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name) | |||
37 | delete db; | 37 | delete db; |
38 | } | 38 | } |
39 | db = new DateBookDB; | 39 | db = new DateBookDB; |
40 | 40 | ||
41 | |||
42 | if ( m_layoutDates ) { | 41 | if ( m_layoutDates ) { |
43 | delete m_layoutDates; | 42 | delete m_layoutDates; |
44 | } | 43 | } |
45 | m_layoutDates = new QVBoxLayout( this ); | 44 | m_layoutDates = new QVBoxLayout( this ); |
@@ -67,12 +66,8 @@ void DatebookPluginWidget::readConfig() { | |||
67 | m_moreDays = cfg.readNumEntry( "moredays", 0 ); | 66 | m_moreDays = cfg.readNumEntry( "moredays", 0 ); |
68 | } | 67 | } |
69 | 68 | ||
70 | void DatebookPluginWidget::refresh() { | 69 | void DatebookPluginWidget::refresh() { |
71 | DateBookEvent* ev; | ||
72 | for ( ev = m_eventsList.first(); ev != 0; ev = m_eventsList.next() ) { | ||
73 | delete ev; | ||
74 | } | ||
75 | m_eventsList.clear(); | 70 | m_eventsList.clear(); |
76 | getDates(); | 71 | getDates(); |
77 | } | 72 | } |
78 | 73 | ||
@@ -85,9 +80,8 @@ void DatebookPluginWidget::getDates() { | |||
85 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); | 80 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); |
86 | qBubbleSort( list ); | 81 | qBubbleSort( list ); |
87 | int count = 0; | 82 | int count = 0; |
88 | 83 | ||
89 | qDebug( QString("List count %1" ).arg(list.count() ) ); | ||
90 | if ( list.count() > 0 ) { | 84 | if ( list.count() > 0 ) { |
91 | 85 | ||
92 | for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 86 | for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { |
93 | 87 | ||
@@ -95,24 +89,30 @@ void DatebookPluginWidget::getDates() { | |||
95 | if ( !m_onlyLater ) { | 89 | if ( !m_onlyLater ) { |
96 | count++; | 90 | count++; |
97 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | 91 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); |
98 | m_eventsList.append( l ); | 92 | m_eventsList.append( l ); |
93 | l->show(); | ||
99 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 94 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
100 | } else if ( QDateTime::currentDateTime() <= (*it).event().end() ) { | 95 | } else if ( QDateTime::currentDateTime() <= (*it).event().end() ) { |
101 | count++; | 96 | count++; |
102 | // show only later appointments | 97 | // show only later appointments |
103 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | 98 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); |
104 | m_eventsList.append( l ); | 99 | m_eventsList.append( l ); |
100 | l->show(); | ||
105 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 101 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
106 | } | 102 | } |
107 | } | 103 | } |
108 | } | 104 | } |
109 | if ( m_onlyLater && count == 0 ) { | 105 | if ( m_onlyLater && count == 0 ) { |
110 | QLabel* noMoreEvents = new QLabel( this ); | 106 | QLabel* noMoreEvents = new QLabel( this ); |
107 | m_eventsList.append( noMoreEvents ); | ||
108 | noMoreEvents->show(); | ||
111 | noMoreEvents->setText( QObject::tr( "No more appointments today" ) ); | 109 | noMoreEvents->setText( QObject::tr( "No more appointments today" ) ); |
112 | } | 110 | } |
113 | } else { | 111 | } else { |
114 | QLabel* noEvents = new QLabel( this ); | 112 | QLabel* noEvents = new QLabel( this ); |
113 | m_eventsList.append( noEvents ); | ||
114 | noEvents->show(); | ||
115 | noEvents->setText( QObject::tr( "No appointments today" ) ); | 115 | noEvents->setText( QObject::tr( "No appointments today" ) ); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 8380bc7..e10f059 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -19,8 +19,9 @@ | |||
19 | 19 | ||
20 | #include <qstring.h> | 20 | #include <qstring.h> |
21 | #include <qwidget.h> | 21 | #include <qwidget.h> |
22 | #include <qlayout.h> | 22 | #include <qlayout.h> |
23 | #include <qguardedptr.h> | ||
23 | #include <qlist.h> | 24 | #include <qlist.h> |
24 | 25 | ||
25 | #include <qpe/datebookdb.h> | 26 | #include <qpe/datebookdb.h> |
26 | #include <opie/oclickablelabel.h> | 27 | #include <opie/oclickablelabel.h> |
@@ -37,10 +38,10 @@ public: | |||
37 | void refresh(); | 38 | void refresh(); |
38 | 39 | ||
39 | private: | 40 | private: |
40 | DateBookDB* db; | 41 | DateBookDB* db; |
41 | QVBoxLayout* m_layoutDates; | 42 | QGuardedPtr<QVBoxLayout> m_layoutDates; |
42 | QList<DateBookEvent> m_eventsList; | 43 | QList<QWidget> m_eventsList; |
43 | void readConfig(); | 44 | void readConfig(); |
44 | void getDates(); | 45 | void getDates(); |
45 | 46 | ||
46 | 47 | ||