8 files changed, 7 insertions, 64 deletions

diff --git a/examples/todayplugin/example.pro b/examples/todayplugin/example.pro
index 931e056..4c8c942 100644
--- a/examples/todayplugin/example.pro
+++ b/examples/todayplugin/example.pro
@@ -1,19 +1,17 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 
 # Input
 HEADERS = exampleplugin.h examplepluginimpl.h examplepluginwidget.h
 SOURCES = exampleplugin.cpp examplepluginimpl.cpp examplepluginwidget.cpp
 
-INCLUDEPATH     += $(OPIEDIR)/include \
-                ../ ../library
-DEPENDPATH      += $(OPIEDIR)/include \
-                ../ ../library
+INCLUDEPATH     += $(OPIEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
 
 LIBS+= -lqpe -lopie
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayexampleplugin
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/examples/todayplugin/exampleplugin.cpp b/examples/todayplugin/exampleplugin.cpp
index e5d75df..94a5836 100644
--- a/examples/todayplugin/exampleplugin.cpp
+++ b/examples/todayplugin/exampleplugin.cpp
@@ -1,76 +1,65 @@
 /*
  * exampleplugin.cpp
  *
- * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
 #include "exampleplugin.h"
 
 ExamplePlugin::ExamplePlugin() {
     m_widget = 0l;
 }
 
 ExamplePlugin::~ExamplePlugin() {
     delete (ExamplePluginWidget*)m_widget;
 }
 
 QString ExamplePlugin::pluginName() const {
     return QObject::tr( "Example plugin" );
 }
 
 double ExamplePlugin::versionNumber() const {
     return 0.1;
 }
 
 // this sets the image that will be shown on the left side of the plugin
 QString ExamplePlugin::pixmapNameWidget() const {
-    return "Tux";
+    return QString::fromLatin1("Tux");
 }
 
 QWidget* ExamplePlugin::widget( QWidget * wid ) {
     if(!m_widget) {
         m_widget = new ExamplePluginWidget( wid,  "Example" );
     }
     return m_widget;
 }
 
 
 // that would be the icon of the config widget in todays config view
 QString ExamplePlugin::pixmapNameConfig() const {
     return 0l;
 }
 
 // No config widget yet, look at the datebook plugin for an example of that
-TodayConfigWidget* ExamplePlugin::configWidget( QWidget* ) {
+TodayConfigWidget* ExamplePlugin::configWidget( QWidget* /*parent*/ ) {
     return 0l;
 }
 
 // add the binary name of the app to launch here
 QString ExamplePlugin::appName() const {
-    return "";
+    return QString::null;
 }
 
 // if the plugin should be excluded form the refresh cycles that can be set in the today app
 bool ExamplePlugin::excludeFromRefresh() const {
     return false;
 }
 
 void ExamplePlugin::refresh()  {
     if ( m_widget )  {
         m_widget->refresh();
     }
 }
 
 void ExamplePlugin::reinitialize()  {
 }
diff --git a/examples/todayplugin/exampleplugin.h b/examples/todayplugin/exampleplugin.h
index 0d9f11d..a1df923 100644
--- a/examples/todayplugin/exampleplugin.h
+++ b/examples/todayplugin/exampleplugin.h
@@ -1,39 +1,30 @@
 /*
  * exampleplugin.h
  *
- * copyright   : (c) 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 #ifndef EXAMPLE_PLUGIN_H
 #define EXAMPLE_PLUGIN_H
 
 #include <qwidget.h>
 #include <qguardedptr.h>
 
 #include <opie/todayplugininterface.h>
 #include <opie/todayconfigwidget.h>
 
 #include "examplepluginwidget.h"
 
 // implementation of the today plugin interface
 class ExamplePlugin : public TodayPluginObject {
 
 public:
     ExamplePlugin();
     ~ExamplePlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
diff --git a/examples/todayplugin/examplepluginimpl.cpp b/examples/todayplugin/examplepluginimpl.cpp
index 9ab6164..69287dc 100644
--- a/examples/todayplugin/examplepluginimpl.cpp
+++ b/examples/todayplugin/examplepluginimpl.cpp
@@ -1,39 +1,30 @@
 /*
  * examplepluginimpl.cpp
  *
- * copyright   : (c) 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
 #include "exampleplugin.h"
 #include "examplepluginimpl.h"
 
 ExamplePluginImpl::ExamplePluginImpl() {
     examplePlugin  = new ExamplePlugin();
 }
 
 ExamplePluginImpl::~ExamplePluginImpl() {
     delete examplePlugin;
 }
 
 
 TodayPluginObject* ExamplePluginImpl::guiPart() {
     return examplePlugin;
 }
 
 QRESULT ExamplePluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
     }else
diff --git a/examples/todayplugin/examplepluginimpl.h b/examples/todayplugin/examplepluginimpl.h
index 2c10583..187d6e8 100644
--- a/examples/todayplugin/examplepluginimpl.h
+++ b/examples/todayplugin/examplepluginimpl.h
@@ -1,39 +1,30 @@
 /*
  * examplepluginimpl.h
  *
- * copyright   : (c) 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef EXAMPLE_PLUGIN_IMPL_H
 #define EXAMPLE_PLUGIN_IMPL_H
 
 #include <opie/todayplugininterface.h>
 
 class ExamplePlugin;
 
 class ExamplePluginImpl : public TodayPluginInterface{
 
 public:
     ExamplePluginImpl();
     virtual ~ExamplePluginImpl();
 
     QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
     Q_REFCOUNT
 
     virtual TodayPluginObject *guiPart();
 
 private:
     ExamplePlugin *examplePlugin;
     ulong ref;
 };
 
diff --git a/examples/todayplugin/examplepluginwidget.cpp b/examples/todayplugin/examplepluginwidget.cpp
index 14f1020..d66a11a 100644
--- a/examples/todayplugin/examplepluginwidget.cpp
+++ b/examples/todayplugin/examplepluginwidget.cpp
@@ -1,39 +1,30 @@
 /*
  * examplepluginwidget.cpp
  *
- * copyright   : (c) 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "examplepluginwidget.h"
 
 ExamplePluginWidget::ExamplePluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  name ) {
 
     m_exampleLabel = 0l;
     m_layout = 0l;
 
     if ( m_exampleLabel )  {
         delete m_exampleLabel;
     }
 
    // since here a OClickableLabel is used, the plugin part will be clickable, and the actions
    // that should be triggered when clicked are defined in  slotClicked()
    // of course also normal widgets can be used.
     m_exampleLabel = new OClickableLabel( this );
     connect( m_exampleLabel, SIGNAL( clicked() ), this, SLOT( slotClicked() ) );
 
     if ( m_layout )  {
         delete m_layout;
@@ -42,30 +33,30 @@ ExamplePluginWidget::ExamplePluginWidget( QWidget *parent,  const char* name)
     m_layout->setAutoAdd( true );
 
     readConfig();
     getInfo();
 }
 
 
 ExamplePluginWidget::~ExamplePluginWidget() {
     delete m_exampleLabel;
     delete m_layout;
 }
 
 
 void ExamplePluginWidget::readConfig() {
 // we dont have any config entries in this plugin
 // normally this method is used after today config was used
 }
 
 
 void ExamplePluginWidget::refresh()  {
 
 }
 
 void ExamplePluginWidget::getInfo() {
-    m_exampleLabel->setText(  "Example text"  );
+    m_exampleLabel->setText(  tr("Example text")  );
 }
 
 void ExamplePluginWidget::slotClicked() {
    getInfo();
 }
diff --git a/examples/todayplugin/examplepluginwidget.h b/examples/todayplugin/examplepluginwidget.h
index c94d2cf..eb3c660 100644
--- a/examples/todayplugin/examplepluginwidget.h
+++ b/examples/todayplugin/examplepluginwidget.h
@@ -1,39 +1,30 @@
 /*
  * examplepluginwidget.h
  *
- * copyright   : (c) 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef EXAMPLE_PLUGIN_WIDGET_H
 #define EXAMPLE_PLUGIN_WIDGET_H
 
 #include <qlayout.h>
 
 #include <opie/oclickablelabel.h>
 
 class ExamplePluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     ExamplePluginWidget( QWidget *parent,  const char *name );
     ~ExamplePluginWidget();
     
     void refresh();
 
 private slots:
    void slotClicked();
 
 private:
     OClickableLabel* m_exampleLabel;
     QHBoxLayout* m_layout;
diff --git a/packages b/packages
index f7b48bd..34d93b3 100644
--- a/packages
+++ b/packages
@@ -173,24 +173,25 @@ CONFIG_TODAY_STOCKTICKER	noncore/todayplugins/stockticker/stockticker	stockticke
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
         CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro
         CONFIG_VOLUMEAPPLET     core/applets/volumeappletvolumeapplet.pro
         CONFIG_VTAPPLET         core/applets/vtappletvtapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/settings/networksettings/wlanwlan.pro
         CONFIG_PPP      noncore/settings/networksettings/pppppp.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
         CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro
         CONFIG_MAIN_TAB_EXAMPLE         examples/main-tabexample.pro
         CONFIG_SIMPLE_EXAMPLE   examples/simpleexample.pro
         CONFIG_SIMPLE_ICON      examples/simple-iconexample.pro
         CONFIG_SIMPLE_MAIN      examples/simple-mainexample.pro
         CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
 CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
         CONFIG_APPLET_EXAMPLE   examples/appletexample.pro
+        CONFIG_TODAY_EXAMPLE    examples/todaypluginexample.pro