Diffstat (limited to 'core/pim/today/plugins/datebook') (more/less context) (ignore whitespace changes)
4 files changed, 54 insertions, 27 deletions
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 @@ -20,12 +20,13 @@ #include "datebookevent.h" #include "datebookplugin.h" -#include "datebookpluginwidget.h" #include "datebookpluginconfig.h" DatebookPlugin::DatebookPlugin() { + m_widget = 0; } DatebookPlugin::~DatebookPlugin() { + delete m_widget; } @@ -43,5 +44,8 @@ QString DatebookPlugin::pixmapNameWidget() const { QWidget* DatebookPlugin::widget( QWidget* wid ) { - return new DatebookPluginWidget( wid, "Datebook" ); + if(!m_widget) { + m_widget = new DatebookPluginWidget( wid, "Datebook" ); + } + return m_widget; } @@ -61,2 +65,8 @@ bool DatebookPlugin::excludeFromRefresh() const { return false; } + +void DatebookPlugin::refresh() { + if ( m_widget ) { + m_widget->refresh(); + } +} 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 @@ -24,4 +24,6 @@ #include <opie/todayplugininterface.h> +#include "datebookpluginwidget.h" + class DatebookPlugin : public TodayPluginObject { @@ -38,4 +40,8 @@ public: QString appName() const; bool excludeFromRefresh() const; + void refresh(); + + private: + DatebookPluginWidget *m_widget; }; 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,3 +1,3 @@ -/* + /* * datebookpluginwidget.cpp * @@ -17,5 +17,4 @@ #include "datebookpluginwidget.h" -#include "datebookevent.h" #include <qpe/timestring.h> @@ -31,5 +30,19 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name) : QWidget(parent, name ) { + db = 0l; + m_layoutDates = 0l; + + if ( db ) { + delete db; + } + db = new DateBookDB; + + if ( m_layoutDates ) { + delete m_layoutDates; + } + m_layoutDates = new QVBoxLayout( this ); + m_layoutDates->setAutoAdd( true ); + readConfig(); getDates(); @@ -38,4 +51,5 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name) DatebookPluginWidget::~DatebookPluginWidget() { delete db; + delete m_layoutDates; } @@ -51,4 +65,11 @@ void DatebookPluginWidget::readConfig() { } +void DatebookPluginWidget::refresh() { + DateBookEvent* ev; + for ( ev = m_eventsList.first(); ev != 0; ev = m_eventsList.next() ) { + delete ev; + } + getDates(); +} /** @@ -57,28 +78,14 @@ void DatebookPluginWidget::readConfig() { void DatebookPluginWidget::getDates() { - QDate date = QDate::currentDate(); - QVBoxLayout* layoutDates = new QVBoxLayout( this ); - layoutDates->setSpacing( 1 ); - layoutDates->setMargin( 1 ); - - if ( db ) { - delete db; - } - - db = new DateBookDB; - QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); - qBubbleSort( list ); - - Config config( "qpe" ); - + //Config config( "qpe" ); int count=0; if ( list.count() > 0 ) { - for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) { + for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { if ( count <= m_max_lines_meet ) { @@ -88,12 +95,12 @@ void DatebookPluginWidget::getDates() { count++; DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); - layoutDates->addWidget( l ); - QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) ); + m_eventsList.append( l ); + QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); } else if ( ( time.toString() <= TimeString::dateString( (*it).event().end() ) ) ) { count++; // show only later appointments DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); - layoutDates->addWidget( l ); - QObject::connect ( l, SIGNAL( editEvent( const Event &) ), l, SLOT( editEventSlot( const Event &) ) ); + m_eventsList.append( l ); + QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); } } @@ -102,10 +109,8 @@ void DatebookPluginWidget::getDates() { QLabel* noMoreEvents = new QLabel( this ); noMoreEvents->setText( QObject::tr( "No more appointments today" ) ); - layoutDates->addWidget( noMoreEvents ); } } else { QLabel* noEvents = new QLabel( this ); noEvents->setText( QObject::tr( "No appointments today" ) ); - layoutDates->addWidget( noEvents ); } } 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 @@ -20,8 +20,11 @@ #include <qstring.h> #include <qwidget.h> +#include <qlayout.h> +#include <qlist.h> #include <qpe/datebookdb.h> #include <opie/oclickablelabel.h> +#include "datebookevent.h" class DatebookPluginWidget : public QWidget { @@ -32,11 +35,14 @@ public: DatebookPluginWidget( QWidget *parent, const char *name ); ~DatebookPluginWidget(); - + void refresh(); private: DateBookDB* db; + QVBoxLayout* m_layoutDates; + QList<DateBookEvent> m_eventsList; void readConfig(); void getDates(); + // how many lines should be showed in the datebook section int m_max_lines_meet; |