author | zautrix <zautrix> | 2005-02-13 19:07:45 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-13 19:07:45 (UTC) |
commit | 7bd83e913399b8be68a7d37e8f02118ec9eab90e (patch) (unidiff) | |
tree | 284d1592687ea4d3e0c220fafd289a702718dee4 | |
parent | 293271fe9e6a9061da329183f8f488d79580f7da (diff) | |
download | kdepimpi-7bd83e913399b8be68a7d37e8f02118ec9eab90e.zip kdepimpi-7bd83e913399b8be68a7d37e8f02118ec9eab90e.tar.gz kdepimpi-7bd83e913399b8be68a7d37e8f02118ec9eab90e.tar.bz2 |
todo fixi
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 14 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 17 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 7 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 3 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 6 | ||||
-rw-r--r-- | libkcal/icalformatimpl.cpp | 2 | ||||
-rw-r--r-- | libkcal/incidence.cpp | 16 | ||||
-rw-r--r-- | libkcal/kincidenceformatter.cpp | 12 | ||||
-rw-r--r-- | libkcal/todo.cpp | 4 |
11 files changed, 74 insertions, 13 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index c85ca35..2d4cb74 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1176,109 +1176,109 @@ | |||
1176 | { "Edit Selection...","Editiere Auswahl" }, | 1176 | { "Edit Selection...","Editiere Auswahl" }, |
1177 | { "recurring events","wiederholende Termine" }, | 1177 | { "recurring events","wiederholende Termine" }, |
1178 | { "recurr. events","wiederh.Termine" }, | 1178 | { "recurr. events","wiederh.Termine" }, |
1179 | { "completed to-dos","erledigte Todos" }, | 1179 | { "completed to-dos","erledigte Todos" }, |
1180 | { "events","Termine" }, | 1180 | { "events","Termine" }, |
1181 | { "todos","Todos" }, | 1181 | { "todos","Todos" }, |
1182 | { "journals","Journale" }, | 1182 | { "journals","Journale" }, |
1183 | { "public","öffentl." }, | 1183 | { "public","öffentl." }, |
1184 | { "private","privat" }, | 1184 | { "private","privat" }, |
1185 | { "confidential","vertraul." }, | 1185 | { "confidential","vertraul." }, |
1186 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, | 1186 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, |
1187 | { "Yesterday","Gestern" }, | 1187 | { "Yesterday","Gestern" }, |
1188 | { "Day after tomorrow","Übermorgen" }, | 1188 | { "Day after tomorrow","Übermorgen" }, |
1189 | { "Tomorrow","Morgen" }, | 1189 | { "Tomorrow","Morgen" }, |
1190 | { "Day before yesterday","Vorgestern" }, | 1190 | { "Day before yesterday","Vorgestern" }, |
1191 | { "Size %1","Größe %1" }, | 1191 | { "Size %1","Größe %1" }, |
1192 | { "New Agendasize: %1","Neue Agendagröße: %1" }, | 1192 | { "New Agendasize: %1","Neue Agendagröße: %1" }, |
1193 | { " (%1 y.)"," (%1 J.)" }, | 1193 | { " (%1 y.)"," (%1 J.)" }, |
1194 | { "Allday:","Ganztägig:" }, | 1194 | { "Allday:","Ganztägig:" }, |
1195 | { "compl.todos","erled.Todos" }, | 1195 | { "compl.todos","erled.Todos" }, |
1196 | { "Day view","Tagesansicht" }, | 1196 | { "Day view","Tagesansicht" }, |
1197 | { "Next days","Nächste Tage" }, | 1197 | { "Next days","Nächste Tage" }, |
1198 | { "Next week","Nächste Woche" }, | 1198 | { "Next week","Nächste Woche" }, |
1199 | { "Next two weeks","Nächste zwei Wochen" }, | 1199 | { "Next two weeks","Nächste zwei Wochen" }, |
1200 | { "Next month","Nächster Monat" }, | 1200 | { "Next month","Nächster Monat" }, |
1201 | { "Journal view","Journal" }, | 1201 | { "Journal view","Journal" }, |
1202 | { "Display all opened","Zeige alle geöffnet" }, | 1202 | { "Display all opened","Zeige alle geöffnet" }, |
1203 | { "Display all closed","Zeige alle geschlossen" }, | 1203 | { "Display all closed","Zeige alle geschlossen" }, |
1204 | { "Display all flat","Zeige alle flach" }, | 1204 | { "Display all flat","Zeige alle flach" }, |
1205 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, | 1205 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, |
1206 | { "Default todo done color:","Standard Todo erledigt Farbe" }, | 1206 | { "Default todo done color:","Standard Todo erledigt Farbe" }, |
1207 | { "Select week %1-%2","Wähle Woche %1-%2" }, | 1207 | { "Select week %1-%2","Wähle Woche %1-%2" }, |
1208 | { "Select Week","Wähle Woche" }, | 1208 | { "Select Week","Wähle Woche" }, |
1209 | { "Set alarm for selected...","Setze Alarm für Selekt..." }, | 1209 | { "Set alarm for selected...","Setze Alarm für Selekt..." }, |
1210 | { "Set Alarm!","Setze Alarm!" }, | 1210 | { "Set Alarm!","Setze Alarm!" }, |
1211 | { "Canged alarm for %1 items","Alarm für %1 Items geändert" }, | 1211 | { "Canged alarm for %1 items","Alarm für %1 Items geändert" }, |
1212 | { " and "," und " }, | 1212 | { " and "," und " }, |
1213 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, | 1213 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, |
1214 | { "Mail to selected","Mail an Ausgewählte" }, | 1214 | { "Mail to selected","Mail an Ausgewählte" }, |
1215 | { "Mail to all","Mail an Alle" }, | 1215 | { "Mail to all","Mail an Alle" }, |
1216 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, | 1216 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, |
1217 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, | 1217 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, |
1218 | { " on"," am" }, | 1218 | { " on"," am" }, |
1219 | { " completed on "," erledigt am " }, | 1219 | { " completed on "," erledigt am " }, |
1220 | { "Save as Event template","Speichere als Vorlage" }, | 1220 | { "Save as Event template","Speichere als Vorlage" }, |
1221 | { "Load Event template","Lade Termin Vorlage" }, | 1221 | { "Load Event template","Lade Termin Vorlage" }, |
1222 | { "Save as Journal template","Speichere als Journal Vorlage" }, | 1222 | { "Save as Journal template","Speichere als Journal Vorlage" }, |
1223 | { "Insert Journal template","Füge Journal Vorlage ein" }, | 1223 | { "Insert Journal template","Füge Journal Vorlage ein" }, |
1224 | { "Sub todos:<br>","Unter Todos:<br>" }, | 1224 | { "Sub todos:<br>","Unter Todos:<br>" }, |
1225 | { "Parent todo:<br>","Über Todo:<br>" }, | 1225 | { "Parent todo:<br>","Über Todo:<br>" }, |
1226 | { "Set current as color category","Setze Gewählte als Farbkategorie" }, | 1226 | { "Set current as color category","Setze Gewählte als Farbkategorie" }, |
1227 | { " completed"," erledigt" }, | 1227 | { " completed"," erledigt" }, |
1228 | { "(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.net --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" }, | 1228 | { "(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.net --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" }, |
1229 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, | 1229 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, |
1230 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, | 1230 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, |
1231 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, | 1231 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, |
1232 | { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" }, | 1232 | { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" }, |
1233 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, | 1233 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, |
1234 | { "Error","Fehler" }, | 1234 | { "Error","Fehler" }, |
1235 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, | 1235 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, |
1236 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, | 1236 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, |
1237 | { "Warning","Warnung" }, | 1237 | { "Warning","Warnung" }, |
1238 | { "Select week number","Wähle Wochen Nummer" }, | 1238 | { "Select week number","Wähle Wochen Nummer" }, |
1239 | { "Februar","Februar" }, | 1239 | { "Februar","Februar" }, |
1240 | { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" }, | 1240 | { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" }, |
1241 | { "W","W" }, | 1241 | { "W","W" }, |
1242 | { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" }, | 1242 | { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" }, |
1243 | { "T: %1","T: %1" }, | 1243 | { "T: %1","T: %1" }, |
1244 | { "Start: ","Start: " }, | 1244 | { "Start: ","Start: " }, |
1245 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, | 1245 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, |
1246 | { "Password for remote access:","Passwort für fernen Zugriff:" }, | 1246 | { "Password for remote access:","Passwort für fernen Zugriff:" }, |
1247 | { "Remote IP address:","Ferne IP Adresse:" }, | 1247 | { "Remote IP address:","Ferne IP Adresse:" }, |
1248 | { "Remote port number:","Ferne Port Nummer:" }, | 1248 | { "Remote port number:","Ferne Port Nummer:" }, |
1249 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, | 1249 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, |
1250 | { "Remote from: ","Fern von: " }, | 1250 | { "Remote from: ","Fern von: " }, |
1251 | { "Local from: ","Lokal von: " }, | 1251 | { "Local from: ","Lokal von: " }, |
1252 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, | 1252 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, |
1253 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, | 1253 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, |
1254 | { "Write back","Schreibe zurück" }, | 1254 | { "Write back","Schreibe zurück" }, |
1255 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, | 1255 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, |
1256 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, | 1256 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, |
1257 | { "Received sync request","Sync Anfrage erhalten" }, | 1257 | { "Received sync request","Sync Anfrage erhalten" }, |
1258 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, | 1258 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, |
1259 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, | 1259 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, |
1260 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, | 1260 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, |
1261 | { "Sending file...","Sende Datei..." }, | 1261 | { "Sending file...","Sende Datei..." }, |
1262 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, | 1262 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, |
1263 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, | 1263 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, |
1264 | { "Received %1 bytes","%1 Bytes erhalten" }, | 1264 | { "Received %1 bytes","%1 Bytes erhalten" }, |
1265 | { "Writing file to disk...","Speichere Datei..." }, | 1265 | { "Writing file to disk...","Speichere Datei..." }, |
1266 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, | 1266 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, |
1267 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, | 1267 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, |
1268 | { "Synchronize!","Synchronisiere!" }, | 1268 | { "Synchronize!","Synchronisiere!" }, |
1269 | { "High clock skew!","Großer Uhrzeitunterschied!" }, | 1269 | { "High clock skew!","Großer Uhrzeitunterschied!" }, |
1270 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 1270 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
1271 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, | 1271 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, |
1272 | { "","" }, | 1272 | { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, |
1273 | { "","" }, | 1273 | { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, |
1274 | { "","" }, | 1274 | { "","" }, |
1275 | { "","" }, | 1275 | { "","" }, |
1276 | { "","" }, | 1276 | { "","" }, |
1277 | { "","" }, | 1277 | { "","" }, |
1278 | { "","" }, | 1278 | { "","" }, |
1279 | { "","" }, | 1279 | { "","" }, |
1280 | { "","" }, | 1280 | { "","" }, |
1281 | { "","" }, | 1281 | { "","" }, |
1282 | { "","" }, | 1282 | { "","" }, |
1283 | { "","" }, | 1283 | { "","" }, |
1284 | { "","" }, \ No newline at end of file | 1284 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7c8316f..3dac20b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2170,201 +2170,213 @@ void CalendarView::updateView() | |||
2170 | void CalendarView::updateUnmanagedViews() | 2170 | void CalendarView::updateUnmanagedViews() |
2171 | { | 2171 | { |
2172 | mDateNavigator->updateDayMatrix(); | 2172 | mDateNavigator->updateDayMatrix(); |
2173 | } | 2173 | } |
2174 | 2174 | ||
2175 | int CalendarView::msgItemDelete(const QString name) | 2175 | int CalendarView::msgItemDelete(const QString name) |
2176 | { | 2176 | { |
2177 | return KMessageBox::warningContinueCancel(this,name +"\n\n"+ | 2177 | return KMessageBox::warningContinueCancel(this,name +"\n\n"+ |
2178 | i18n("This item will be\npermanently deleted."), | 2178 | i18n("This item will be\npermanently deleted."), |
2179 | i18n("KO/Pi Confirmation"),i18n("Delete")); | 2179 | i18n("KO/Pi Confirmation"),i18n("Delete")); |
2180 | } | 2180 | } |
2181 | 2181 | ||
2182 | 2182 | ||
2183 | void CalendarView::edit_cut() | 2183 | void CalendarView::edit_cut() |
2184 | { | 2184 | { |
2185 | Event *anEvent=0; | 2185 | Event *anEvent=0; |
2186 | 2186 | ||
2187 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2187 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2188 | 2188 | ||
2189 | if (mViewManager->currentView()->isEventView()) { | 2189 | if (mViewManager->currentView()->isEventView()) { |
2190 | if ( incidence && incidence->type() == "Event" ) { | 2190 | if ( incidence && incidence->type() == "Event" ) { |
2191 | anEvent = static_cast<Event *>(incidence); | 2191 | anEvent = static_cast<Event *>(incidence); |
2192 | } | 2192 | } |
2193 | } | 2193 | } |
2194 | 2194 | ||
2195 | if (!anEvent) { | 2195 | if (!anEvent) { |
2196 | KNotifyClient::beep(); | 2196 | KNotifyClient::beep(); |
2197 | return; | 2197 | return; |
2198 | } | 2198 | } |
2199 | DndFactory factory( mCalendar ); | 2199 | DndFactory factory( mCalendar ); |
2200 | factory.cutIncidence(anEvent); | 2200 | factory.cutIncidence(anEvent); |
2201 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2201 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2202 | } | 2202 | } |
2203 | 2203 | ||
2204 | void CalendarView::edit_copy() | 2204 | void CalendarView::edit_copy() |
2205 | { | 2205 | { |
2206 | Event *anEvent=0; | 2206 | Event *anEvent=0; |
2207 | 2207 | ||
2208 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2208 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2209 | 2209 | ||
2210 | if (mViewManager->currentView()->isEventView()) { | 2210 | if (mViewManager->currentView()->isEventView()) { |
2211 | if ( incidence && incidence->type() == "Event" ) { | 2211 | if ( incidence && incidence->type() == "Event" ) { |
2212 | anEvent = static_cast<Event *>(incidence); | 2212 | anEvent = static_cast<Event *>(incidence); |
2213 | } | 2213 | } |
2214 | } | 2214 | } |
2215 | 2215 | ||
2216 | if (!anEvent) { | 2216 | if (!anEvent) { |
2217 | KNotifyClient::beep(); | 2217 | KNotifyClient::beep(); |
2218 | return; | 2218 | return; |
2219 | } | 2219 | } |
2220 | DndFactory factory( mCalendar ); | 2220 | DndFactory factory( mCalendar ); |
2221 | factory.copyIncidence(anEvent); | 2221 | factory.copyIncidence(anEvent); |
2222 | } | 2222 | } |
2223 | 2223 | ||
2224 | void CalendarView::edit_paste() | 2224 | void CalendarView::edit_paste() |
2225 | { | 2225 | { |
2226 | QDate date = mNavigator->selectedDates().first(); | 2226 | QDate date = mNavigator->selectedDates().first(); |
2227 | 2227 | ||
2228 | DndFactory factory( mCalendar ); | 2228 | DndFactory factory( mCalendar ); |
2229 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); | 2229 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); |
2230 | 2230 | ||
2231 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2231 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2232 | } | 2232 | } |
2233 | 2233 | ||
2234 | void CalendarView::edit_options() | 2234 | void CalendarView::edit_options() |
2235 | { | 2235 | { |
2236 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2236 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2237 | emit save(); | 2237 | emit save(); |
2238 | emit saveStopTimer(); | 2238 | emit saveStopTimer(); |
2239 | mDialogManager->showOptionsDialog(); | 2239 | mDialogManager->showOptionsDialog(); |
2240 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2240 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2241 | emit saveStopTimer(); | 2241 | emit saveStopTimer(); |
2242 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), | 2242 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), |
2243 | i18n("Timezone settings"),i18n("Reload"))) { | 2243 | i18n("Timezone settings"),i18n("Reload"))) { |
2244 | qDebug("KO: TZ reload cancelled "); | 2244 | qDebug("KO: TZ reload cancelled "); |
2245 | return; | 2245 | return; |
2246 | } | 2246 | } |
2247 | qDebug("KO: Timezone change "); | 2247 | qDebug("KO: Timezone change "); |
2248 | openCalendar( MainWindow::defaultFileName() ); | 2248 | openCalendar( MainWindow::defaultFileName() ); |
2249 | setModified(true); | 2249 | setModified(true); |
2250 | } | 2250 | } |
2251 | else | 2251 | else |
2252 | qDebug("KO: No tz change "); | 2252 | qDebug("KO: No tz change "); |
2253 | 2253 | ||
2254 | } | 2254 | } |
2255 | 2255 | ||
2256 | 2256 | ||
2257 | void CalendarView::slotSelectPickerDate( QDate d) | 2257 | void CalendarView::slotSelectPickerDate( QDate d) |
2258 | { | 2258 | { |
2259 | mDateFrame->hide(); | 2259 | mDateFrame->hide(); |
2260 | if ( mDatePickerMode == 1 ) { | 2260 | if ( mDatePickerMode == 1 ) { |
2261 | mNavigator->slotDaySelect( d ); | 2261 | mNavigator->slotDaySelect( d ); |
2262 | } else if ( mDatePickerMode == 2 ) { | 2262 | } else if ( mDatePickerMode == 2 ) { |
2263 | if ( mMoveIncidence->type() == "Todo" ) { | 2263 | if ( mMoveIncidence->type() == "Todo" ) { |
2264 | Todo * to = (Todo *) mMoveIncidence; | 2264 | Todo * to = (Todo *) mMoveIncidence; |
2265 | QTime tim; | 2265 | QTime tim; |
2266 | int len = 0; | ||
2267 | if ( to->hasStartDate() && to->hasDueDate() ) | ||
2268 | len = to->dtStart().secsTo( to->dtDue()); | ||
2266 | if ( to->hasDueDate() ) | 2269 | if ( to->hasDueDate() ) |
2267 | tim = to->dtDue().time(); | 2270 | tim = to->dtDue().time(); |
2268 | else { | 2271 | else { |
2269 | tim = QTime ( 0,0,0 ); | 2272 | tim = QTime ( 0,0,0 ); |
2270 | to->setFloats( true ); | 2273 | to->setFloats( true ); |
2271 | to->setHasDueDate( true ); | 2274 | to->setHasDueDate( true ); |
2272 | } | 2275 | } |
2273 | QDateTime dt ( d,tim ); | 2276 | QDateTime dt ( d,tim ); |
2274 | to->setDtDue( dt ); | 2277 | to->setDtDue( dt ); |
2278 | |||
2279 | if ( to->hasStartDate() ) { | ||
2280 | if ( len>0 ) | ||
2281 | to->setDtStart(to->dtDue().addSecs( -len )); | ||
2282 | else | ||
2283 | if (to->dtStart() > to->dtDue() ) | ||
2284 | to->setDtStart(to->dtDue().addDays( -3 )); | ||
2285 | } | ||
2286 | |||
2275 | todoChanged( to ); | 2287 | todoChanged( to ); |
2276 | } else { | 2288 | } else { |
2277 | if ( mMoveIncidence->doesRecur() ) { | 2289 | if ( mMoveIncidence->doesRecur() ) { |
2278 | #if 0 | 2290 | #if 0 |
2279 | // PENDING implement this | 2291 | // PENDING implement this |
2280 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); | 2292 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); |
2281 | mCalendar()->addIncidence( newInc ); | 2293 | mCalendar()->addIncidence( newInc ); |
2282 | if ( mMoveIncidence->type() == "Todo" ) | 2294 | if ( mMoveIncidence->type() == "Todo" ) |
2283 | emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED ); | 2295 | emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED ); |
2284 | else | 2296 | else |
2285 | emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED); | 2297 | emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED); |
2286 | mMoveIncidence = newInc; | 2298 | mMoveIncidence = newInc; |
2287 | 2299 | ||
2288 | #endif | 2300 | #endif |
2289 | } | 2301 | } |
2290 | QTime tim = mMoveIncidence->dtStart().time(); | 2302 | QTime tim = mMoveIncidence->dtStart().time(); |
2291 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); | 2303 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); |
2292 | QDateTime dt ( d,tim ); | 2304 | QDateTime dt ( d,tim ); |
2293 | mMoveIncidence->setDtStart( dt ); | 2305 | mMoveIncidence->setDtStart( dt ); |
2294 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); | 2306 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); |
2295 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); | 2307 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); |
2296 | } | 2308 | } |
2297 | 2309 | ||
2298 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); | 2310 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); |
2299 | } | 2311 | } |
2300 | } | 2312 | } |
2301 | 2313 | ||
2302 | void CalendarView::removeCategories() | 2314 | void CalendarView::removeCategories() |
2303 | { | 2315 | { |
2304 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 2316 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); |
2305 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 2317 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
2306 | QStringList catIncList; | 2318 | QStringList catIncList; |
2307 | QStringList newCatList; | 2319 | QStringList newCatList; |
2308 | Incidence* inc = incList.first(); | 2320 | Incidence* inc = incList.first(); |
2309 | int i; | 2321 | int i; |
2310 | int count = 0; | 2322 | int count = 0; |
2311 | while ( inc ) { | 2323 | while ( inc ) { |
2312 | newCatList.clear(); | 2324 | newCatList.clear(); |
2313 | catIncList = inc->categories() ; | 2325 | catIncList = inc->categories() ; |
2314 | for( i = 0; i< catIncList.count(); ++i ) { | 2326 | for( i = 0; i< catIncList.count(); ++i ) { |
2315 | if ( catList.contains (catIncList[i])) | 2327 | if ( catList.contains (catIncList[i])) |
2316 | newCatList.append( catIncList[i] ); | 2328 | newCatList.append( catIncList[i] ); |
2317 | } | 2329 | } |
2318 | newCatList.sort(); | 2330 | newCatList.sort(); |
2319 | inc->setCategories( newCatList.join(",") ); | 2331 | inc->setCategories( newCatList.join(",") ); |
2320 | inc = incList.next(); | 2332 | inc = incList.next(); |
2321 | } | 2333 | } |
2322 | } | 2334 | } |
2323 | 2335 | ||
2324 | int CalendarView::addCategories() | 2336 | int CalendarView::addCategories() |
2325 | { | 2337 | { |
2326 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 2338 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); |
2327 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 2339 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
2328 | QStringList catIncList; | 2340 | QStringList catIncList; |
2329 | Incidence* inc = incList.first(); | 2341 | Incidence* inc = incList.first(); |
2330 | int i; | 2342 | int i; |
2331 | int count = 0; | 2343 | int count = 0; |
2332 | while ( inc ) { | 2344 | while ( inc ) { |
2333 | catIncList = inc->categories() ; | 2345 | catIncList = inc->categories() ; |
2334 | for( i = 0; i< catIncList.count(); ++i ) { | 2346 | for( i = 0; i< catIncList.count(); ++i ) { |
2335 | if ( !catList.contains (catIncList[i])) { | 2347 | if ( !catList.contains (catIncList[i])) { |
2336 | catList.append( catIncList[i] ); | 2348 | catList.append( catIncList[i] ); |
2337 | //qDebug("add cat %s ", catIncList[i].latin1()); | 2349 | //qDebug("add cat %s ", catIncList[i].latin1()); |
2338 | ++count; | 2350 | ++count; |
2339 | } | 2351 | } |
2340 | } | 2352 | } |
2341 | inc = incList.next(); | 2353 | inc = incList.next(); |
2342 | } | 2354 | } |
2343 | catList.sort(); | 2355 | catList.sort(); |
2344 | KOPrefs::instance()->mCustomCategories = catList; | 2356 | KOPrefs::instance()->mCustomCategories = catList; |
2345 | return count; | 2357 | return count; |
2346 | } | 2358 | } |
2347 | 2359 | ||
2348 | void CalendarView::manageCategories() | 2360 | void CalendarView::manageCategories() |
2349 | { | 2361 | { |
2350 | KOCatPrefs* cp = new KOCatPrefs(); | 2362 | KOCatPrefs* cp = new KOCatPrefs(); |
2351 | cp->show(); | 2363 | cp->show(); |
2352 | int w =cp->sizeHint().width() ; | 2364 | int w =cp->sizeHint().width() ; |
2353 | int h = cp->sizeHint().height() ; | 2365 | int h = cp->sizeHint().height() ; |
2354 | int dw = QApplication::desktop()->width(); | 2366 | int dw = QApplication::desktop()->width(); |
2355 | int dh = QApplication::desktop()->height(); | 2367 | int dh = QApplication::desktop()->height(); |
2356 | cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2368 | cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2357 | if ( !cp->exec() ) { | 2369 | if ( !cp->exec() ) { |
2358 | delete cp; | 2370 | delete cp; |
2359 | return; | 2371 | return; |
2360 | } | 2372 | } |
2361 | int count = 0; | 2373 | int count = 0; |
2362 | if ( cp->addCat() ) { | 2374 | if ( cp->addCat() ) { |
2363 | count = addCategories(); | 2375 | count = addCategories(); |
2364 | if ( count ) { | 2376 | if ( count ) { |
2365 | topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! ")); | 2377 | topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! ")); |
2366 | writeSettings(); | 2378 | writeSettings(); |
2367 | } else | 2379 | } else |
2368 | topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! ")); | 2380 | topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! ")); |
2369 | } else { | 2381 | } else { |
2370 | removeCategories(); | 2382 | removeCategories(); |
@@ -3717,193 +3729,193 @@ Todo *CalendarView::selectedTodo() | |||
3717 | } | 3729 | } |
3718 | 3730 | ||
3719 | return 0; | 3731 | return 0; |
3720 | } | 3732 | } |
3721 | 3733 | ||
3722 | void CalendarView::dialogClosing(Incidence *in) | 3734 | void CalendarView::dialogClosing(Incidence *in) |
3723 | { | 3735 | { |
3724 | // mDialogList.remove(in); | 3736 | // mDialogList.remove(in); |
3725 | } | 3737 | } |
3726 | 3738 | ||
3727 | void CalendarView::showIncidence() | 3739 | void CalendarView::showIncidence() |
3728 | { | 3740 | { |
3729 | Incidence *incidence = currentSelection(); | 3741 | Incidence *incidence = currentSelection(); |
3730 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 3742 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
3731 | if ( incidence ) { | 3743 | if ( incidence ) { |
3732 | ShowIncidenceVisitor v; | 3744 | ShowIncidenceVisitor v; |
3733 | v.act( incidence, this ); | 3745 | v.act( incidence, this ); |
3734 | } | 3746 | } |
3735 | } | 3747 | } |
3736 | void CalendarView::editIncidenceDescription() | 3748 | void CalendarView::editIncidenceDescription() |
3737 | { | 3749 | { |
3738 | mFlagEditDescription = true; | 3750 | mFlagEditDescription = true; |
3739 | editIncidence(); | 3751 | editIncidence(); |
3740 | mFlagEditDescription = false; | 3752 | mFlagEditDescription = false; |
3741 | } | 3753 | } |
3742 | void CalendarView::editIncidence() | 3754 | void CalendarView::editIncidence() |
3743 | { | 3755 | { |
3744 | // qDebug("editIncidence() "); | 3756 | // qDebug("editIncidence() "); |
3745 | Incidence *incidence = currentSelection(); | 3757 | Incidence *incidence = currentSelection(); |
3746 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 3758 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
3747 | if ( incidence ) { | 3759 | if ( incidence ) { |
3748 | EditIncidenceVisitor v; | 3760 | EditIncidenceVisitor v; |
3749 | v.act( incidence, this ); | 3761 | v.act( incidence, this ); |
3750 | } | 3762 | } |
3751 | } | 3763 | } |
3752 | 3764 | ||
3753 | void CalendarView::deleteIncidence() | 3765 | void CalendarView::deleteIncidence() |
3754 | { | 3766 | { |
3755 | Incidence *incidence = currentSelection(); | 3767 | Incidence *incidence = currentSelection(); |
3756 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 3768 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
3757 | if ( incidence ) { | 3769 | if ( incidence ) { |
3758 | deleteIncidence(incidence); | 3770 | deleteIncidence(incidence); |
3759 | } | 3771 | } |
3760 | } | 3772 | } |
3761 | 3773 | ||
3762 | void CalendarView::showIncidence(Incidence *incidence) | 3774 | void CalendarView::showIncidence(Incidence *incidence) |
3763 | { | 3775 | { |
3764 | if ( incidence ) { | 3776 | if ( incidence ) { |
3765 | ShowIncidenceVisitor v; | 3777 | ShowIncidenceVisitor v; |
3766 | v.act( incidence, this ); | 3778 | v.act( incidence, this ); |
3767 | } | 3779 | } |
3768 | } | 3780 | } |
3769 | 3781 | ||
3770 | void CalendarView::editIncidence(Incidence *incidence) | 3782 | void CalendarView::editIncidence(Incidence *incidence) |
3771 | { | 3783 | { |
3772 | if ( incidence ) { | 3784 | if ( incidence ) { |
3773 | 3785 | ||
3774 | EditIncidenceVisitor v; | 3786 | EditIncidenceVisitor v; |
3775 | v.act( incidence, this ); | 3787 | v.act( incidence, this ); |
3776 | 3788 | ||
3777 | } | 3789 | } |
3778 | } | 3790 | } |
3779 | 3791 | ||
3780 | void CalendarView::deleteIncidence(Incidence *incidence) | 3792 | void CalendarView::deleteIncidence(Incidence *incidence) |
3781 | { | 3793 | { |
3782 | //qDebug(" CalendarView::deleteIncidence "); | 3794 | //qDebug(" CalendarView::deleteIncidence "); |
3783 | if ( incidence ) { | 3795 | if ( incidence ) { |
3784 | DeleteIncidenceVisitor v; | 3796 | DeleteIncidenceVisitor v; |
3785 | v.act( incidence, this ); | 3797 | v.act( incidence, this ); |
3786 | } | 3798 | } |
3787 | } | 3799 | } |
3788 | 3800 | ||
3789 | 3801 | ||
3790 | void CalendarView::lookForOutgoingMessages() | 3802 | void CalendarView::lookForOutgoingMessages() |
3791 | { | 3803 | { |
3792 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); | 3804 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); |
3793 | ogd->loadMessages(); | 3805 | ogd->loadMessages(); |
3794 | } | 3806 | } |
3795 | 3807 | ||
3796 | void CalendarView::lookForIncomingMessages() | 3808 | void CalendarView::lookForIncomingMessages() |
3797 | { | 3809 | { |
3798 | IncomingDialog *icd = mDialogManager->incomingDialog(); | 3810 | IncomingDialog *icd = mDialogManager->incomingDialog(); |
3799 | icd->retrieve(); | 3811 | icd->retrieve(); |
3800 | } | 3812 | } |
3801 | 3813 | ||
3802 | bool CalendarView::removeCompletedSubTodos( Todo* t ) | 3814 | bool CalendarView::removeCompletedSubTodos( Todo* t ) |
3803 | { | 3815 | { |
3804 | bool deleteTodo = true; | 3816 | bool deleteTodo = true; |
3805 | QPtrList<Incidence> subTodos; | 3817 | QPtrList<Incidence> subTodos; |
3806 | Incidence *aTodo; | 3818 | Incidence *aTodo; |
3807 | subTodos = t->relations(); | 3819 | subTodos = t->relations(); |
3808 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { | 3820 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { |
3809 | if (! removeCompletedSubTodos( (Todo*) aTodo )) | 3821 | if (! removeCompletedSubTodos( (Todo*) aTodo )) |
3810 | deleteTodo = false; | 3822 | deleteTodo = false; |
3811 | } | 3823 | } |
3812 | if ( deleteTodo ) { | 3824 | if ( deleteTodo ) { |
3813 | if ( t->isCompleted() ) { | 3825 | if ( t->isCompleted() && !t->doesRecur()) { |
3814 | checkExternalId( t ); | 3826 | checkExternalId( t ); |
3815 | mCalendar->deleteTodo( t ); | 3827 | mCalendar->deleteTodo( t ); |
3816 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); | 3828 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); |
3817 | } | 3829 | } |
3818 | else | 3830 | else |
3819 | deleteTodo = false; | 3831 | deleteTodo = false; |
3820 | } | 3832 | } |
3821 | return deleteTodo; | 3833 | return deleteTodo; |
3822 | 3834 | ||
3823 | } | 3835 | } |
3824 | void CalendarView::purgeCompleted() | 3836 | void CalendarView::purgeCompleted() |
3825 | { | 3837 | { |
3826 | int result = KMessageBox::warningContinueCancel(this, | 3838 | int result = KMessageBox::warningContinueCancel(this, |
3827 | i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge")); | 3839 | i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge")); |
3828 | 3840 | ||
3829 | if (result == KMessageBox::Continue) { | 3841 | if (result == KMessageBox::Continue) { |
3830 | 3842 | ||
3831 | QPtrList<Todo> todoCal; | 3843 | QPtrList<Todo> todoCal; |
3832 | QPtrList<Todo> rootTodos; | 3844 | QPtrList<Todo> rootTodos; |
3833 | //QPtrList<Incidence> rel; | 3845 | //QPtrList<Incidence> rel; |
3834 | Todo *aTodo;//, *rTodo; | 3846 | Todo *aTodo;//, *rTodo; |
3835 | Incidence *rIncidence; | 3847 | Incidence *rIncidence; |
3836 | bool childDelete = false; | 3848 | bool childDelete = false; |
3837 | bool deletedOne = true; | 3849 | bool deletedOne = true; |
3838 | todoCal = calendar()->todos(); | 3850 | todoCal = calendar()->todos(); |
3839 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { | 3851 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { |
3840 | if ( !aTodo->relatedTo() ) | 3852 | if ( !aTodo->relatedTo() ) |
3841 | rootTodos.append( aTodo ); | 3853 | rootTodos.append( aTodo ); |
3842 | } | 3854 | } |
3843 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { | 3855 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { |
3844 | removeCompletedSubTodos( aTodo ); | 3856 | removeCompletedSubTodos( aTodo ); |
3845 | } | 3857 | } |
3846 | 3858 | ||
3847 | updateView(); | 3859 | updateView(); |
3848 | } | 3860 | } |
3849 | } | 3861 | } |
3850 | 3862 | ||
3851 | void CalendarView::slotCalendarChanged() | 3863 | void CalendarView::slotCalendarChanged() |
3852 | { | 3864 | { |
3853 | ; | 3865 | ; |
3854 | } | 3866 | } |
3855 | 3867 | ||
3856 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 3868 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
3857 | { | 3869 | { |
3858 | //qDebug(" alendarView::keyPressEvent "); | 3870 | //qDebug(" alendarView::keyPressEvent "); |
3859 | e->ignore(); | 3871 | e->ignore(); |
3860 | } | 3872 | } |
3861 | 3873 | ||
3862 | 3874 | ||
3863 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 3875 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
3864 | { | 3876 | { |
3865 | // mSyncManager = manager; | 3877 | // mSyncManager = manager; |
3866 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { | 3878 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { |
3867 | qDebug("KO: SyncKDE request detected!"); | 3879 | qDebug("KO: SyncKDE request detected!"); |
3868 | } | 3880 | } |
3869 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 3881 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
3870 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 3882 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
3871 | return syncCalendar( filename, mode ); | 3883 | return syncCalendar( filename, mode ); |
3872 | } | 3884 | } |
3873 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | 3885 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) |
3874 | { | 3886 | { |
3875 | //mSyncManager = manager; | 3887 | //mSyncManager = manager; |
3876 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 3888 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
3877 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 3889 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
3878 | if ( resource == "sharp" ) | 3890 | if ( resource == "sharp" ) |
3879 | syncExternal( 0 ); | 3891 | syncExternal( 0 ); |
3880 | if ( resource == "phone" ) | 3892 | if ( resource == "phone" ) |
3881 | syncExternal( 1 ); | 3893 | syncExternal( 1 ); |
3882 | // pending setmodified | 3894 | // pending setmodified |
3883 | return true; | 3895 | return true; |
3884 | } | 3896 | } |
3885 | void CalendarView::setSyncManager(KSyncManager* manager) | 3897 | void CalendarView::setSyncManager(KSyncManager* manager) |
3886 | { | 3898 | { |
3887 | mSyncManager = manager; | 3899 | mSyncManager = manager; |
3888 | } | 3900 | } |
3889 | 3901 | ||
3890 | void CalendarView::removeSyncInfo( QString syncProfile) | 3902 | void CalendarView::removeSyncInfo( QString syncProfile) |
3891 | { | 3903 | { |
3892 | qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1()); | 3904 | qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1()); |
3893 | mCalendar->removeSyncInfo( syncProfile ); | 3905 | mCalendar->removeSyncInfo( syncProfile ); |
3894 | 3906 | ||
3895 | } | 3907 | } |
3896 | 3908 | ||
3897 | void CalendarView::undo_delete() | 3909 | void CalendarView::undo_delete() |
3898 | { | 3910 | { |
3899 | //qDebug("undo_delete() "); | 3911 | //qDebug("undo_delete() "); |
3900 | Incidence* undo = mCalendar->undoIncidence(); | 3912 | Incidence* undo = mCalendar->undoIncidence(); |
3901 | if ( !undo ) { | 3913 | if ( !undo ) { |
3902 | KMessageBox::sorry(this,i18n("There is nothing to undo!"), | 3914 | KMessageBox::sorry(this,i18n("There is nothing to undo!"), |
3903 | i18n("KO/Pi")); | 3915 | i18n("KO/Pi")); |
3904 | return; | 3916 | return; |
3905 | } | 3917 | } |
3906 | if ( KMessageBox::Continue ==KMessageBox::warningContinueCancel(this,undo->summary().left(25) + | 3918 | if ( KMessageBox::Continue ==KMessageBox::warningContinueCancel(this,undo->summary().left(25) + |
3907 | i18n("\nAre you sure you want\nto restore this?"), | 3919 | i18n("\nAre you sure you want\nto restore this?"), |
3908 | i18n("KO/Pi Confirmation"),i18n("Restore"))) { | 3920 | i18n("KO/Pi Confirmation"),i18n("Restore"))) { |
3909 | mCalendar->undoDeleteIncidence(); | 3921 | mCalendar->undoDeleteIncidence(); |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 13d8398..4ff6899 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -906,374 +906,387 @@ void KOAgendaView::updateConfig() | |||
906 | mAgenda->storePosition(); | 906 | mAgenda->storePosition(); |
907 | mAgenda->updateConfig(); | 907 | mAgenda->updateConfig(); |
908 | mAllDayAgenda->updateConfig(); | 908 | mAllDayAgenda->updateConfig(); |
909 | // widget synchronization | 909 | // widget synchronization |
910 | //TODO: find a better way, maybe signal/slot | 910 | //TODO: find a better way, maybe signal/slot |
911 | mTimeLabels->positionChanged(); | 911 | mTimeLabels->positionChanged(); |
912 | 912 | ||
913 | // for some reason, this needs to be called explicitly | 913 | // for some reason, this needs to be called explicitly |
914 | mTimeLabels->repaint(); | 914 | mTimeLabels->repaint(); |
915 | 915 | ||
916 | mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); | 916 | mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); |
917 | 917 | ||
918 | // ToolTips displaying summary of events | 918 | // ToolTips displaying summary of events |
919 | KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() | 919 | KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() |
920 | ->mEnableToolTips); | 920 | ->mEnableToolTips); |
921 | 921 | ||
922 | //setHolidayMasks(); | 922 | //setHolidayMasks(); |
923 | 923 | ||
924 | //createDayLabels(); called by via updateView(); | 924 | //createDayLabels(); called by via updateView(); |
925 | mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); | 925 | mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); |
926 | updateView(); | 926 | updateView(); |
927 | mAgenda->restorePosition(); | 927 | mAgenda->restorePosition(); |
928 | } | 928 | } |
929 | 929 | ||
930 | 930 | ||
931 | void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) | 931 | void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) |
932 | { | 932 | { |
933 | // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl; | 933 | // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl; |
934 | //qDebug("KOAgendaView::updateEventDates "); | 934 | //qDebug("KOAgendaView::updateEventDates "); |
935 | QDateTime startDt,endDt; | 935 | QDateTime startDt,endDt; |
936 | QDate startDate; | 936 | QDate startDate; |
937 | int lenInSecs; | 937 | int lenInSecs; |
938 | // if ( type == KOAgenda::RESIZETOP ) | 938 | // if ( type == KOAgenda::RESIZETOP ) |
939 | // qDebug("RESIZETOP "); | 939 | // qDebug("RESIZETOP "); |
940 | // if ( type == KOAgenda::RESIZEBOTTOM ) | 940 | // if ( type == KOAgenda::RESIZEBOTTOM ) |
941 | // qDebug("RESIZEBOTTOM "); | 941 | // qDebug("RESIZEBOTTOM "); |
942 | // if ( type == KOAgenda::MOVE ) | 942 | // if ( type == KOAgenda::MOVE ) |
943 | // qDebug("MOVE "); | 943 | // qDebug("MOVE "); |
944 | if ( item->incidence()->type() == "Event" ) { | 944 | if ( item->incidence()->type() == "Event" ) { |
945 | startDt =item->incidence()->dtStart(); | 945 | startDt =item->incidence()->dtStart(); |
946 | endDt = item->incidence()->dtEnd(); | 946 | endDt = item->incidence()->dtEnd(); |
947 | lenInSecs = startDt.secsTo( endDt ); | 947 | lenInSecs = startDt.secsTo( endDt ); |
948 | } | 948 | } |
949 | 949 | ||
950 | // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); | 950 | // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); |
951 | 951 | ||
952 | if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { | 952 | if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { |
953 | startDate = mSelectedDates[item->mLastMoveXPos]; | 953 | startDate = mSelectedDates[item->mLastMoveXPos]; |
954 | } else { | 954 | } else { |
955 | if (item->cellX() < 0) { | 955 | if (item->cellX() < 0) { |
956 | startDate = (mSelectedDates.first()).addDays(item->cellX()); | 956 | startDate = (mSelectedDates.first()).addDays(item->cellX()); |
957 | } else { | 957 | } else { |
958 | startDate = mSelectedDates[item->cellX()]; | 958 | startDate = mSelectedDates[item->cellX()]; |
959 | } | 959 | } |
960 | } | 960 | } |
961 | startDt.setDate(startDate); | 961 | startDt.setDate(startDate); |
962 | 962 | ||
963 | if (item->incidence()->doesFloat()) { | 963 | if (item->incidence()->doesFloat()) { |
964 | endDt.setDate(startDate.addDays(item->cellWidth() - 1)); | 964 | endDt.setDate(startDate.addDays(item->cellWidth() - 1)); |
965 | } else { | 965 | } else { |
966 | if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) | 966 | if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) |
967 | startDt.setTime(mAgenda->gyToTime(item->cellYTop())); | 967 | startDt.setTime(mAgenda->gyToTime(item->cellYTop())); |
968 | if ( item->incidence()->type() == "Event" ) { | 968 | if ( item->incidence()->type() == "Event" ) { |
969 | if ( type == KOAgenda::MOVE ) { | 969 | if ( type == KOAgenda::MOVE ) { |
970 | endDt = startDt.addSecs(lenInSecs); | 970 | endDt = startDt.addSecs(lenInSecs); |
971 | 971 | ||
972 | } else if ( type == KOAgenda::RESIZEBOTTOM ) { | 972 | } else if ( type == KOAgenda::RESIZEBOTTOM ) { |
973 | if (item->lastMultiItem()) { | 973 | if (item->lastMultiItem()) { |
974 | endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); | 974 | endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); |
975 | endDt.setDate(startDate. | 975 | endDt.setDate(startDate. |
976 | addDays(item->lastMultiItem()->cellX() - item->cellX())); | 976 | addDays(item->lastMultiItem()->cellX() - item->cellX())); |
977 | } else { | 977 | } else { |
978 | endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); | 978 | endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); |
979 | endDt.setDate(startDate); | 979 | endDt.setDate(startDate); |
980 | } | 980 | } |
981 | } | 981 | } |
982 | } else { | 982 | } else { |
983 | // todo | 983 | // todo |
984 | if (item->lastMultiItem()) { | 984 | if (item->lastMultiItem()) { |
985 | endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); | 985 | endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); |
986 | endDt.setDate(startDate. | 986 | endDt.setDate(startDate. |
987 | addDays(item->lastMultiItem()->cellX() - item->cellX())); | 987 | addDays(item->lastMultiItem()->cellX() - item->cellX())); |
988 | } else { | 988 | } else { |
989 | //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); | 989 | //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); |
990 | if ( item->cellYBottom() > 0 ) | 990 | if ( item->cellYBottom() > 0 ) |
991 | endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); | 991 | endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); |
992 | else | 992 | else |
993 | endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); | 993 | endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); |
994 | endDt.setDate(startDate); | 994 | endDt.setDate(startDate); |
995 | } | 995 | } |
996 | } | 996 | } |
997 | } | 997 | } |
998 | if ( item->incidence()->type() == "Event" ) { | 998 | if ( item->incidence()->type() == "Event" ) { |
999 | item->incidence()->setDtStart(startDt); | 999 | item->incidence()->setDtStart(startDt); |
1000 | (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); | 1000 | (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); |
1001 | } else if ( item->incidence()->type() == "Todo" ) { | 1001 | } else if ( item->incidence()->type() == "Todo" ) { |
1002 | (static_cast<Todo*>(item->incidence()))->setDtDue(endDt); | 1002 | Todo* to = static_cast<Todo*>(item->incidence()); |
1003 | |||
1004 | int len = 0; | ||
1005 | if ( to->hasStartDate() && to->hasDueDate() ) | ||
1006 | len = to->dtStart().secsTo( to->dtDue()); | ||
1007 | to->setDtDue(endDt); | ||
1008 | if ( to->hasStartDate() ) { | ||
1009 | if ( len>0 ) | ||
1010 | to->setDtStart(to->dtDue().addSecs( -len )); | ||
1011 | else | ||
1012 | if (to->dtStart() > to->dtDue() ) | ||
1013 | to->setDtStart(to->dtDue().addDays( -3 )); | ||
1014 | } | ||
1015 | |||
1003 | } | 1016 | } |
1004 | //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); | 1017 | //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); |
1005 | item->incidence()->setRevision(item->incidence()->revision()+1); | 1018 | item->incidence()->setRevision(item->incidence()->revision()+1); |
1006 | item->setItemDate(startDt.date()); | 1019 | item->setItemDate(startDt.date()); |
1007 | //item->updateItem(); | 1020 | //item->updateItem(); |
1008 | if ( item->incidence()->type() == "Todo" ) { | 1021 | if ( item->incidence()->type() == "Todo" ) { |
1009 | emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); | 1022 | emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); |
1010 | 1023 | ||
1011 | } | 1024 | } |
1012 | else | 1025 | else |
1013 | emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); | 1026 | emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); |
1014 | item->updateItem(); | 1027 | item->updateItem(); |
1015 | } | 1028 | } |
1016 | 1029 | ||
1017 | void KOAgendaView::showDates( const QDate &start, const QDate &end ) | 1030 | void KOAgendaView::showDates( const QDate &start, const QDate &end ) |
1018 | { | 1031 | { |
1019 | // kdDebug() << "KOAgendaView::selectDates" << endl; | 1032 | // kdDebug() << "KOAgendaView::selectDates" << endl; |
1020 | 1033 | ||
1021 | mSelectedDates.clear(); | 1034 | mSelectedDates.clear(); |
1022 | // qDebug("KOAgendaView::showDates "); | 1035 | // qDebug("KOAgendaView::showDates "); |
1023 | QDate d = start; | 1036 | QDate d = start; |
1024 | while (d <= end) { | 1037 | while (d <= end) { |
1025 | mSelectedDates.append(d); | 1038 | mSelectedDates.append(d); |
1026 | d = d.addDays( 1 ); | 1039 | d = d.addDays( 1 ); |
1027 | } | 1040 | } |
1028 | 1041 | ||
1029 | // and update the view | 1042 | // and update the view |
1030 | fillAgenda(); | 1043 | fillAgenda(); |
1031 | } | 1044 | } |
1032 | 1045 | ||
1033 | 1046 | ||
1034 | void KOAgendaView::showEvents(QPtrList<Event>) | 1047 | void KOAgendaView::showEvents(QPtrList<Event>) |
1035 | { | 1048 | { |
1036 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; | 1049 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; |
1037 | } | 1050 | } |
1038 | 1051 | ||
1039 | void KOAgendaView::changeEventDisplay(Event *, int) | 1052 | void KOAgendaView::changeEventDisplay(Event *, int) |
1040 | { | 1053 | { |
1041 | // qDebug("KOAgendaView::changeEventDisplay "); | 1054 | // qDebug("KOAgendaView::changeEventDisplay "); |
1042 | // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; | 1055 | // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; |
1043 | // this should be re-written to be MUCH smarter. Right now we | 1056 | // this should be re-written to be MUCH smarter. Right now we |
1044 | // are just playing dumb. | 1057 | // are just playing dumb. |
1045 | fillAgenda(); | 1058 | fillAgenda(); |
1046 | } | 1059 | } |
1047 | 1060 | ||
1048 | void KOAgendaView::fillAgenda(const QDate &) | 1061 | void KOAgendaView::fillAgenda(const QDate &) |
1049 | { | 1062 | { |
1050 | // qDebug("KOAgendaView::fillAgenda "); | 1063 | // qDebug("KOAgendaView::fillAgenda "); |
1051 | fillAgenda(); | 1064 | fillAgenda(); |
1052 | } | 1065 | } |
1053 | 1066 | ||
1054 | void KOAgendaView::fillAgenda() | 1067 | void KOAgendaView::fillAgenda() |
1055 | { | 1068 | { |
1056 | if ( globalFlagBlockStartup ) | 1069 | if ( globalFlagBlockStartup ) |
1057 | return; | 1070 | return; |
1058 | if ( globalFlagBlockAgenda == 1 ) | 1071 | if ( globalFlagBlockAgenda == 1 ) |
1059 | return; | 1072 | return; |
1060 | //if ( globalFlagBlockAgenda == 2 ) | 1073 | //if ( globalFlagBlockAgenda == 2 ) |
1061 | //globalFlagBlockAgenda = 0; | 1074 | //globalFlagBlockAgenda = 0; |
1062 | // globalFlagBlockPainting = false; | 1075 | // globalFlagBlockPainting = false; |
1063 | if ( globalFlagBlockAgenda == 0 ) | 1076 | if ( globalFlagBlockAgenda == 0 ) |
1064 | globalFlagBlockAgenda = 1; | 1077 | globalFlagBlockAgenda = 1; |
1065 | // clearView(); | 1078 | // clearView(); |
1066 | //qDebug("fillAgenda()++++ "); | 1079 | //qDebug("fillAgenda()++++ "); |
1067 | globalFlagBlockAgendaItemPaint = 1; | 1080 | globalFlagBlockAgendaItemPaint = 1; |
1068 | 1081 | ||
1069 | mAllDayAgenda->changeColumns(mSelectedDates.count()); | 1082 | mAllDayAgenda->changeColumns(mSelectedDates.count()); |
1070 | mAgenda->changeColumns(mSelectedDates.count()); | 1083 | mAgenda->changeColumns(mSelectedDates.count()); |
1071 | qApp->processEvents(); | 1084 | qApp->processEvents(); |
1072 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); | 1085 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); |
1073 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); | 1086 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); |
1074 | setHolidayMasks(); | 1087 | setHolidayMasks(); |
1075 | 1088 | ||
1076 | //mAgenda->hideUnused(); | 1089 | //mAgenda->hideUnused(); |
1077 | //mAllDayAgenda->hideUnused(); | 1090 | //mAllDayAgenda->hideUnused(); |
1078 | 1091 | ||
1079 | // mAgenda->blockNextRepaint( false ); | 1092 | // mAgenda->blockNextRepaint( false ); |
1080 | // mAgenda->viewport()->repaint(); | 1093 | // mAgenda->viewport()->repaint(); |
1081 | // mAgenda->blockNextRepaint( true ); | 1094 | // mAgenda->blockNextRepaint( true ); |
1082 | mMinY.resize(mSelectedDates.count()); | 1095 | mMinY.resize(mSelectedDates.count()); |
1083 | mMaxY.resize(mSelectedDates.count()); | 1096 | mMaxY.resize(mSelectedDates.count()); |
1084 | 1097 | ||
1085 | QPtrList<Event> dayEvents; | 1098 | QPtrList<Event> dayEvents; |
1086 | 1099 | ||
1087 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. | 1100 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. |
1088 | // Therefore, gtodoset all of them. | 1101 | // Therefore, gtodoset all of them. |
1089 | QPtrList<Todo> todos = calendar()->todos(); | 1102 | QPtrList<Todo> todos = calendar()->todos(); |
1090 | 1103 | ||
1091 | mAgenda->setDateList(mSelectedDates); | 1104 | mAgenda->setDateList(mSelectedDates); |
1092 | 1105 | ||
1093 | QDate today = QDate::currentDate(); | 1106 | QDate today = QDate::currentDate(); |
1094 | 1107 | ||
1095 | DateList::ConstIterator dit; | 1108 | DateList::ConstIterator dit; |
1096 | int curCol = 0; | 1109 | int curCol = 0; |
1097 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 1110 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
1098 | QDate currentDate = *dit; | 1111 | QDate currentDate = *dit; |
1099 | // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() | 1112 | // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() |
1100 | // << endl; | 1113 | // << endl; |
1101 | 1114 | ||
1102 | dayEvents = calendar()->events(currentDate,true); | 1115 | dayEvents = calendar()->events(currentDate,true); |
1103 | 1116 | ||
1104 | // Default values, which can never be reached | 1117 | // Default values, which can never be reached |
1105 | mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; | 1118 | mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; |
1106 | mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; | 1119 | mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; |
1107 | 1120 | ||
1108 | unsigned int numEvent; | 1121 | unsigned int numEvent; |
1109 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { | 1122 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { |
1110 | Event *event = dayEvents.at(numEvent); | 1123 | Event *event = dayEvents.at(numEvent); |
1111 | if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) | 1124 | if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) |
1112 | if ( event->uid().left(15) == QString("last-syncEvent-") ) | 1125 | if ( event->uid().left(15) == QString("last-syncEvent-") ) |
1113 | continue; | 1126 | continue; |
1114 | // kdDebug() << " Event: " << event->summary() << endl; | 1127 | // kdDebug() << " Event: " << event->summary() << endl; |
1115 | 1128 | ||
1116 | int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; | 1129 | int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; |
1117 | int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; | 1130 | int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; |
1118 | 1131 | ||
1119 | // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; | 1132 | // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; |
1120 | 1133 | ||
1121 | if (event->doesFloat()) { | 1134 | if (event->doesFloat()) { |
1122 | if (event->recurrence()->doesRecur()) { | 1135 | if (event->recurrence()->doesRecur()) { |
1123 | mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); | 1136 | mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); |
1124 | } else { | 1137 | } else { |
1125 | if (beginX <= 0 && curCol == 0) { | 1138 | if (beginX <= 0 && curCol == 0) { |
1126 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1139 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1127 | } else if (beginX == curCol) { | 1140 | } else if (beginX == curCol) { |
1128 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1141 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1129 | } | 1142 | } |
1130 | } | 1143 | } |
1131 | } else if (event->isMultiDay()) { | 1144 | } else if (event->isMultiDay()) { |
1132 | if ( event->doesRecur () ) { | 1145 | if ( event->doesRecur () ) { |
1133 | QDate dateit = currentDate; | 1146 | QDate dateit = currentDate; |
1134 | int count = 0; | 1147 | int count = 0; |
1135 | int max = event->dtStart().daysTo( event->dtEnd() ) +2; | 1148 | int max = event->dtStart().daysTo( event->dtEnd() ) +2; |
1136 | while (! event->recursOn( dateit ) && count <= max ) { | 1149 | while (! event->recursOn( dateit ) && count <= max ) { |
1137 | ++count; | 1150 | ++count; |
1138 | dateit = dateit.addDays( -1 ); | 1151 | dateit = dateit.addDays( -1 ); |
1139 | } | 1152 | } |
1140 | bool ok; | 1153 | bool ok; |
1141 | QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok ); | 1154 | QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok ); |
1142 | if ( ok ) | 1155 | if ( ok ) |
1143 | { | 1156 | { |
1144 | int secs = event->dtStart().secsTo( event->dtEnd() ); | 1157 | int secs = event->dtStart().secsTo( event->dtEnd() ); |
1145 | QDateTime nextOcend =nextOcstart.addSecs( secs ); ; | 1158 | QDateTime nextOcend =nextOcstart.addSecs( secs ); ; |
1146 | beginX = currentDate.daysTo(nextOcstart.date()) + curCol; | 1159 | beginX = currentDate.daysTo(nextOcstart.date()) + curCol; |
1147 | endX = currentDate.daysTo(nextOcend.date()) + curCol; | 1160 | endX = currentDate.daysTo(nextOcend.date()) + curCol; |
1148 | 1161 | ||
1149 | } | 1162 | } |
1150 | } | 1163 | } |
1151 | int startY = mAgenda->timeToY(event->dtStart().time()); | 1164 | int startY = mAgenda->timeToY(event->dtStart().time()); |
1152 | int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; | 1165 | int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; |
1153 | //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol ); | 1166 | //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol ); |
1154 | if ((beginX <= 0 && curCol == 0) || beginX == curCol) { | 1167 | if ((beginX <= 0 && curCol == 0) || beginX == curCol) { |
1155 | //qDebug("insert!!! "); | 1168 | //qDebug("insert!!! "); |
1156 | mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY); | 1169 | mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY); |
1157 | } | 1170 | } |
1158 | if (beginX == curCol) { | 1171 | if (beginX == curCol) { |
1159 | mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); | 1172 | mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); |
1160 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; | 1173 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; |
1161 | } else if (endX == curCol) { | 1174 | } else if (endX == curCol) { |
1162 | mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); | 1175 | mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); |
1163 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; | 1176 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; |
1164 | } else { | 1177 | } else { |
1165 | mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); | 1178 | mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); |
1166 | mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); | 1179 | mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); |
1167 | } | 1180 | } |
1168 | } else { | 1181 | } else { |
1169 | int startY = mAgenda->timeToY(event->dtStart().time()); | 1182 | int startY = mAgenda->timeToY(event->dtStart().time()); |
1170 | int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; | 1183 | int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; |
1171 | if (endY < startY) endY = startY; | 1184 | if (endY < startY) endY = startY; |
1172 | mAgenda->insertItem(event,currentDate,curCol,startY,endY); | 1185 | mAgenda->insertItem(event,currentDate,curCol,startY,endY); |
1173 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; | 1186 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; |
1174 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; | 1187 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; |
1175 | } | 1188 | } |
1176 | } | 1189 | } |
1177 | // ---------- [display Todos -------------- | 1190 | // ---------- [display Todos -------------- |
1178 | unsigned int numTodo; | 1191 | unsigned int numTodo; |
1179 | for (numTodo = 0; numTodo < todos.count(); ++numTodo) { | 1192 | for (numTodo = 0; numTodo < todos.count(); ++numTodo) { |
1180 | Todo *todo = todos.at(numTodo); | 1193 | Todo *todo = todos.at(numTodo); |
1181 | 1194 | ||
1182 | if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date | 1195 | if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date |
1183 | 1196 | ||
1184 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. | 1197 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. |
1185 | // Already completed items can be displayed on their original due date | 1198 | // Already completed items can be displayed on their original due date |
1186 | //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda | 1199 | //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda |
1187 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; | 1200 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; |
1188 | bool fillIn = false; | 1201 | bool fillIn = false; |
1189 | if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) | 1202 | if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) |
1190 | fillIn = true; | 1203 | fillIn = true; |
1191 | if ( ! fillIn && !todo->hasCompletedDate() ) | 1204 | if ( ! fillIn && !todo->hasCompletedDate() ) |
1192 | fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue); | 1205 | fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue); |
1193 | if ( fillIn ) { | 1206 | if ( fillIn ) { |
1194 | if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue | 1207 | if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue |
1195 | if ( KOPrefs::instance()->mShowTodoInAgenda ) | 1208 | if ( KOPrefs::instance()->mShowTodoInAgenda ) |
1196 | mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol); | 1209 | mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol); |
1197 | } | 1210 | } |
1198 | else { | 1211 | else { |
1199 | QDateTime dt; | 1212 | QDateTime dt; |
1200 | if ( todo->hasCompletedDate() ) | 1213 | if ( todo->hasCompletedDate() ) |
1201 | dt = todo->completed(); | 1214 | dt = todo->completed(); |
1202 | else | 1215 | else |
1203 | dt = todo->dtDue();; | 1216 | dt = todo->dtDue();; |
1204 | 1217 | ||
1205 | 1218 | ||
1206 | int endY = mAgenda->timeToY(dt.time()) - 1; | 1219 | int endY = mAgenda->timeToY(dt.time()) - 1; |
1207 | int hi = (18/KOPrefs::instance()->mHourSize); | 1220 | int hi = (18/KOPrefs::instance()->mHourSize); |
1208 | //qDebug("hei %d ",KOPrefs::instance()->mHourSize); | 1221 | //qDebug("hei %d ",KOPrefs::instance()->mHourSize); |
1209 | int startY = endY -hi; | 1222 | int startY = endY -hi; |
1210 | 1223 | ||
1211 | mAgenda->insertItem(todo,currentDate,curCol,startY,endY); | 1224 | mAgenda->insertItem(todo,currentDate,curCol,startY,endY); |
1212 | 1225 | ||
1213 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; | 1226 | if (startY < mMinY[curCol]) mMinY[curCol] = startY; |
1214 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; | 1227 | if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; |
1215 | } | 1228 | } |
1216 | } | 1229 | } |
1217 | } | 1230 | } |
1218 | // ---------- display Todos] -------------- | 1231 | // ---------- display Todos] -------------- |
1219 | 1232 | ||
1220 | ++curCol; | 1233 | ++curCol; |
1221 | } | 1234 | } |
1222 | mAgenda->hideUnused(); | 1235 | mAgenda->hideUnused(); |
1223 | mAllDayAgenda->hideUnused(); | 1236 | mAllDayAgenda->hideUnused(); |
1224 | mAgenda->checkScrollBoundaries(); | 1237 | mAgenda->checkScrollBoundaries(); |
1225 | 1238 | ||
1226 | deleteSelectedDateTime(); | 1239 | deleteSelectedDateTime(); |
1227 | 1240 | ||
1228 | createDayLabels(); | 1241 | createDayLabels(); |
1229 | emit incidenceSelected( 0 ); | 1242 | emit incidenceSelected( 0 ); |
1230 | 1243 | ||
1231 | if ( globalFlagBlockAgenda == 2 ) { | 1244 | if ( globalFlagBlockAgenda == 2 ) { |
1232 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 1245 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
1233 | setStartHour( KOPrefs::instance()->mDayBegins ); | 1246 | setStartHour( KOPrefs::instance()->mDayBegins ); |
1234 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 1247 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
1235 | setStartHour( QTime::currentTime ().hour() ); | 1248 | setStartHour( QTime::currentTime ().hour() ); |
1236 | // qApp->processEvents(); | 1249 | // qApp->processEvents(); |
1237 | } | 1250 | } |
1238 | qApp->processEvents(); | 1251 | qApp->processEvents(); |
1239 | //qDebug("qApp->processEvents(); END "); | 1252 | //qDebug("qApp->processEvents(); END "); |
1240 | globalFlagBlockAgenda = 0; | 1253 | globalFlagBlockAgenda = 0; |
1241 | 1254 | ||
1242 | // mAgenda->hideUnused(); | 1255 | // mAgenda->hideUnused(); |
1243 | //mAllDayAgenda->hideUnused(); | 1256 | //mAllDayAgenda->hideUnused(); |
1244 | mAllDayAgenda->drawContentsToPainter(); | 1257 | mAllDayAgenda->drawContentsToPainter(); |
1245 | mAgenda->drawContentsToPainter(); | 1258 | mAgenda->drawContentsToPainter(); |
1246 | repaintAgenda(); | 1259 | repaintAgenda(); |
1247 | // mAgenda->finishUpdate(); | 1260 | // mAgenda->finishUpdate(); |
1248 | //mAllDayAgenda->finishUpdate(); | 1261 | //mAllDayAgenda->finishUpdate(); |
1249 | 1262 | ||
1250 | // repaintAgenda(); | 1263 | // repaintAgenda(); |
1251 | //qApp->processEvents(); | 1264 | //qApp->processEvents(); |
1252 | // globalFlagBlockAgenda = 0; | 1265 | // globalFlagBlockAgenda = 0; |
1253 | } | 1266 | } |
1254 | void KOAgendaView::repaintAgenda() | 1267 | void KOAgendaView::repaintAgenda() |
1255 | { | 1268 | { |
1256 | // mAllDayAgenda->drawContentsToPainter(); | 1269 | // mAllDayAgenda->drawContentsToPainter(); |
1257 | // mAllDayAgenda->viewport()->repaint( false ); | 1270 | // mAllDayAgenda->viewport()->repaint( false ); |
1258 | // mAgenda->drawContentsToPainter(); | 1271 | // mAgenda->drawContentsToPainter(); |
1259 | // mAgenda->viewport()->repaint( false ); | 1272 | // mAgenda->viewport()->repaint( false ); |
1260 | // qApp->processEvents(); | 1273 | // qApp->processEvents(); |
1261 | 1274 | ||
1262 | //qDebug("KOAgendaView::repaintAgenda() "); | 1275 | //qDebug("KOAgendaView::repaintAgenda() "); |
1263 | //qApp->processEvents(); | 1276 | //qApp->processEvents(); |
1264 | mAgenda->viewport()->repaint( false ); | 1277 | mAgenda->viewport()->repaint( false ); |
1265 | mAllDayAgenda->viewport()->repaint( false ); | 1278 | mAllDayAgenda->viewport()->repaint( false ); |
1266 | mAgenda->finishUpdate(); | 1279 | mAgenda->finishUpdate(); |
1267 | mAllDayAgenda->finishUpdate(); | 1280 | mAllDayAgenda->finishUpdate(); |
1268 | } | 1281 | } |
1269 | 1282 | ||
1270 | 1283 | ||
1271 | void KOAgendaView::clearView() | 1284 | void KOAgendaView::clearView() |
1272 | { | 1285 | { |
1273 | // kdDebug() << "ClearView" << endl; | 1286 | // kdDebug() << "ClearView" << endl; |
1274 | mAllDayAgenda->clear(); | 1287 | mAllDayAgenda->clear(); |
1275 | mAgenda->clear(); | 1288 | mAgenda->clear(); |
1276 | } | 1289 | } |
1277 | 1290 | ||
1278 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1291 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
1279 | const QDate &td) | 1292 | const QDate &td) |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 39921a0..f6c9624 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -309,192 +309,199 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
309 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); | 309 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); |
310 | if ( ok ) { | 310 | if ( ok ) { |
311 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); | 311 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); |
312 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); | 312 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); |
313 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true ); | 313 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true ); |
314 | 314 | ||
315 | } else { | 315 | } else { |
316 | bool last; | 316 | bool last; |
317 | QDate nextd; | 317 | QDate nextd; |
318 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); | 318 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); |
319 | if ( last ) { | 319 | if ( last ) { |
320 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); | 320 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); |
321 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); | 321 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); |
322 | } | 322 | } |
323 | } | 323 | } |
324 | } else { | 324 | } else { |
325 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); | 325 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); |
326 | 326 | ||
327 | } | 327 | } |
328 | 328 | ||
329 | 329 | ||
330 | if (event->isAlarmEnabled()) { | 330 | if (event->isAlarmEnabled()) { |
331 | Alarm *alarm =event->alarms().first() ; | 331 | Alarm *alarm =event->alarms().first() ; |
332 | QDateTime t = alarm->time(); | 332 | QDateTime t = alarm->time(); |
333 | int min = t.secsTo( event->dtStart() )/60; | 333 | int min = t.secsTo( event->dtStart() )/60; |
334 | QString s =i18n("( %1 min before )").arg( min ); | 334 | QString s =i18n("( %1 min before )").arg( min ); |
335 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 335 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
336 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 336 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
337 | //addTag("p",s); | 337 | //addTag("p",s); |
338 | } | 338 | } |
339 | 339 | ||
340 | addTag("b",i18n("Access: ")); | 340 | addTag("b",i18n("Access: ")); |
341 | mText.append(event->secrecyStr()+"<br>"); | 341 | mText.append(event->secrecyStr()+"<br>"); |
342 | if (!event->description().isEmpty()) { | 342 | if (!event->description().isEmpty()) { |
343 | addTag("p",i18n("<b>Details: </b>")); | 343 | addTag("p",i18n("<b>Details: </b>")); |
344 | addTag("p",event->description()); | 344 | addTag("p",event->description()); |
345 | } | 345 | } |
346 | 346 | ||
347 | formatCategories(event); | 347 | formatCategories(event); |
348 | 348 | ||
349 | formatReadOnly(event); | 349 | formatReadOnly(event); |
350 | formatAttendees(event); | 350 | formatAttendees(event); |
351 | 351 | ||
352 | setText(mText); | 352 | setText(mText); |
353 | //QWhatsThis::add(this,mText); | 353 | //QWhatsThis::add(this,mText); |
354 | 354 | ||
355 | } | 355 | } |
356 | 356 | ||
357 | void KOEventViewer::appendTodo(Todo *event, int mode ) | 357 | void KOEventViewer::appendTodo(Todo *event, int mode ) |
358 | { | 358 | { |
359 | mMailSubject = ""; | 359 | mMailSubject = ""; |
360 | mCurrentIncidence = event; | 360 | mCurrentIncidence = event; |
361 | topLevelWidget()->setCaption(i18n("Todo Viewer")); | 361 | topLevelWidget()->setCaption(i18n("Todo Viewer")); |
362 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 362 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
363 | if (mode == 0 ) | 363 | if (mode == 0 ) |
364 | addTag("h2",event->summary()); | 364 | addTag("h2",event->summary()); |
365 | else { | 365 | else { |
366 | if ( mColorMode == 1 ) { | 366 | if ( mColorMode == 1 ) { |
367 | mText +="<font color=\"#00A000\">"; | 367 | mText +="<font color=\"#00A000\">"; |
368 | } | 368 | } |
369 | if ( mColorMode == 2 ) { | 369 | if ( mColorMode == 2 ) { |
370 | mText +="<font color=\"#B00000\">"; | 370 | mText +="<font color=\"#B00000\">"; |
371 | } | 371 | } |
372 | if ( mode == 1 ) { | 372 | if ( mode == 1 ) { |
373 | addTag("h2",i18n( "Local: " ) +event->summary()); | 373 | addTag("h2",i18n( "Local: " ) +event->summary()); |
374 | } else { | 374 | } else { |
375 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 375 | addTag("h2",i18n( "Remote: " ) +event->summary()); |
376 | } | 376 | } |
377 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 377 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
378 | if ( mColorMode ) | 378 | if ( mColorMode ) |
379 | mText += "</font>"; | 379 | mText += "</font>"; |
380 | } | 380 | } |
381 | mMailSubject += i18n( "Todo " )+ event->summary(); | 381 | mMailSubject += i18n( "Todo " )+ event->summary(); |
382 | 382 | ||
383 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { | 383 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { |
384 | mText +="<font color=\"#B00000\">"; | 384 | mText +="<font color=\"#B00000\">"; |
385 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); | 385 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); |
386 | mText += "</font>"; | 386 | mText += "</font>"; |
387 | } else { | 387 | } else { |
388 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 388 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
389 | .arg(event->percentComplete())); | 389 | .arg(event->percentComplete())); |
390 | } | 390 | } |
391 | 391 | ||
392 | if (event->cancelled ()) { | 392 | if (event->cancelled ()) { |
393 | mText +="<font color=\"#B00000\">"; | 393 | mText +="<font color=\"#B00000\">"; |
394 | addTag("i",i18n("This todo has been cancelled!")); | 394 | addTag("i",i18n("This todo has been cancelled!")); |
395 | mText.append("<br>"); | 395 | mText.append("<br>"); |
396 | mText += "</font>"; | 396 | mText += "</font>"; |
397 | mMailSubject += i18n("(cancelled)"); | 397 | mMailSubject += i18n("(cancelled)"); |
398 | } | 398 | } |
399 | 399 | ||
400 | if (!event->location().isEmpty()) { | 400 | if (!event->location().isEmpty()) { |
401 | addTag("b",i18n("Location: ")); | 401 | addTag("b",i18n("Location: ")); |
402 | mText.append(event->location()+"<br>"); | 402 | mText.append(event->location()+"<br>"); |
403 | mMailSubject += i18n(" at ") + event->location(); | 403 | mMailSubject += i18n(" at ") + event->location(); |
404 | } | 404 | } |
405 | |||
406 | if (event->recurrence()->doesRecur()) { | ||
407 | |||
408 | QString recurText = event->recurrence()->recurrenceText(); | ||
409 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | ||
410 | |||
411 | } | ||
405 | if (event->hasStartDate()) { | 412 | if (event->hasStartDate()) { |
406 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 413 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
407 | } | 414 | } |
408 | if (event->hasDueDate()) { | 415 | if (event->hasDueDate()) { |
409 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 416 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
410 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 417 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
411 | } | 418 | } |
412 | addTag("b",i18n("Access: ")); | 419 | addTag("b",i18n("Access: ")); |
413 | mText.append(event->secrecyStr()+"<br>"); | 420 | mText.append(event->secrecyStr()+"<br>"); |
414 | if (!event->description().isEmpty()) { | 421 | if (!event->description().isEmpty()) { |
415 | addTag("p",i18n("<b>Details: </b>")); | 422 | addTag("p",i18n("<b>Details: </b>")); |
416 | addTag("p",event->description()); | 423 | addTag("p",event->description()); |
417 | } | 424 | } |
418 | 425 | ||
419 | formatCategories(event); | 426 | formatCategories(event); |
420 | 427 | ||
421 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 428 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
422 | .arg(QString::number(event->priority()))); | 429 | .arg(QString::number(event->priority()))); |
423 | 430 | ||
424 | formatReadOnly(event); | 431 | formatReadOnly(event); |
425 | formatAttendees(event); | 432 | formatAttendees(event); |
426 | if ( event->relatedTo() ) { | 433 | if ( event->relatedTo() ) { |
427 | addTag("b",i18n("Parent todo:<br>")); | 434 | addTag("b",i18n("Parent todo:<br>")); |
428 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 435 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
429 | } | 436 | } |
430 | QPtrList<Incidence> Relations = event->relations(); | 437 | QPtrList<Incidence> Relations = event->relations(); |
431 | Incidence *to; | 438 | Incidence *to; |
432 | if ( Relations.first() ) | 439 | if ( Relations.first() ) |
433 | addTag("b",i18n("Sub todos:<br>")); | 440 | addTag("b",i18n("Sub todos:<br>")); |
434 | for (to=Relations.first();to;to=Relations.next()) { | 441 | for (to=Relations.first();to;to=Relations.next()) { |
435 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 442 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); |
436 | 443 | ||
437 | } | 444 | } |
438 | setText(mText); | 445 | setText(mText); |
439 | } | 446 | } |
440 | 447 | ||
441 | void KOEventViewer::formatCategories(Incidence *event) | 448 | void KOEventViewer::formatCategories(Incidence *event) |
442 | { | 449 | { |
443 | if (!event->categoriesStr().isEmpty()) { | 450 | if (!event->categoriesStr().isEmpty()) { |
444 | if (event->categories().count() == 1) { | 451 | if (event->categories().count() == 1) { |
445 | addTag("h3",i18n("Category")); | 452 | addTag("h3",i18n("Category")); |
446 | } else { | 453 | } else { |
447 | addTag("h3",i18n("Categories")); | 454 | addTag("h3",i18n("Categories")); |
448 | } | 455 | } |
449 | addTag("p",event->categoriesStr()); | 456 | addTag("p",event->categoriesStr()); |
450 | } | 457 | } |
451 | } | 458 | } |
452 | void KOEventViewer::formatAttendees(Incidence *event) | 459 | void KOEventViewer::formatAttendees(Incidence *event) |
453 | { | 460 | { |
454 | QPtrList<Attendee> attendees = event->attendees(); | 461 | QPtrList<Attendee> attendees = event->attendees(); |
455 | if (attendees.count()) { | 462 | if (attendees.count()) { |
456 | 463 | ||
457 | 464 | ||
458 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 465 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
459 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | 466 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); |
460 | addTag("h3",i18n("Organizer")); | 467 | addTag("h3",i18n("Organizer")); |
461 | mText.append("<ul><li>"); | 468 | mText.append("<ul><li>"); |
462 | #ifndef KORG_NOKABC | 469 | #ifndef KORG_NOKABC |
463 | 470 | ||
464 | #ifdef DESKTOP_VERSION | 471 | #ifdef DESKTOP_VERSION |
465 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 472 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
466 | KABC::Addressee::List addressList; | 473 | KABC::Addressee::List addressList; |
467 | addressList = add_book->findByEmail(event->organizer()); | 474 | addressList = add_book->findByEmail(event->organizer()); |
468 | KABC::Addressee o = addressList.first(); | 475 | KABC::Addressee o = addressList.first(); |
469 | if (!o.isEmpty() && addressList.size()<2) { | 476 | if (!o.isEmpty() && addressList.size()<2) { |
470 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 477 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
471 | mText += o.formattedName(); | 478 | mText += o.formattedName(); |
472 | mText += "</a>\n"; | 479 | mText += "</a>\n"; |
473 | } else { | 480 | } else { |
474 | mText.append(event->organizer()); | 481 | mText.append(event->organizer()); |
475 | } | 482 | } |
476 | #else //DESKTOP_VERSION | 483 | #else //DESKTOP_VERSION |
477 | mText += "<a href=\"uid:organizer\">"; | 484 | mText += "<a href=\"uid:organizer\">"; |
478 | mText += event->organizer(); | 485 | mText += event->organizer(); |
479 | mText += "</a>\n"; | 486 | mText += "</a>\n"; |
480 | #endif //DESKTOP_VERSION | 487 | #endif //DESKTOP_VERSION |
481 | 488 | ||
482 | 489 | ||
483 | #else | 490 | #else |
484 | mText.append(event->organizer()); | 491 | mText.append(event->organizer()); |
485 | #endif | 492 | #endif |
486 | 493 | ||
487 | if (iconPath) { | 494 | if (iconPath) { |
488 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; | 495 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; |
489 | mText += "<IMG src=\"" + iconPath + "\">"; | 496 | mText += "<IMG src=\"" + iconPath + "\">"; |
490 | mText += "</a>\n"; | 497 | mText += "</a>\n"; |
491 | } | 498 | } |
492 | mText.append("</li></ul>"); | 499 | mText.append("</li></ul>"); |
493 | 500 | ||
494 | addTag("h3",i18n("Attendees")); | 501 | addTag("h3",i18n("Attendees")); |
495 | Attendee *a; | 502 | Attendee *a; |
496 | mText.append("<ul>"); | 503 | mText.append("<ul>"); |
497 | int a_count = 0; | 504 | int a_count = 0; |
498 | int a_count_nr = 0; | 505 | int a_count_nr = 0; |
499 | 506 | ||
500 | for(a=attendees.first();a;a=attendees.next()) { | 507 | for(a=attendees.first();a;a=attendees.next()) { |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index acd9265..d8e940b 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -63,193 +63,193 @@ | |||
63 | #include "kfiledialog.h" | 63 | #include "kfiledialog.h" |
64 | 64 | ||
65 | #include "kolistview.h" | 65 | #include "kolistview.h" |
66 | 66 | ||
67 | 67 | ||
68 | 68 | ||
69 | 69 | ||
70 | class KOListViewWhatsThis :public QWhatsThis | 70 | class KOListViewWhatsThis :public QWhatsThis |
71 | { | 71 | { |
72 | public: | 72 | public: |
73 | KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; | 73 | KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; |
74 | 74 | ||
75 | protected: | 75 | protected: |
76 | virtual QString text( const QPoint& p) | 76 | virtual QString text( const QPoint& p) |
77 | { | 77 | { |
78 | return _view->getWhatsThisText(p) ; | 78 | return _view->getWhatsThisText(p) ; |
79 | } | 79 | } |
80 | private: | 80 | private: |
81 | QWidget* _wid; | 81 | QWidget* _wid; |
82 | KOListView * _view; | 82 | KOListView * _view; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | 85 | ||
86 | ListItemVisitor::ListItemVisitor(KOListViewItem *item, QDate date ) | 86 | ListItemVisitor::ListItemVisitor(KOListViewItem *item, QDate date ) |
87 | { | 87 | { |
88 | mItem = item; | 88 | mItem = item; |
89 | mDate = date; | 89 | mDate = date; |
90 | } | 90 | } |
91 | 91 | ||
92 | ListItemVisitor::~ListItemVisitor() | 92 | ListItemVisitor::~ListItemVisitor() |
93 | { | 93 | { |
94 | } | 94 | } |
95 | 95 | ||
96 | bool ListItemVisitor::visit(Event *e) | 96 | bool ListItemVisitor::visit(Event *e) |
97 | { | 97 | { |
98 | 98 | ||
99 | bool ok = false; | 99 | bool ok = false; |
100 | QString start, end; | 100 | QString start, end; |
101 | QDate ds, de; | 101 | QDate ds, de; |
102 | if ( e->doesRecur() ) { | 102 | if ( e->doesRecur() ) { |
103 | ds = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date(); | 103 | ds = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date(); |
104 | if ( ok ) { | 104 | if ( ok ) { |
105 | int days = e->dtStart().date().daysTo(e->dtEnd().date() ); | 105 | int days = e->dtStart().date().daysTo(e->dtEnd().date() ); |
106 | start = KGlobal::locale()->formatDate(ds,true); | 106 | start = KGlobal::locale()->formatDate(ds,true); |
107 | de = ds.addDays( days); | 107 | de = ds.addDays( days); |
108 | end = KGlobal::locale()->formatDate(de,true); | 108 | end = KGlobal::locale()->formatDate(de,true); |
109 | } | 109 | } |
110 | 110 | ||
111 | } | 111 | } |
112 | if ( ! ok ) { | 112 | if ( ! ok ) { |
113 | start =e->dtStartDateStr(); | 113 | start =e->dtStartDateStr(); |
114 | end = e->dtEndDateStr(); | 114 | end = e->dtEndDateStr(); |
115 | ds = e->dtStart().date(); | 115 | ds = e->dtStart().date(); |
116 | de = e->dtEnd().date(); | 116 | de = e->dtEnd().date(); |
117 | } | 117 | } |
118 | mItem->setText(0,e->summary()); | 118 | mItem->setText(0,e->summary()); |
119 | mItem->setText(1,start); | 119 | mItem->setText(1,start); |
120 | mItem->setText(2,e->dtStartTimeStr()); | 120 | mItem->setText(2,e->dtStartTimeStr()); |
121 | mItem->setText(3,end); | 121 | mItem->setText(3,end); |
122 | mItem->setText(4,e->dtEndTimeStr()); | 122 | mItem->setText(4,e->dtEndTimeStr()); |
123 | mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No")); | 123 | mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No")); |
124 | mItem->setText(6, e->recurrence()->recurrenceText()); | 124 | mItem->setText(6, e->recurrence()->recurrenceText()); |
125 | mItem->setText(7,"---"); | 125 | mItem->setText(7,"---"); |
126 | mItem->setText(8,"---"); | 126 | mItem->setText(8,"---"); |
127 | mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No")); | 127 | mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No")); |
128 | mItem->setText(10,e->categoriesStr()); | 128 | mItem->setText(10,e->categoriesStr()); |
129 | 129 | ||
130 | QString key; | 130 | QString key; |
131 | QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time(); | 131 | QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time(); |
132 | key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute()); | 132 | key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute()); |
133 | mItem->setSortKey(1,key); | 133 | mItem->setSortKey(1,key); |
134 | 134 | ||
135 | t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time(); | 135 | t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time(); |
136 | key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute()); | 136 | key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute()); |
137 | mItem->setSortKey(3,key); | 137 | mItem->setSortKey(3,key); |
138 | 138 | ||
139 | return true; | 139 | return true; |
140 | } | 140 | } |
141 | 141 | ||
142 | bool ListItemVisitor::visit(Todo *t) | 142 | bool ListItemVisitor::visit(Todo *t) |
143 | { | 143 | { |
144 | mItem->setText(0,i18n("To-Do: %1").arg(t->summary())); | 144 | mItem->setText(0,i18n("To-Do: %1").arg(t->summary())); |
145 | if (t->hasStartDate()) { | 145 | if (t->hasStartDate()) { |
146 | mItem->setText(1,t->dtStartDateStr()); | 146 | mItem->setText(1,t->dtStartDateStr()); |
147 | if (t->doesFloat()) { | 147 | if (t->doesFloat()) { |
148 | mItem->setText(2,"---"); | 148 | mItem->setText(2,"---"); |
149 | } else { | 149 | } else { |
150 | mItem->setText(2,t->dtStartTimeStr()); | 150 | mItem->setText(2,t->dtStartTimeStr()); |
151 | } | 151 | } |
152 | } else { | 152 | } else { |
153 | mItem->setText(1,"---"); | 153 | mItem->setText(1,"---"); |
154 | mItem->setText(2,"---"); | 154 | mItem->setText(2,"---"); |
155 | } | 155 | } |
156 | mItem->setText(3,"---"); | 156 | mItem->setText(3,"---"); |
157 | mItem->setText(4,"---"); | 157 | mItem->setText(4,"---"); |
158 | mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No")); | 158 | mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No")); |
159 | mItem->setText(6,"---"); | 159 | mItem->setText(6, t->recurrence()->recurrenceText()); |
160 | if (t->hasDueDate()) { | 160 | if (t->hasDueDate()) { |
161 | mItem->setText(7,t->dtDueDateStr()); | 161 | mItem->setText(7,t->dtDueDateStr()); |
162 | if (t->doesFloat()) { | 162 | if (t->doesFloat()) { |
163 | mItem->setText(8,"---"); | 163 | mItem->setText(8,"---"); |
164 | } else { | 164 | } else { |
165 | mItem->setText(8,t->dtDueTimeStr()); | 165 | mItem->setText(8,t->dtDueTimeStr()); |
166 | } | 166 | } |
167 | } else { | 167 | } else { |
168 | mItem->setText(7,"---"); | 168 | mItem->setText(7,"---"); |
169 | mItem->setText(8,"---"); | 169 | mItem->setText(8,"---"); |
170 | } | 170 | } |
171 | mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); | 171 | mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); |
172 | mItem->setText(10,t->categoriesStr()); | 172 | mItem->setText(10,t->categoriesStr()); |
173 | 173 | ||
174 | QString key; | 174 | QString key; |
175 | QDate d; | 175 | QDate d; |
176 | if (t->hasDueDate()) { | 176 | if (t->hasDueDate()) { |
177 | d = t->dtDue().date(); | 177 | d = t->dtDue().date(); |
178 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); | 178 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); |
179 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 179 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
180 | mItem->setSortKey(7,key); | 180 | mItem->setSortKey(7,key); |
181 | } | 181 | } |
182 | if ( t->hasStartDate() ) { | 182 | if ( t->hasStartDate() ) { |
183 | d = t->dtStart().date(); | 183 | d = t->dtStart().date(); |
184 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); | 184 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); |
185 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 185 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
186 | mItem->setSortKey(1,key); | 186 | mItem->setSortKey(1,key); |
187 | } | 187 | } |
188 | return true; | 188 | return true; |
189 | } | 189 | } |
190 | 190 | ||
191 | bool ListItemVisitor::visit(Journal * j) | 191 | bool ListItemVisitor::visit(Journal * j) |
192 | { | 192 | { |
193 | QString des = j->description().left(50); | 193 | QString des = j->description().left(50); |
194 | des = des.simplifyWhiteSpace (); | 194 | des = des.simplifyWhiteSpace (); |
195 | des.replace (QRegExp ("\\n"),"" ); | 195 | des.replace (QRegExp ("\\n"),"" ); |
196 | des.replace (QRegExp ("\\r"),"" ); | 196 | des.replace (QRegExp ("\\r"),"" ); |
197 | mItem->setText(0,i18n("Journal")+": "+des.left(25)); | 197 | mItem->setText(0,i18n("Journal")+": "+des.left(25)); |
198 | mItem->setText(1,j->dtStartDateStr()); | 198 | mItem->setText(1,j->dtStartDateStr()); |
199 | mItem->setText(2,"---"); | 199 | mItem->setText(2,"---"); |
200 | mItem->setText(3,"---"); | 200 | mItem->setText(3,"---"); |
201 | mItem->setText(4,"---"); | 201 | mItem->setText(4,"---"); |
202 | mItem->setText(5,"---"); | 202 | mItem->setText(5,"---"); |
203 | mItem->setText(6,"---"); | 203 | mItem->setText(6,"---"); |
204 | mItem->setText(7,j->dtStartDateStr()); | 204 | mItem->setText(7,j->dtStartDateStr()); |
205 | mItem->setText(8,"---"); | 205 | mItem->setText(8,"---"); |
206 | mItem->setText(9,"---"); | 206 | mItem->setText(9,"---"); |
207 | mItem->setText(10,i18n("Last Modified: ")+ KGlobal::locale()->formatDateTime( j->lastModified() , true) ); | 207 | mItem->setText(10,i18n("Last Modified: ")+ KGlobal::locale()->formatDateTime( j->lastModified() , true) ); |
208 | 208 | ||
209 | QString key; | 209 | QString key; |
210 | QDate d = j->dtStart().date(); | 210 | QDate d = j->dtStart().date(); |
211 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); | 211 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); |
212 | mItem->setSortKey(1,key); | 212 | mItem->setSortKey(1,key); |
213 | mItem->setSortKey(7,key); | 213 | mItem->setSortKey(7,key); |
214 | 214 | ||
215 | return true; | 215 | return true; |
216 | } | 216 | } |
217 | 217 | ||
218 | KOListView::KOListView(Calendar *calendar, QWidget *parent, | 218 | KOListView::KOListView(Calendar *calendar, QWidget *parent, |
219 | const char *name) | 219 | const char *name) |
220 | : KOEventView(calendar, parent, name) | 220 | : KOEventView(calendar, parent, name) |
221 | { | 221 | { |
222 | mActiveItem = 0; | 222 | mActiveItem = 0; |
223 | mListView = new KOListViewListView(this); | 223 | mListView = new KOListViewListView(this); |
224 | mListView->addColumn(i18n("Summary")); | 224 | mListView->addColumn(i18n("Summary")); |
225 | mListView->addColumn(i18n("Start Date")); | 225 | mListView->addColumn(i18n("Start Date")); |
226 | mListView->addColumn(i18n("Start Time")); | 226 | mListView->addColumn(i18n("Start Time")); |
227 | mListView->addColumn(i18n("End Date")); | 227 | mListView->addColumn(i18n("End Date")); |
228 | mListView->addColumn(i18n("End Time")); | 228 | mListView->addColumn(i18n("End Time")); |
229 | mListView->addColumn(i18n("Alarm")); // alarm set? | 229 | mListView->addColumn(i18n("Alarm")); // alarm set? |
230 | mListView->addColumn(i18n("Recurs")); // recurs? | 230 | mListView->addColumn(i18n("Recurs")); // recurs? |
231 | mListView->addColumn(i18n("Due Date")); | 231 | mListView->addColumn(i18n("Due Date")); |
232 | mListView->addColumn(i18n("Due Time")); | 232 | mListView->addColumn(i18n("Due Time")); |
233 | mListView->addColumn(i18n("Cancelled")); | 233 | mListView->addColumn(i18n("Cancelled")); |
234 | mListView->addColumn(i18n("Categories")); | 234 | mListView->addColumn(i18n("Categories")); |
235 | 235 | ||
236 | mListView->setColumnAlignment(0,AlignLeft); | 236 | mListView->setColumnAlignment(0,AlignLeft); |
237 | mListView->setColumnAlignment(1,AlignLeft); | 237 | mListView->setColumnAlignment(1,AlignLeft); |
238 | mListView->setColumnAlignment(2,AlignHCenter); | 238 | mListView->setColumnAlignment(2,AlignHCenter); |
239 | mListView->setColumnAlignment(3,AlignLeft); | 239 | mListView->setColumnAlignment(3,AlignLeft); |
240 | mListView->setColumnAlignment(4,AlignHCenter); | 240 | mListView->setColumnAlignment(4,AlignHCenter); |
241 | mListView->setColumnAlignment(5,AlignLeft); | 241 | mListView->setColumnAlignment(5,AlignLeft); |
242 | mListView->setColumnAlignment(6,AlignLeft); | 242 | mListView->setColumnAlignment(6,AlignLeft); |
243 | mListView->setColumnAlignment(7,AlignLeft); | 243 | mListView->setColumnAlignment(7,AlignLeft); |
244 | mListView->setColumnAlignment(8,AlignLeft); | 244 | mListView->setColumnAlignment(8,AlignLeft); |
245 | mListView->setColumnAlignment(9,AlignLeft); | 245 | mListView->setColumnAlignment(9,AlignLeft); |
246 | mListView->setColumnAlignment(10,AlignLeft); | 246 | mListView->setColumnAlignment(10,AlignLeft); |
247 | mListView->setColumnWidthMode(10, QListView::Manual); | 247 | mListView->setColumnWidthMode(10, QListView::Manual); |
248 | new KOListViewWhatsThis(mListView->viewport(),this); | 248 | new KOListViewWhatsThis(mListView->viewport(),this); |
249 | 249 | ||
250 | int iii = 0; | 250 | int iii = 0; |
251 | for ( iii = 0; iii< 10 ; ++iii ) | 251 | for ( iii = 0; iii< 10 ; ++iii ) |
252 | mListView->setColumnWidthMode( iii, QListView::Manual ); | 252 | mListView->setColumnWidthMode( iii, QListView::Manual ); |
253 | 253 | ||
254 | QBoxLayout *layoutTop = new QVBoxLayout(this); | 254 | QBoxLayout *layoutTop = new QVBoxLayout(this); |
255 | layoutTop->addWidget(mListView); | 255 | layoutTop->addWidget(mListView); |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index f595d35..d0380e3 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -488,192 +488,195 @@ void MonthViewCell::insertEvent(Event *event) | |||
488 | 488 | ||
489 | } | 489 | } |
490 | text = prefix + event->summary(); | 490 | text = prefix + event->summary(); |
491 | mToolTip += text; | 491 | mToolTip += text; |
492 | } else { | 492 | } else { |
493 | if (event->doesFloat()) { | 493 | if (event->doesFloat()) { |
494 | text = event->summary(); | 494 | text = event->summary(); |
495 | mToolTip += text; | 495 | mToolTip += text; |
496 | } | 496 | } |
497 | else { | 497 | else { |
498 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 498 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
499 | text += " " + event->summary(); | 499 | text += " " + event->summary(); |
500 | mToolTip += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 500 | mToolTip += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
501 | } | 501 | } |
502 | } | 502 | } |
503 | 503 | ||
504 | MonthViewItem *item = new MonthViewItem( event, mDate, text ); | 504 | MonthViewItem *item = new MonthViewItem( event, mDate, text ); |
505 | QPalette pal; | 505 | QPalette pal; |
506 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { | 506 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { |
507 | QStringList categories = event->categories(); | 507 | QStringList categories = event->categories(); |
508 | QString cat = categories.first(); | 508 | QString cat = categories.first(); |
509 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { | 509 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { |
510 | pal = getPalette(); | 510 | pal = getPalette(); |
511 | if (cat.isEmpty()) { | 511 | if (cat.isEmpty()) { |
512 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); | 512 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); |
513 | } else { | 513 | } else { |
514 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); | 514 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); |
515 | } | 515 | } |
516 | 516 | ||
517 | } else { | 517 | } else { |
518 | if (cat.isEmpty()) { | 518 | if (cat.isEmpty()) { |
519 | pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); | 519 | pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); |
520 | } else { | 520 | } else { |
521 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); | 521 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); |
522 | } | 522 | } |
523 | } | 523 | } |
524 | 524 | ||
525 | } else { | 525 | } else { |
526 | pal = mStandardPalette ; | 526 | pal = mStandardPalette ; |
527 | } | 527 | } |
528 | item->setPalette( pal ); | 528 | item->setPalette( pal ); |
529 | item->setRecur( event->recurrence()->doesRecur() ); | 529 | item->setRecur( event->recurrence()->doesRecur() ); |
530 | item->setAlarm( event->isAlarmEnabled() ); | 530 | item->setAlarm( event->isAlarmEnabled() ); |
531 | item->setMoreInfo( event->description().length() > 0 ); | 531 | item->setMoreInfo( event->description().length() > 0 ); |
532 | #ifdef DESKTOP_VERSION | 532 | #ifdef DESKTOP_VERSION |
533 | Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails, | 533 | Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails, |
534 | KOPrefs::instance()->email()); | 534 | KOPrefs::instance()->email()); |
535 | if ( me != 0 ) { | 535 | if ( me != 0 ) { |
536 | if ( me->status() == Attendee::NeedsAction && me->RSVP()) | 536 | if ( me->status() == Attendee::NeedsAction && me->RSVP()) |
537 | item->setReply(true); | 537 | item->setReply(true); |
538 | else | 538 | else |
539 | item->setReply(false); | 539 | item->setReply(false); |
540 | } else | 540 | } else |
541 | item->setReply(false); | 541 | item->setReply(false); |
542 | #endif | 542 | #endif |
543 | mItemList->insertItem( item ); | 543 | mItemList->insertItem( item ); |
544 | mToolTip += "\n"; | 544 | mToolTip += "\n"; |
545 | } | 545 | } |
546 | void MonthViewCell::insertTodo(Todo *todo) | 546 | void MonthViewCell::insertTodo(Todo *todo) |
547 | { | 547 | { |
548 | mItemList->setFocusPolicy(WheelFocus); | 548 | mItemList->setFocusPolicy(WheelFocus); |
549 | QString text; | 549 | QString text; |
550 | if (todo->hasDueDate()) { | 550 | if (todo->hasDueDate()) { |
551 | if (!todo->doesFloat()) { | 551 | if (!todo->doesFloat()) { |
552 | text += KGlobal::locale()->formatTime(todo->dtDue().time()); | 552 | text += KGlobal::locale()->formatTime(todo->dtDue().time()); |
553 | text += " "; | 553 | text += " "; |
554 | } | 554 | } |
555 | } | 555 | } |
556 | text += i18n("T: %1").arg(todo->summary()); | 556 | text += i18n("T: %1").arg(todo->summary()); |
557 | 557 | ||
558 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | 558 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); |
559 | //item->setPalette( mStandardPalette ); | 559 | //item->setPalette( mStandardPalette ); |
560 | QPalette pal; | 560 | QPalette pal; |
561 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { | 561 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { |
562 | QStringList categories = todo->categories(); | 562 | QStringList categories = todo->categories(); |
563 | QString cat = categories.first(); | 563 | QString cat = categories.first(); |
564 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { | 564 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { |
565 | pal = getPalette(); | 565 | pal = getPalette(); |
566 | if (cat.isEmpty()) { | 566 | if (cat.isEmpty()) { |
567 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); | 567 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); |
568 | } else { | 568 | } else { |
569 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); | 569 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); |
570 | } | 570 | } |
571 | 571 | ||
572 | } else { | 572 | } else { |
573 | if (cat.isEmpty()) { | 573 | if (cat.isEmpty()) { |
574 | pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); | 574 | pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); |
575 | } else { | 575 | } else { |
576 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); | 576 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); |
577 | } | 577 | } |
578 | } | 578 | } |
579 | 579 | ||
580 | } else { | 580 | } else { |
581 | pal = mStandardPalette ; | 581 | pal = mStandardPalette ; |
582 | } | 582 | } |
583 | item->setPalette( pal ); | 583 | item->setPalette( pal ); |
584 | item->setRecur( todo->recurrence()->doesRecur() ); | ||
585 | item->setAlarm( todo->isAlarmEnabled() ); | ||
586 | item->setMoreInfo( todo->description().length() > 0 ); | ||
584 | mItemList->insertItem( item ); | 587 | mItemList->insertItem( item ); |
585 | mToolTip += text+"\n"; | 588 | mToolTip += text+"\n"; |
586 | } | 589 | } |
587 | void MonthViewCell::finishUpdateCell() | 590 | void MonthViewCell::finishUpdateCell() |
588 | { | 591 | { |
589 | #ifdef DESKTOP_VERSION | 592 | #ifdef DESKTOP_VERSION |
590 | if (mToolTip != "") | 593 | if (mToolTip != "") |
591 | QToolTip::add(this,mToolTip,toolTipGroup(),""); | 594 | QToolTip::add(this,mToolTip,toolTipGroup(),""); |
592 | #endif | 595 | #endif |
593 | mItemList->sort(); | 596 | mItemList->sort(); |
594 | //setMyPalette(); | 597 | //setMyPalette(); |
595 | setMyPalette(); | 598 | setMyPalette(); |
596 | QString text; | 599 | QString text; |
597 | bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog; | 600 | bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog; |
598 | if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { | 601 | if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { |
599 | text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " "; | 602 | text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " "; |
600 | mLabel->resize( mLabelBigSize ); | 603 | mLabel->resize( mLabelBigSize ); |
601 | text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); | 604 | text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); |
602 | } else { | 605 | } else { |
603 | mLabel->resize( mLabelSize ); | 606 | mLabel->resize( mLabelSize ); |
604 | text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); | 607 | text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); |
605 | } | 608 | } |
606 | 609 | ||
607 | mLabel->setText( text ); | 610 | mLabel->setText( text ); |
608 | resizeEvent( 0 ); | 611 | resizeEvent( 0 ); |
609 | } | 612 | } |
610 | void MonthViewCell::updateCell() | 613 | void MonthViewCell::updateCell() |
611 | { | 614 | { |
612 | qDebug("MonthViewCell::updateCell() "); | 615 | qDebug("MonthViewCell::updateCell() "); |
613 | if ( !mMonthView->isUpdatePossible() ) | 616 | if ( !mMonthView->isUpdatePossible() ) |
614 | return; | 617 | return; |
615 | startUpdateCell(); | 618 | startUpdateCell(); |
616 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 619 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
617 | QPtrList<Event> events = mMonthView->calendar()->events( mDate, true ); | 620 | QPtrList<Event> events = mMonthView->calendar()->events( mDate, true ); |
618 | Event *event; | 621 | Event *event; |
619 | for( event = events.first(); event; event = events.next() ) { // for event | 622 | for( event = events.first(); event; event = events.next() ) { // for event |
620 | insertEvent(event); | 623 | insertEvent(event); |
621 | } | 624 | } |
622 | // insert due todos | 625 | // insert due todos |
623 | QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); | 626 | QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); |
624 | Todo *todo; | 627 | Todo *todo; |
625 | for(todo = todos.first(); todo; todo = todos.next()) { | 628 | for(todo = todos.first(); todo; todo = todos.next()) { |
626 | insertTodo( todo ); | 629 | insertTodo( todo ); |
627 | } | 630 | } |
628 | finishUpdateCell(); | 631 | finishUpdateCell(); |
629 | // if ( isVisible()) | 632 | // if ( isVisible()) |
630 | //qApp->processEvents(); | 633 | //qApp->processEvents(); |
631 | } | 634 | } |
632 | 635 | ||
633 | void MonthViewCell::updateConfig( bool bigFont ) // = false | 636 | void MonthViewCell::updateConfig( bool bigFont ) // = false |
634 | { | 637 | { |
635 | 638 | ||
636 | if ( bigFont ) { | 639 | if ( bigFont ) { |
637 | QFont fo = KOPrefs::instance()->mMonthViewFont; | 640 | QFont fo = KOPrefs::instance()->mMonthViewFont; |
638 | int ps = fo.pointSize() + 2; | 641 | int ps = fo.pointSize() + 2; |
639 | if ( ps < 18 ) | 642 | if ( ps < 18 ) |
640 | ps += 2; | 643 | ps += 2; |
641 | fo.setPointSize( ps ); | 644 | fo.setPointSize( ps ); |
642 | setFont( fo ); | 645 | setFont( fo ); |
643 | } else | 646 | } else |
644 | setFont( KOPrefs::instance()->mMonthViewFont ); | 647 | setFont( KOPrefs::instance()->mMonthViewFont ); |
645 | 648 | ||
646 | QFontMetrics fm( font() ); | 649 | QFontMetrics fm( font() ); |
647 | mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); | 650 | mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); |
648 | mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); | 651 | mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); |
649 | mHolidayPalette = mStandardPalette; | 652 | mHolidayPalette = mStandardPalette; |
650 | mPrimaryPalette = mStandardPalette; | 653 | mPrimaryPalette = mStandardPalette; |
651 | mNonPrimaryPalette = mStandardPalette; | 654 | mNonPrimaryPalette = mStandardPalette; |
652 | if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { | 655 | if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { |
653 | mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); | 656 | mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); |
654 | mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); | 657 | mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); |
655 | mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); | 658 | mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); |
656 | mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); | 659 | mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); |
657 | mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor); | 660 | mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor); |
658 | mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor); | 661 | mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor); |
659 | mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark()); | 662 | mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark()); |
660 | mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); | 663 | mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); |
661 | mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); | 664 | mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); |
662 | } | 665 | } |
663 | //updateCell(); | 666 | //updateCell(); |
664 | } | 667 | } |
665 | 668 | ||
666 | void MonthViewCell::enableScrollBars( bool enabled ) | 669 | void MonthViewCell::enableScrollBars( bool enabled ) |
667 | { | 670 | { |
668 | if ( enabled ) { | 671 | if ( enabled ) { |
669 | mItemList->setVScrollBarMode(QScrollView::Auto); | 672 | mItemList->setVScrollBarMode(QScrollView::Auto); |
670 | mItemList->setHScrollBarMode(QScrollView::Auto); | 673 | mItemList->setHScrollBarMode(QScrollView::Auto); |
671 | } else { | 674 | } else { |
672 | mItemList->setVScrollBarMode(QScrollView::AlwaysOff); | 675 | mItemList->setVScrollBarMode(QScrollView::AlwaysOff); |
673 | mItemList->setHScrollBarMode(QScrollView::AlwaysOff); | 676 | mItemList->setHScrollBarMode(QScrollView::AlwaysOff); |
674 | } | 677 | } |
675 | } | 678 | } |
676 | 679 | ||
677 | Incidence *MonthViewCell::selectedIncidence() | 680 | Incidence *MonthViewCell::selectedIncidence() |
678 | { | 681 | { |
679 | int index = mItemList->currentItem(); | 682 | int index = mItemList->currentItem(); |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 391b3bb..18dc656 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -574,192 +574,198 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
574 | } | 574 | } |
575 | } | 575 | } |
576 | tempText += "</b></td><td>"; | 576 | tempText += "</b></td><td>"; |
577 | bool needClose = false; | 577 | bool needClose = false; |
578 | if ( ev->cancelled() ) { | 578 | if ( ev->cancelled() ) { |
579 | tempText += "<font color=\"#F00000\">[c"; | 579 | tempText += "<font color=\"#F00000\">[c"; |
580 | needClose =true; | 580 | needClose =true; |
581 | 581 | ||
582 | } | 582 | } |
583 | if ( ev->isAlarmEnabled() ) { | 583 | if ( ev->isAlarmEnabled() ) { |
584 | if ( !needClose) | 584 | if ( !needClose) |
585 | tempText +="["; | 585 | tempText +="["; |
586 | tempText += "a"; | 586 | tempText += "a"; |
587 | needClose =true; | 587 | needClose =true; |
588 | 588 | ||
589 | } | 589 | } |
590 | if ( ev->description().length() > 0 ) { | 590 | if ( ev->description().length() > 0 ) { |
591 | if ( !needClose) | 591 | if ( !needClose) |
592 | tempText +="["; | 592 | tempText +="["; |
593 | tempText += "i"; | 593 | tempText += "i"; |
594 | needClose =true; | 594 | needClose =true; |
595 | } | 595 | } |
596 | if ( ev->recurrence()->doesRecur() ) { | 596 | if ( ev->recurrence()->doesRecur() ) { |
597 | if ( !needClose) | 597 | if ( !needClose) |
598 | tempText +="["; | 598 | tempText +="["; |
599 | tempText += "r"; | 599 | tempText += "r"; |
600 | needClose =true; | 600 | needClose =true; |
601 | } | 601 | } |
602 | if ( needClose ) { | 602 | if ( needClose ) { |
603 | tempText += "] "; | 603 | tempText += "] "; |
604 | } | 604 | } |
605 | if ( ev->cancelled() ) | 605 | if ( ev->cancelled() ) |
606 | tempText += "</font>"; | 606 | tempText += "</font>"; |
607 | tempText += "<a "; | 607 | tempText += "<a "; |
608 | if (ev->type()=="Event") tempText += "href=\"event:"; | 608 | if (ev->type()=="Event") tempText += "href=\"event:"; |
609 | if (ev->type()=="Todo") tempText += "href=\"todo:"; | 609 | if (ev->type()=="Todo") tempText += "href=\"todo:"; |
610 | tempText += ev->uid() + "\">"; | 610 | tempText += ev->uid() + "\">"; |
611 | if ( ev->summary().length() > 0 ) | 611 | if ( ev->summary().length() > 0 ) |
612 | tempText += ev->summary(); | 612 | tempText += ev->summary(); |
613 | else | 613 | else |
614 | tempText += i18n("-no summary-"); | 614 | tempText += i18n("-no summary-"); |
615 | if ( bDay ) { | 615 | if ( bDay ) { |
616 | noc = ev->getNextOccurence( cdt.addDays(-1), &ok ); | 616 | noc = ev->getNextOccurence( cdt.addDays(-1), &ok ); |
617 | if ( ok ) { | 617 | if ( ok ) { |
618 | int years = 0; | 618 | int years = 0; |
619 | if ( ev->type() =="Todo" ) { | 619 | if ( ev->type() =="Todo" ) { |
620 | years = noc.date().year() -((Todo*)ev)->dtDue().date().year(); | 620 | years = noc.date().year() -((Todo*)ev)->dtDue().date().year(); |
621 | } else | 621 | } else |
622 | years = noc.date().year() - ev->dtStart().date().year(); | 622 | years = noc.date().year() - ev->dtStart().date().year(); |
623 | tempText += i18n(" (%1 y.)"). arg( years ); | 623 | tempText += i18n(" (%1 y.)"). arg( years ); |
624 | } | 624 | } |
625 | } | 625 | } |
626 | 626 | ||
627 | tempText += "</a>"; | 627 | tempText += "</a>"; |
628 | if ( KOPrefs::instance()->mWNViewShowLocation ) | 628 | if ( KOPrefs::instance()->mWNViewShowLocation ) |
629 | if ( !ev->location().isEmpty() ) | 629 | if ( !ev->location().isEmpty() ) |
630 | tempText += " ("+ev->location() +")"; | 630 | tempText += " ("+ev->location() +")"; |
631 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) | 631 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) |
632 | tempText += " ["+ev->relatedTo()->summary() +"]"; | 632 | tempText += " ["+ev->relatedTo()->summary() +"]"; |
633 | tempText += "</td></tr>\n"; | 633 | tempText += "</td></tr>\n"; |
634 | mText += tempText; | 634 | mText += tempText; |
635 | return true; | 635 | return true; |
636 | } | 636 | } |
637 | 637 | ||
638 | bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) | 638 | bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) |
639 | { | 639 | { |
640 | if ( mTodos.find( ev ) != mTodos.end() ) return false; | 640 | if ( mTodos.find( ev ) != mTodos.end() ) return false; |
641 | 641 | ||
642 | mTodos.append( ev ); | 642 | mTodos.append( ev ); |
643 | if ( !isSub ) | 643 | if ( !isSub ) |
644 | mText += "<p>"; | 644 | mText += "<p>"; |
645 | else | 645 | else |
646 | mText += "<li>"; | 646 | mText += "<li>"; |
647 | mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] "; | 647 | mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] "; |
648 | 648 | ||
649 | 649 | ||
650 | mText += ind; | 650 | mText += ind; |
651 | bool needClose = false; | 651 | bool needClose = false; |
652 | if ( ev->cancelled() ) { | 652 | if ( ev->cancelled() ) { |
653 | mText += "<font color=\"#F00000\">[c"; | 653 | mText += "<font color=\"#F00000\">[c"; |
654 | needClose =true; | 654 | needClose =true; |
655 | 655 | ||
656 | } | 656 | } |
657 | if ( ev->isAlarmEnabled() ) { | 657 | if ( ev->isAlarmEnabled() ) { |
658 | if ( !needClose) | 658 | if ( !needClose) |
659 | mText +="["; | 659 | mText +="["; |
660 | mText += "a"; | 660 | mText += "a"; |
661 | needClose =true; | 661 | needClose =true; |
662 | 662 | ||
663 | } | 663 | } |
664 | 664 | ||
665 | if ( ev->description().length() > 0 ) { | 665 | if ( ev->description().length() > 0 ) { |
666 | if ( !needClose) | 666 | if ( !needClose) |
667 | mText +="["; | 667 | mText +="["; |
668 | mText += "i"; | 668 | mText += "i"; |
669 | needClose =true; | 669 | needClose =true; |
670 | } | ||
671 | if ( ev->doesRecur() ) { | ||
672 | if ( !needClose) | ||
673 | mText +="["; | ||
674 | mText += "r"; | ||
675 | needClose =true; | ||
670 | } | 676 | } |
671 | // if ( ev->recurrence()->doesRecur() ) { | 677 | // if ( ev->recurrence()->doesRecur() ) { |
672 | // if ( !needClose) | 678 | // if ( !needClose) |
673 | // mText +="("; | 679 | // mText +="("; |
674 | // mText += "r"; | 680 | // mText += "r"; |
675 | // needClose =true; | 681 | // needClose =true; |
676 | // } | 682 | // } |
677 | if ( needClose ) | 683 | if ( needClose ) |
678 | mText += "] "; | 684 | mText += "] "; |
679 | if ( ev->cancelled() ) | 685 | if ( ev->cancelled() ) |
680 | mText += "</font>"; | 686 | mText += "</font>"; |
681 | mText += "<a href=\"todo:" + ev->uid() + "\">"; | 687 | mText += "<a href=\"todo:" + ev->uid() + "\">"; |
682 | if ( ev->summary().length() > 0 ) | 688 | if ( ev->summary().length() > 0 ) |
683 | mText += ev->summary(); | 689 | mText += ev->summary(); |
684 | else | 690 | else |
685 | mText += i18n("-no summary-"); | 691 | mText += i18n("-no summary-"); |
686 | mText += "</a>"; | 692 | mText += "</a>"; |
687 | if ( ((Todo*)ev)->hasDueDate () ) { | 693 | if ( ((Todo*)ev)->hasDueDate () ) { |
688 | QString year = ""; | 694 | QString year = ""; |
689 | int ye = ((Todo*)ev)->dtDue().date().year(); | 695 | int ye = ((Todo*)ev)->dtDue().date().year(); |
690 | if ( QDateTime::currentDateTime().date().year() != ye ) | 696 | if ( QDateTime::currentDateTime().date().year() != ye ) |
691 | year = QString::number( ye ); | 697 | year = QString::number( ye ); |
692 | QString dfs = KGlobal::locale()->dateFormatShort(); | 698 | QString dfs = KGlobal::locale()->dateFormatShort(); |
693 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 699 | KGlobal::locale()->setDateFormatShort("%d.%b"); |
694 | mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>"; | 700 | mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>"; |
695 | KGlobal::locale()->setDateFormatShort(dfs); | 701 | KGlobal::locale()->setDateFormatShort(dfs); |
696 | } | 702 | } |
697 | if ( KOPrefs::instance()->mWNViewShowLocation ) | 703 | if ( KOPrefs::instance()->mWNViewShowLocation ) |
698 | if ( !ev->location().isEmpty() ) | 704 | if ( !ev->location().isEmpty() ) |
699 | mText += " ("+ev->location() +")"; | 705 | mText += " ("+ev->location() +")"; |
700 | if ( !isSub ) { | 706 | if ( !isSub ) { |
701 | if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents) | 707 | if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents) |
702 | mText += " ["+ev->relatedTo()->summary() +"]"; | 708 | mText += " ["+ev->relatedTo()->summary() +"]"; |
703 | mText += "</p>\n"; | 709 | mText += "</p>\n"; |
704 | } | 710 | } |
705 | else { | 711 | else { |
706 | ind += "-"; | 712 | ind += "-"; |
707 | mText += "</li>\n"; | 713 | mText += "</li>\n"; |
708 | } | 714 | } |
709 | QPtrList<Incidence> Relations = ev->relations(); | 715 | QPtrList<Incidence> Relations = ev->relations(); |
710 | Incidence *to; | 716 | Incidence *to; |
711 | for (to=Relations.first();to;to=Relations.next()) { | 717 | for (to=Relations.first();to;to=Relations.next()) { |
712 | if (!((Todo*)to)->isCompleted()) | 718 | if (!((Todo*)to)->isCompleted()) |
713 | appendTodo( to, ind , true ); | 719 | appendTodo( to, ind , true ); |
714 | } | 720 | } |
715 | 721 | ||
716 | return true; | 722 | return true; |
717 | } | 723 | } |
718 | 724 | ||
719 | /* | 725 | /* |
720 | void KOWhatsNextView::createEventViewer() | 726 | void KOWhatsNextView::createEventViewer() |
721 | { | 727 | { |
722 | if (!mEventViewer) { | 728 | if (!mEventViewer) { |
723 | 729 | ||
724 | mEventViewer = new KOEventViewerDialog(this); | 730 | mEventViewer = new KOEventViewerDialog(this); |
725 | } | 731 | } |
726 | } | 732 | } |
727 | */ | 733 | */ |
728 | void KOWhatsNextView::setEventViewer(KOEventViewerDialog* v ) | 734 | void KOWhatsNextView::setEventViewer(KOEventViewerDialog* v ) |
729 | { | 735 | { |
730 | mEventViewer = v; | 736 | mEventViewer = v; |
731 | } | 737 | } |
732 | 738 | ||
733 | // TODO: Create this function in CalendarView and remove it from here | 739 | // TODO: Create this function in CalendarView and remove it from here |
734 | void KOWhatsNextView::showIncidence(const QString &uid) | 740 | void KOWhatsNextView::showIncidence(const QString &uid) |
735 | { | 741 | { |
736 | 742 | ||
737 | if ( !mEventViewer ) { | 743 | if ( !mEventViewer ) { |
738 | qDebug("KOWhatsNextView::showIncidence::sorry, no event viewer set "); | 744 | qDebug("KOWhatsNextView::showIncidence::sorry, no event viewer set "); |
739 | return; | 745 | return; |
740 | } | 746 | } |
741 | //kdDebug() << "KOWhatsNextView::showIncidence(): " << uid << endl; | 747 | //kdDebug() << "KOWhatsNextView::showIncidence(): " << uid << endl; |
742 | //qDebug("KOWhatsNextView::showIncidence %s ", uid.latin1()); | 748 | //qDebug("KOWhatsNextView::showIncidence %s ", uid.latin1()); |
743 | if (uid.startsWith("event:")) { | 749 | if (uid.startsWith("event:")) { |
744 | #ifdef DESKTOP_VERSION | 750 | #ifdef DESKTOP_VERSION |
745 | Event *event = calendar()->event(uid.mid(8)); | 751 | Event *event = calendar()->event(uid.mid(8)); |
746 | #else | 752 | #else |
747 | Event *event = calendar()->event(uid.mid(6)); | 753 | Event *event = calendar()->event(uid.mid(6)); |
748 | #endif | 754 | #endif |
749 | //qDebug("event %d uid %s ", event, uid.mid(6).latin1()); | 755 | //qDebug("event %d uid %s ", event, uid.mid(6).latin1()); |
750 | if (!event) return; | 756 | if (!event) return; |
751 | //createEventViewer(); | 757 | //createEventViewer(); |
752 | mEventViewer->setEvent(event); | 758 | mEventViewer->setEvent(event); |
753 | } else if (uid.startsWith("todo:")) { | 759 | } else if (uid.startsWith("todo:")) { |
754 | #ifdef DESKTOP_VERSION | 760 | #ifdef DESKTOP_VERSION |
755 | Todo *todo = calendar()->todo(uid.mid(7)); | 761 | Todo *todo = calendar()->todo(uid.mid(7)); |
756 | #else | 762 | #else |
757 | Todo *todo = calendar()->todo(uid.mid(5)); | 763 | Todo *todo = calendar()->todo(uid.mid(5)); |
758 | #endif | 764 | #endif |
759 | if (!todo) return; | 765 | if (!todo) return; |
760 | //createEventViewer(); | 766 | //createEventViewer(); |
761 | mEventViewer->setTodo(todo); | 767 | mEventViewer->setTodo(todo); |
762 | } else { | 768 | } else { |
763 | return; | 769 | return; |
764 | 770 | ||
765 | } | 771 | } |
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index bb9cb29..2e38ae3 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp | |||
@@ -1117,193 +1117,193 @@ Attachment *ICalFormatImpl::readAttachment(icalproperty *attach) | |||
1117 | /* | 1117 | /* |
1118 | icalparameter *vp = icalproperty_get_first_parameter(attach, ICAL_VALUE_PARAMETER); | 1118 | icalparameter *vp = icalproperty_get_first_parameter(attach, ICAL_VALUE_PARAMETER); |
1119 | if (vp) | 1119 | if (vp) |
1120 | v = icalparameter_get_value(vp); | 1120 | v = icalparameter_get_value(vp); |
1121 | 1121 | ||
1122 | icalparameter *ep = icalproperty_get_first_parameter(attach, ICAL_ENCODING_PARAMETER); | 1122 | icalparameter *ep = icalproperty_get_first_parameter(attach, ICAL_ENCODING_PARAMETER); |
1123 | if (ep) | 1123 | if (ep) |
1124 | e = icalparameter_get_encoding(ep); | 1124 | e = icalparameter_get_encoding(ep); |
1125 | */ | 1125 | */ |
1126 | int isurl = icalattach_get_is_url (a); | 1126 | int isurl = icalattach_get_is_url (a); |
1127 | if (isurl == 0) | 1127 | if (isurl == 0) |
1128 | attachment = new Attachment((const char*)icalattach_get_data(a)); | 1128 | attachment = new Attachment((const char*)icalattach_get_data(a)); |
1129 | else { | 1129 | else { |
1130 | attachment = new Attachment(QString(icalattach_get_url(a))); | 1130 | attachment = new Attachment(QString(icalattach_get_url(a))); |
1131 | } | 1131 | } |
1132 | 1132 | ||
1133 | icalparameter *p = icalproperty_get_first_parameter(attach, ICAL_FMTTYPE_PARAMETER); | 1133 | icalparameter *p = icalproperty_get_first_parameter(attach, ICAL_FMTTYPE_PARAMETER); |
1134 | if (p) | 1134 | if (p) |
1135 | attachment->setMimeType(QString(icalparameter_get_fmttype(p))); | 1135 | attachment->setMimeType(QString(icalparameter_get_fmttype(p))); |
1136 | 1136 | ||
1137 | return attachment; | 1137 | return attachment; |
1138 | } | 1138 | } |
1139 | #include <qtextcodec.h> | 1139 | #include <qtextcodec.h> |
1140 | void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) | 1140 | void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) |
1141 | { | 1141 | { |
1142 | readIncidenceBase(parent,incidence); | 1142 | readIncidenceBase(parent,incidence); |
1143 | 1143 | ||
1144 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); | 1144 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); |
1145 | bool readrec = false; | 1145 | bool readrec = false; |
1146 | const char *text; | 1146 | const char *text; |
1147 | int intvalue; | 1147 | int intvalue; |
1148 | icaltimetype icaltime; | 1148 | icaltimetype icaltime; |
1149 | icaldurationtype icalduration; | 1149 | icaldurationtype icalduration; |
1150 | struct icalrecurrencetype rectype; | 1150 | struct icalrecurrencetype rectype; |
1151 | QStringList categories; | 1151 | QStringList categories; |
1152 | 1152 | ||
1153 | while (p) { | 1153 | while (p) { |
1154 | icalproperty_kind kind = icalproperty_isa(p); | 1154 | icalproperty_kind kind = icalproperty_isa(p); |
1155 | switch (kind) { | 1155 | switch (kind) { |
1156 | 1156 | ||
1157 | case ICAL_CREATED_PROPERTY: | 1157 | case ICAL_CREATED_PROPERTY: |
1158 | icaltime = icalproperty_get_created(p); | 1158 | icaltime = icalproperty_get_created(p); |
1159 | incidence->setCreated(readICalDateTime(icaltime)); | 1159 | incidence->setCreated(readICalDateTime(icaltime)); |
1160 | break; | 1160 | break; |
1161 | 1161 | ||
1162 | case ICAL_SEQUENCE_PROPERTY: // sequence | 1162 | case ICAL_SEQUENCE_PROPERTY: // sequence |
1163 | intvalue = icalproperty_get_sequence(p); | 1163 | intvalue = icalproperty_get_sequence(p); |
1164 | incidence->setRevision(intvalue); | 1164 | incidence->setRevision(intvalue); |
1165 | break; | 1165 | break; |
1166 | 1166 | ||
1167 | case ICAL_LASTMODIFIED_PROPERTY: // last modification date | 1167 | case ICAL_LASTMODIFIED_PROPERTY: // last modification date |
1168 | icaltime = icalproperty_get_lastmodified(p); | 1168 | icaltime = icalproperty_get_lastmodified(p); |
1169 | incidence->setLastModified(readICalDateTime(icaltime)); | 1169 | incidence->setLastModified(readICalDateTime(icaltime)); |
1170 | break; | 1170 | break; |
1171 | 1171 | ||
1172 | case ICAL_DTSTART_PROPERTY: // start date and time | 1172 | case ICAL_DTSTART_PROPERTY: // start date and time |
1173 | icaltime = icalproperty_get_dtstart(p); | 1173 | icaltime = icalproperty_get_dtstart(p); |
1174 | if (icaltime.is_date) { | 1174 | if (icaltime.is_date) { |
1175 | incidence->setDtStart(QDateTime(readICalDate(icaltime),QTime(0,0,0))); | 1175 | incidence->setDtStart(QDateTime(readICalDate(icaltime),QTime(0,0,0))); |
1176 | incidence->setFloats(true); | 1176 | incidence->setFloats(true); |
1177 | } else { | 1177 | } else { |
1178 | incidence->setDtStart(readICalDateTime(icaltime)); | 1178 | incidence->setDtStart(readICalDateTime(icaltime)); |
1179 | } | 1179 | } |
1180 | break; | 1180 | break; |
1181 | 1181 | ||
1182 | case ICAL_DURATION_PROPERTY: // start date and time | 1182 | case ICAL_DURATION_PROPERTY: // start date and time |
1183 | icalduration = icalproperty_get_duration(p); | 1183 | icalduration = icalproperty_get_duration(p); |
1184 | incidence->setDuration(readICalDuration(icalduration)); | 1184 | incidence->setDuration(readICalDuration(icalduration)); |
1185 | break; | 1185 | break; |
1186 | 1186 | ||
1187 | case ICAL_DESCRIPTION_PROPERTY: // description | 1187 | case ICAL_DESCRIPTION_PROPERTY: // description |
1188 | text = icalproperty_get_description(p); | 1188 | text = icalproperty_get_description(p); |
1189 | incidence->setDescription(QString::fromUtf8(text)); | 1189 | incidence->setDescription(QString::fromUtf8(text)); |
1190 | break; | 1190 | break; |
1191 | 1191 | ||
1192 | case ICAL_SUMMARY_PROPERTY: // summary | 1192 | case ICAL_SUMMARY_PROPERTY: // summary |
1193 | { | 1193 | { |
1194 | text = icalproperty_get_summary(p); | 1194 | text = icalproperty_get_summary(p); |
1195 | incidence->setSummary(QString::fromUtf8(text)); | 1195 | incidence->setSummary(QString::fromUtf8(text)); |
1196 | } | 1196 | } |
1197 | break; | 1197 | break; |
1198 | case ICAL_STATUS_PROPERTY: // summary | 1198 | case ICAL_STATUS_PROPERTY: // summary |
1199 | { | 1199 | { |
1200 | if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) ) | 1200 | if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) ) |
1201 | incidence->setCancelled( true ); | 1201 | incidence->setCancelled( true ); |
1202 | } | 1202 | } |
1203 | break; | 1203 | break; |
1204 | 1204 | ||
1205 | case ICAL_LOCATION_PROPERTY: // location | 1205 | case ICAL_LOCATION_PROPERTY: // location |
1206 | text = icalproperty_get_location(p); | 1206 | text = icalproperty_get_location(p); |
1207 | incidence->setLocation(QString::fromUtf8(text)); | 1207 | incidence->setLocation(QString::fromUtf8(text)); |
1208 | break; | 1208 | break; |
1209 | 1209 | ||
1210 | case ICAL_RECURRENCEID_PROPERTY: | 1210 | case ICAL_RECURRENCEID_PROPERTY: |
1211 | icaltime = icalproperty_get_recurrenceid(p); | 1211 | icaltime = icalproperty_get_recurrenceid(p); |
1212 | incidence->setRecurrenceID( readICalDateTime(icaltime) ); | 1212 | incidence->setRecurrenceID( readICalDateTime(icaltime) ); |
1213 | qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() ); | 1213 | //qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() ); |
1214 | break; | 1214 | break; |
1215 | #if 0 | 1215 | #if 0 |
1216 | // status | 1216 | // status |
1217 | if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) { | 1217 | if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) { |
1218 | incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo))); | 1218 | incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo))); |
1219 | deleteStr(s); | 1219 | deleteStr(s); |
1220 | } | 1220 | } |
1221 | else | 1221 | else |
1222 | incidence->setStatus("NEEDS ACTION"); | 1222 | incidence->setStatus("NEEDS ACTION"); |
1223 | #endif | 1223 | #endif |
1224 | 1224 | ||
1225 | case ICAL_PRIORITY_PROPERTY: // priority | 1225 | case ICAL_PRIORITY_PROPERTY: // priority |
1226 | intvalue = icalproperty_get_priority(p); | 1226 | intvalue = icalproperty_get_priority(p); |
1227 | incidence->setPriority(intvalue); | 1227 | incidence->setPriority(intvalue); |
1228 | break; | 1228 | break; |
1229 | 1229 | ||
1230 | case ICAL_CATEGORIES_PROPERTY: // categories | 1230 | case ICAL_CATEGORIES_PROPERTY: // categories |
1231 | text = icalproperty_get_categories(p); | 1231 | text = icalproperty_get_categories(p); |
1232 | categories.append(QString::fromUtf8(text)); | 1232 | categories.append(QString::fromUtf8(text)); |
1233 | break; | 1233 | break; |
1234 | //******************************************* | 1234 | //******************************************* |
1235 | case ICAL_RRULE_PROPERTY: | 1235 | case ICAL_RRULE_PROPERTY: |
1236 | // we do need (maybe )start datetime of incidence for recurrence | 1236 | // we do need (maybe )start datetime of incidence for recurrence |
1237 | // such that we can read recurrence only after we read incidence completely | 1237 | // such that we can read recurrence only after we read incidence completely |
1238 | readrec = true; | 1238 | readrec = true; |
1239 | rectype = icalproperty_get_rrule(p); | 1239 | rectype = icalproperty_get_rrule(p); |
1240 | break; | 1240 | break; |
1241 | 1241 | ||
1242 | case ICAL_EXDATE_PROPERTY: | 1242 | case ICAL_EXDATE_PROPERTY: |
1243 | icaltime = icalproperty_get_exdate(p); | 1243 | icaltime = icalproperty_get_exdate(p); |
1244 | incidence->addExDate(readICalDate(icaltime)); | 1244 | incidence->addExDate(readICalDate(icaltime)); |
1245 | break; | 1245 | break; |
1246 | 1246 | ||
1247 | case ICAL_CLASS_PROPERTY: { | 1247 | case ICAL_CLASS_PROPERTY: { |
1248 | int inttext = icalproperty_get_class(p); | 1248 | int inttext = icalproperty_get_class(p); |
1249 | if (inttext == ICAL_CLASS_PUBLIC ) { | 1249 | if (inttext == ICAL_CLASS_PUBLIC ) { |
1250 | incidence->setSecrecy(Incidence::SecrecyPublic); | 1250 | incidence->setSecrecy(Incidence::SecrecyPublic); |
1251 | } else if (inttext == ICAL_CLASS_CONFIDENTIAL ) { | 1251 | } else if (inttext == ICAL_CLASS_CONFIDENTIAL ) { |
1252 | incidence->setSecrecy(Incidence::SecrecyConfidential); | 1252 | incidence->setSecrecy(Incidence::SecrecyConfidential); |
1253 | } else { | 1253 | } else { |
1254 | incidence->setSecrecy(Incidence::SecrecyPrivate); | 1254 | incidence->setSecrecy(Incidence::SecrecyPrivate); |
1255 | } | 1255 | } |
1256 | } | 1256 | } |
1257 | break; | 1257 | break; |
1258 | 1258 | ||
1259 | case ICAL_ATTACH_PROPERTY: // attachments | 1259 | case ICAL_ATTACH_PROPERTY: // attachments |
1260 | incidence->addAttachment(readAttachment(p)); | 1260 | incidence->addAttachment(readAttachment(p)); |
1261 | break; | 1261 | break; |
1262 | 1262 | ||
1263 | default: | 1263 | default: |
1264 | // kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind | 1264 | // kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind |
1265 | // << endl; | 1265 | // << endl; |
1266 | break; | 1266 | break; |
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); | 1269 | p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); |
1270 | } | 1270 | } |
1271 | if ( readrec ) { | 1271 | if ( readrec ) { |
1272 | readRecurrenceRule(rectype,incidence); | 1272 | readRecurrenceRule(rectype,incidence); |
1273 | } | 1273 | } |
1274 | // kpilot stuff | 1274 | // kpilot stuff |
1275 | // TODO: move this application-specific code to kpilot | 1275 | // TODO: move this application-specific code to kpilot |
1276 | QString kp = incidence->nonKDECustomProperty("X-PILOTID"); | 1276 | QString kp = incidence->nonKDECustomProperty("X-PILOTID"); |
1277 | if (!kp.isNull()) { | 1277 | if (!kp.isNull()) { |
1278 | incidence->setPilotId(kp.toInt()); | 1278 | incidence->setPilotId(kp.toInt()); |
1279 | } | 1279 | } |
1280 | kp = incidence->nonKDECustomProperty("X-PILOTSTAT"); | 1280 | kp = incidence->nonKDECustomProperty("X-PILOTSTAT"); |
1281 | if (!kp.isNull()) { | 1281 | if (!kp.isNull()) { |
1282 | incidence->setSyncStatus(kp.toInt()); | 1282 | incidence->setSyncStatus(kp.toInt()); |
1283 | } | 1283 | } |
1284 | 1284 | ||
1285 | 1285 | ||
1286 | kp = incidence->nonKDECustomProperty("X-KOPIEXTID"); | 1286 | kp = incidence->nonKDECustomProperty("X-KOPIEXTID"); |
1287 | if (!kp.isNull()) { | 1287 | if (!kp.isNull()) { |
1288 | incidence->setIDStr(kp); | 1288 | incidence->setIDStr(kp); |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | // Cancel backwards compatibility mode for subsequent changes by the application | 1291 | // Cancel backwards compatibility mode for subsequent changes by the application |
1292 | incidence->recurrence()->setCompatVersion(); | 1292 | incidence->recurrence()->setCompatVersion(); |
1293 | 1293 | ||
1294 | // add categories | 1294 | // add categories |
1295 | incidence->setCategories(categories); | 1295 | incidence->setCategories(categories); |
1296 | 1296 | ||
1297 | // iterate through all alarms | 1297 | // iterate through all alarms |
1298 | for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); | 1298 | for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); |
1299 | alarm; | 1299 | alarm; |
1300 | alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { | 1300 | alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { |
1301 | readAlarm(alarm,incidence); | 1301 | readAlarm(alarm,incidence); |
1302 | } | 1302 | } |
1303 | } | 1303 | } |
1304 | 1304 | ||
1305 | void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) | 1305 | void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) |
1306 | { | 1306 | { |
1307 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); | 1307 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); |
1308 | 1308 | ||
1309 | while (p) { | 1309 | while (p) { |
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 0684af2..708ee6b 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -120,196 +120,204 @@ void Incidence::setCancelled( bool b ) | |||
120 | updated(); | 120 | updated(); |
121 | } | 121 | } |
122 | bool Incidence::hasStartDate() const | 122 | bool Incidence::hasStartDate() const |
123 | { | 123 | { |
124 | return mHasStartDate; | 124 | return mHasStartDate; |
125 | } | 125 | } |
126 | 126 | ||
127 | void Incidence::setHasStartDate(bool f) | 127 | void Incidence::setHasStartDate(bool f) |
128 | { | 128 | { |
129 | if (mReadOnly) return; | 129 | if (mReadOnly) return; |
130 | mHasStartDate = f; | 130 | mHasStartDate = f; |
131 | updated(); | 131 | updated(); |
132 | } | 132 | } |
133 | 133 | ||
134 | // A string comparison that considers that null and empty are the same | 134 | // A string comparison that considers that null and empty are the same |
135 | static bool stringCompare( const QString& s1, const QString& s2 ) | 135 | static bool stringCompare( const QString& s1, const QString& s2 ) |
136 | { | 136 | { |
137 | if ( s1.isEmpty() && s2.isEmpty() ) | 137 | if ( s1.isEmpty() && s2.isEmpty() ) |
138 | return true; | 138 | return true; |
139 | return s1 == s2; | 139 | return s1 == s2; |
140 | } | 140 | } |
141 | 141 | ||
142 | bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) | 142 | bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) |
143 | { | 143 | { |
144 | 144 | ||
145 | if( i1.alarms().count() != i2.alarms().count() ) { | 145 | if( i1.alarms().count() != i2.alarms().count() ) { |
146 | return false; // no need to check further | 146 | return false; // no need to check further |
147 | } | 147 | } |
148 | if ( i1.alarms().count() > 0 ) { | 148 | if ( i1.alarms().count() > 0 ) { |
149 | if ( !( *(i1.alarms().first()) == *(i2.alarms().first())) ) | 149 | if ( !( *(i1.alarms().first()) == *(i2.alarms().first())) ) |
150 | { | 150 | { |
151 | qDebug("alarm not equal "); | 151 | qDebug("alarm not equal "); |
152 | return false; | 152 | return false; |
153 | } | 153 | } |
154 | } | 154 | } |
155 | #if 0 | 155 | #if 0 |
156 | QPtrListIterator<Alarm> a1( i1.alarms() ); | 156 | QPtrListIterator<Alarm> a1( i1.alarms() ); |
157 | QPtrListIterator<Alarm> a2( i2.alarms() ); | 157 | QPtrListIterator<Alarm> a2( i2.alarms() ); |
158 | for( ; a1.current() && a2.current(); ++a1, ++a2 ) { | 158 | for( ; a1.current() && a2.current(); ++a1, ++a2 ) { |
159 | if( *a1.current() == *a2.current() ) { | 159 | if( *a1.current() == *a2.current() ) { |
160 | continue; | 160 | continue; |
161 | } | 161 | } |
162 | else { | 162 | else { |
163 | return false; | 163 | return false; |
164 | } | 164 | } |
165 | } | 165 | } |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | if ( i1.hasRecurrenceID() == i2.hasRecurrenceID() ) { | 168 | if ( i1.hasRecurrenceID() == i2.hasRecurrenceID() ) { |
169 | if ( i1.hasRecurrenceID() ) { | 169 | if ( i1.hasRecurrenceID() ) { |
170 | if ( i1.recurrenceID() != i2.recurrenceID() ) | 170 | if ( i1.recurrenceID() != i2.recurrenceID() ) |
171 | return false; | 171 | return false; |
172 | } | 172 | } |
173 | 173 | ||
174 | } else { | 174 | } else { |
175 | return false; | 175 | return false; |
176 | } | 176 | } |
177 | 177 | ||
178 | if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) ) | 178 | if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) ) |
179 | return false; | 179 | return false; |
180 | if ( i1.hasStartDate() == i2.hasStartDate() ) { | 180 | if ( i1.hasStartDate() == i2.hasStartDate() ) { |
181 | if ( i1.hasStartDate() ) { | 181 | if ( i1.hasStartDate() ) { |
182 | if ( i1.dtStart() != i2.dtStart() ) | 182 | if ( i1.dtStart() != i2.dtStart() ) |
183 | return false; | 183 | return false; |
184 | } | 184 | } |
185 | } else { | 185 | } else { |
186 | return false; | 186 | return false; |
187 | } | 187 | } |
188 | if (!( *i1.recurrence() == *i2.recurrence()) ) { | 188 | if (!( *i1.recurrence() == *i2.recurrence()) ) { |
189 | qDebug("recurrence is NOT equal "); | 189 | qDebug("recurrence is NOT equal "); |
190 | return false; | 190 | return false; |
191 | } | 191 | } |
192 | return | 192 | return |
193 | // i1.created() == i2.created() && | 193 | // i1.created() == i2.created() && |
194 | stringCompare( i1.description(), i2.description() ) && | 194 | stringCompare( i1.description(), i2.description() ) && |
195 | stringCompare( i1.summary(), i2.summary() ) && | 195 | stringCompare( i1.summary(), i2.summary() ) && |
196 | i1.categories() == i2.categories() && | 196 | i1.categories() == i2.categories() && |
197 | // no need to compare mRelatedTo | 197 | // no need to compare mRelatedTo |
198 | stringCompare( i1.relatedToUid(), i2.relatedToUid() ) && | 198 | stringCompare( i1.relatedToUid(), i2.relatedToUid() ) && |
199 | // i1.relations() == i2.relations() && | 199 | // i1.relations() == i2.relations() && |
200 | i1.exDates() == i2.exDates() && | 200 | i1.exDates() == i2.exDates() && |
201 | i1.attachments() == i2.attachments() && | 201 | i1.attachments() == i2.attachments() && |
202 | i1.resources() == i2.resources() && | 202 | i1.resources() == i2.resources() && |
203 | i1.secrecy() == i2.secrecy() && | 203 | i1.secrecy() == i2.secrecy() && |
204 | i1.priority() == i2.priority() && | 204 | i1.priority() == i2.priority() && |
205 | i1.cancelled() == i2.cancelled() && | 205 | i1.cancelled() == i2.cancelled() && |
206 | stringCompare( i1.location(), i2.location() ); | 206 | stringCompare( i1.location(), i2.location() ); |
207 | } | 207 | } |
208 | 208 | ||
209 | Incidence* Incidence::recreateCloneException( QDate d ) | 209 | Incidence* Incidence::recreateCloneException( QDate d ) |
210 | { | 210 | { |
211 | Incidence* newInc = clone(); | 211 | Incidence* newInc = clone(); |
212 | newInc->recreate(); | 212 | newInc->recreate(); |
213 | if ( doesRecur() ) { | 213 | if ( doesRecur() ) { |
214 | addExDate( d ); | 214 | addExDate( d ); |
215 | newInc->recurrence()->unsetRecurs(); | 215 | newInc->recurrence()->unsetRecurs(); |
216 | int len = dtStart().secsTo( ((Event*)this)->dtEnd()); | 216 | if ( type() == "Event") { |
217 | QTime tim = dtStart().time(); | 217 | int len = dtStart().secsTo( ((Event*)this)->dtEnd()); |
218 | newInc->setDtStart( QDateTime(d, tim) ); | 218 | QTime tim = dtStart().time(); |
219 | ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); | 219 | newInc->setDtStart( QDateTime(d, tim) ); |
220 | ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); | ||
221 | } else { | ||
222 | int len = dtStart().secsTo( ((Todo*)this)->dtDue()); | ||
223 | QTime tim = ((Todo*)this)->dtDue().time(); | ||
224 | ((Todo*)newInc)->setDtDue( QDateTime(d, tim) ); | ||
225 | ((Todo*)newInc)->setDtStart( ((Todo*)newInc)->dtDue().addSecs( -len ) ); | ||
226 | ((Todo*)this)->setRecurDates(); | ||
227 | } | ||
220 | } | 228 | } |
221 | return newInc; | 229 | return newInc; |
222 | } | 230 | } |
223 | 231 | ||
224 | void Incidence::recreate() | 232 | void Incidence::recreate() |
225 | { | 233 | { |
226 | setCreated(QDateTime::currentDateTime()); | 234 | setCreated(QDateTime::currentDateTime()); |
227 | 235 | ||
228 | setUid(CalFormat::createUniqueId()); | 236 | setUid(CalFormat::createUniqueId()); |
229 | 237 | ||
230 | setRevision(0); | 238 | setRevision(0); |
231 | setIDStr( ":" ); | 239 | setIDStr( ":" ); |
232 | setLastModified(QDateTime::currentDateTime()); | 240 | setLastModified(QDateTime::currentDateTime()); |
233 | } | 241 | } |
234 | 242 | ||
235 | void Incidence::setReadOnly( bool readOnly ) | 243 | void Incidence::setReadOnly( bool readOnly ) |
236 | { | 244 | { |
237 | IncidenceBase::setReadOnly( readOnly ); | 245 | IncidenceBase::setReadOnly( readOnly ); |
238 | recurrence()->setRecurReadOnly( readOnly); | 246 | recurrence()->setRecurReadOnly( readOnly); |
239 | } | 247 | } |
240 | 248 | ||
241 | void Incidence::setCreated(QDateTime created) | 249 | void Incidence::setCreated(QDateTime created) |
242 | { | 250 | { |
243 | if (mReadOnly) return; | 251 | if (mReadOnly) return; |
244 | mCreated = getEvenTime(created); | 252 | mCreated = getEvenTime(created); |
245 | } | 253 | } |
246 | 254 | ||
247 | QDateTime Incidence::created() const | 255 | QDateTime Incidence::created() const |
248 | { | 256 | { |
249 | return mCreated; | 257 | return mCreated; |
250 | } | 258 | } |
251 | 259 | ||
252 | void Incidence::setRevision(int rev) | 260 | void Incidence::setRevision(int rev) |
253 | { | 261 | { |
254 | if (mReadOnly) return; | 262 | if (mReadOnly) return; |
255 | mRevision = rev; | 263 | mRevision = rev; |
256 | 264 | ||
257 | updated(); | 265 | updated(); |
258 | } | 266 | } |
259 | 267 | ||
260 | int Incidence::revision() const | 268 | int Incidence::revision() const |
261 | { | 269 | { |
262 | return mRevision; | 270 | return mRevision; |
263 | } | 271 | } |
264 | 272 | ||
265 | void Incidence::setDtStart(const QDateTime &dtStart) | 273 | void Incidence::setDtStart(const QDateTime &dtStart) |
266 | { | 274 | { |
267 | 275 | ||
268 | QDateTime dt = getEvenTime(dtStart); | 276 | QDateTime dt = getEvenTime(dtStart); |
269 | recurrence()->setRecurStart( dt); | 277 | recurrence()->setRecurStart( dt); |
270 | IncidenceBase::setDtStart( dt ); | 278 | IncidenceBase::setDtStart( dt ); |
271 | } | 279 | } |
272 | 280 | ||
273 | void Incidence::setDescription(const QString &description) | 281 | void Incidence::setDescription(const QString &description) |
274 | { | 282 | { |
275 | if (mReadOnly) return; | 283 | if (mReadOnly) return; |
276 | mDescription = description; | 284 | mDescription = description; |
277 | updated(); | 285 | updated(); |
278 | } | 286 | } |
279 | 287 | ||
280 | QString Incidence::description() const | 288 | QString Incidence::description() const |
281 | { | 289 | { |
282 | return mDescription; | 290 | return mDescription; |
283 | } | 291 | } |
284 | 292 | ||
285 | 293 | ||
286 | void Incidence::setSummary(const QString &summary) | 294 | void Incidence::setSummary(const QString &summary) |
287 | { | 295 | { |
288 | if (mReadOnly) return; | 296 | if (mReadOnly) return; |
289 | mSummary = summary; | 297 | mSummary = summary; |
290 | updated(); | 298 | updated(); |
291 | } | 299 | } |
292 | 300 | ||
293 | QString Incidence::summary() const | 301 | QString Incidence::summary() const |
294 | { | 302 | { |
295 | return mSummary; | 303 | return mSummary; |
296 | } | 304 | } |
297 | 305 | ||
298 | void Incidence::setCategories(const QStringList &categories) | 306 | void Incidence::setCategories(const QStringList &categories) |
299 | { | 307 | { |
300 | if (mReadOnly) return; | 308 | if (mReadOnly) return; |
301 | mCategories = categories; | 309 | mCategories = categories; |
302 | updated(); | 310 | updated(); |
303 | } | 311 | } |
304 | 312 | ||
305 | // TODO: remove setCategories(QString) function | 313 | // TODO: remove setCategories(QString) function |
306 | void Incidence::setCategories(const QString &catStr) | 314 | void Incidence::setCategories(const QString &catStr) |
307 | { | 315 | { |
308 | if (mReadOnly) return; | 316 | if (mReadOnly) return; |
309 | mCategories.clear(); | 317 | mCategories.clear(); |
310 | 318 | ||
311 | if (catStr.isEmpty()) return; | 319 | if (catStr.isEmpty()) return; |
312 | 320 | ||
313 | mCategories = QStringList::split(",",catStr); | 321 | mCategories = QStringList::split(",",catStr); |
314 | 322 | ||
315 | QStringList::Iterator it; | 323 | QStringList::Iterator it; |
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp index 0d9c3f4..cc3088a 100644 --- a/libkcal/kincidenceformatter.cpp +++ b/libkcal/kincidenceformatter.cpp | |||
@@ -99,192 +99,204 @@ void KIncidenceFormatter::setEvent(Event *event) | |||
99 | .arg(event->dtEndTimeStr())); | 99 | .arg(event->dtEndTimeStr())); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
103 | if (event->recurrence()->doesRecur()) { | 103 | if (event->recurrence()->doesRecur()) { |
104 | 104 | ||
105 | QString recurText = event->recurrence()->recurrenceText(); | 105 | QString recurText = event->recurrence()->recurrenceText(); |
106 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); | 106 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); |
107 | 107 | ||
108 | bool ok; | 108 | bool ok; |
109 | QDate start = QDate::currentDate(); | 109 | QDate start = QDate::currentDate(); |
110 | QDateTime next; | 110 | QDateTime next; |
111 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); | 111 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); |
112 | if ( ok ) { | 112 | if ( ok ) { |
113 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); | 113 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); |
114 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); | 114 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); |
115 | 115 | ||
116 | } else { | 116 | } else { |
117 | bool last; | 117 | bool last; |
118 | QDate nextd; | 118 | QDate nextd; |
119 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); | 119 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); |
120 | if ( last ) { | 120 | if ( last ) { |
121 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); | 121 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); |
122 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); | 122 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | 127 | ||
128 | if (event->isAlarmEnabled()) { | 128 | if (event->isAlarmEnabled()) { |
129 | Alarm *alarm =event->alarms().first() ; | 129 | Alarm *alarm =event->alarms().first() ; |
130 | QDateTime t = alarm->time(); | 130 | QDateTime t = alarm->time(); |
131 | int min = t.secsTo( event->dtStart() )/60; | 131 | int min = t.secsTo( event->dtStart() )/60; |
132 | QString s =i18n("(%1 min before)").arg( min ); | 132 | QString s =i18n("(%1 min before)").arg( min ); |
133 | addTag("p",i18n("<b>Alarm on: </b>") + s + ": "+KGlobal::locale()->formatDateTime( t, shortDate )); | 133 | addTag("p",i18n("<b>Alarm on: </b>") + s + ": "+KGlobal::locale()->formatDateTime( t, shortDate )); |
134 | //addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 134 | //addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
135 | //addTag("p",s); | 135 | //addTag("p",s); |
136 | } | 136 | } |
137 | 137 | ||
138 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); | 138 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); |
139 | // mText.append(event->secrecyStr()+"<br>"); | 139 | // mText.append(event->secrecyStr()+"<br>"); |
140 | formatCategories(event); | 140 | formatCategories(event); |
141 | if (!event->description().isEmpty()) { | 141 | if (!event->description().isEmpty()) { |
142 | addTag("p",i18n("<b>Details: </b>")); | 142 | addTag("p",i18n("<b>Details: </b>")); |
143 | addTag("p",event->description()); | 143 | addTag("p",event->description()); |
144 | } | 144 | } |
145 | 145 | ||
146 | 146 | ||
147 | formatReadOnly(event); | 147 | formatReadOnly(event); |
148 | formatAttendees(event); | 148 | formatAttendees(event); |
149 | 149 | ||
150 | 150 | ||
151 | } | 151 | } |
152 | 152 | ||
153 | void KIncidenceFormatter::setTodo(Todo *event ) | 153 | void KIncidenceFormatter::setTodo(Todo *event ) |
154 | { | 154 | { |
155 | int mode = 0; | 155 | int mode = 0; |
156 | mCurrentIncidence = event; | 156 | mCurrentIncidence = event; |
157 | bool shortDate = true; | 157 | bool shortDate = true; |
158 | if (mode == 0 ) | 158 | if (mode == 0 ) |
159 | addTag("h3",event->summary()); | 159 | addTag("h3",event->summary()); |
160 | else { | 160 | else { |
161 | if ( mColorMode == 1 ) { | 161 | if ( mColorMode == 1 ) { |
162 | mText +="<font color=\"#00A000\">"; | 162 | mText +="<font color=\"#00A000\">"; |
163 | } | 163 | } |
164 | if ( mColorMode == 2 ) { | 164 | if ( mColorMode == 2 ) { |
165 | mText +="<font color=\"#B00000\">"; | 165 | mText +="<font color=\"#B00000\">"; |
166 | } | 166 | } |
167 | if ( mode == 1 ) { | 167 | if ( mode == 1 ) { |
168 | addTag("h2",i18n( "Local: " ) +event->summary()); | 168 | addTag("h2",i18n( "Local: " ) +event->summary()); |
169 | } else { | 169 | } else { |
170 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 170 | addTag("h2",i18n( "Remote: " ) +event->summary()); |
171 | } | 171 | } |
172 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 172 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
173 | if ( mColorMode ) | 173 | if ( mColorMode ) |
174 | mText += "</font>"; | 174 | mText += "</font>"; |
175 | } | 175 | } |
176 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { | 176 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { |
177 | mText +="<font color=\"#B00000\">"; | 177 | mText +="<font color=\"#B00000\">"; |
178 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(shortDate) ) ); | 178 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(shortDate) ) ); |
179 | mText += "</font>"; | 179 | mText += "</font>"; |
180 | } else { | 180 | } else { |
181 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 181 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
182 | .arg(event->percentComplete())); | 182 | .arg(event->percentComplete())); |
183 | } | 183 | } |
184 | if (event->cancelled ()) { | 184 | if (event->cancelled ()) { |
185 | mText +="<font color=\"#B00000\">"; | 185 | mText +="<font color=\"#B00000\">"; |
186 | addTag("i",i18n("This todo has been cancelled!")); | 186 | addTag("i",i18n("This todo has been cancelled!")); |
187 | mText.append("<br>"); | 187 | mText.append("<br>"); |
188 | mText += "</font>"; | 188 | mText += "</font>"; |
189 | } | 189 | } |
190 | 190 | ||
191 | if (!event->location().isEmpty()) { | 191 | if (!event->location().isEmpty()) { |
192 | addTag("b",i18n("Location: ")); | 192 | addTag("b",i18n("Location: ")); |
193 | mText.append(event->location()+"<br>"); | 193 | mText.append(event->location()+"<br>"); |
194 | } | 194 | } |
195 | |||
196 | if (event->recurrence()->doesRecur()) { | ||
197 | |||
198 | QString recurText = event->recurrence()->recurrenceText(); | ||
199 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | ||
200 | } | ||
201 | |||
202 | if (event->hasStartDate()) { | ||
203 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(shortDate))); | ||
204 | } | ||
205 | |||
206 | |||
195 | if (event->hasDueDate()) { | 207 | if (event->hasDueDate()) { |
196 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate))); | 208 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate))); |
197 | } | 209 | } |
198 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 210 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
199 | .arg(QString::number(event->priority()))); | 211 | .arg(QString::number(event->priority()))); |
200 | 212 | ||
201 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); | 213 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); |
202 | formatCategories(event); | 214 | formatCategories(event); |
203 | if (!event->description().isEmpty()) { | 215 | if (!event->description().isEmpty()) { |
204 | addTag("p",i18n("<b>Details: </b>")); | 216 | addTag("p",i18n("<b>Details: </b>")); |
205 | addTag("p",event->description()); | 217 | addTag("p",event->description()); |
206 | } | 218 | } |
207 | 219 | ||
208 | 220 | ||
209 | 221 | ||
210 | formatReadOnly(event); | 222 | formatReadOnly(event); |
211 | formatAttendees(event); | 223 | formatAttendees(event); |
212 | 224 | ||
213 | } | 225 | } |
214 | 226 | ||
215 | void KIncidenceFormatter::setJournal(Journal* ) | 227 | void KIncidenceFormatter::setJournal(Journal* ) |
216 | { | 228 | { |
217 | 229 | ||
218 | } | 230 | } |
219 | 231 | ||
220 | void KIncidenceFormatter::formatCategories(Incidence *event) | 232 | void KIncidenceFormatter::formatCategories(Incidence *event) |
221 | { | 233 | { |
222 | if (!event->categoriesStr().isEmpty()) { | 234 | if (!event->categoriesStr().isEmpty()) { |
223 | addTag("p",i18n("<b>Categories: </b>")+event->categoriesStr() ); | 235 | addTag("p",i18n("<b>Categories: </b>")+event->categoriesStr() ); |
224 | //mText.append(event->categoriesStr()); | 236 | //mText.append(event->categoriesStr()); |
225 | } | 237 | } |
226 | } | 238 | } |
227 | void KIncidenceFormatter::addTag(const QString & tag,const QString & text) | 239 | void KIncidenceFormatter::addTag(const QString & tag,const QString & text) |
228 | { | 240 | { |
229 | int number=text.contains("\n"); | 241 | int number=text.contains("\n"); |
230 | QString str = "<" + tag + ">"; | 242 | QString str = "<" + tag + ">"; |
231 | QString tmpText=text; | 243 | QString tmpText=text; |
232 | QString tmpStr=str; | 244 | QString tmpStr=str; |
233 | if(number !=-1) | 245 | if(number !=-1) |
234 | { | 246 | { |
235 | if (number > 0) { | 247 | if (number > 0) { |
236 | int pos=0; | 248 | int pos=0; |
237 | QString tmp; | 249 | QString tmp; |
238 | for(int i=0;i<=number;i++) { | 250 | for(int i=0;i<=number;i++) { |
239 | pos=tmpText.find("\n"); | 251 | pos=tmpText.find("\n"); |
240 | tmp=tmpText.left(pos); | 252 | tmp=tmpText.left(pos); |
241 | tmpText=tmpText.right(tmpText.length()-pos-1); | 253 | tmpText=tmpText.right(tmpText.length()-pos-1); |
242 | tmpStr+=tmp+"<br>"; | 254 | tmpStr+=tmp+"<br>"; |
243 | } | 255 | } |
244 | } | 256 | } |
245 | else tmpStr += tmpText; | 257 | else tmpStr += tmpText; |
246 | tmpStr+="</" + tag + ">"; | 258 | tmpStr+="</" + tag + ">"; |
247 | mText.append(tmpStr); | 259 | mText.append(tmpStr); |
248 | } | 260 | } |
249 | else | 261 | else |
250 | { | 262 | { |
251 | str += text + "</" + tag + ">"; | 263 | str += text + "</" + tag + ">"; |
252 | mText.append(str); | 264 | mText.append(str); |
253 | } | 265 | } |
254 | } | 266 | } |
255 | 267 | ||
256 | void KIncidenceFormatter::formatAttendees(Incidence *event) | 268 | void KIncidenceFormatter::formatAttendees(Incidence *event) |
257 | { | 269 | { |
258 | QPtrList<Attendee> attendees = event->attendees(); | 270 | QPtrList<Attendee> attendees = event->attendees(); |
259 | if (attendees.count()) { | 271 | if (attendees.count()) { |
260 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 272 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
261 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | 273 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); |
262 | addTag("h3",i18n("Organizer")); | 274 | addTag("h3",i18n("Organizer")); |
263 | mText.append("<ul><li>"); | 275 | mText.append("<ul><li>"); |
264 | #if 0 | 276 | #if 0 |
265 | //ndef KORG_NOKABC | 277 | //ndef KORG_NOKABC |
266 | 278 | ||
267 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 279 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
268 | KABC::Addressee::List addressList; | 280 | KABC::Addressee::List addressList; |
269 | addressList = add_book->findByEmail(event->organizer()); | 281 | addressList = add_book->findByEmail(event->organizer()); |
270 | KABC::Addressee o = addressList.first(); | 282 | KABC::Addressee o = addressList.first(); |
271 | if (!o.isEmpty() && addressList.size()<2) { | 283 | if (!o.isEmpty() && addressList.size()<2) { |
272 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 284 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
273 | mText += o.formattedName(); | 285 | mText += o.formattedName(); |
274 | mText += "</a>\n"; | 286 | mText += "</a>\n"; |
275 | } else { | 287 | } else { |
276 | mText.append(event->organizer()); | 288 | mText.append(event->organizer()); |
277 | } | 289 | } |
278 | #else | 290 | #else |
279 | mText.append(event->organizer()); | 291 | mText.append(event->organizer()); |
280 | #endif | 292 | #endif |
281 | if (iconPath) { | 293 | if (iconPath) { |
282 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; | 294 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; |
283 | mText += "<IMG src=\"" + iconPath + "\">"; | 295 | mText += "<IMG src=\"" + iconPath + "\">"; |
284 | mText += "</a>\n"; | 296 | mText += "</a>\n"; |
285 | } | 297 | } |
286 | mText.append("</li></ul>"); | 298 | mText.append("</li></ul>"); |
287 | 299 | ||
288 | addTag("h3",i18n("Attendees")); | 300 | addTag("h3",i18n("Attendees")); |
289 | Attendee *a; | 301 | Attendee *a; |
290 | mText.append("<ul>"); | 302 | mText.append("<ul>"); |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 1f54c2f..39d16b6 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -276,182 +276,182 @@ int Todo::status() const | |||
276 | { | 276 | { |
277 | return mStatus; | 277 | return mStatus; |
278 | } | 278 | } |
279 | 279 | ||
280 | QString Todo::statusStr() const | 280 | QString Todo::statusStr() const |
281 | { | 281 | { |
282 | switch(mStatus) { | 282 | switch(mStatus) { |
283 | case NEEDS_ACTION: | 283 | case NEEDS_ACTION: |
284 | return QString("NEEDS ACTION"); | 284 | return QString("NEEDS ACTION"); |
285 | break; | 285 | break; |
286 | case ACCEPTED: | 286 | case ACCEPTED: |
287 | return QString("ACCEPTED"); | 287 | return QString("ACCEPTED"); |
288 | break; | 288 | break; |
289 | case SENT: | 289 | case SENT: |
290 | return QString("SENT"); | 290 | return QString("SENT"); |
291 | break; | 291 | break; |
292 | case TENTATIVE: | 292 | case TENTATIVE: |
293 | return QString("TENTATIVE"); | 293 | return QString("TENTATIVE"); |
294 | break; | 294 | break; |
295 | case CONFIRMED: | 295 | case CONFIRMED: |
296 | return QString("CONFIRMED"); | 296 | return QString("CONFIRMED"); |
297 | break; | 297 | break; |
298 | case DECLINED: | 298 | case DECLINED: |
299 | return QString("DECLINED"); | 299 | return QString("DECLINED"); |
300 | break; | 300 | break; |
301 | case COMPLETED: | 301 | case COMPLETED: |
302 | return QString("COMPLETED"); | 302 | return QString("COMPLETED"); |
303 | break; | 303 | break; |
304 | case DELEGATED: | 304 | case DELEGATED: |
305 | return QString("DELEGATED"); | 305 | return QString("DELEGATED"); |
306 | break; | 306 | break; |
307 | } | 307 | } |
308 | return QString(""); | 308 | return QString(""); |
309 | } | 309 | } |
310 | #endif | 310 | #endif |
311 | 311 | ||
312 | bool Todo::isCompleted() const | 312 | bool Todo::isCompleted() const |
313 | { | 313 | { |
314 | if (mPercentComplete == 100) { | 314 | if (mPercentComplete == 100) { |
315 | return true; | 315 | return true; |
316 | } | 316 | } |
317 | else return false; | 317 | else return false; |
318 | } | 318 | } |
319 | 319 | ||
320 | void Todo::setCompleted(bool completed) | 320 | void Todo::setCompleted(bool completed) |
321 | { | 321 | { |
322 | if ( mHasRecurrenceID && completed && mPercentComplete != 100 ) { | 322 | if ( mHasRecurrenceID && completed && mPercentComplete != 100 ) { |
323 | if ( !setRecurDates() ) | 323 | if ( !setRecurDates() ) |
324 | completed = false; | 324 | completed = false; |
325 | } | 325 | } |
326 | if (completed) mPercentComplete = 100; | 326 | if (completed) mPercentComplete = 100; |
327 | else { | 327 | else { |
328 | mPercentComplete = 0; | 328 | mPercentComplete = 0; |
329 | mHasCompletedDate = false; | 329 | mHasCompletedDate = false; |
330 | } | 330 | } |
331 | updated(); | 331 | updated(); |
332 | } | 332 | } |
333 | 333 | ||
334 | QDateTime Todo::completed() const | 334 | QDateTime Todo::completed() const |
335 | { | 335 | { |
336 | return mCompleted; | 336 | return mCompleted; |
337 | } | 337 | } |
338 | 338 | ||
339 | QString Todo::completedStr( bool shortF ) const | 339 | QString Todo::completedStr( bool shortF ) const |
340 | { | 340 | { |
341 | return KGlobal::locale()->formatDateTime(mCompleted, shortF); | 341 | return KGlobal::locale()->formatDateTime(mCompleted, shortF); |
342 | } | 342 | } |
343 | 343 | ||
344 | void Todo::setCompleted(const QDateTime &completed) | 344 | void Todo::setCompleted(const QDateTime &completed) |
345 | { | 345 | { |
346 | //qDebug("Todo::setCompleted "); | 346 | //qDebug("Todo::setCompleted "); |
347 | if ( mHasCompletedDate ) { | 347 | if ( mHasCompletedDate ) { |
348 | // qDebug("has completed data - return "); | 348 | // qDebug("has completed data - return "); |
349 | return; | 349 | return; |
350 | } | 350 | } |
351 | mHasCompletedDate = true; | 351 | mHasCompletedDate = true; |
352 | mPercentComplete = 100; | 352 | mPercentComplete = 100; |
353 | mCompleted = getEvenTime(completed); | 353 | mCompleted = getEvenTime(completed); |
354 | updated(); | 354 | updated(); |
355 | } | 355 | } |
356 | 356 | ||
357 | bool Todo::hasCompletedDate() const | 357 | bool Todo::hasCompletedDate() const |
358 | { | 358 | { |
359 | return mHasCompletedDate; | 359 | return mHasCompletedDate; |
360 | } | 360 | } |
361 | 361 | ||
362 | int Todo::percentComplete() const | 362 | int Todo::percentComplete() const |
363 | { | 363 | { |
364 | return mPercentComplete; | 364 | return mPercentComplete; |
365 | } | 365 | } |
366 | bool Todo::setRecurDates() | 366 | bool Todo::setRecurDates() |
367 | { | 367 | { |
368 | if ( !mHasRecurrenceID ) | 368 | if ( !mHasRecurrenceID ) |
369 | return true; | 369 | return true; |
370 | int secs = mDtStart.secsTo( dtDue() ); | 370 | int secs = mDtStart.secsTo( dtDue() ); |
371 | bool ok; | 371 | bool ok; |
372 | qDebug("--------------------setRecurDates() "); | 372 | qDebug("T:setRecurDates() "); |
373 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); | 373 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); |
374 | QDateTime next = getNextOccurence( mRecurrenceID, &ok ); | 374 | QDateTime next = getNextOccurence( mRecurrenceID, &ok ); |
375 | if ( ok ) { | 375 | if ( ok ) { |
376 | mRecurrenceID = next; | 376 | mRecurrenceID = next; |
377 | mDtStart = next; | 377 | mDtStart = next; |
378 | setDtDue( next.addSecs( secs ) ); | 378 | setDtDue( next.addSecs( secs ) ); |
379 | if ( QDateTime::currentDateTime() > next) | 379 | if ( QDateTime::currentDateTime() > next) |
380 | return false; | 380 | return false; |
381 | } else { | 381 | } else { |
382 | setHasRecurrenceID( false ); | 382 | setHasRecurrenceID( false ); |
383 | recurrence()->unsetRecurs(); | 383 | recurrence()->unsetRecurs(); |
384 | } | 384 | } |
385 | return true; | 385 | return true; |
386 | } | 386 | } |
387 | void Todo::setPercentComplete(int v) | 387 | void Todo::setPercentComplete(int v) |
388 | { | 388 | { |
389 | if ( mHasRecurrenceID && v == 100 && mPercentComplete != 100 ) { | 389 | if ( mHasRecurrenceID && v == 100 && mPercentComplete != 100 ) { |
390 | if ( !setRecurDates() ) | 390 | if ( !setRecurDates() ) |
391 | v = 0; | 391 | v = 0; |
392 | } | 392 | } |
393 | mPercentComplete = v; | 393 | mPercentComplete = v; |
394 | if ( v != 100 ) | 394 | if ( v != 100 ) |
395 | mHasCompletedDate = false; | 395 | mHasCompletedDate = false; |
396 | updated(); | 396 | updated(); |
397 | } | 397 | } |
398 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const | 398 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const |
399 | { | 399 | { |
400 | if ( isCompleted() || ! hasDueDate() || cancelled() ) { | 400 | if ( isCompleted() || ! hasDueDate() || cancelled() ) { |
401 | *ok = false; | 401 | *ok = false; |
402 | return QDateTime (); | 402 | return QDateTime (); |
403 | } | 403 | } |
404 | QDateTime incidenceStart; | 404 | QDateTime incidenceStart; |
405 | incidenceStart = dtDue(); | 405 | incidenceStart = dtDue(); |
406 | bool enabled = false; | 406 | bool enabled = false; |
407 | Alarm* alarm; | 407 | Alarm* alarm; |
408 | int off = 0; | 408 | int off = 0; |
409 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; | 409 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; |
410 | // if ( QDateTime::currentDateTime() > incidenceStart ){ | 410 | // if ( QDateTime::currentDateTime() > incidenceStart ){ |
411 | // *ok = false; | 411 | // *ok = false; |
412 | // return incidenceStart; | 412 | // return incidenceStart; |
413 | // } | 413 | // } |
414 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { | 414 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { |
415 | if (alarm->enabled()) { | 415 | if (alarm->enabled()) { |
416 | if ( alarm->hasTime () ) { | 416 | if ( alarm->hasTime () ) { |
417 | if ( alarm->time() < alarmStart ) { | 417 | if ( alarm->time() < alarmStart ) { |
418 | alarmStart = alarm->time(); | 418 | alarmStart = alarm->time(); |
419 | enabled = true; | 419 | enabled = true; |
420 | off = alarmStart.secsTo( incidenceStart ); | 420 | off = alarmStart.secsTo( incidenceStart ); |
421 | } | 421 | } |
422 | 422 | ||
423 | } else { | 423 | } else { |
424 | int secs = alarm->startOffset().asSeconds(); | 424 | int secs = alarm->startOffset().asSeconds(); |
425 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { | 425 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { |
426 | alarmStart = incidenceStart.addSecs( secs ); | 426 | alarmStart = incidenceStart.addSecs( secs ); |
427 | enabled = true; | 427 | enabled = true; |
428 | off = -secs; | 428 | off = -secs; |
429 | } | 429 | } |
430 | } | 430 | } |
431 | } | 431 | } |
432 | } | 432 | } |
433 | if ( enabled ) { | 433 | if ( enabled ) { |
434 | if ( alarmStart > QDateTime::currentDateTime() ) { | 434 | if ( alarmStart > QDateTime::currentDateTime() ) { |
435 | *ok = true; | 435 | *ok = true; |
436 | * offset = off; | 436 | * offset = off; |
437 | return alarmStart; | 437 | return alarmStart; |
438 | } | 438 | } |
439 | } | 439 | } |
440 | *ok = false; | 440 | *ok = false; |
441 | return QDateTime (); | 441 | return QDateTime (); |
442 | 442 | ||
443 | } | 443 | } |
444 | 444 | ||
445 | void Todo::checkSetCompletedFalse() | 445 | void Todo::checkSetCompletedFalse() |
446 | { | 446 | { |
447 | if ( !hasRecurrenceID() ) { | 447 | if ( !hasRecurrenceID() ) { |
448 | qDebug("ERROR 1 in Todo::checkSetCompletedFalse"); | 448 | qDebug("ERROR 1 in Todo::checkSetCompletedFalse"); |
449 | } | 449 | } |
450 | // qDebug("Todo::checkSetCompletedFalse()"); | 450 | // qDebug("Todo::checkSetCompletedFalse()"); |
451 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); | 451 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); |
452 | if ( mPercentComplete == 100 && mDtStart == mRecurrenceID && QDateTime::currentDateTime() > mDtStart) { | 452 | if ( mPercentComplete == 100 && mDtStart == mRecurrenceID && QDateTime::currentDateTime() > mDtStart) { |
453 | qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); | 453 | qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); |
454 | setCompleted( false ); | 454 | setCompleted( false ); |
455 | qDebug("Todo::checkSetCompletedFalse++++++++++++++++++++++++++++ "); | 455 | qDebug("Todo::checkSetCompletedFalse "); |
456 | } | 456 | } |
457 | } | 457 | } |