new today version, now plugin bases

1 files changed, 30 insertions, 67 deletions

diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index f28c029..ca17020 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,11 +1,8 @@
 /*
  * today.h
  *
- * ---------------------
- *
- * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
- * email       : max.reiss@gmx.de
+ * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
@@ -21,21 +18,31 @@
 #ifndef TODAY_H
 #define TODAY_H
 
-#include <qpe/datebookdb.h>
-#include <qpe/event.h>
-
 #include <opie/tododb.h>
-#include <opie/oclickablelabel.h>
 
 #include <qdatetime.h>
 #include <qlist.h>
 
+#include <qpe/qlibrary.h>
+#include <qpe/event.h>
+
 #include "todayconfig.h"
 #include "todaybase.h"
+#include "todayplugininterface.h"
 
 class QVBoxLayout;
 
+struct TodayPlugin {
+    QLibrary *library;
+    TodayPluginInterface *iface;
+    TodayPluginObject *guiPart;
+    QString name;
+    bool active;
+    int pos;
+};
+
 class Today : public TodayBase {
+
     Q_OBJECT
 
   public:
@@ -44,75 +51,31 @@ class Today : public TodayBase {
 
   private slots:
     void startConfig();
-    void startTodo();
-    void startDatebook();
     void startAddressbook();
-    void startMail();
+    void launchApp( QString appName );
     void editCard();
     void draw();
-    void editEvent(const Event &e);
- private:
+    void refresh();
+
+private:
     void init();
-    void getDates();
-    void getTodo();
-    void getMail();
-    void autoStart();
-    bool checkIfModified();
     void setOwnerField();
     void setOwnerField(QString &string);
-  private slots:
+    void loadPlugins();
+
+private slots:
     void channelReceived(const QCString &msg, const QByteArray & data);
 
  private:
-    DateBookDB *db;
-    ToDoDB *todo;
-    todayconfig *conf;
-    QWidget* AllDateBookEvents;
-    //Config cfg;
-    int MAX_LINES_TASK;
-    int MAX_CHAR_CLIP;
-    int MAX_LINES_MEET;
-    int SHOW_LOCATION;
-    int SHOW_NOTES;
-};
+    TodayConfig *conf;
+    QStringList m_excludeApplets;
 
-class DateBookEvent: public OClickableLabel {
-  Q_OBJECT
-public:
-  DateBookEvent(const EffectiveEvent &ev,
-                QWidget* parent = 0,
-                int SHOW_LOCATION = 0,
-                int SHOW_NOTES = 0,
-                const char* name = 0,
-                WFlags fl = 0);
-signals:
-    void editEvent(const Event &e);
-private slots:
-    void editMe();
-private:
-    QString ampmTime(QTime);
-    const EffectiveEvent event;
-    bool ampm;
-};
+    QVBoxLayout *pluginLayout;
 
-class DateBookEventLater: public OClickableLabel {
-  Q_OBJECT
-public:
-    DateBookEventLater(const EffectiveEvent &ev,
-		       QWidget* parent = 0,
-		       int SHOW_LOCATION = 0,
-		       int SHOW_NOTES = 0,
-		       const char* name = 0,
-		       WFlags fl = 0);
-signals:
-    void editEvent(const Event &e);
-private slots:
-    void editMe();
-private:
-    QString ampmTime(QTime);
-    const EffectiveEvent event;
-    bool ampm;
+    // QString m_autoStartTimer;
+    int m_newStart;
+    //  int m_autoStart;
+    int m_maxCharClip;
 };
 
-#endif // TODAY_H
-
+#endif