-rw-r--r-- | core/pim/today/today.cpp | 22 |
1 files changed, 12 insertions, 10 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() { | |||
190 | TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); | 190 | TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); |
191 | db = new DateBookDB; | ||
192 | 191 | ||
@@ -209,4 +208,5 @@ void Today::init() { | |||
209 | ONLY_LATER = cfg.readNumEntry("onlylater",1); | 208 | ONLY_LATER = cfg.readNumEntry("onlylater",1); |
210 | } | ||
211 | 209 | ||
210 | db = new DateBookDB; | ||
211 | } | ||
212 | 212 | ||
@@ -298,3 +298,3 @@ void Today::getDates() { | |||
298 | count++; | 298 | count++; |
299 | DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents); | 299 | DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES); |
300 | layoutDates->addWidget(l); | 300 | layoutDates->addWidget(l); |
@@ -306,3 +306,3 @@ void Today::getDates() { | |||
306 | // show only later appointments | 306 | // show only later appointments |
307 | DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents); | 307 | DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES); |
308 | layoutDates->addWidget(l); | 308 | layoutDates->addWidget(l); |
@@ -445,2 +445,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
445 | QWidget* parent = 0, | 445 | QWidget* parent = 0, |
446 | int SHOW_LOCATION = 0, | ||
447 | int SHOW_NOTES = 0, | ||
446 | const char* name = 0, | 448 | const char* name = 0, |
@@ -459,4 +461,3 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
459 | if (SHOW_LOCATION == 1) { | 461 | if (SHOW_LOCATION == 1) { |
460 | msg += "<BR><i>" + (ev).location(); | 462 | msg += "<BR><i>" + (ev).location() + "</i>"; |
461 | msg += "</i>"; | ||
462 | } | 463 | } |
@@ -474,3 +475,3 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
474 | if (SHOW_NOTES == 1) { | 475 | if (SHOW_NOTES == 1) { |
475 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 476 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); |
476 | } | 477 | } |
@@ -485,2 +486,4 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, | |||
485 | QWidget* parent = 0, | 486 | QWidget* parent = 0, |
487 | int SHOW_LOCATION = 0, | ||
488 | int SHOW_NOTES = 0, | ||
486 | const char* name = 0, | 489 | const char* name = 0, |
@@ -500,4 +503,3 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, | |||
500 | if (SHOW_LOCATION == 1) { | 503 | if (SHOW_LOCATION == 1) { |
501 | msg += "<BR><i>" + (ev).location(); | 504 | msg += "<BR><i>" + (ev).location() + "</i>"; |
502 | msg += "</i>"; | ||
503 | } | 505 | } |
@@ -514,3 +516,3 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, | |||
514 | if (SHOW_NOTES == 1) { | 516 | if (SHOW_NOTES == 1) { |
515 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 517 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); |
516 | } | 518 | } |