summaryrefslogtreecommitdiff
path: root/core/pim/today/today.cpp
Side-by-side diff
Diffstat (limited to 'core/pim/today/today.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp149
1 files changed, 92 insertions, 57 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d715fc1..69bcb68 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -41,2 +41,3 @@
#include <qfileinfo.h>
+#include <qlayout.h>
@@ -47,2 +48,3 @@
+
int MAX_LINES_TASK;
@@ -55,2 +57,4 @@ int ONLY_LATER;
int AUTOSTART;
+
+int NEW_START=1;
/*
@@ -71,3 +75,2 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
-
void Today::autoStart() {
@@ -205,3 +208,6 @@ void Today::getDates() {
QDate date = QDate::currentDate();
- QTime time = QTime::currentTime();
+ QWidget* AllDateBookEvents = new QWidget( );
+ QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
+ //QTime time = QTime::currentTime();
+
QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
@@ -223,61 +229,18 @@ void Today::getDates() {
if ( count <= MAX_LINES_MEET ) {
- //cout << time.toString() << endl;
- //cout << TimeString::dateString((*it).event().end()) << endl;
- // decide if to get all day or only later appointments
- if (!ONLY_LATER) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg += "<BR><i>" + (*it).location();
- msg += "</i>";
- }
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
- }
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg+= "<BR><i>" + (*it).location();
- msg += "</i>";
+ DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+ layoutDates->addWidget(l);
+ connect (l, SIGNAL(editEvent(const Event &)),
+ this, SIGNAL(editEvent(const Event &)));
}
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
}
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- }
- }
- }
- if (msg.isEmpty()) {
- msg = tr("No more appointments today");
- }
- DatesField->setText(msg);
+ layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+ sv1->addChild(AllDateBookEvents);
+
+ //if (msg.isEmpty()) {
+ // msg = tr("No more appointments today");
+ //}
+ //DatesField->setText(msg);
}
@@ -373,5 +336,6 @@ void Today::getTodo() {
// if the todolist.xml file was not modified in between, do not parse it.
- if (!checkIfModified()) {
+ if (!checkIfModified() && !NEW_START) {
return;
}
+ NEW_START=0;
@@ -443 +407,72 @@ Today::~Today() {
}
+
+
+DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+ QWidget* parent = 0,
+ const char* name = 0,
+ WFlags fl = 0) :
+ ClickableLabel(parent,name,fl), event(ev) {
+
+ QString msg;
+ QTime time = QTime::currentTime();
+
+ if (!ONLY_LATER) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg += "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ msg += "<BR>";
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += " <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ } else if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg+= "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ }
+
+ setText(msg);
+ connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+ setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+}
+
+void DateBookEvent::editMe() {
+ emit editEvent(event.event());
+}
+
+
+