summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/TODO2
-rw-r--r--core/pim/today/changelog1
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.cpp14
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.h6
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.cpp53
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.h8
-rw-r--r--core/pim/today/plugins/mail/mailplugin.cpp17
-rw-r--r--core/pim/today/plugins/mail/mailplugin.h6
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp33
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.h6
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp16
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h8
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.cpp34
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.h4
-rw-r--r--core/pim/today/today.cpp42
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
@@ -3,10 +3,8 @@ TODO for today:
- retail rom mail plugin (z)
- autostart on retail rom (Z)
-* show "upcoming appointents the next days
-
* show alarm icons on alarm events (partly done)
* qcop integration for updating events?
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
@@ -1,7 +1,8 @@
0.6.1
* datebook plugin now can now also show following days
++ changed refresh
* fixed one mem leak
0.6
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
@@ -18,16 +18,17 @@
#include "datebookevent.h"
#include "datebookplugin.h"
-#include "datebookpluginwidget.h"
#include "datebookpluginconfig.h"
DatebookPlugin::DatebookPlugin() {
+ m_widget = 0;
}
DatebookPlugin::~DatebookPlugin() {
+ delete m_widget;
}
QString DatebookPlugin::pluginName() const {
return QObject::tr( "Datebook plugin");
@@ -41,9 +42,12 @@ QString DatebookPlugin::pixmapNameWidget() const {
return "DateBook";
}
QWidget* DatebookPlugin::widget( QWidget* wid ) {
- return new DatebookPluginWidget( wid, "Datebook" );
+ if(!m_widget) {
+ m_widget = new DatebookPluginWidget( wid, "Datebook" );
+ }
+ return m_widget;
}
QString DatebookPlugin::pixmapNameConfig() const {
return "DateBook";
@@ -59,4 +63,10 @@ QString DatebookPlugin::appName() const {
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
@@ -22,8 +22,10 @@
#include <opie/oclickablelabel.h>
#include <opie/todayplugininterface.h>
+#include "datebookpluginwidget.h"
+
class DatebookPlugin : public TodayPluginObject {
public:
DatebookPlugin();
@@ -36,8 +38,12 @@ public:
QString pixmapNameConfig() const;
TodayConfigWidget* configWidget( QWidget *);
QString appName() const;
bool excludeFromRefresh() const;
+ void refresh();
+
+ private:
+ DatebookPluginWidget *m_widget;
};
#endif
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,5 +1,5 @@
-/*
+ /*
* datebookpluginwidget.cpp
*
* copyright : (c) 2002 by Maximilian Reiß
* email : harlekin@handhelds.org
@@ -15,9 +15,8 @@
***************************************************************************/
#include "datebookpluginwidget.h"
-#include "datebookevent.h"
#include <qpe/timestring.h>
#include <qpe/config.h>
@@ -29,15 +28,30 @@
#include <qtimer.h>
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();
}
DatebookPluginWidget::~DatebookPluginWidget() {
delete db;
+ delete m_layoutDates;
}
void DatebookPluginWidget::readConfig() {
@@ -49,64 +63,55 @@ void DatebookPluginWidget::readConfig() {
m_onlyLater = cfg.readNumEntry( "onlylater", 1 );
m_moreDays = cfg.readNumEntry( "moredays", 0 );
}
+void DatebookPluginWidget::refresh() {
+ DateBookEvent* ev;
+ for ( ev = m_eventsList.first(); ev != 0; ev = m_eventsList.next() ) {
+ delete ev;
+ }
+ getDates();
+}
/**
* Get all events that are in the datebook xml file for today
*/
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 ) {
QTime time = QTime::currentTime();
if ( !m_onlyLater ) {
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 & ) ) );
}
}
}
if ( m_onlyLater && count == 0 ) {
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
@@ -18,27 +18,33 @@
#define DATEBOOK_PLUGIN_WIDGET_H
#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 {
Q_OBJECT
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;
// If location is to be showed too, 1 to activate it.
bool m_show_location;
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
@@ -15,15 +15,15 @@
***************************************************************************/
#include "mailplugin.h"
-#include "mailpluginwidget.h"
-
MailPlugin::MailPlugin() {
+ m_widget = 0l;
}
MailPlugin::~MailPlugin() {
+ delete m_widget;
}
QString MailPlugin::pluginName() const {
return QObject::tr( "Mail plugin" );
@@ -37,16 +37,20 @@ QString MailPlugin::pixmapNameWidget() const {
return "mail/desktopicon";
}
QWidget* MailPlugin::widget( QWidget * wid ) {
- return new MailPluginWidget( wid, "Mail" );
+ if(!m_widget) {
+ m_widget = new MailPluginWidget( wid, "Datebook" );
+ }
+ return m_widget;
}
+
QString MailPlugin::pixmapNameConfig() const {
return 0l;
}
-TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* MailPlugin::configWidget( QWidget* ) {
return 0l;
}
QString MailPlugin::appName() const {
@@ -57,4 +61,9 @@ QString MailPlugin::appName() const {
bool MailPlugin::excludeFromRefresh() const {
return false;
}
+void MailPlugin::refresh() {
+ if ( m_widget ) {
+ m_widget->refresh();
+ }
+}
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
@@ -26,8 +26,10 @@
#include <opie/todayplugininterface.h>
#include <opie/todayconfigwidget.h>
+#include "mailpluginwidget.h"
+
class MailPlugin : public TodayPluginObject {
public:
MailPlugin();
@@ -40,7 +42,11 @@ public:
QString pixmapNameConfig() const;
TodayConfigWidget* configWidget(QWidget *);
QString appName() const;
bool excludeFromRefresh() const;
+ void refresh();
+
+ private:
+ MailPluginWidget *m_widget;
};
#endif
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
@@ -29,13 +29,31 @@
MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
: QWidget(parent, name ) {
+ m_mailLabel = 0l;
+ m_layout = 0l;
+
+ if ( m_mailLabel ) {
+ delete m_mailLabel;
+ }
+ m_mailLabel = new OClickableLabel( this );
+ m_mailLabel->setMaximumHeight( 15 );
+ connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
+
+ if ( m_layout ) {
+ delete m_layout;
+ }
+ m_layout = new QHBoxLayout( this );
+ m_layout->setAutoAdd( true );
+
readConfig();
getInfo();
}
MailPluginWidget::~MailPluginWidget() {
+ delete m_mailLabel;
+ delete m_layout;
}
void MailPluginWidget::readConfig() {
@@ -43,26 +61,23 @@ void MailPluginWidget::readConfig() {
cfg.setGroup( "config" );
}
-void MailPluginWidget::getInfo() {
-
- QHBoxLayout* layout = new QHBoxLayout( this );
+void MailPluginWidget::refresh() {
+ getInfo();
+}
- mailLabel = new OClickableLabel( this );
- mailLabel->setMaximumHeight( 15 );
- connect( mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
+void MailPluginWidget::getInfo() {
Config cfg( "opiemail" );
cfg.setGroup( "today" );
int NEW_MAILS = cfg.readNumEntry( "newmails", 0 );
int OUTGOING = cfg.readNumEntry( "outgoing", 0 );
- QString output = QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING );
+ //QString output = QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING );
- mailLabel->setText( output );
- layout->addWidget( mailLabel );
+ m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ) );
}
/**
* launches datebook
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
@@ -19,8 +19,9 @@
#define MAIL_PLUGIN_WIDGET_H
#include <qstring.h>
#include <qwidget.h>
+#include <qlayout.h>
#include <opie/tododb.h>
#include <opie/oclickablelabel.h>
@@ -31,14 +32,17 @@ class MailPluginWidget : public QWidget {
public:
MailPluginWidget( QWidget *parent, const char *name );
~MailPluginWidget();
+
+ void refresh();
protected slots:
void startMail();
private:
- OClickableLabel *mailLabel;
+ OClickableLabel* m_mailLabel;
+ QHBoxLayout* m_layout;
void readConfig();
void getInfo();
};
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
@@ -17,31 +17,35 @@
#include "todoplugin.h"
#include "todopluginconfig.h"
-#include "todopluginwidget.h"
TodolistPlugin::TodolistPlugin() {
+ m_widget = 0l;
}
TodolistPlugin::~TodolistPlugin() {
+ delete m_widget;
}
QString TodolistPlugin::pluginName() const {
return QObject::tr( "Todolist plugin" );
}
double TodolistPlugin::versionNumber() const {
- return 0.8;
+ return 0.9;
}
QString TodolistPlugin::pixmapNameWidget() const {
return "TodoList";
}
QWidget* TodolistPlugin::widget( QWidget *wid ) {
- return new TodolistPluginWidget( wid, "Todolist" );
+ if(!m_widget) {
+ m_widget = new TodolistPluginWidget( wid, "Todolist" );
+ }
+ return m_widget;
}
QString TodolistPlugin::pixmapNameConfig() const {
return "TodoList";
@@ -58,4 +62,10 @@ QString TodolistPlugin::appName() const {
bool TodolistPlugin::excludeFromRefresh() const {
return false;
}
+
+void TodolistPlugin::refresh() {
+ if ( m_widget ) {
+ m_widget->refresh();
+ }
+}
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
@@ -23,21 +23,27 @@
#include <opie/tododb.h>
#include <opie/oclickablelabel.h>
#include <opie/todayplugininterface.h>
+#include "todopluginwidget.h"
+
class TodolistPlugin : public TodayPluginObject {
public:
TodolistPlugin();
~TodolistPlugin();
-
+
QString pluginName() const;
double versionNumber() const;
QString pixmapNameWidget() const;
QWidget* widget(QWidget *);
QString pixmapNameConfig() const;
TodayConfigWidget* configWidget(QWidget *);
QString appName() const;
bool excludeFromRefresh() const;
+ void refresh();
+
+ private:
+ TodolistPluginWidget *m_widget;
};
#endif
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
@@ -29,24 +29,40 @@
TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
: QWidget( parent, name ) {
- todoLabel = 0l;
todo = 0l;
+ layoutTodo = 0l;
+ todoLabel = 0l;
if ( todo ) {
delete todo;
}
-
todo = new OTodoAccess();
todo->load();
+ if ( layoutTodo ) {
+ delete layoutTodo;
+ }
+ layoutTodo = new QVBoxLayout( this );
+ layoutTodo->setAutoAdd( true );
+
+
+ if ( todoLabel ) {
+ delete todoLabel;
+ }
+ todoLabel = new OClickableLabel( this );
+
+ connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) );
+
readConfig();
getTodo();
}
TodolistPluginWidget::~TodolistPluginWidget() {
delete todo;
+ delete todoLabel;
+ delete layoutTodo;
}
void TodolistPluginWidget::readConfig() {
@@ -55,22 +71,17 @@ void TodolistPluginWidget::readConfig() {
m_maxLinesTask = cfg.readNumEntry( "maxlinestask", 5 );
m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 );
}
+void TodolistPluginWidget:: refresh() {
+ getTodo();
+}
/**
* Get the todos
*/
void TodolistPluginWidget::getTodo() {
- QVBoxLayout* layoutTodo = new QVBoxLayout( this );
-
- if ( todoLabel ) {
- delete todoLabel;
- }
-
- todoLabel = new OClickableLabel( this );
- connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) );
QString output;
QString tmpout;
int count = 0;
@@ -85,9 +96,9 @@ void TodolistPluginWidget::getTodo() {
if( desc.isEmpty() ) {
desc = (*m_it).description();
}
tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
- ammount++;
+ ammount++ ;
}
}
// get total number of still open todos
@@ -117,9 +128,8 @@ void TodolistPluginWidget::getTodo() {
} else {
output = QObject::tr( "No active tasks" );
}
todoLabel->setText( output );
- layoutTodo->addWidget( todoLabel );
}
/**
* start the todolist
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
@@ -18,8 +18,9 @@
#define TODOLIST_PLUGIN_WIDGET_H
#include <qstring.h>
#include <qwidget.h>
+#include <qlayout.h>
#include <opie/otodo.h>
#include <opie/otodoaccess.h>
#include <opie/oclickablelabel.h>
@@ -32,13 +33,16 @@ class TodolistPluginWidget : public QWidget {
public:
TodolistPluginWidget( QWidget *parent, const char *name );
~TodolistPluginWidget();
+ void refresh();
+
protected slots:
void startTodolist();
private:
OClickableLabel *todoLabel;
+ QVBoxLayout* layoutTodo;
OTodoAccess *todo;
OTodoAccess::List m_list;
OTodoAccess::List::Iterator m_it;
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
@@ -69,9 +69,10 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
setOwnerField();
m_refreshTimer = new QTimer( this );
connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
m_refreshTimer->start( 15000 );
- refresh();
+ init();
+ loadPlugins();
showMaximized();
}
/**
@@ -135,8 +136,23 @@ void Today::init() {
cfg.setGroup( "General" );
m_iconSize = cfg.readNumEntry( "IconSize", 18 );
setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
+
+
+ // qDebug(" refresh ");
+ // set the date in top label
+ QDate date = QDate::currentDate();
+ QString time = ( tr( date.toString() ) );
+
+ DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
+
+ if ( layout ) {
+ delete layout;
+ }
+ layout = new QVBoxLayout( this );
+ layout->addWidget( Frame );
+ layout->addWidget( OwnerField );
}
/**
@@ -265,8 +281,9 @@ void Today::loadPlugins() {
pluginList.append( tempPlugin );
}
}
}
+ draw();
}
/**
@@ -339,9 +356,9 @@ void Today::startConfig() {
for ( confWidget = configWidgetList.first(); confWidget != 0;
confWidget = configWidgetList.next() ) {
confWidget->writeConfig();
}
- refresh();
+ loadPlugins();
} else {
// since refresh is not called in that case , reconnect the signal
connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
}
@@ -354,24 +371,15 @@ void Today::startConfig() {
*/
void Today::refresh() {
init();
- // qDebug(" refresh ");
- // set the date in top label
- QDate date = QDate::currentDate();
- QString time = ( tr( date.toString() ) );
-
- DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
-
- if ( layout ) {
- delete layout;
+ QValueList<TodayPlugin>::Iterator it;
+ for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
+ if ( !(*it).excludeRefresh ) {
+ (*it).guiPart->refresh();
+ qDebug( "refresh" );
+ }
}
- layout = new QVBoxLayout( this );
- layout->addWidget( Frame );
- layout->addWidget( OwnerField );
-
- loadPlugins();
- draw();
}
void Today::startApplication() {
QCopEnvelope e( "QPE/System", "execute(QString)" );