4 files changed, 48 insertions, 14 deletions

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 @@
 #include "mailplugin.h"
-#include "mailpluginwidget.h"
-
 
 MailPlugin::MailPlugin() {
+    m_widget = 0l;
 }
@@ -25,2 +24,3 @@ MailPlugin::MailPlugin() {
 MailPlugin::~MailPlugin() {
+    delete m_widget;
 }
@@ -40,5 +40,9 @@ QString MailPlugin::pixmapNameWidget() const {
 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 {
@@ -47,3 +51,3 @@ QString MailPlugin::pixmapNameConfig() const {
 
-TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
+TodayConfigWidget* MailPlugin::configWidget( QWidget* ) {
     return 0l;
@@ -60 +64,6 @@ bool MailPlugin::excludeFromRefresh() const {
 
+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
@@ -29,2 +29,4 @@
 
+#include "mailpluginwidget.h"
+
 class MailPlugin : public TodayPluginObject {
@@ -43,2 +45,6 @@ public:
     bool excludeFromRefresh() const;
+    void refresh();
+
+ private:
+    MailPluginWidget *m_widget;
 };
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)
 
+    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();
@@ -37,2 +53,4 @@ MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
 MailPluginWidget::~MailPluginWidget() {
+    delete m_mailLabel;
+    delete m_layout;
 }
@@ -46,9 +64,7 @@ void MailPluginWidget::readConfig() {
 
-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() {
 
@@ -60,6 +76,5 @@ void MailPluginWidget::getInfo() {
 
-    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 ) );
 }
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 @@
 #include <qwidget.h>
+#include <qlayout.h>
 
@@ -34,2 +35,4 @@ public:
     ~MailPluginWidget();
+    
+    void refresh();
 
@@ -39,3 +42,4 @@ protected slots:
 private:
-    OClickableLabel *mailLabel;
+    OClickableLabel* m_mailLabel;
+    QHBoxLayout* m_layout;
     void readConfig();