2 files changed, 25 insertions, 17 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 2dc96fc..58ba4f4 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -190,3 +190,2 @@ void Today::init() {
   TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>"));
-  db = new DateBookDB;
    
@@ -209,4 +208,5 @@ void Today::init() {
   ONLY_LATER = cfg.readNumEntry("onlylater",1);
-}
 
+  db = new DateBookDB;
+}
 
@@ -298,3 +298,3 @@ void Today::getDates() {
           count++;
-          DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+          DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
           layoutDates->addWidget(l);
@@ -306,3 +306,3 @@ void Today::getDates() {
           // show only later appointments
-          DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents);
+          DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
           layoutDates->addWidget(l);
@@ -444,5 +444,7 @@ Today::~Today() {
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 
-                                           QWidget* parent = 0, 
-                                           const char* name = 0, 
-                                           WFlags fl = 0) :
+                             QWidget* parent = 0, 
+                             int SHOW_LOCATION = 0,
+                             int SHOW_NOTES = 0,
+                             const char* name = 0, 
+                             WFlags fl = 0) :
   ClickableLabel(parent,name,fl), event(ev) {
@@ -459,4 +461,3 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     if (SHOW_LOCATION == 1) {
-      msg += "<BR><i>" + (ev).location();
-      msg += "</i>";
+      msg += "<BR><i>" + (ev).location() + "</i>";
     }
@@ -474,3 +475,3 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     if (SHOW_NOTES == 1) {
-      msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+      msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
     }
@@ -485,2 +486,4 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
                                        QWidget* parent = 0, 
+                                       int SHOW_LOCATION = 0,
+                                       int SHOW_NOTES = 0,
                                        const char* name = 0, 
@@ -500,4 +503,3 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
     if (SHOW_LOCATION == 1) {
-      msg += "<BR><i>" + (ev).location();
-      msg += "</i>";
+      msg += "<BR><i>" + (ev).location() + "</i>";
     }
@@ -514,3 +516,3 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
     if (SHOW_NOTES == 1) {
-      msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+      msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
     }
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 6048781..090e8f9 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -80,4 +80,7 @@ public:
     DateBookEvent(const EffectiveEvent &ev, 
-                         QWidget* parent = 0, const char* name = 0, 
-                         WFlags fl = 0);
+                  QWidget* parent = 0,
+                  int SHOW_LOCATION = 0,
+                  int SHOW_NOTES = 0,
+                  const char* name = 0, 
+                  WFlags fl = 0);
 signals:
@@ -94,4 +97,7 @@ public:
     DateBookEventLater(const EffectiveEvent &ev, 
-                         QWidget* parent = 0, const char* name = 0, 
-                         WFlags fl = 0);
+                       QWidget* parent = 0,
+                       int SHOW_LOCATION = 0,
+                       int SHOW_NOTES = 0,
+                       const char* name = 0, 
+                       WFlags fl = 0);
 signals: