-rw-r--r-- | core/pim/today/today.cpp | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index eb8b50c..0f6e598 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -49,3 +49,3 @@ int SHOW_NOTES; | |||
49 | // show only later dates | 49 | // show only later dates |
50 | int ONLY_LATER = 1; | 50 | int ONLY_LATER; |
51 | /* | 51 | /* |
@@ -77,3 +77,4 @@ void Today::draw() | |||
77 | getTodo(); | 77 | getTodo(); |
78 | QTimer::singleShot( 60*1000, this, SLOT(draw()) ); | 78 | // how often refresh |
79 | QTimer::singleShot( 30*1000, this, SLOT(draw()) ); | ||
79 | 80 | ||
@@ -97,2 +98,4 @@ void Today::init() | |||
97 | SHOW_NOTES = cfg.readNumEntry("shownotes",0); | 98 | SHOW_NOTES = cfg.readNumEntry("shownotes",0); |
99 | ONLY_LATER = cfg.readNumEntry("onlylater",1); | ||
100 | |||
98 | } | 101 | } |
@@ -121,2 +124,4 @@ void Today::startConfig() | |||
121 | conf->SpinBox7->setValue(MAX_CHAR_CLIP); | 124 | conf->SpinBox7->setValue(MAX_CHAR_CLIP); |
125 | // only later | ||
126 | conf->CheckBox3->setChecked(ONLY_LATER); | ||
122 | 127 | ||
@@ -129,2 +134,3 @@ void Today::startConfig() | |||
129 | int maxcharclip = conf->SpinBox7->value(); | 134 | int maxcharclip = conf->SpinBox7->value(); |
135 | int onlylater = conf->CheckBox3->isChecked(); | ||
130 | 136 | ||
@@ -135,2 +141,3 @@ void Today::startConfig() | |||
135 | cfg.writeEntry("shownotes", notes); | 141 | cfg.writeEntry("shownotes", notes); |
142 | cfg.writeEntry("onlylater", onlylater); | ||
136 | // sync it to "disk" | 143 | // sync it to "disk" |
@@ -171,3 +178,25 @@ void Today::getDates() | |||
171 | // still some bug in here, 1 h off | 178 | // still some bug in here, 1 h off |
172 | if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) | 179 | |
180 | // decide if to get all day or only later appointments | ||
181 | if (!ONLY_LATER) | ||
182 | { | ||
183 | msg += "<B>" + (*it).description() + "</B>"; | ||
184 | // include location or not | ||
185 | if (SHOW_LOCATION == 1) | ||
186 | { | ||
187 | msg+= "<BR>" + (*it).location(); | ||
188 | } | ||
189 | msg += "<BR>" | ||
190 | // start time of event | ||
191 | + TimeString::timeString(QTime((*it).event().start().time()) ) | ||
192 | // end time of event | ||
193 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | ||
194 | + "<BR>"; | ||
195 | // include possible note or not | ||
196 | if (SHOW_NOTES == 1) | ||
197 | { | ||
198 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | ||
199 | } | ||
200 | } | ||
201 | else if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) | ||
173 | { | 202 | { |
@@ -192,2 +221,7 @@ void Today::getDates() | |||
192 | } | 221 | } |
222 | |||
223 | if (msg.isEmpty()) | ||
224 | { | ||
225 | msg = "No more appointments today"; | ||
226 | } | ||
193 | } | 227 | } |