author | zautrix <zautrix> | 2005-07-03 15:58:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-03 15:58:48 (UTC) |
commit | 9be5bd1c7e9ee829dd73f5b4a36a2f4331edf68e (patch) (unidiff) | |
tree | 4e5e6a4e6eac36df79891d61ed1d1cd76ed6105d | |
parent | 0c632bafd2d058504118dc8957fc4808a784f548 (diff) | |
download | kdepimpi-9be5bd1c7e9ee829dd73f5b4a36a2f4331edf68e.zip kdepimpi-9be5bd1c7e9ee829dd73f5b4a36a2f4331edf68e.tar.gz kdepimpi-9be5bd1c7e9ee829dd73f5b4a36a2f4331edf68e.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 26 | ||||
-rw-r--r-- | korganizer/koeventviewer.h | 1 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 53 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 6 |
9 files changed, 80 insertions, 18 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 30bb856..71d7208 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,98 +1,103 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.13 ************ | ||
4 | |||
5 | Fixed a problem in KA/Pi search. | ||
6 | |||
7 | |||
3 | ********** VERSION 2.1.12 ************ | 8 | ********** VERSION 2.1.12 ************ |
4 | 9 | ||
5 | KO/Pi: | 10 | KO/Pi: |
6 | Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus. | 11 | Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus. |
7 | Fixed a problem with the month view when file was saved but KO/Pi was not the active window. | 12 | Fixed a problem with the month view when file was saved but KO/Pi was not the active window. |
8 | Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only). | 13 | Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only). |
9 | Fixed some other small problems. | 14 | Fixed some other small problems. |
10 | 15 | ||
11 | ********** VERSION 2.1.11 ************ | 16 | ********** VERSION 2.1.11 ************ |
12 | 17 | ||
13 | KO/Pi: | 18 | KO/Pi: |
14 | Because we can have many calendars now in KO/Pi we can have more than one journal entry per day. | 19 | Because we can have many calendars now in KO/Pi we can have more than one journal entry per day. |
15 | Added features to handle (and add ) more than one journal entry per day. | 20 | Added features to handle (and add ) more than one journal entry per day. |
16 | Added option for a journal title. | 21 | Added option for a journal title. |
17 | 22 | ||
18 | Added info about the calendar, the item belongs to, to the event/todo/journal viewer. | 23 | Added info about the calendar, the item belongs to, to the event/todo/journal viewer. |
19 | Fixed a problem of the alarm of completed recurring todos. | 24 | Fixed a problem of the alarm of completed recurring todos. |
20 | Added to the event/todo editor to set quickly the category of an item. | 25 | Added to the event/todo editor to set quickly the category of an item. |
21 | 26 | ||
22 | 27 | ||
23 | Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet. | 28 | Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet. |
24 | 29 | ||
25 | Added KA/Pi multi sync to the multi sync called from the alarm applet. | 30 | Added KA/Pi multi sync to the multi sync called from the alarm applet. |
26 | 31 | ||
27 | ********** VERSION 2.1.10 ************ | 32 | ********** VERSION 2.1.10 ************ |
28 | 33 | ||
29 | KO/Pi: | 34 | KO/Pi: |
30 | Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file. | 35 | Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file. |
31 | When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted. | 36 | When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted. |
32 | Fixed a bug in searching for a small timerange, i.e. one day. | 37 | Fixed a bug in searching for a small timerange, i.e. one day. |
33 | 38 | ||
34 | KA/Pi: | 39 | KA/Pi: |
35 | Fixed two problems in csv export. | 40 | Fixed two problems in csv export. |
36 | Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi. | 41 | Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi. |
37 | 42 | ||
38 | ********** VERSION 2.1.9 ************ | 43 | ********** VERSION 2.1.9 ************ |
39 | 44 | ||
40 | KO/Pi: | 45 | KO/Pi: |
41 | Fixed some problems of the new search options in the search dialog. | 46 | Fixed some problems of the new search options in the search dialog. |
42 | Fixed some problems in the new resource config options. | 47 | Fixed some problems in the new resource config options. |
43 | Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page. | 48 | Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page. |
44 | Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown: | 49 | Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown: |
45 | Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup. | 50 | Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup. |
46 | 51 | ||
47 | Fixed a problem in recurrence range in syncing with DTM. | 52 | Fixed a problem in recurrence range in syncing with DTM. |
48 | 53 | ||
49 | KA/Pi: | 54 | KA/Pi: |
50 | Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...) | 55 | Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...) |
51 | 56 | ||
52 | PwM/Pi: | 57 | PwM/Pi: |
53 | Added "sec" to the timeout config settings to make it clear the timeout values are seconds. | 58 | Added "sec" to the timeout config settings to make it clear the timeout values are seconds. |
54 | 59 | ||
55 | ********** VERSION 2.1.8 ************ | 60 | ********** VERSION 2.1.8 ************ |
56 | 61 | ||
57 | KO/Pi: | 62 | KO/Pi: |
58 | Added info about the completion state of a todo in the ListView/Searchdialog. | 63 | Added info about the completion state of a todo in the ListView/Searchdialog. |
59 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. | 64 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. |
60 | Fixed some updating problems when changing the filter. | 65 | Fixed some updating problems when changing the filter. |
61 | 66 | ||
62 | KA/Pi: | 67 | KA/Pi: |
63 | In the addressee selection dialog now the formatted name is shown, if not empty. | 68 | In the addressee selection dialog now the formatted name is shown, if not empty. |
64 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. | 69 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. |
65 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. | 70 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. |
66 | 71 | ||
67 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. | 72 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. |
68 | Fixed the sorting for size in the file selector on the Z. | 73 | Fixed the sorting for size in the file selector on the Z. |
69 | 74 | ||
70 | Changed the color selection dialog on the Zaurus to a more user friendly version. | 75 | Changed the color selection dialog on the Zaurus to a more user friendly version. |
71 | 76 | ||
72 | ********** VERSION 2.1.7 ************ | 77 | ********** VERSION 2.1.7 ************ |
73 | 78 | ||
74 | KO/Pi: | 79 | KO/Pi: |
75 | Fixed several problems in the new Resource handling. | 80 | Fixed several problems in the new Resource handling. |
76 | Added more options to the search dialog. | 81 | Added more options to the search dialog. |
77 | Fixed a problem in the Month view. | 82 | Fixed a problem in the Month view. |
78 | Added more options to the dialog when setting a todo to stopped. | 83 | Added more options to the dialog when setting a todo to stopped. |
79 | 84 | ||
80 | Fixed two small problems in KO/Pi Alarm applet. | 85 | Fixed two small problems in KO/Pi Alarm applet. |
81 | 86 | ||
82 | ********** VERSION 2.1.6 ************ | 87 | ********** VERSION 2.1.6 ************ |
83 | 88 | ||
84 | This release is for testing only. | 89 | This release is for testing only. |
85 | 90 | ||
86 | KO/Pi: | 91 | KO/Pi: |
87 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. | 92 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. |
88 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. | 93 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. |
89 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. | 94 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. |
90 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. | 95 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. |
91 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. | 96 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. |
92 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. | 97 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. |
93 | 98 | ||
94 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. | 99 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. |
95 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. | 100 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. |
96 | Now on every sync the set of calendars is synced which are enabled in the resource view. | 101 | Now on every sync the set of calendars is synced which are enabled in the resource view. |
97 | 102 | ||
98 | A calendar is enabled in the resource view if the "eye" column is checked. | 103 | A calendar is enabled in the resource view if the "eye" column is checked. |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index d7954c6..bc5cbb7 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1115,194 +1115,194 @@ | |||
1115 | { "Print day","Drucke Tag" }, | 1115 | { "Print day","Drucke Tag" }, |
1116 | { "CalPrintDay_Base","CalPrintDay_Base" }, | 1116 | { "CalPrintDay_Base","CalPrintDay_Base" }, |
1117 | { "Date && Time Range","Datum && Zeitspanne" }, | 1117 | { "Date && Time Range","Datum && Zeitspanne" }, |
1118 | { "&End date:","&Enddatum:" }, | 1118 | { "&End date:","&Enddatum:" }, |
1119 | { "&Start date:","&Startdatum:" }, | 1119 | { "&Start date:","&Startdatum:" }, |
1120 | { "Start &time:","Startzeit:" }, | 1120 | { "Start &time:","Startzeit:" }, |
1121 | { "End ti&me:","Endzeit:" }, | 1121 | { "End ti&me:","Endzeit:" }, |
1122 | { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" }, | 1122 | { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" }, |
1123 | { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" }, | 1123 | { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" }, |
1124 | { "Alt+D","Alt+D" }, | 1124 | { "Alt+D","Alt+D" }, |
1125 | { "&Use colors","Nutze Farben" }, | 1125 | { "&Use colors","Nutze Farben" }, |
1126 | { "Alt+U","Alt+U" }, | 1126 | { "Alt+U","Alt+U" }, |
1127 | { "Print week","Drucke Woche" }, | 1127 | { "Print week","Drucke Woche" }, |
1128 | { "CalPrintWeek_Base","CalPrintWeek_Base" }, | 1128 | { "CalPrintWeek_Base","CalPrintWeek_Base" }, |
1129 | { "Use &colors","Nutze Farben" }, | 1129 | { "Use &colors","Nutze Farben" }, |
1130 | { "Type of View","Typ der Ansicht" }, | 1130 | { "Type of View","Typ der Ansicht" }, |
1131 | { "Print as &Filofax page","Drucke als &Filofax Seite" }, | 1131 | { "Print as &Filofax page","Drucke als &Filofax Seite" }, |
1132 | { "Alt+F","Alt+F" }, | 1132 | { "Alt+F","Alt+F" }, |
1133 | { "Print as &timetable view:","Drucke als Zeittabelle:" }, | 1133 | { "Print as &timetable view:","Drucke als Zeittabelle:" }, |
1134 | { "Alt+T","Alt+T" }, | 1134 | { "Alt+T","Alt+T" }, |
1135 | { "Print as split week view","Drucke als gesplittete Wochenansicht" }, | 1135 | { "Print as split week view","Drucke als gesplittete Wochenansicht" }, |
1136 | { "Print month","Drucke Monat" }, | 1136 | { "Print month","Drucke Monat" }, |
1137 | { "CalPrintMonth_Base","CalPrintMonth_Base" }, | 1137 | { "CalPrintMonth_Base","CalPrintMonth_Base" }, |
1138 | { "&Start month:","&Startmonat:" }, | 1138 | { "&Start month:","&Startmonat:" }, |
1139 | { "&End month:","&Endmonat:" }, | 1139 | { "&End month:","&Endmonat:" }, |
1140 | { "Print week &numbers","Drucke Wochen Nummer(n)" }, | 1140 | { "Print week &numbers","Drucke Wochen Nummer(n)" }, |
1141 | { "Print todos","Drucke Todos" }, | 1141 | { "Print todos","Drucke Todos" }, |
1142 | { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" }, | 1142 | { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" }, |
1143 | { "Include &description of the item","Inclusive Itembeschreibung" }, | 1143 | { "Include &description of the item","Inclusive Itembeschreibung" }, |
1144 | { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" }, | 1144 | { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" }, |
1145 | { "Include &priority of the item","Inclusive Priorität des Items" }, | 1145 | { "Include &priority of the item","Inclusive Priorität des Items" }, |
1146 | { "Items to Print","Zu druckende Items" }, | 1146 | { "Items to Print","Zu druckende Items" }, |
1147 | { "&From:","Von:" }, | 1147 | { "&From:","Von:" }, |
1148 | { "&To:","Bis:" }, | 1148 | { "&To:","Bis:" }, |
1149 | { "Print &all todo items","Drucke alle Todo Items" }, | 1149 | { "Print &all todo items","Drucke alle Todo Items" }, |
1150 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, | 1150 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, |
1151 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, | 1151 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, |
1152 | { "Todo List","Todo Liste" }, | 1152 | { "Todo List","Todo Liste" }, |
1153 | { "&Title:","&Titel:" }, | 1153 | { "&Title:","&Titel:" }, |
1154 | { "Co&nnect subtodos with its parent","Verbinde Untertodos mit ihren Ober-Todos" }, | 1154 | { "Co&nnect subtodos with its parent","Verbinde Untertodos mit ihren Ober-Todos" }, |
1155 | { "Todo list","Todo Liste" }, | 1155 | { "Todo list","Todo Liste" }, |
1156 | { "&Print...","Drucke..." }, | 1156 | { "&Print...","Drucke..." }, |
1157 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, | 1157 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, |
1158 | { "[Unconfigured]","[Unkonfiguriert]" }, | 1158 | { "[Unconfigured]","[Unkonfiguriert]" }, |
1159 | { "OK","OK" }, | 1159 | { "OK","OK" }, |
1160 | { "FilterEditor","FilterEditor" }, | 1160 | { "FilterEditor","FilterEditor" }, |
1161 | { "Include","Inclusive" }, | 1161 | { "Include","Inclusive" }, |
1162 | { "Exclude","Exclusive" }, | 1162 | { "Exclude","Exclusive" }, |
1163 | { "Edit Selection...","Editiere Auswahl" }, | 1163 | { "Edit Selection...","Editiere Auswahl" }, |
1164 | { "recurring events","wiederholende Termine" }, | 1164 | { "recurring events","wiederholende Termine" }, |
1165 | { "recurr. events","wiederh.Termine" }, | 1165 | { "recurr. events","wiederh.Termine" }, |
1166 | { "completed to-dos","erledigte Todos" }, | 1166 | { "completed to-dos","erledigte Todos" }, |
1167 | { "events","Termine" }, | 1167 | { "events","Termine" }, |
1168 | { "todos","Todos" }, | 1168 | { "todos","Todos" }, |
1169 | { "journals","Journale" }, | 1169 | { "journals","Journale" }, |
1170 | { "public","öffentl." }, | 1170 | { "public","öffentl." }, |
1171 | { "private","privat" }, | 1171 | { "private","privat" }, |
1172 | { "confidential","vertraul." }, | 1172 | { "confidential","vertraul." }, |
1173 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Untertodos.\nAlle erledigten Untertodos\nwerden auch gelöscht!" }, | 1173 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Untertodos.\nAlle erledigten Untertodos\nwerden auch gelöscht!" }, |
1174 | { "Yesterday","Gestern" }, | 1174 | { "Yesterday","Gestern" }, |
1175 | { "Day after tomorrow","Übermorgen" }, | 1175 | { "Day after tomorrow","Übermorgen" }, |
1176 | { "Tomorrow","Morgen" }, | 1176 | { "Tomorrow","Morgen" }, |
1177 | { "Day before yesterday","Vorgestern" }, | 1177 | { "Day before yesterday","Vorgestern" }, |
1178 | { "Size %1","Größe %1" }, | 1178 | { "Size %1","Größe %1" }, |
1179 | { "New Agendasize: %1","Neue Agendagröße: %1" }, | 1179 | { "New Agendasize: %1","Neue Agendagröße: %1" }, |
1180 | { " (%1 y.)"," (%1 J.)" }, | 1180 | { " (%1 y.)"," (%1 J.)" }, |
1181 | { "Allday:","Ganztägig:" }, | 1181 | { "Allday:","Ganztägig:" }, |
1182 | { "compl.todos","erled.Todos" }, | 1182 | { "compl.todos","erled.Todos" }, |
1183 | { "Day view","Tagesansicht" }, | 1183 | { "Day view","Tagesansicht" }, |
1184 | { "Next days","Nächste Tage" }, | 1184 | { "Next days","Nächste Tage" }, |
1185 | { "Next week","Nächste Woche" }, | 1185 | { "Next week","Nächste Woche" }, |
1186 | { "Next two weeks","Nächste zwei Wochen" }, | 1186 | { "Next two weeks","Nächste zwei Wochen" }, |
1187 | { "This month","Dieser Monat" }, | 1187 | { "This month","Dieser Monat" }, |
1188 | { "Journal view","Journal" }, | 1188 | { "Journal view","Journal" }, |
1189 | { "Display all opened","Zeige alle geöffnet" }, | 1189 | { "Display all opened","Zeige alle geöffnet" }, |
1190 | { "Display all closed","Zeige alle geschlossen" }, | 1190 | { "Display all closed","Zeige alle geschlossen" }, |
1191 | { "Display all flat","Zeige alle flach" }, | 1191 | { "Display all flat","Zeige alle flach" }, |
1192 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, | 1192 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, |
1193 | { "Default todo done color:","Standard Todo erledigt Farbe" }, | 1193 | { "Default todo done color:","Standard Todo erledigt Farbe" }, |
1194 | { "Select week %1-%2","Wähle Woche %1-%2" }, | 1194 | { "Select week %1-%2","Wähle Woche %1-%2" }, |
1195 | { "Select Week","Wähle Woche" }, | 1195 | { "Select Week","Wähle Woche" }, |
1196 | { "Set alarm...","Setze Alarm..." }, | 1196 | { "Set alarm...","Setze Alarm..." }, |
1197 | { "Set Alarm!","Setze Alarm!" }, | 1197 | { "Set Alarm!","Setze Alarm!" }, |
1198 | { "Changed alarm for %1 items","Alarm für %1 Items geändert" }, | 1198 | { "Changed alarm for %1 items","Alarm für %1 Items geändert" }, |
1199 | { " and "," und " }, | 1199 | { " and "," und " }, |
1200 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, | 1200 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, |
1201 | { "Mail to selected","Mail an Ausgewählte" }, | 1201 | { "Mail to selected","Mail an Ausgewählte" }, |
1202 | { "Mail to all","Mail an Alle" }, | 1202 | { "Mail to all","Mail an Alle" }, |
1203 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, | 1203 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, |
1204 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, | 1204 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, |
1205 | { " on"," am" }, | 1205 | { " on"," am" }, |
1206 | { " completed on "," erledigt am " }, | 1206 | { " completed on "," erledigt am " }, |
1207 | { "Save as Event template","Speichere als Vorlage" }, | 1207 | { "Save as Event template","Speichere als Vorlage" }, |
1208 | { "Load Event template","Lade Termin Vorlage" }, | 1208 | { "Load Event template","Lade Termin Vorlage" }, |
1209 | { "Save as Journal template","Speichere als Journal Vorlage" }, | 1209 | { "Save as Journal template","Speichere als Journal Vorlage" }, |
1210 | { "Insert Journal template","Füge Journal Vorlage ein" }, | 1210 | { "Insert Journal template","Füge Journal Vorlage ein" }, |
1211 | { "Sub todos:<br>","Unter Todos:<br>" }, | 1211 | { "Sub todos:<br>","Unter-Todos:<br>" }, |
1212 | { "Parent todo:<br>","Über Todo:<br>" }, | 1212 | { "Parent todo:<br>","Über-Todo:<br>" }, |
1213 | { "Set current as color category","Setze Gewählte als Farbkategorie" }, | 1213 | { "Set current as color category","Setze Gewählte als Farbkategorie" }, |
1214 | { " completed"," erledigt" }, | 1214 | { " completed"," erledigt" }, |
1215 | { "(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.info --- 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.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" }, | 1215 | { "(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.info --- 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.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" }, |
1216 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, | 1216 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, |
1217 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, | 1217 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, |
1218 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, | 1218 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, |
1219 | { "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?" }, | 1219 | { "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?" }, |
1220 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, | 1220 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, |
1221 | { "Error","Fehler" }, | 1221 | { "Error","Fehler" }, |
1222 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, | 1222 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, |
1223 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, | 1223 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, |
1224 | { "Warning","Warnung" }, | 1224 | { "Warning","Warnung" }, |
1225 | { "Select week number","Wähle Wochen Nummer" }, | 1225 | { "Select week number","Wähle Wochen Nummer" }, |
1226 | { "Februar","Februar" }, | 1226 | { "Februar","Februar" }, |
1227 | { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" }, | 1227 | { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" }, |
1228 | { "W","W" }, | 1228 | { "W","W" }, |
1229 | { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" }, | 1229 | { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" }, |
1230 | { "T: %1","T: %1" }, | 1230 | { "T: %1","T: %1" }, |
1231 | { "Start: ","Start: " }, | 1231 | { "Start: ","Start: " }, |
1232 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, | 1232 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, |
1233 | { "Password for remote access:","Passwort für fernen Zugriff:" }, | 1233 | { "Password for remote access:","Passwort für fernen Zugriff:" }, |
1234 | { "Remote IP address:","Ferne IP Adresse:" }, | 1234 | { "Remote IP address:","Ferne IP Adresse:" }, |
1235 | { "Remote port number:","Ferne Port Nummer:" }, | 1235 | { "Remote port number:","Ferne Port Nummer:" }, |
1236 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, | 1236 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, |
1237 | { "Remote from: ","Fern von: " }, | 1237 | { "Remote from: ","Fern von: " }, |
1238 | { "Local from: ","Lokal von: " }, | 1238 | { "Local from: ","Lokal von: " }, |
1239 | { "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" }, | 1239 | { "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" }, |
1240 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, | 1240 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, |
1241 | { "Write back","Schreibe zurück" }, | 1241 | { "Write back","Schreibe zurück" }, |
1242 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, | 1242 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, |
1243 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, | 1243 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, |
1244 | { "Received sync request","Sync Anfrage erhalten" }, | 1244 | { "Received sync request","Sync Anfrage erhalten" }, |
1245 | { "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." }, | 1245 | { "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." }, |
1246 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, | 1246 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, |
1247 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, | 1247 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, |
1248 | { "Sending file...","Sende Datei..." }, | 1248 | { "Sending file...","Sende Datei..." }, |
1249 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, | 1249 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, |
1250 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, | 1250 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, |
1251 | { "Received %1 bytes","%1 Bytes erhalten" }, | 1251 | { "Received %1 bytes","%1 Bytes erhalten" }, |
1252 | { "Writing file to disk...","Speichere Datei..." }, | 1252 | { "Writing file to disk...","Speichere Datei..." }, |
1253 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, | 1253 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, |
1254 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, | 1254 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, |
1255 | { "Synchronize!","Synchronisiere!" }, | 1255 | { "Synchronize!","Synchronisiere!" }, |
1256 | { "High clock skew!","Großer Uhrzeitunterschied!" }, | 1256 | { "High clock skew!","Großer Uhrzeitunterschied!" }, |
1257 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 1257 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
1258 | { "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!" }, | 1258 | { "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!" }, |
1259 | { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, | 1259 | { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, |
1260 | { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, | 1260 | { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, |
1261 | { "List week view","Listenwochenansicht" }, | 1261 | { "List week view","Listenwochenansicht" }, |
1262 | { "List week","Listenwochenansicht" }, | 1262 | { "List week","Listenwochenansicht" }, |
1263 | { "Next Week","Nächste Woche" }, | 1263 | { "Next Week","Nächste Woche" }, |
1264 | { "Previous Week","Vorherige Woche" }, | 1264 | { "Previous Week","Vorherige Woche" }, |
1265 | { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, | 1265 | { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, |
1266 | { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, | 1266 | { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, |
1267 | { "Details","Details" }, | 1267 | { "Details","Details" }, |
1268 | { "Created time","Erstellt Zeit" }, | 1268 | { "Created time","Erstellt Zeit" }, |
1269 | { "Last modified time","Geändert Zeit" }, | 1269 | { "Last modified time","Geändert Zeit" }, |
1270 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, | 1270 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, |
1271 | { "View Options","Anzeige Optionen" }, | 1271 | { "View Options","Anzeige Optionen" }, |
1272 | { "<b>Created: ","<b>Erstellt am: " }, | 1272 | { "<b>Created: ","<b>Erstellt am: " }, |
1273 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, | 1273 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, |
1274 | { "Journal: ","Journal: " }, | 1274 | { "Journal: ","Journal: " }, |
1275 | { "yearly","jährlich" }, | 1275 | { "yearly","jährlich" }, |
1276 | { "(%1) ","%1-" }, | 1276 | { "(%1) ","%1-" }, |
1277 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, | 1277 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, |
1278 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, | 1278 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, |
1279 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, | 1279 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, |
1280 | { "Summary/Loc.","Titel/Ort" }, | 1280 | { "Summary/Loc.","Titel/Ort" }, |
1281 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, | 1281 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, |
1282 | { "Week Number","Wochennummer" }, | 1282 | { "Week Number","Wochennummer" }, |
1283 | { "Import","Importiere" }, | 1283 | { "Import","Importiere" }, |
1284 | { "Export","Exportiere" }, | 1284 | { "Export","Exportiere" }, |
1285 | { "Beam","Beame" }, | 1285 | { "Beam","Beame" }, |
1286 | { "Export","Exportiere" }, | 1286 | { "Export","Exportiere" }, |
1287 | { "As iCal (ics) file...","Als iCal (ics) Datei..." }, | 1287 | { "As iCal (ics) file...","Als iCal (ics) Datei..." }, |
1288 | { "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, | 1288 | { "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, |
1289 | { "Journal/Details...","Journale/Details..." }, | 1289 | { "Journal/Details...","Journale/Details..." }, |
1290 | { "Agenda View","Agenda Ansicht" }, | 1290 | { "Agenda View","Agenda Ansicht" }, |
1291 | { "Show current time","Zeige aktuelle Zeit" }, | 1291 | { "Show current time","Zeige aktuelle Zeit" }, |
1292 | { "Edit new item","Bearbeite neuen Eintrag" }, | 1292 | { "Edit new item","Bearbeite neuen Eintrag" }, |
1293 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, | 1293 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, |
1294 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, | 1294 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, |
1295 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, | 1295 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, |
1296 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, | 1296 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, |
1297 | { "%1 days\n","%1 Tagen\n" }, | 1297 | { "%1 days\n","%1 Tagen\n" }, |
1298 | { "1 day\n","1 Tag\n" }, | 1298 | { "1 day\n","1 Tag\n" }, |
1299 | { "%1 hours\n","%1 Stunden\n" }, | 1299 | { "%1 hours\n","%1 Stunden\n" }, |
1300 | { "1 hour\n","1 Stunde\n" }, | 1300 | { "1 hour\n","1 Stunde\n" }, |
1301 | { "%1 minutes\n","%1 Minuten\n" }, | 1301 | { "%1 minutes\n","%1 Minuten\n" }, |
1302 | { "1 minute\n","1 Minute\n" }, | 1302 | { "1 minute\n","1 Minute\n" }, |
1303 | { "Only one toolbar","Nur eine Toolbar" }, | 1303 | { "Only one toolbar","Nur eine Toolbar" }, |
1304 | { "Print","Drucke" }, | 1304 | { "Print","Drucke" }, |
1305 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, | 1305 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, |
1306 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, | 1306 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, |
1307 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, | 1307 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, |
1308 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, | 1308 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 72221fd..1785b8a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3256,192 +3256,193 @@ void CalendarView::todoDeleted() | |||
3256 | void CalendarView::newTodoDateTime( QDateTime dt, bool allday ) | 3256 | void CalendarView::newTodoDateTime( QDateTime dt, bool allday ) |
3257 | { | 3257 | { |
3258 | showTodoEditor(); | 3258 | showTodoEditor(); |
3259 | mTodoEditor->newTodo(dt,0,allday); | 3259 | mTodoEditor->newTodo(dt,0,allday); |
3260 | if ( mFilterView->filtersEnabled() ) { | 3260 | if ( mFilterView->filtersEnabled() ) { |
3261 | CalFilter *filter = mFilterView->selectedFilter(); | 3261 | CalFilter *filter = mFilterView->selectedFilter(); |
3262 | if (filter && filter->showCategories()) { | 3262 | if (filter && filter->showCategories()) { |
3263 | mTodoEditor->setCategories(filter->categoryList().join(",") ); | 3263 | mTodoEditor->setCategories(filter->categoryList().join(",") ); |
3264 | } | 3264 | } |
3265 | if ( filter ) | 3265 | if ( filter ) |
3266 | mTodoEditor->setSecrecy( filter->getSecrecy() ); | 3266 | mTodoEditor->setSecrecy( filter->getSecrecy() ); |
3267 | } | 3267 | } |
3268 | mTodoEditor->exec(); | 3268 | mTodoEditor->exec(); |
3269 | setActiveWindow(); | 3269 | setActiveWindow(); |
3270 | } | 3270 | } |
3271 | 3271 | ||
3272 | void CalendarView::newTodo() | 3272 | void CalendarView::newTodo() |
3273 | { | 3273 | { |
3274 | newTodoDateTime( QDateTime(),true ); | 3274 | newTodoDateTime( QDateTime(),true ); |
3275 | } | 3275 | } |
3276 | 3276 | ||
3277 | void CalendarView::newSubTodo() | 3277 | void CalendarView::newSubTodo() |
3278 | { | 3278 | { |
3279 | Todo *todo = selectedTodo(); | 3279 | Todo *todo = selectedTodo(); |
3280 | if ( todo ) newSubTodo( todo ); | 3280 | if ( todo ) newSubTodo( todo ); |
3281 | } | 3281 | } |
3282 | 3282 | ||
3283 | void CalendarView::newSubTodo(Todo *parentEvent) | 3283 | void CalendarView::newSubTodo(Todo *parentEvent) |
3284 | { | 3284 | { |
3285 | 3285 | ||
3286 | showTodoEditor(); | 3286 | showTodoEditor(); |
3287 | mTodoEditor->newTodo(QDateTime(),parentEvent,true); | 3287 | mTodoEditor->newTodo(QDateTime(),parentEvent,true); |
3288 | mTodoEditor->exec(); | 3288 | mTodoEditor->exec(); |
3289 | setActiveWindow(); | 3289 | setActiveWindow(); |
3290 | } | 3290 | } |
3291 | 3291 | ||
3292 | void CalendarView::newFloatingEvent() | 3292 | void CalendarView::newFloatingEvent() |
3293 | { | 3293 | { |
3294 | DateList tmpList = mNavigator->selectedDates(); | 3294 | DateList tmpList = mNavigator->selectedDates(); |
3295 | QDate date = tmpList.first(); | 3295 | QDate date = tmpList.first(); |
3296 | 3296 | ||
3297 | newEvent( QDateTime( date, QTime( 12, 0, 0 ) ), | 3297 | newEvent( QDateTime( date, QTime( 12, 0, 0 ) ), |
3298 | QDateTime( date, QTime( 12, 0, 0 ) ), true ); | 3298 | QDateTime( date, QTime( 12, 0, 0 ) ), true ); |
3299 | } | 3299 | } |
3300 | 3300 | ||
3301 | 3301 | ||
3302 | void CalendarView::editEvent( Event *event ) | 3302 | void CalendarView::editEvent( Event *event ) |
3303 | { | 3303 | { |
3304 | 3304 | ||
3305 | if ( !event ) return; | 3305 | if ( !event ) return; |
3306 | if ( event->isReadOnly() ) { | 3306 | if ( event->isReadOnly() ) { |
3307 | showEvent( event ); | 3307 | showEvent( event ); |
3308 | return; | 3308 | return; |
3309 | } | 3309 | } |
3310 | showEventEditor(); | 3310 | showEventEditor(); |
3311 | mEventEditor->editEvent( event , mFlagEditDescription); | 3311 | mEventEditor->editEvent( event , mFlagEditDescription); |
3312 | mEventEditor->exec(); | 3312 | mEventEditor->exec(); |
3313 | setActiveWindow(); | 3313 | setActiveWindow(); |
3314 | 3314 | ||
3315 | } | 3315 | } |
3316 | void CalendarView::editJournal( Journal *jour ) | 3316 | void CalendarView::editJournal( Journal *jour ) |
3317 | { | 3317 | { |
3318 | if ( !jour ) return; | 3318 | if ( !jour ) return; |
3319 | mDialogManager->hideSearchDialog(); | 3319 | mDialogManager->hideSearchDialog(); |
3320 | mViewManager->showJournalView(); | 3320 | mViewManager->showJournalView(); |
3321 | mNavigator->slotDaySelect( jour->dtStart().date() ); | 3321 | mNavigator->slotDaySelect( jour->dtStart().date() ); |
3322 | } | 3322 | } |
3323 | void CalendarView::editTodo( Todo *todo ) | 3323 | void CalendarView::editTodo( Todo *todo ) |
3324 | { | 3324 | { |
3325 | if ( !todo ) return; | 3325 | if ( !todo ) return; |
3326 | 3326 | ||
3327 | if ( todo->isReadOnly() ) { | 3327 | if ( todo->isReadOnly() ) { |
3328 | showTodo( todo ); | 3328 | showTodo( todo ); |
3329 | return; | 3329 | return; |
3330 | } | 3330 | } |
3331 | showTodoEditor(); | 3331 | showTodoEditor(); |
3332 | mTodoEditor->editTodo( todo ,mFlagEditDescription); | 3332 | mTodoEditor->editTodo( todo ,mFlagEditDescription); |
3333 | mTodoEditor->exec(); | 3333 | mTodoEditor->exec(); |
3334 | setActiveWindow(); | 3334 | setActiveWindow(); |
3335 | 3335 | ||
3336 | } | 3336 | } |
3337 | 3337 | ||
3338 | KOEventViewerDialog* CalendarView::getEventViewerDialog() | 3338 | KOEventViewerDialog* CalendarView::getEventViewerDialog() |
3339 | { | 3339 | { |
3340 | if ( !mEventViewerDialog ) { | 3340 | if ( !mEventViewerDialog ) { |
3341 | mEventViewerDialog = new KOEventViewerDialog(0); | 3341 | mEventViewerDialog = new KOEventViewerDialog(0); |
3342 | connect( mEventViewerDialog, SIGNAL( editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* ) ) ); | 3342 | connect( mEventViewerDialog, SIGNAL( editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* ) ) ); |
3343 | connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig())); | 3343 | connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig())); |
3344 | connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), | 3344 | connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), |
3345 | dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); | 3345 | dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); |
3346 | connect( mEventViewerDialog, SIGNAL(showAgendaView( bool ) ), | 3346 | connect( mEventViewerDialog, SIGNAL(showAgendaView( bool ) ), |
3347 | viewManager(), SLOT( showAgendaView( bool ) ) ); | 3347 | viewManager(), SLOT( showAgendaView( bool ) ) ); |
3348 | connect( mEventViewerDialog, SIGNAL(signalViewerClosed()), | 3348 | connect( mEventViewerDialog, SIGNAL(signalViewerClosed()), |
3349 | this, SLOT( slotViewerClosed() ) ); | 3349 | this, SLOT( slotViewerClosed() ) ); |
3350 | connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), | 3350 | connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), |
3351 | this, SLOT( todoChanged(Todo *) ) ); | 3351 | this, SLOT( todoChanged(Todo *) ) ); |
3352 | connect( mEventViewerDialog, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | ||
3352 | mEventViewerDialog->resize( 640, 480 ); | 3353 | mEventViewerDialog->resize( 640, 480 ); |
3353 | 3354 | ||
3354 | } | 3355 | } |
3355 | return mEventViewerDialog; | 3356 | return mEventViewerDialog; |
3356 | } | 3357 | } |
3357 | void CalendarView::showEvent(Event *event) | 3358 | void CalendarView::showEvent(Event *event) |
3358 | { | 3359 | { |
3359 | getEventViewerDialog()->setEvent(event); | 3360 | getEventViewerDialog()->setEvent(event); |
3360 | getEventViewerDialog()->showMe(); | 3361 | getEventViewerDialog()->showMe(); |
3361 | } | 3362 | } |
3362 | 3363 | ||
3363 | void CalendarView::showTodo(Todo *event) | 3364 | void CalendarView::showTodo(Todo *event) |
3364 | { | 3365 | { |
3365 | getEventViewerDialog()->setTodo(event); | 3366 | getEventViewerDialog()->setTodo(event); |
3366 | getEventViewerDialog()->showMe(); | 3367 | getEventViewerDialog()->showMe(); |
3367 | } | 3368 | } |
3368 | void CalendarView::showJournal( Journal *jour ) | 3369 | void CalendarView::showJournal( Journal *jour ) |
3369 | { | 3370 | { |
3370 | getEventViewerDialog()->setJournal(jour); | 3371 | getEventViewerDialog()->setJournal(jour); |
3371 | getEventViewerDialog()->showMe(); | 3372 | getEventViewerDialog()->showMe(); |
3372 | 3373 | ||
3373 | } | 3374 | } |
3374 | // void CalendarView::todoModified (Todo *event, int changed) | 3375 | // void CalendarView::todoModified (Todo *event, int changed) |
3375 | // { | 3376 | // { |
3376 | // // if (mDialogList.find (event) != mDialogList.end ()) { | 3377 | // // if (mDialogList.find (event) != mDialogList.end ()) { |
3377 | // // kdDebug() << "Todo modified and open" << endl; | 3378 | // // kdDebug() << "Todo modified and open" << endl; |
3378 | // // KOTodoEditor* temp = (KOTodoEditor *) mDialogList[event]; | 3379 | // // KOTodoEditor* temp = (KOTodoEditor *) mDialogList[event]; |
3379 | // // temp->modified (changed); | 3380 | // // temp->modified (changed); |
3380 | 3381 | ||
3381 | // // } | 3382 | // // } |
3382 | 3383 | ||
3383 | // mViewManager->updateView(); | 3384 | // mViewManager->updateView(); |
3384 | // } | 3385 | // } |
3385 | 3386 | ||
3386 | void CalendarView::appointment_show() | 3387 | void CalendarView::appointment_show() |
3387 | { | 3388 | { |
3388 | Event *anEvent = 0; | 3389 | Event *anEvent = 0; |
3389 | 3390 | ||
3390 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 3391 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
3391 | 3392 | ||
3392 | if (mViewManager->currentView()->isEventView()) { | 3393 | if (mViewManager->currentView()->isEventView()) { |
3393 | if ( incidence && incidence->typeID() == eventID ) { | 3394 | if ( incidence && incidence->typeID() == eventID ) { |
3394 | anEvent = static_cast<Event *>(incidence); | 3395 | anEvent = static_cast<Event *>(incidence); |
3395 | } | 3396 | } |
3396 | } | 3397 | } |
3397 | 3398 | ||
3398 | if (!anEvent) { | 3399 | if (!anEvent) { |
3399 | KNotifyClient::beep(); | 3400 | KNotifyClient::beep(); |
3400 | return; | 3401 | return; |
3401 | } | 3402 | } |
3402 | 3403 | ||
3403 | showEvent(anEvent); | 3404 | showEvent(anEvent); |
3404 | } | 3405 | } |
3405 | 3406 | ||
3406 | void CalendarView::appointment_edit() | 3407 | void CalendarView::appointment_edit() |
3407 | { | 3408 | { |
3408 | Event *anEvent = 0; | 3409 | Event *anEvent = 0; |
3409 | 3410 | ||
3410 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 3411 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
3411 | 3412 | ||
3412 | if (mViewManager->currentView()->isEventView()) { | 3413 | if (mViewManager->currentView()->isEventView()) { |
3413 | if ( incidence && incidence->typeID() == eventID ) { | 3414 | if ( incidence && incidence->typeID() == eventID ) { |
3414 | anEvent = static_cast<Event *>(incidence); | 3415 | anEvent = static_cast<Event *>(incidence); |
3415 | } | 3416 | } |
3416 | } | 3417 | } |
3417 | 3418 | ||
3418 | if (!anEvent) { | 3419 | if (!anEvent) { |
3419 | KNotifyClient::beep(); | 3420 | KNotifyClient::beep(); |
3420 | return; | 3421 | return; |
3421 | } | 3422 | } |
3422 | 3423 | ||
3423 | editEvent(anEvent); | 3424 | editEvent(anEvent); |
3424 | } | 3425 | } |
3425 | 3426 | ||
3426 | void CalendarView::appointment_delete() | 3427 | void CalendarView::appointment_delete() |
3427 | { | 3428 | { |
3428 | Event *anEvent = 0; | 3429 | Event *anEvent = 0; |
3429 | 3430 | ||
3430 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 3431 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
3431 | 3432 | ||
3432 | if (mViewManager->currentView()->isEventView()) { | 3433 | if (mViewManager->currentView()->isEventView()) { |
3433 | if ( incidence && incidence->typeID() == eventID ) { | 3434 | if ( incidence && incidence->typeID() == eventID ) { |
3434 | anEvent = static_cast<Event *>(incidence); | 3435 | anEvent = static_cast<Event *>(incidence); |
3435 | } | 3436 | } |
3436 | } | 3437 | } |
3437 | 3438 | ||
3438 | if (!anEvent) { | 3439 | if (!anEvent) { |
3439 | KNotifyClient::beep(); | 3440 | KNotifyClient::beep(); |
3440 | return; | 3441 | return; |
3441 | } | 3442 | } |
3442 | 3443 | ||
3443 | deleteEvent(anEvent); | 3444 | deleteEvent(anEvent); |
3444 | } | 3445 | } |
3445 | 3446 | ||
3446 | void CalendarView::todo_resub( Todo * parent, Todo * sub ) | 3447 | void CalendarView::todo_resub( Todo * parent, Todo * sub ) |
3447 | { | 3448 | { |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index f6c252b..2d0bfff 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -17,192 +17,202 @@ | |||
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <qcstring.h> | 20 | #include <qcstring.h> |
21 | #include <qwhatsthis.h> | 21 | #include <qwhatsthis.h> |
22 | #include <qdialog.h> | 22 | #include <qdialog.h> |
23 | #include <qapplication.h> | 23 | #include <qapplication.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | 26 | ||
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kapplication.h> | 28 | #include <kapplication.h> |
29 | #include <libkcal/event.h> | 29 | #include <libkcal/event.h> |
30 | #include <libkcal/todo.h> | 30 | #include <libkcal/todo.h> |
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <kiconloader.h> | 32 | #include <kiconloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kglobal.h> | 34 | #include <kglobal.h> |
35 | #include <kprocess.h> | 35 | #include <kprocess.h> |
36 | #include "koprefs.h" | 36 | #include "koprefs.h" |
37 | 37 | ||
38 | #include <kabc/stdaddressbook.h> | 38 | #include <kabc/stdaddressbook.h> |
39 | 39 | ||
40 | #ifndef KORG_NODCOP | 40 | #ifndef KORG_NODCOP |
41 | #include <dcopclient.h> | 41 | #include <dcopclient.h> |
42 | #include "korganizer.h" | 42 | #include "korganizer.h" |
43 | #include "koprefs.h" | 43 | #include "koprefs.h" |
44 | #include "actionmanager.h" | 44 | #include "actionmanager.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #include "koeventviewer.h" | 47 | #include "koeventviewer.h" |
48 | //#ifndef KORG_NOKABC | 48 | //#ifndef KORG_NOKABC |
49 | //#include <kabc/stdaddressbook.h> | 49 | //#include <kabc/stdaddressbook.h> |
50 | //#define size count | 50 | //#define size count |
51 | //#endif | 51 | //#endif |
52 | 52 | ||
53 | #ifdef DESKTOP_VERSION | 53 | #ifdef DESKTOP_VERSION |
54 | #include <kabc/addresseedialog.h> | 54 | #include <kabc/addresseedialog.h> |
55 | #include <kabc/addresseeview.h> | 55 | #include <kabc/addresseeview.h> |
56 | #include <qprinter.h> | 56 | #include <qprinter.h> |
57 | #include <qpainter.h> | 57 | #include <qpainter.h> |
58 | #include <qpaintdevicemetrics.h> | 58 | #include <qpaintdevicemetrics.h> |
59 | #else //DESKTOP_VERSION | 59 | #else //DESKTOP_VERSION |
60 | #include <externalapphandler.h> | 60 | #include <externalapphandler.h> |
61 | #include <qtopia/qcopenvelope_qws.h> | 61 | #include <qtopia/qcopenvelope_qws.h> |
62 | #endif //DESKTOP_VERSION | 62 | #endif //DESKTOP_VERSION |
63 | 63 | ||
64 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) | 64 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) |
65 | : QTextBrowser(parent,name) | 65 | : QTextBrowser(parent,name) |
66 | { | 66 | { |
67 | mSyncMode = false; | 67 | mSyncMode = false; |
68 | mColorMode = 0; | 68 | mColorMode = 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | KOEventViewer::~KOEventViewer() | 71 | KOEventViewer::~KOEventViewer() |
72 | { | 72 | { |
73 | } | 73 | } |
74 | 74 | ||
75 | void KOEventViewer::printMe() | 75 | void KOEventViewer::printMe() |
76 | { | 76 | { |
77 | #ifdef DESKTOP_VERSION | 77 | #ifdef DESKTOP_VERSION |
78 | 78 | ||
79 | KOPrintPrefs pp ( this ); | 79 | KOPrintPrefs pp ( this ); |
80 | if (!pp.exec() ) | 80 | if (!pp.exec() ) |
81 | return; | 81 | return; |
82 | int scaleval = pp.printMode() ; | 82 | int scaleval = pp.printMode() ; |
83 | 83 | ||
84 | QPrinter printer; | 84 | QPrinter printer; |
85 | if (!printer.setup() ) | 85 | if (!printer.setup() ) |
86 | return; | 86 | return; |
87 | QPainter p; | 87 | QPainter p; |
88 | p.begin ( &printer ); | 88 | p.begin ( &printer ); |
89 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); | 89 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); |
90 | float dx, dy; | 90 | float dx, dy; |
91 | int wid = (m.width() * 9)/10; | 91 | int wid = (m.width() * 9)/10; |
92 | dx = (float) wid/(float)contentsWidth (); | 92 | dx = (float) wid/(float)contentsWidth (); |
93 | dy = (float)(m.height()) / (float)contentsHeight (); | 93 | dy = (float)(m.height()) / (float)contentsHeight (); |
94 | float scale; | 94 | float scale; |
95 | // scale to fit the width or height of the paper | 95 | // scale to fit the width or height of the paper |
96 | if ( dx < dy ) | 96 | if ( dx < dy ) |
97 | scale = dx; | 97 | scale = dx; |
98 | else | 98 | else |
99 | scale = dy; | 99 | scale = dy; |
100 | 100 | ||
101 | p.translate( m.width()/10,0 ); | 101 | p.translate( m.width()/10,0 ); |
102 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { | 102 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { |
103 | p.scale( scale, scale ); | 103 | p.scale( scale, scale ); |
104 | } | 104 | } |
105 | drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); | 105 | drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); |
106 | p.end(); | 106 | p.end(); |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | } | 109 | } |
110 | void KOEventViewer::setSource(const QString& n) | 110 | void KOEventViewer::setSource(const QString& n) |
111 | { | 111 | { |
112 | 112 | ||
113 | if ( n.left(8) == "todo_uid" ) { | ||
114 | int midstr = 9; | ||
115 | #ifdef DESKTOP_VERSION | ||
116 | midstr = 11; | ||
117 | #endif | ||
118 | qDebug("-%s- ", n.mid(midstr).latin1()); | ||
119 | emit showIncidence( n.mid(midstr) ); | ||
120 | return; | ||
121 | } | ||
122 | |||
113 | if ( n.left(3) == "uid" ) | 123 | if ( n.left(3) == "uid" ) |
114 | #ifdef DESKTOP_VERSION | 124 | #ifdef DESKTOP_VERSION |
115 | { | 125 | { |
116 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 126 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
117 | KABC::AddressBook::Iterator it; | 127 | KABC::AddressBook::Iterator it; |
118 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 128 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
119 | // LR I do not understand, why the uid string is different on zaurus and desktop | 129 | // LR I do not understand, why the uid string is different on zaurus and desktop |
120 | QString uid = "uid://"+(*it).uid(); | 130 | QString uid = "uid://"+(*it).uid(); |
121 | 131 | ||
122 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); | 132 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); |
123 | if (n == uid ) { | 133 | if (n == uid ) { |
124 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); | 134 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); |
125 | QDialog dia( this,"dia123", true ); | 135 | QDialog dia( this,"dia123", true ); |
126 | dia.setCaption( i18n("Details of attendee") ); | 136 | dia.setCaption( i18n("Details of attendee") ); |
127 | QVBoxLayout lay ( &dia ); | 137 | QVBoxLayout lay ( &dia ); |
128 | KABC::AddresseeView av ( &dia ); | 138 | KABC::AddresseeView av ( &dia ); |
129 | av.setAddressee( (*it) ); | 139 | av.setAddressee( (*it) ); |
130 | lay.addWidget( &av ); | 140 | lay.addWidget( &av ); |
131 | if ( QApplication::desktop()->width() < 480 ) | 141 | if ( QApplication::desktop()->width() < 480 ) |
132 | dia.resize( 220, 240); | 142 | dia.resize( 220, 240); |
133 | else { | 143 | else { |
134 | dia.resize( 400,400); | 144 | dia.resize( 400,400); |
135 | } | 145 | } |
136 | dia.exec(); | 146 | dia.exec(); |
137 | break; | 147 | break; |
138 | } | 148 | } |
139 | } | 149 | } |
140 | return; | 150 | return; |
141 | } | 151 | } |
142 | #else | 152 | #else |
143 | { | 153 | { |
144 | if ( "uid:organizer" == n ) { | 154 | if ( "uid:organizer" == n ) { |
145 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),""); | 155 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),""); |
146 | return; | 156 | return; |
147 | } | 157 | } |
148 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); | 158 | QPtrList<Attendee> attendees = mCurrentIncidence->attendees(); |
149 | if (attendees.count()) { | 159 | if (attendees.count()) { |
150 | Attendee *a; | 160 | Attendee *a; |
151 | for(a=attendees.first();a;a=attendees.next()) { | 161 | for(a=attendees.first();a;a=attendees.next()) { |
152 | if ( "uid:"+a->uid() == n ) { | 162 | if ( "uid:"+a->uid() == n ) { |
153 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid()); | 163 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid()); |
154 | return; | 164 | return; |
155 | } | 165 | } |
156 | } | 166 | } |
157 | } | 167 | } |
158 | return; | 168 | return; |
159 | } | 169 | } |
160 | //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/); | 170 | //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/); |
161 | // the result should now arrive through method insertAttendees | 171 | // the result should now arrive through method insertAttendees |
162 | //QString uid = "uid:"+(*it).uid(); | 172 | //QString uid = "uid:"+(*it).uid(); |
163 | #endif | 173 | #endif |
164 | if ( n.left(6) == "mailto" ) { | 174 | if ( n.left(6) == "mailto" ) { |
165 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); | 175 | // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); |
166 | #ifndef DESKTOP_VERSION | 176 | #ifndef DESKTOP_VERSION |
167 | if ( n.mid(7,3) == "ALL" ) { | 177 | if ( n.mid(7,3) == "ALL" ) { |
168 | mailToAttendees( true ); | 178 | mailToAttendees( true ); |
169 | } else if ( n.mid(7,4) == "RSVP" ) { | 179 | } else if ( n.mid(7,4) == "RSVP" ) { |
170 | mailToAttendees( false ); | 180 | mailToAttendees( false ); |
171 | } else { | 181 | } else { |
172 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); | 182 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); |
173 | e << n.mid(7); | 183 | e << n.mid(7); |
174 | } | 184 | } |
175 | #endif | 185 | #endif |
176 | 186 | ||
177 | } | 187 | } |
178 | 188 | ||
179 | 189 | ||
180 | #ifndef KORG_NODCOP | 190 | #ifndef KORG_NODCOP |
181 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; | 191 | kdDebug() << "KOEventViewer::setSource(): " << n << endl; |
182 | QString tmpStr; | 192 | QString tmpStr; |
183 | if (n.startsWith("mailto:")) { | 193 | if (n.startsWith("mailto:")) { |
184 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); | 194 | KApplication::kApplication()->invokeMailer(n.mid(7),QString::null); |
185 | //emit showIncidence(n); | 195 | //emit showIncidence(n); |
186 | return; | 196 | return; |
187 | } else if (n.startsWith("uid:")) { | 197 | } else if (n.startsWith("uid:")) { |
188 | DCOPClient *client = KApplication::kApplication()->dcopClient(); | 198 | DCOPClient *client = KApplication::kApplication()->dcopClient(); |
189 | const QByteArray noParamData; | 199 | const QByteArray noParamData; |
190 | const QByteArray paramData; | 200 | const QByteArray paramData; |
191 | QByteArray replyData; | 201 | QByteArray replyData; |
192 | QCString replyTypeStr; | 202 | QCString replyTypeStr; |
193 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) | 203 | #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()", noParamData, replyTypeStr, replyData)) |
194 | bool foundAbbrowser = PING_ABBROWSER; | 204 | bool foundAbbrowser = PING_ABBROWSER; |
195 | 205 | ||
196 | if (foundAbbrowser) { | 206 | if (foundAbbrowser) { |
197 | //KAddressbook is already running, so just DCOP to it to bring up the contact editor | 207 | //KAddressbook is already running, so just DCOP to it to bring up the contact editor |
198 | //client->send("kaddressbook","KAddressBookIface", | 208 | //client->send("kaddressbook","KAddressBookIface", |
199 | QDataStream arg(paramData, IO_WriteOnly); | 209 | QDataStream arg(paramData, IO_WriteOnly); |
200 | arg << n.mid(6); | 210 | arg << n.mid(6); |
201 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); | 211 | client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )", paramData); |
202 | return; | 212 | return; |
203 | } else { | 213 | } else { |
204 | /* | 214 | /* |
205 | KaddressBook is not already running. Pass it the UID of the contact via the command line while starting it - its neater. | 215 | KaddressBook is not already running. Pass it the UID of the contact via the command line while starting it - its neater. |
206 | We start it without its main interface | 216 | We start it without its main interface |
207 | */ | 217 | */ |
208 | KIconLoader* iconLoader = new KIconLoader(); | 218 | KIconLoader* iconLoader = new KIconLoader(); |
@@ -437,200 +447,212 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
437 | if ( mColorMode == 1 ) { | 447 | if ( mColorMode == 1 ) { |
438 | mText +="<font color=\"#00A000\">"; | 448 | mText +="<font color=\"#00A000\">"; |
439 | } | 449 | } |
440 | if ( mColorMode == 2 ) { | 450 | if ( mColorMode == 2 ) { |
441 | mText +="<font color=\"#B00000\">"; | 451 | mText +="<font color=\"#B00000\">"; |
442 | } | 452 | } |
443 | if ( mode == 1 ) { | 453 | if ( mode == 1 ) { |
444 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); | 454 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
445 | } else { | 455 | } else { |
446 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); | 456 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
447 | } | 457 | } |
448 | formatReadOnly(event); | 458 | formatReadOnly(event); |
449 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 459 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
450 | if ( mColorMode ) | 460 | if ( mColorMode ) |
451 | mText += "</font>"; | 461 | mText += "</font>"; |
452 | } | 462 | } |
453 | mMailSubject += i18n( "Todo " )+ event->summary(); | 463 | mMailSubject += i18n( "Todo " )+ event->summary(); |
454 | 464 | ||
455 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { | 465 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { |
456 | mText +="<font color=\"#B00000\">"; | 466 | mText +="<font color=\"#B00000\">"; |
457 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); | 467 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); |
458 | mText += "</font>"; | 468 | mText += "</font>"; |
459 | } else { | 469 | } else { |
460 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 470 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
461 | .arg(event->percentComplete())); | 471 | .arg(event->percentComplete())); |
462 | } | 472 | } |
463 | 473 | ||
464 | if (event->cancelled ()) { | 474 | if (event->cancelled ()) { |
465 | mText +="<font color=\"#B00000\">"; | 475 | mText +="<font color=\"#B00000\">"; |
466 | addTag("i",i18n("This todo has been cancelled!")); | 476 | addTag("i",i18n("This todo has been cancelled!")); |
467 | mText.append("<br>"); | 477 | mText.append("<br>"); |
468 | mText += "</font>"; | 478 | mText += "</font>"; |
469 | mMailSubject += i18n("(cancelled)"); | 479 | mMailSubject += i18n("(cancelled)"); |
470 | } | 480 | } |
471 | 481 | ||
472 | 482 | ||
473 | 483 | ||
474 | if (event->recurrence()->doesRecur()) { | 484 | if (event->recurrence()->doesRecur()) { |
475 | 485 | ||
476 | QString recurText = event->recurrence()->recurrenceText(); | 486 | QString recurText = event->recurrence()->recurrenceText(); |
477 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 487 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
478 | 488 | ||
479 | } | 489 | } |
480 | if (event->hasStartDate()) { | 490 | if (event->hasStartDate()) { |
481 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 491 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
482 | } | 492 | } |
483 | if (event->hasDueDate()) { | 493 | if (event->hasDueDate()) { |
484 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 494 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
485 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 495 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
486 | } | 496 | } |
487 | if (!event->location().isEmpty()) { | 497 | if (!event->location().isEmpty()) { |
488 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); | 498 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); |
489 | mMailSubject += i18n(" at ") + event->location(); | 499 | mMailSubject += i18n(" at ") + event->location(); |
490 | } | 500 | } |
491 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 501 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
492 | .arg(QString::number(event->priority()))); | 502 | .arg(QString::number(event->priority()))); |
493 | 503 | ||
494 | if (event->isAlarmEnabled()) { | 504 | if (event->isAlarmEnabled()) { |
495 | Alarm *alarm =event->alarms().first() ; | 505 | Alarm *alarm =event->alarms().first() ; |
496 | QDateTime t = alarm->time(); | 506 | QDateTime t = alarm->time(); |
497 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 507 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
498 | if ( wideScreen ) { | 508 | if ( wideScreen ) { |
499 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); | 509 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); |
500 | } else { | 510 | } else { |
501 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 511 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
502 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 512 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
503 | } | 513 | } |
504 | } | 514 | } |
505 | 515 | ||
506 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); | 516 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); |
507 | 517 | ||
508 | formatCategories(event); | 518 | formatCategories(event); |
509 | 519 | ||
510 | formatAttendees(event); | 520 | formatAttendees(event); |
511 | 521 | ||
512 | if ( KOPrefs::instance()->mEVshowCreated ) { | 522 | if ( KOPrefs::instance()->mEVshowCreated ) { |
513 | if(wideScreen ){ | 523 | if(wideScreen ){ |
514 | 524 | ||
515 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 525 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
516 | 526 | ||
517 | } else { | 527 | } else { |
518 | addTag("p",i18n("<b>Created: ") +" </b>"); | 528 | addTag("p",i18n("<b>Created: ") +" </b>"); |
519 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 529 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
520 | } | 530 | } |
521 | } | 531 | } |
522 | if ( KOPrefs::instance()->mEVshowChanged ) { | 532 | if ( KOPrefs::instance()->mEVshowChanged ) { |
523 | if(wideScreen ){ | 533 | if(wideScreen ){ |
524 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); | 534 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); |
525 | 535 | ||
526 | } else { | 536 | } else { |
527 | addTag("p",i18n("<b>Last modified: ") +" </b>"); | 537 | addTag("p",i18n("<b>Last modified: ") +" </b>"); |
528 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); | 538 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); |
529 | } | 539 | } |
530 | } | 540 | } |
531 | if ( event->relatedTo() ) { | 541 | if ( event->relatedTo() ) { |
532 | addTag("b",i18n("Parent todo:<br>")); | 542 | addTag("b",i18n("Parent todo:<br>")); |
533 | mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 543 | |
544 | QString t_name = "[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] ";// +event->relatedTo()->summary()); | ||
545 | |||
546 | mText += t_name; | ||
547 | mText += "<a href=\"todo_uid:" + event->relatedTo()->uid() + "\">"; | ||
548 | mText += deTag(event->relatedTo()->summary()); | ||
549 | mText += "</a><br>"; | ||
550 | |||
551 | // mText.append(deTag("[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] " +event->relatedTo()->summary()) +"<br>"); | ||
534 | } | 552 | } |
535 | QPtrList<Incidence> Relations = event->relations(); | 553 | QPtrList<Incidence> Relations = event->relations(); |
536 | Incidence *to; | 554 | Incidence *to; |
537 | if ( Relations.first() ) | 555 | if ( Relations.first() ) |
538 | addTag("b",i18n("Sub todos:<br>")); | 556 | addTag("b",i18n("Sub todos:<br>")); |
539 | for (to=Relations.first();to;to=Relations.next()) { | 557 | for (to=Relations.first();to;to=Relations.next()) { |
540 | mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 558 | QString t_name = "[" +QString::number(((Todo*)to)->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%] ";// +to->relatedTo()->summary()); |
559 | mText += t_name; | ||
560 | mText += "<a href=\"todo_uid:" + to->uid() + "\">"; | ||
561 | mText += deTag(to->summary()); | ||
562 | mText += "</a><br>"; | ||
541 | 563 | ||
542 | } | 564 | } |
543 | 565 | ||
544 | if ( KOPrefs::instance()->mEVshowDetails ) { | 566 | if ( KOPrefs::instance()->mEVshowDetails ) { |
545 | if (!event->description().isEmpty()) { | 567 | if (!event->description().isEmpty()) { |
546 | addTag("p",i18n("<b>Details: </b>")); | 568 | addTag("p",i18n("<b>Details: </b>")); |
547 | addTag("p",deTag(event->description())); | 569 | addTag("p",deTag(event->description())); |
548 | } | 570 | } |
549 | } | 571 | } |
550 | setText(mText); | 572 | setText(mText); |
551 | } | 573 | } |
552 | 574 | ||
553 | void KOEventViewer::formatCategories(Incidence *event) | 575 | void KOEventViewer::formatCategories(Incidence *event) |
554 | { | 576 | { |
555 | if (!event->categoriesStr().isEmpty()) { | 577 | if (!event->categoriesStr().isEmpty()) { |
556 | if (event->categories().count() == 1) { | 578 | if (event->categories().count() == 1) { |
557 | addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace()); | 579 | addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace()); |
558 | } else { | 580 | } else { |
559 | addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ; | 581 | addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ; |
560 | } | 582 | } |
561 | } | 583 | } |
562 | } | 584 | } |
563 | void KOEventViewer::formatAttendees(Incidence *event) | 585 | void KOEventViewer::formatAttendees(Incidence *event) |
564 | { | 586 | { |
565 | QPtrList<Attendee> attendees = event->attendees(); | 587 | QPtrList<Attendee> attendees = event->attendees(); |
566 | if (attendees.count()) { | 588 | if (attendees.count()) { |
567 | 589 | ||
568 | 590 | ||
569 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 591 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
570 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | 592 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); |
571 | addTag("h3",i18n("Organizer")); | 593 | addTag("h3",i18n("Organizer")); |
572 | mText.append("<ul><li>"); | 594 | mText.append("<ul><li>"); |
573 | #ifndef KORG_NOKABC | 595 | #ifndef KORG_NOKABC |
574 | 596 | ||
575 | #ifdef DESKTOP_VERSION | 597 | #ifdef DESKTOP_VERSION |
576 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 598 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
577 | KABC::Addressee::List addressList; | 599 | KABC::Addressee::List addressList; |
578 | addressList = add_book->findByEmail(event->organizer()); | 600 | addressList = add_book->findByEmail(event->organizer()); |
579 | KABC::Addressee o = addressList.first(); | 601 | KABC::Addressee o = addressList.first(); |
580 | if (!o.isEmpty() && addressList.size()<2) { | 602 | if (!o.isEmpty() && addressList.size()<2) { |
581 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 603 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
582 | mText += o.formattedName(); | 604 | mText += o.formattedName(); |
583 | mText += "</a>\n"; | 605 | mText += "</a>\n"; |
584 | } else { | 606 | } else { |
585 | mText.append(event->organizer()); | 607 | mText.append(event->organizer()); |
586 | } | 608 | } |
587 | #else //DESKTOP_VERSION | 609 | #else //DESKTOP_VERSION |
588 | mText += "<a href=\"uid:organizer\">"; | 610 | mText += "<a href=\"uid:organizer\">"; |
589 | mText += event->organizer(); | 611 | mText += event->organizer(); |
590 | mText += "</a>\n"; | 612 | mText += "</a>\n"; |
591 | #endif //DESKTOP_VERSION | 613 | #endif //DESKTOP_VERSION |
592 | 614 | ||
593 | 615 | ||
594 | #else | 616 | #else |
595 | mText.append(event->organizer()); | 617 | mText.append(event->organizer()); |
596 | #endif | 618 | #endif |
597 | 619 | ||
598 | if (iconPath) { | 620 | if (iconPath) { |
599 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; | 621 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; |
600 | mText += "<IMG src=\"" + iconPath + "\">"; | 622 | mText += "<IMG src=\"" + iconPath + "\">"; |
601 | mText += "</a>\n"; | 623 | mText += "</a>\n"; |
602 | } | 624 | } |
603 | mText.append("</li></ul>"); | 625 | mText.append("</li></ul>"); |
604 | 626 | ||
605 | addTag("h3",i18n("Attendees")); | 627 | addTag("h3",i18n("Attendees")); |
606 | Attendee *a; | 628 | Attendee *a; |
607 | mText.append("<ul>"); | 629 | mText.append("<ul>"); |
608 | int a_count = 0; | 630 | int a_count = 0; |
609 | int a_count_nr = 0; | 631 | int a_count_nr = 0; |
610 | 632 | ||
611 | for(a=attendees.first();a;a=attendees.next()) { | 633 | for(a=attendees.first();a;a=attendees.next()) { |
612 | #ifndef KORG_NOKABC | 634 | #ifndef KORG_NOKABC |
613 | #ifdef DESKTOP_VERSION | 635 | #ifdef DESKTOP_VERSION |
614 | if (a->name().isEmpty()) { | 636 | if (a->name().isEmpty()) { |
615 | addressList = add_book->findByEmail(a->email()); | 637 | addressList = add_book->findByEmail(a->email()); |
616 | KABC::Addressee o = addressList.first(); | 638 | KABC::Addressee o = addressList.first(); |
617 | if (!o.isEmpty() && addressList.size()<2) { | 639 | if (!o.isEmpty() && addressList.size()<2) { |
618 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 640 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
619 | mText += o.formattedName(); | 641 | mText += o.formattedName(); |
620 | mText += "</a>\n"; | 642 | mText += "</a>\n"; |
621 | } else { | 643 | } else { |
622 | mText += "<li>"; | 644 | mText += "<li>"; |
623 | mText.append(a->email()); | 645 | mText.append(a->email()); |
624 | mText += "\n"; | 646 | mText += "\n"; |
625 | } | 647 | } |
626 | } else { | 648 | } else { |
627 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 649 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
628 | if (!a->name().isEmpty()) mText += a->name(); | 650 | if (!a->name().isEmpty()) mText += a->name(); |
629 | else mText += a->email(); | 651 | else mText += a->email(); |
630 | mText += "</a>\n"; | 652 | mText += "</a>\n"; |
631 | } | 653 | } |
632 | #else //DESKTOP_VERSION | 654 | #else //DESKTOP_VERSION |
633 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 655 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
634 | if (!a->name().isEmpty()) mText += a->name(); | 656 | if (!a->name().isEmpty()) mText += a->name(); |
635 | else mText += a->email(); | 657 | else mText += a->email(); |
636 | mText += "</a>\n"; | 658 | mText += "</a>\n"; |
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 1eeb8d1..64eb4ff 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h | |||
@@ -33,99 +33,100 @@ using namespace KCal; | |||
33 | #ifdef DESKTOP_VERSION | 33 | #ifdef DESKTOP_VERSION |
34 | 34 | ||
35 | #include <qradiobutton.h> | 35 | #include <qradiobutton.h> |
36 | #include <qpushbutton.h> | 36 | #include <qpushbutton.h> |
37 | #include <qlayout.h> | 37 | #include <qlayout.h> |
38 | #include <qdialog.h> | 38 | #include <qdialog.h> |
39 | #include <qlabel.h> | 39 | #include <qlabel.h> |
40 | #include <qbuttongroup.h> | 40 | #include <qbuttongroup.h> |
41 | #include <kglobal.h> | 41 | #include <kglobal.h> |
42 | 42 | ||
43 | class KOPrintPrefs : public QDialog | 43 | class KOPrintPrefs : public QDialog |
44 | { | 44 | { |
45 | public: | 45 | public: |
46 | KOPrintPrefs( QWidget *parent=0, const char *name=0 ) : | 46 | KOPrintPrefs( QWidget *parent=0, const char *name=0 ) : |
47 | QDialog( parent, name, true ) | 47 | QDialog( parent, name, true ) |
48 | { | 48 | { |
49 | setCaption( i18n("KO/Pi Printout") ); | 49 | setCaption( i18n("KO/Pi Printout") ); |
50 | QVBoxLayout* lay = new QVBoxLayout( this ); | 50 | QVBoxLayout* lay = new QVBoxLayout( this ); |
51 | lay->setSpacing( 9 ); | 51 | lay->setSpacing( 9 ); |
52 | lay->setMargin( 9 ); | 52 | lay->setMargin( 9 ); |
53 | QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this ); | 53 | QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this ); |
54 | lay->addWidget( lab ); | 54 | lay->addWidget( lab ); |
55 | lab->setAlignment( AlignCenter ); | 55 | lab->setAlignment( AlignCenter ); |
56 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this ); | 56 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this ); |
57 | lay->addWidget( format ); | 57 | lay->addWidget( format ); |
58 | format->setExclusive ( true ) ; | 58 | format->setExclusive ( true ) ; |
59 | pmNo = new QRadioButton(i18n("Print unscaled"), format ); | 59 | pmNo = new QRadioButton(i18n("Print unscaled"), format ); |
60 | pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format ); | 60 | pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format ); |
61 | new QRadioButton(i18n("Print scaled up/down to fit one page"), format ); | 61 | new QRadioButton(i18n("Print scaled up/down to fit one page"), format ); |
62 | pmScaledDown->setChecked( true ); | 62 | pmScaledDown->setChecked( true ); |
63 | QPushButton * ok = new QPushButton( i18n("OK"), this ); | 63 | QPushButton * ok = new QPushButton( i18n("OK"), this ); |
64 | lay->addWidget( ok ); | 64 | lay->addWidget( ok ); |
65 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 65 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
66 | lay->addWidget( cancel ); | 66 | lay->addWidget( cancel ); |
67 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 67 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
68 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 68 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
69 | } | 69 | } |
70 | 70 | ||
71 | int printMode() | 71 | int printMode() |
72 | { | 72 | { |
73 | if ( pmNo->isChecked() ) | 73 | if ( pmNo->isChecked() ) |
74 | return 0; | 74 | return 0; |
75 | if ( pmScaledDown->isChecked() ) | 75 | if ( pmScaledDown->isChecked() ) |
76 | return 1; | 76 | return 1; |
77 | return 2; | 77 | return 2; |
78 | } | 78 | } |
79 | private: | 79 | private: |
80 | QRadioButton* pmNo; | 80 | QRadioButton* pmNo; |
81 | QRadioButton* pmScaledDown; | 81 | QRadioButton* pmScaledDown; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | class KOEventViewer : public QTextBrowser { | 86 | class KOEventViewer : public QTextBrowser { |
87 | Q_OBJECT | 87 | Q_OBJECT |
88 | public: | 88 | public: |
89 | KOEventViewer(QWidget *parent=0,const char *name=0); | 89 | KOEventViewer(QWidget *parent=0,const char *name=0); |
90 | virtual ~KOEventViewer(); | 90 | virtual ~KOEventViewer(); |
91 | 91 | ||
92 | void setSource(const QString &); | 92 | void setSource(const QString &); |
93 | void setEvent(Event *event); | 93 | void setEvent(Event *event); |
94 | void addEvent(Event *event); | 94 | void addEvent(Event *event); |
95 | void setTodo(Todo *event, bool clearV = true ); | 95 | void setTodo(Todo *event, bool clearV = true ); |
96 | void setJournal(Journal *jour, bool clearV = true ); | 96 | void setJournal(Journal *jour, bool clearV = true ); |
97 | 97 | ||
98 | void appendEvent(Event *event, int mode = 0 ); | 98 | void appendEvent(Event *event, int mode = 0 ); |
99 | void appendTodo(Todo *event, int mode = 0 ); | 99 | void appendTodo(Todo *event, int mode = 0 ); |
100 | void appendJournal(Journal *jour, int mode = 0 ); | 100 | void appendJournal(Journal *jour, int mode = 0 ); |
101 | 101 | ||
102 | void clearEvents(bool now=false); | 102 | void clearEvents(bool now=false); |
103 | 103 | ||
104 | void addText(QString text); | 104 | void addText(QString text); |
105 | void setSyncMode( bool ); | 105 | void setSyncMode( bool ); |
106 | void setColorMode( int ); | 106 | void setColorMode( int ); |
107 | void mailToAttendees( bool all ); | 107 | void mailToAttendees( bool all ); |
108 | void printMe(); | 108 | void printMe(); |
109 | 109 | ||
110 | protected: | 110 | protected: |
111 | int mColorMode; | 111 | int mColorMode; |
112 | void addTag(const QString & tag,const QString & text); | 112 | void addTag(const QString & tag,const QString & text); |
113 | 113 | ||
114 | void formatCategories(Incidence *event); | 114 | void formatCategories(Incidence *event); |
115 | void formatAttendees(Incidence *event); | 115 | void formatAttendees(Incidence *event); |
116 | void formatReadOnly(Incidence *event); | 116 | void formatReadOnly(Incidence *event); |
117 | void keyPressEvent ( QKeyEvent * e ); | 117 | void keyPressEvent ( QKeyEvent * e ); |
118 | 118 | ||
119 | private: | 119 | private: |
120 | QTextBrowser *mEventTextView; | 120 | QTextBrowser *mEventTextView; |
121 | bool mSyncMode; | 121 | bool mSyncMode; |
122 | QString deTag(QString text); | 122 | QString deTag(QString text); |
123 | 123 | ||
124 | QString mText; | 124 | QString mText; |
125 | QString mMailSubject; | 125 | QString mMailSubject; |
126 | Incidence* mCurrentIncidence; | 126 | Incidence* mCurrentIncidence; |
127 | signals: | 127 | signals: |
128 | void launchaddressbook(QString uid); | 128 | void launchaddressbook(QString uid); |
129 | void showIncidence(QString uid); | ||
129 | }; | 130 | }; |
130 | 131 | ||
131 | #endif | 132 | #endif |
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 02f13c7..0763825 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -1,149 +1,150 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | 21 | ||
22 | #include <libkcal/event.h> | 22 | #include <libkcal/event.h> |
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
25 | 25 | ||
26 | #include "koeventviewer.h" | 26 | #include "koeventviewer.h" |
27 | #include <kmessagebox.h> | 27 | #include <kmessagebox.h> |
28 | #include "koprefs.h" | 28 | #include "koprefs.h" |
29 | #include <libkcal/todo.h> | 29 | #include <libkcal/todo.h> |
30 | #include "qapp.h" | 30 | #include "qapp.h" |
31 | 31 | ||
32 | #include "koeventviewerdialog.h" | 32 | #include "koeventviewerdialog.h" |
33 | extern int globalFlagBlockAgenda; | 33 | extern int globalFlagBlockAgenda; |
34 | 34 | ||
35 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) | 35 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) |
36 | : KDialogBase(parent,name, | 36 | : KDialogBase(parent,name, |
37 | #ifndef DESKTOP_VERSION | 37 | #ifndef DESKTOP_VERSION |
38 | true , | 38 | true , |
39 | #else | 39 | #else |
40 | false, | 40 | false, |
41 | #endif | 41 | #endif |
42 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) | 42 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) |
43 | { | 43 | { |
44 | sendSignalViewerClosed = true; | 44 | sendSignalViewerClosed = true; |
45 | mEventViewer = new KOEventViewer(this); | 45 | mEventViewer = new KOEventViewer(this); |
46 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 46 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
47 | setMainWidget(mEventViewer); | 47 | setMainWidget(mEventViewer); |
48 | setButtonText(Ok, i18n("Edit") ); | 48 | setButtonText(Ok, i18n("Edit") ); |
49 | 49 | ||
50 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), | 50 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), |
51 | SLOT(editIncidence())); | 51 | SLOT(editIncidence())); |
52 | QObject::connect(this,SIGNAL(user1Clicked()), | 52 | QObject::connect(this,SIGNAL(user1Clicked()), |
53 | SLOT(showIncidence())); | 53 | SLOT(showIncidence())); |
54 | connect( mEventViewer, SIGNAL( showIncidence( QString ) ),SIGNAL( showIncidence( QString ) )); | ||
54 | mIncidence = 0; | 55 | mIncidence = 0; |
55 | // TODO: Set a sensible size (based on the content?). | 56 | // TODO: Set a sensible size (based on the content?). |
56 | //showMaximized(); | 57 | //showMaximized(); |
57 | //qDebug("++++++++++++KOEventViewerDialog() "); | 58 | //qDebug("++++++++++++KOEventViewerDialog() "); |
58 | // if ( KOPrefs::instance()->mCompactDialogs ) { | 59 | // if ( KOPrefs::instance()->mCompactDialogs ) { |
59 | // setFixedSize( 240,284 ); | 60 | // setFixedSize( 240,284 ); |
60 | // move( 0, 15 ); | 61 | // move( 0, 15 ); |
61 | // } else { | 62 | // } else { |
62 | // setMinimumSize(300,200); | 63 | // setMinimumSize(300,200); |
63 | // resize(320,300); | 64 | // resize(320,300); |
64 | // } | 65 | // } |
65 | mSyncMode = false; | 66 | mSyncMode = false; |
66 | mSyncResult = 0; | 67 | mSyncResult = 0; |
67 | 68 | ||
68 | } | 69 | } |
69 | 70 | ||
70 | KOEventViewerDialog::~KOEventViewerDialog() | 71 | KOEventViewerDialog::~KOEventViewerDialog() |
71 | { | 72 | { |
72 | //qDebug("-------~KOEventViewerDialog() "); | 73 | //qDebug("-------~KOEventViewerDialog() "); |
73 | } | 74 | } |
74 | void KOEventViewerDialog::showMe() | 75 | void KOEventViewerDialog::showMe() |
75 | { | 76 | { |
76 | 77 | ||
77 | #ifdef DESKTOP_VERSION | 78 | #ifdef DESKTOP_VERSION |
78 | int x,y,w,h; | 79 | int x,y,w,h; |
79 | x = geometry().x(); | 80 | x = geometry().x(); |
80 | y = geometry().y(); | 81 | y = geometry().y(); |
81 | w = width(); | 82 | w = width(); |
82 | h = height(); | 83 | h = height(); |
83 | show(); | 84 | show(); |
84 | setGeometry(x,y,w,h); | 85 | setGeometry(x,y,w,h); |
85 | raise(); | 86 | raise(); |
86 | #else | 87 | #else |
87 | showMaximized(); | 88 | showMaximized(); |
88 | #endif | 89 | #endif |
89 | QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) ); | 90 | QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) ); |
90 | 91 | ||
91 | } | 92 | } |
92 | void KOEventViewerDialog::setMyFocus() | 93 | void KOEventViewerDialog::setMyFocus() |
93 | { | 94 | { |
94 | 95 | ||
95 | setActiveWindow(); | 96 | setActiveWindow(); |
96 | mEventViewer->setFocus(); | 97 | mEventViewer->setFocus(); |
97 | 98 | ||
98 | } | 99 | } |
99 | void KOEventViewerDialog::print() | 100 | void KOEventViewerDialog::print() |
100 | { | 101 | { |
101 | mEventViewer->printMe(); | 102 | mEventViewer->printMe(); |
102 | 103 | ||
103 | } | 104 | } |
104 | void KOEventViewerDialog::setSyncMode( bool b ) | 105 | void KOEventViewerDialog::setSyncMode( bool b ) |
105 | { | 106 | { |
106 | mSyncMode = b; | 107 | mSyncMode = b; |
107 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 108 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
108 | if ( mSyncMode ) { | 109 | if ( mSyncMode ) { |
109 | findButton( Close )->setText( i18n("Cancel Sync")); | 110 | findButton( Close )->setText( i18n("Cancel Sync")); |
110 | findButton( Ok )->setText( i18n("Remote")); | 111 | findButton( Ok )->setText( i18n("Remote")); |
111 | findButton( User1 )->setText( i18n("Local")); | 112 | findButton( User1 )->setText( i18n("Local")); |
112 | } else { | 113 | } else { |
113 | findButton( Close )->setText( i18n("Close")); | 114 | findButton( Close )->setText( i18n("Close")); |
114 | findButton( Ok )->setText( i18n("Edit")); | 115 | findButton( Ok )->setText( i18n("Edit")); |
115 | findButton( User1 )->setText( i18n("Agenda")); | 116 | findButton( User1 )->setText( i18n("Agenda")); |
116 | } | 117 | } |
117 | mEventViewer->setSyncMode( b ); | 118 | mEventViewer->setSyncMode( b ); |
118 | } | 119 | } |
119 | void KOEventViewerDialog::setColorMode( int m ) | 120 | void KOEventViewerDialog::setColorMode( int m ) |
120 | { | 121 | { |
121 | mEventViewer->setColorMode( m ); | 122 | mEventViewer->setColorMode( m ); |
122 | } | 123 | } |
123 | int KOEventViewerDialog::executeS( bool local ) | 124 | int KOEventViewerDialog::executeS( bool local ) |
124 | { | 125 | { |
125 | mSyncResult = 3; | 126 | mSyncResult = 3; |
126 | if ( local ) | 127 | if ( local ) |
127 | findButton( User1 )->setFocus(); | 128 | findButton( User1 )->setFocus(); |
128 | else | 129 | else |
129 | findButton( Ok )->setFocus(); | 130 | findButton( Ok )->setFocus(); |
130 | exec(); | 131 | exec(); |
131 | return mSyncResult; | 132 | return mSyncResult; |
132 | } | 133 | } |
133 | 134 | ||
134 | void KOEventViewerDialog::updateConfig() | 135 | void KOEventViewerDialog::updateConfig() |
135 | { | 136 | { |
136 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 137 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
137 | 138 | ||
138 | } | 139 | } |
139 | void KOEventViewerDialog::setEvent(Event *event) | 140 | void KOEventViewerDialog::setEvent(Event *event) |
140 | { | 141 | { |
141 | mEventViewer->setEvent(event); | 142 | mEventViewer->setEvent(event); |
142 | mIncidence = event; | 143 | mIncidence = event; |
143 | mEventViewer->setFocus(); | 144 | mEventViewer->setFocus(); |
144 | //findButton( Close )->setFocus(); | 145 | //findButton( Close )->setFocus(); |
145 | if ( !mSyncMode ) { | 146 | if ( !mSyncMode ) { |
146 | findButton( User1 )->setText( i18n("Agenda")); | 147 | findButton( User1 )->setText( i18n("Agenda")); |
147 | } | 148 | } |
148 | } | 149 | } |
149 | void KOEventViewerDialog::setIncidence(Incidence *in ) | 150 | void KOEventViewerDialog::setIncidence(Incidence *in ) |
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 29fee49..71696f4 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h | |||
@@ -1,77 +1,78 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | #ifndef KOEVENTVIEWERDIALOG_H | 19 | #ifndef KOEVENTVIEWERDIALOG_H |
20 | #define KOEVENTVIEWERDIALOG_H | 20 | #define KOEVENTVIEWERDIALOG_H |
21 | // | 21 | // |
22 | // Viewer dialog for events. | 22 | // Viewer dialog for events. |
23 | // | 23 | // |
24 | 24 | ||
25 | #include <qtextview.h> | 25 | #include <qtextview.h> |
26 | 26 | ||
27 | #include <kdialogbase.h> | 27 | #include <kdialogbase.h> |
28 | 28 | ||
29 | #include <libkcal/event.h> | 29 | #include <libkcal/event.h> |
30 | 30 | ||
31 | using namespace KCal; | 31 | using namespace KCal; |
32 | 32 | ||
33 | class KOEventViewer; | 33 | class KOEventViewer; |
34 | 34 | ||
35 | class KOEventViewerDialog : public KDialogBase { | 35 | class KOEventViewerDialog : public KDialogBase { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | public: | 37 | public: |
38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); | 38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); |
39 | virtual ~KOEventViewerDialog(); | 39 | virtual ~KOEventViewerDialog(); |
40 | 40 | ||
41 | void setEvent(Event *event); | 41 | void setEvent(Event *event); |
42 | void addEvent(Event *event); | 42 | void addEvent(Event *event); |
43 | void setTodo(Todo *event); | 43 | void setTodo(Todo *event); |
44 | void setJournal(Journal *journal); | 44 | void setJournal(Journal *journal); |
45 | void setIncidence(Incidence *inc); | 45 | void setIncidence(Incidence *inc); |
46 | void addIncidence(Incidence *inc); | 46 | void addIncidence(Incidence *inc); |
47 | void addText(QString text); | 47 | void addText(QString text); |
48 | void showMe(); | 48 | void showMe(); |
49 | void setSyncMode( bool ); | 49 | void setSyncMode( bool ); |
50 | void setColorMode( int m ); | 50 | void setColorMode( int m ); |
51 | int executeS( bool ); | 51 | int executeS( bool ); |
52 | public slots: | 52 | public slots: |
53 | void updateConfig(); | 53 | void updateConfig(); |
54 | void print(); | 54 | void print(); |
55 | void setMyFocus(); | 55 | void setMyFocus(); |
56 | signals: | 56 | signals: |
57 | void showIncidence( QString ); | ||
57 | void editIncidence( Incidence* ); | 58 | void editIncidence( Incidence* ); |
58 | void jumpToTime( const QDate &); | 59 | void jumpToTime( const QDate &); |
59 | void showAgendaView( bool ); | 60 | void showAgendaView( bool ); |
60 | void todoCompleted(Todo*); | 61 | void todoCompleted(Todo*); |
61 | void signalViewerClosed(); | 62 | void signalViewerClosed(); |
62 | private slots: | 63 | private slots: |
63 | void slotViewerClosed(); | 64 | void slotViewerClosed(); |
64 | void editIncidence(); | 65 | void editIncidence(); |
65 | void showIncidence(); | 66 | void showIncidence(); |
66 | protected: | 67 | protected: |
67 | void hideEvent ( QHideEvent * e ); | 68 | void hideEvent ( QHideEvent * e ); |
68 | private: | 69 | private: |
69 | bool sendSignalViewerClosed; | 70 | bool sendSignalViewerClosed; |
70 | bool mSyncMode; | 71 | bool mSyncMode; |
71 | int mSyncResult; | 72 | int mSyncResult; |
72 | KOEventViewer *mEventViewer; | 73 | KOEventViewer *mEventViewer; |
73 | Incidence* mIncidence; | 74 | Incidence* mIncidence; |
74 | void keyPressEvent ( QKeyEvent * e ); | 75 | void keyPressEvent ( QKeyEvent * e ); |
75 | }; | 76 | }; |
76 | 77 | ||
77 | #endif | 78 | #endif |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index e2966f8..4f42c83 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -474,210 +474,224 @@ void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e) | |||
474 | ///////////////////////////////////////////////////////////////////////////// | 474 | ///////////////////////////////////////////////////////////////////////////// |
475 | 475 | ||
476 | KOQuickTodo::KOQuickTodo(QWidget *parent) : | 476 | KOQuickTodo::KOQuickTodo(QWidget *parent) : |
477 | QLineEdit(parent) | 477 | QLineEdit(parent) |
478 | { | 478 | { |
479 | setText(i18n("Click to add a new Todo")); | 479 | setText(i18n("Click to add a new Todo")); |
480 | } | 480 | } |
481 | 481 | ||
482 | void KOQuickTodo::focusInEvent(QFocusEvent *ev) | 482 | void KOQuickTodo::focusInEvent(QFocusEvent *ev) |
483 | { | 483 | { |
484 | if ( text()==i18n("Click to add a new Todo") ) | 484 | if ( text()==i18n("Click to add a new Todo") ) |
485 | setText(""); | 485 | setText(""); |
486 | QLineEdit::focusInEvent(ev); | 486 | QLineEdit::focusInEvent(ev); |
487 | } | 487 | } |
488 | 488 | ||
489 | void KOQuickTodo::focusOutEvent(QFocusEvent *ev) | 489 | void KOQuickTodo::focusOutEvent(QFocusEvent *ev) |
490 | { | 490 | { |
491 | setText(i18n("Click to add a new Todo")); | 491 | setText(i18n("Click to add a new Todo")); |
492 | QLineEdit::focusOutEvent(ev); | 492 | QLineEdit::focusOutEvent(ev); |
493 | } | 493 | } |
494 | 494 | ||
495 | ///////////////////////////////////////////////////////////////////////////// | 495 | ///////////////////////////////////////////////////////////////////////////// |
496 | 496 | ||
497 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | 497 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : |
498 | KOrg::BaseView(calendar,parent,name) | 498 | KOrg::BaseView(calendar,parent,name) |
499 | { | 499 | { |
500 | mCategoryPopupMenu = 0; | 500 | mCategoryPopupMenu = 0; |
501 | mPendingUpdateBeforeRepaint = false; | 501 | mPendingUpdateBeforeRepaint = false; |
502 | isFlatDisplay = false; | 502 | isFlatDisplay = false; |
503 | mNavigator = 0; | 503 | mNavigator = 0; |
504 | QBoxLayout *topLayout = new QVBoxLayout(this); | 504 | QBoxLayout *topLayout = new QVBoxLayout(this); |
505 | mName = QString ( name ); | 505 | mName = QString ( name ); |
506 | mBlockUpdate = false; | 506 | mBlockUpdate = false; |
507 | mQuickAdd = new KOQuickTodo(this); | 507 | mQuickAdd = new KOQuickTodo(this); |
508 | topLayout->addWidget(mQuickAdd); | 508 | topLayout->addWidget(mQuickAdd); |
509 | 509 | ||
510 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide(); | 510 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide(); |
511 | 511 | ||
512 | mTodoListView = new KOTodoListView(calendar,this, name ); | 512 | mTodoListView = new KOTodoListView(calendar,this, name ); |
513 | topLayout->addWidget(mTodoListView); | 513 | topLayout->addWidget(mTodoListView); |
514 | //mTodoListView->header()->setMaximumHeight(30); | 514 | //mTodoListView->header()->setMaximumHeight(30); |
515 | mTodoListView->setRootIsDecorated(true); | 515 | mTodoListView->setRootIsDecorated(true); |
516 | mTodoListView->setAllColumnsShowFocus(true); | 516 | mTodoListView->setAllColumnsShowFocus(true); |
517 | 517 | ||
518 | mTodoListView->setShowSortIndicator(true); | 518 | mTodoListView->setShowSortIndicator(true); |
519 | 519 | ||
520 | mTodoListView->addColumn(i18n("Todo")); | 520 | mTodoListView->addColumn(i18n("Todo")); |
521 | mTodoListView->addColumn(i18n("Prio")); | 521 | mTodoListView->addColumn(i18n("Prio")); |
522 | mTodoListView->setColumnAlignment(1,AlignHCenter); | 522 | mTodoListView->setColumnAlignment(1,AlignHCenter); |
523 | mTodoListView->addColumn(i18n("Complete")); | 523 | mTodoListView->addColumn(i18n("Complete")); |
524 | mTodoListView->setColumnAlignment(2,AlignCenter); | 524 | mTodoListView->setColumnAlignment(2,AlignCenter); |
525 | 525 | ||
526 | mTodoListView->addColumn(i18n("Due Date")); | 526 | mTodoListView->addColumn(i18n("Due Date")); |
527 | mTodoListView->setColumnAlignment(3,AlignLeft); | 527 | mTodoListView->setColumnAlignment(3,AlignLeft); |
528 | mTodoListView->addColumn(i18n("Due Time")); | 528 | mTodoListView->addColumn(i18n("Due Time")); |
529 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 529 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
530 | 530 | ||
531 | mTodoListView->addColumn(i18n("Start Date")); | 531 | mTodoListView->addColumn(i18n("Start Date")); |
532 | mTodoListView->setColumnAlignment(5,AlignLeft); | 532 | mTodoListView->setColumnAlignment(5,AlignLeft); |
533 | mTodoListView->addColumn(i18n("Start Time")); | 533 | mTodoListView->addColumn(i18n("Start Time")); |
534 | mTodoListView->setColumnAlignment(6,AlignHCenter); | 534 | mTodoListView->setColumnAlignment(6,AlignHCenter); |
535 | 535 | ||
536 | mTodoListView->addColumn(i18n("Cancelled")); | 536 | mTodoListView->addColumn(i18n("Cancelled")); |
537 | mTodoListView->addColumn(i18n("Categories")); | 537 | mTodoListView->addColumn(i18n("Categories")); |
538 | mTodoListView->addColumn(i18n("Calendar")); | 538 | mTodoListView->addColumn(i18n("Calendar")); |
539 | #if 0 | 539 | #if 0 |
540 | mTodoListView->addColumn(i18n("Sort Id")); | 540 | mTodoListView->addColumn(i18n("Sort Id")); |
541 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 541 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
542 | #endif | 542 | #endif |
543 | 543 | ||
544 | mTodoListView->setMinimumHeight( 60 ); | 544 | mTodoListView->setMinimumHeight( 60 ); |
545 | mTodoListView->setItemsRenameable( true ); | 545 | mTodoListView->setItemsRenameable( true ); |
546 | mTodoListView->setRenameable( 0 ); | 546 | mTodoListView->setRenameable( 0 ); |
547 | mTodoListView->setColumnWidth( 0, 120 ); | 547 | mTodoListView->setColumnWidth( 0, 120 ); |
548 | int iii = 0; | 548 | int iii = 0; |
549 | for ( iii = 0; iii< 10 ; ++iii ) | 549 | for ( iii = 0; iii< 10 ; ++iii ) |
550 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); | 550 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); |
551 | 551 | ||
552 | 552 | ||
553 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); | 553 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); |
554 | 554 | ||
555 | mPriorityPopupMenu = new QPopupMenu(this); | 555 | mPriorityPopupMenu = new QPopupMenu(this); |
556 | for (int i = 1; i <= 5; i++) { | 556 | for (int i = 1; i <= 5; i++) { |
557 | QString label = QString ("%1").arg (i); | 557 | QString label = QString ("%1").arg (i); |
558 | mPriority[mPriorityPopupMenu->insertItem (label)] = i; | 558 | mPriority[mPriorityPopupMenu->insertItem (label)] = i; |
559 | } | 559 | } |
560 | connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int))); | 560 | connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int))); |
561 | 561 | ||
562 | mPercentageCompletedPopupMenu = new QPopupMenu(this); | 562 | mPercentageCompletedPopupMenu = new QPopupMenu(this); |
563 | for (int i = 0; i <= 100; i+=20) { | 563 | for (int i = 0; i <= 100; i+=20) { |
564 | QString label = QString ("%1 %").arg (i); | 564 | QString label = QString ("%1 %").arg (i); |
565 | mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; | 565 | mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; |
566 | } | 566 | } |
567 | connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int))); | 567 | connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int))); |
568 | 568 | ||
569 | 569 | ||
570 | mCategoryPopupMenu = new QPopupMenu (this); | ||
571 | mCategoryPopupMenu->setCheckable (true); | ||
572 | connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int))); | ||
573 | connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ())); | ||
574 | |||
575 | mCalPopupMenu = new QPopupMenu (this); | ||
576 | mCalPopupMenu->setCheckable (true); | ||
577 | connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int))); | ||
578 | connect (mCalPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCal ())); | ||
579 | |||
580 | |||
581 | |||
570 | 582 | ||
571 | mItemPopupMenu = new QPopupMenu(this); | 583 | mItemPopupMenu = new QPopupMenu(this); |
572 | mItemPopupMenu->insertItem(i18n("Show..."), this, | 584 | mItemPopupMenu->insertItem(i18n("Show"), this, |
573 | SLOT (showTodo())); | 585 | SLOT (showTodo())); |
574 | mItemPopupMenu->insertItem(i18n("Edit..."), this, | 586 | mItemPopupMenu->insertItem(i18n("Edit..."), this, |
575 | SLOT (editTodo())); | 587 | SLOT (editTodo())); |
576 | mItemPopupMenu->insertItem( i18n("Delete"), this, | 588 | mItemPopupMenu->insertItem( i18n("Delete"), this, |
577 | SLOT (deleteTodo())); | 589 | SLOT (deleteTodo())); |
578 | mItemPopupMenu->insertItem( i18n("Clone..."), this, | 590 | mItemPopupMenu->insertItem( i18n("Clone..."), this, |
579 | SLOT (cloneTodo())); | 591 | SLOT (cloneTodo())); |
580 | mItemPopupMenu->insertItem( i18n("Move..."), this, | 592 | mItemPopupMenu->insertItem( i18n("Move..."), this, |
581 | SLOT (moveTodo())); | 593 | SLOT (moveTodo())); |
582 | #ifndef DESKTOP_VERSION | 594 | #ifndef DESKTOP_VERSION |
583 | mItemPopupMenu->insertItem( i18n("Beam..."), this, | 595 | mItemPopupMenu->insertItem( i18n("Beam..."), this, |
584 | SLOT (beamTodo())); | 596 | SLOT (beamTodo())); |
585 | #endif | 597 | #endif |
586 | mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, | 598 | mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, |
587 | SLOT (cancelTodo())); | 599 | SLOT (cancelTodo())); |
600 | mItemPopupMenu->insertItem( i18n("Categories"), mCategoryPopupMenu); | ||
601 | mItemPopupMenu->insertItem( i18n("Calendar"), mCalPopupMenu); | ||
588 | mItemPopupMenu->insertSeparator(); | 602 | mItemPopupMenu->insertSeparator(); |
589 | mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, | 603 | mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, |
590 | SLOT (toggleRunningItem())); | 604 | SLOT (toggleRunningItem())); |
591 | mItemPopupMenu->insertSeparator(); | 605 | mItemPopupMenu->insertSeparator(); |
592 | /* | 606 | /* |
593 | mItemPopupMenu->insertItem( i18n("New Todo..."), this, | 607 | mItemPopupMenu->insertItem( i18n("New Todo..."), this, |
594 | SLOT (newTodo())); | 608 | SLOT (newTodo())); |
595 | */ | 609 | */ |
596 | mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, | 610 | mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, |
597 | SLOT (newSubTodo())); | 611 | SLOT (newSubTodo())); |
598 | mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, | 612 | mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, |
599 | SLOT (unparentTodo()),0,21); | 613 | SLOT (unparentTodo()),0,21); |
600 | mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, | 614 | mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, |
601 | SLOT (reparentTodo()),0,22); | 615 | SLOT (reparentTodo()),0,22); |
602 | mItemPopupMenu->insertSeparator(); | 616 | mItemPopupMenu->insertSeparator(); |
603 | #if 0 | 617 | #if 0 |
604 | mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."), | 618 | mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."), |
605 | this, SLOT( purgeCompleted() ) ); | 619 | this, SLOT( purgeCompleted() ) ); |
606 | mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), | 620 | mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), |
607 | this, SLOT( toggleCompleted() ),0, 33 ); | 621 | this, SLOT( toggleCompleted() ),0, 33 ); |
608 | mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), | 622 | mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), |
609 | this, SLOT( toggleQuickTodo() ),0, 34 ); | 623 | this, SLOT( toggleQuickTodo() ),0, 34 ); |
610 | mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), | 624 | mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), |
611 | this, SLOT( toggleRunning() ),0, 35 ); | 625 | this, SLOT( toggleRunning() ),0, 35 ); |
612 | 626 | ||
613 | #endif | 627 | #endif |
614 | mPopupMenu = new QPopupMenu(this); | 628 | mPopupMenu = new QPopupMenu(this); |
615 | mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, | 629 | mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, |
616 | SLOT (newTodo()),0,1); | 630 | SLOT (newTodo()),0,1); |
617 | mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."), | 631 | mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."), |
618 | this, SLOT(purgeCompleted()),0,2); | 632 | this, SLOT(purgeCompleted()),0,2); |
619 | mPopupMenu->insertItem(i18n("Show Completed"), | 633 | mPopupMenu->insertItem(i18n("Show Completed"), |
620 | this, SLOT( toggleCompleted() ),0,3 ); | 634 | this, SLOT( toggleCompleted() ),0,3 ); |
621 | mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), | 635 | mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), |
622 | this, SLOT( toggleRunning() ),0,5 ); | 636 | this, SLOT( toggleRunning() ),0,5 ); |
623 | mPopupMenu->insertItem(i18n(" set all open","Display all opened"), | 637 | mPopupMenu->insertItem(i18n(" set all open","Display all opened"), |
624 | this, SLOT( setAllOpen() ),0,6 ); | 638 | this, SLOT( setAllOpen() ),0,6 ); |
625 | mPopupMenu->insertItem(i18n(" set all close","Display all closed"), | 639 | mPopupMenu->insertItem(i18n(" set all close","Display all closed"), |
626 | this, SLOT( setAllClose() ),0,7 ); | 640 | this, SLOT( setAllClose() ),0,7 ); |
627 | mPopupMenu->insertItem(i18n(" set all flat","Display all flat"), | 641 | mPopupMenu->insertItem(i18n(" set all flat","Display all flat"), |
628 | this, SLOT( setAllFlat() ),0,8 ); | 642 | this, SLOT( setAllFlat() ),0,8 ); |
629 | mPopupMenu->insertSeparator(); | 643 | mPopupMenu->insertSeparator(); |
630 | mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), | 644 | mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), |
631 | this, SLOT( toggleQuickTodo() ),0,4 ); | 645 | this, SLOT( toggleQuickTodo() ),0,4 ); |
632 | mDocPrefs = new DocPrefs( name ); | 646 | mDocPrefs = new DocPrefs( name ); |
633 | 647 | ||
634 | mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu ); | 648 | mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu ); |
635 | mPopupMenu->setCheckable( true ); | 649 | mPopupMenu->setCheckable( true ); |
636 | mItemPopupMenu->setCheckable( true ); | 650 | mItemPopupMenu->setCheckable( true ); |
637 | 651 | ||
638 | 652 | ||
639 | mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo ); | 653 | mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo ); |
640 | mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo ); | 654 | mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo ); |
641 | 655 | ||
642 | mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo); | 656 | mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo); |
643 | mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo ); | 657 | mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo ); |
644 | 658 | ||
645 | mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos); | 659 | mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos); |
646 | mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos ); | 660 | mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos ); |
647 | 661 | ||
648 | 662 | ||
649 | // Double clicking conflicts with opening/closing the subtree | 663 | // Double clicking conflicts with opening/closing the subtree |
650 | connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ), | 664 | connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ), |
651 | SLOT( editItem( QListViewItem *) ) ); | 665 | SLOT( editItem( QListViewItem *) ) ); |
652 | /* | 666 | /* |
653 | connect( mTodoListView, SIGNAL( rightButtonClicked ( QListViewItem *, | 667 | connect( mTodoListView, SIGNAL( rightButtonClicked ( QListViewItem *, |
654 | const QPoint &,int ) ), | 668 | const QPoint &,int ) ), |
655 | SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); | 669 | SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); |
656 | */ | 670 | */ |
657 | connect( mTodoListView, SIGNAL( contextRequest ( QListViewItem *, | 671 | connect( mTodoListView, SIGNAL( contextRequest ( QListViewItem *, |
658 | const QPoint &,int ) ), | 672 | const QPoint &,int ) ), |
659 | SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); | 673 | SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) ); |
660 | connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ), | 674 | connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ), |
661 | SLOT( itemClicked( QListViewItem * ) ) ); | 675 | SLOT( itemClicked( QListViewItem * ) ) ); |
662 | connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ), | 676 | connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ), |
663 | SLOT( itemDoubleClicked( QListViewItem * ) ) ); | 677 | SLOT( itemDoubleClicked( QListViewItem * ) ) ); |
664 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), | 678 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), |
665 | SLOT( updateView() ) ); | 679 | SLOT( updateView() ) ); |
666 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), | 680 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), |
667 | SLOT( todoModified(Todo *, int) ) ); | 681 | SLOT( todoModified(Todo *, int) ) ); |
668 | connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ), | 682 | connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ), |
669 | SLOT( itemStateChanged( QListViewItem * ) ) ); | 683 | SLOT( itemStateChanged( QListViewItem * ) ) ); |
670 | connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ), | 684 | connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ), |
671 | SLOT( itemStateChanged( QListViewItem * ) ) ); | 685 | SLOT( itemStateChanged( QListViewItem * ) ) ); |
672 | connect( mTodoListView, SIGNAL( paintNeeded() ), | 686 | connect( mTodoListView, SIGNAL( paintNeeded() ), |
673 | SLOT( paintNeeded()) ); | 687 | SLOT( paintNeeded()) ); |
674 | 688 | ||
675 | #if 0 | 689 | #if 0 |
676 | connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)), | 690 | connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)), |
677 | SLOT(selectionChanged(QListViewItem *))); | 691 | SLOT(selectionChanged(QListViewItem *))); |
678 | connect(mTodoListView,SIGNAL(clicked(QListViewItem *)), | 692 | connect(mTodoListView,SIGNAL(clicked(QListViewItem *)), |
679 | SLOT(selectionChanged(QListViewItem *))); | 693 | SLOT(selectionChanged(QListViewItem *))); |
680 | connect(mTodoListView,SIGNAL(pressed(QListViewItem *)), | 694 | connect(mTodoListView,SIGNAL(pressed(QListViewItem *)), |
681 | SLOT(selectionChanged(QListViewItem *))); | 695 | SLOT(selectionChanged(QListViewItem *))); |
682 | #endif | 696 | #endif |
683 | 697 | ||
@@ -960,322 +974,337 @@ KOTodoView::insertTodoItem(Todo *todo) | |||
960 | Todo *relatedTodo = static_cast<Todo *>(incidence); | 974 | Todo *relatedTodo = static_cast<Todo *>(incidence); |
961 | 975 | ||
962 | // kdDebug() << " has Related" << endl; | 976 | // kdDebug() << " has Related" << endl; |
963 | QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator; | 977 | QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator; |
964 | itemIterator = mTodoMap.find(relatedTodo); | 978 | itemIterator = mTodoMap.find(relatedTodo); |
965 | if (itemIterator == mTodoMap.end()) { | 979 | if (itemIterator == mTodoMap.end()) { |
966 | // kdDebug() << " related not yet in list" << endl; | 980 | // kdDebug() << " related not yet in list" << endl; |
967 | itemIterator = insertTodoItem (relatedTodo); | 981 | itemIterator = insertTodoItem (relatedTodo); |
968 | } | 982 | } |
969 | // isn't this pretty stupid? We give one Todo to the KOTodoViewItem | 983 | // isn't this pretty stupid? We give one Todo to the KOTodoViewItem |
970 | // and one into the map. Sure finding is more easy but why? -zecke | 984 | // and one into the map. Sure finding is more easy but why? -zecke |
971 | KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this); | 985 | KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this); |
972 | return mTodoMap.insert(todo,todoItem); | 986 | return mTodoMap.insert(todo,todoItem); |
973 | } else { | 987 | } else { |
974 | // kdDebug() << " no Related" << endl; | 988 | // kdDebug() << " no Related" << endl; |
975 | // see above -zecke | 989 | // see above -zecke |
976 | KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this); | 990 | KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this); |
977 | return mTodoMap.insert(todo,todoItem); | 991 | return mTodoMap.insert(todo,todoItem); |
978 | } | 992 | } |
979 | } | 993 | } |
980 | 994 | ||
981 | 995 | ||
982 | void KOTodoView::updateConfig() | 996 | void KOTodoView::updateConfig() |
983 | { | 997 | { |
984 | updateView(); | 998 | updateView(); |
985 | mTodoListView->repaintContents(); | 999 | mTodoListView->repaintContents(); |
986 | } | 1000 | } |
987 | 1001 | ||
988 | QPtrList<Incidence> KOTodoView::selectedIncidences() | 1002 | QPtrList<Incidence> KOTodoView::selectedIncidences() |
989 | { | 1003 | { |
990 | QPtrList<Incidence> selected; | 1004 | QPtrList<Incidence> selected; |
991 | 1005 | ||
992 | KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); | 1006 | KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); |
993 | // if (!item) item = mActiveItem; | 1007 | // if (!item) item = mActiveItem; |
994 | if (item) selected.append(item->todo()); | 1008 | if (item) selected.append(item->todo()); |
995 | 1009 | ||
996 | return selected; | 1010 | return selected; |
997 | } | 1011 | } |
998 | 1012 | ||
999 | QPtrList<Todo> KOTodoView::selectedTodos() | 1013 | QPtrList<Todo> KOTodoView::selectedTodos() |
1000 | { | 1014 | { |
1001 | QPtrList<Todo> selected; | 1015 | QPtrList<Todo> selected; |
1002 | 1016 | ||
1003 | KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); | 1017 | KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem()); |
1004 | // if (!item) item = mActiveItem; | 1018 | // if (!item) item = mActiveItem; |
1005 | if (item) selected.append(item->todo()); | 1019 | if (item) selected.append(item->todo()); |
1006 | 1020 | ||
1007 | return selected; | 1021 | return selected; |
1008 | } | 1022 | } |
1009 | 1023 | ||
1010 | void KOTodoView::changeEventDisplay(Event *, int) | 1024 | void KOTodoView::changeEventDisplay(Event *, int) |
1011 | { | 1025 | { |
1012 | updateView(); | 1026 | updateView(); |
1013 | } | 1027 | } |
1014 | 1028 | ||
1015 | void KOTodoView::showDates(const QDate &, const QDate &) | 1029 | void KOTodoView::showDates(const QDate &, const QDate &) |
1016 | { | 1030 | { |
1017 | } | 1031 | } |
1018 | 1032 | ||
1019 | void KOTodoView::showEvents(QPtrList<Event>) | 1033 | void KOTodoView::showEvents(QPtrList<Event>) |
1020 | { | 1034 | { |
1021 | kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl; | 1035 | kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl; |
1022 | } | 1036 | } |
1023 | 1037 | ||
1024 | void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1038 | void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
1025 | const QDate &td) | 1039 | const QDate &td) |
1026 | { | 1040 | { |
1027 | #ifndef KORG_NOPRINTER | 1041 | #ifndef KORG_NOPRINTER |
1028 | calPrinter->preview(CalPrinter::Todolist, fd, td); | 1042 | calPrinter->preview(CalPrinter::Todolist, fd, td); |
1029 | #endif | 1043 | #endif |
1030 | } | 1044 | } |
1031 | 1045 | ||
1032 | void KOTodoView::editItem(QListViewItem *item ) | 1046 | void KOTodoView::editItem(QListViewItem *item ) |
1033 | { | 1047 | { |
1034 | emit editTodoSignal(((KOTodoViewItem *)item)->todo()); | 1048 | emit editTodoSignal(((KOTodoViewItem *)item)->todo()); |
1035 | } | 1049 | } |
1036 | 1050 | ||
1037 | void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) | 1051 | void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) |
1038 | { | 1052 | { |
1039 | emit showTodoSignal(((KOTodoViewItem *)item)->todo()); | 1053 | emit showTodoSignal(((KOTodoViewItem *)item)->todo()); |
1040 | } | 1054 | } |
1041 | 1055 | ||
1042 | void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) | 1056 | void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) |
1043 | { | 1057 | { |
1044 | pendingSubtodo = 0; | 1058 | pendingSubtodo = 0; |
1045 | mActiveItem = (KOTodoViewItem *)item; | 1059 | mActiveItem = (KOTodoViewItem *)item; |
1046 | if (item) { | 1060 | if (item) { |
1047 | switch (column){ | 1061 | switch (column){ |
1048 | case 1: | 1062 | case 1: |
1049 | mPriorityPopupMenu->popup(QCursor::pos ()); break; | 1063 | mPriorityPopupMenu->popup(QCursor::pos ()); break; |
1050 | case 2: | 1064 | case 2: |
1051 | mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break; | 1065 | mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break; |
1052 | case 3: | 1066 | case 3: |
1053 | moveTodo(); | 1067 | moveTodo(); |
1054 | break; | 1068 | break; |
1055 | case 8: | 1069 | case 8: |
1056 | getCategoryPopupMenu((KOTodoViewItem *)item)->popup(QCursor::pos ()); break; | 1070 | mCategoryPopupMenu->popup(QCursor::pos ()); break; |
1071 | case 9: | ||
1072 | mCalPopupMenu->popup(QCursor::pos ()); break; | ||
1057 | default: | 1073 | default: |
1058 | mItemPopupMenu->popup(QCursor::pos()); | 1074 | mItemPopupMenu->popup(QCursor::pos()); |
1059 | } | 1075 | } |
1060 | } else mPopupMenu->popup(QCursor::pos()); | 1076 | } else mPopupMenu->popup(QCursor::pos()); |
1061 | } | 1077 | } |
1062 | void KOTodoView::newTodo() | 1078 | void KOTodoView::newTodo() |
1063 | { | 1079 | { |
1064 | emit newTodoSignal(); | 1080 | emit newTodoSignal(); |
1065 | } | 1081 | } |
1066 | 1082 | ||
1067 | void KOTodoView::newSubTodo() | 1083 | void KOTodoView::newSubTodo() |
1068 | { | 1084 | { |
1069 | if (mActiveItem) { | 1085 | if (mActiveItem) { |
1070 | emit newSubTodoSignal(mActiveItem->todo()); | 1086 | emit newSubTodoSignal(mActiveItem->todo()); |
1071 | } | 1087 | } |
1072 | } | 1088 | } |
1073 | void KOTodoView::unparentTodo() | 1089 | void KOTodoView::unparentTodo() |
1074 | { | 1090 | { |
1075 | if (mActiveItem) { | 1091 | if (mActiveItem) { |
1076 | emit unparentTodoSignal(mActiveItem->todo()); | 1092 | emit unparentTodoSignal(mActiveItem->todo()); |
1077 | } | 1093 | } |
1078 | } | 1094 | } |
1079 | 1095 | ||
1080 | void KOTodoView::reparentTodo() | 1096 | void KOTodoView::reparentTodo() |
1081 | { | 1097 | { |
1082 | if (mActiveItem) { | 1098 | if (mActiveItem) { |
1083 | topLevelWidget()->setCaption(i18n("Click on new parent item")); | 1099 | topLevelWidget()->setCaption(i18n("Click on new parent item")); |
1084 | pendingSubtodo = mActiveItem; | 1100 | pendingSubtodo = mActiveItem; |
1085 | } | 1101 | } |
1086 | } | 1102 | } |
1087 | void KOTodoView::editTodo() | 1103 | void KOTodoView::editTodo() |
1088 | { | 1104 | { |
1089 | if (mActiveItem) { | 1105 | if (mActiveItem) { |
1090 | emit editTodoSignal(mActiveItem->todo()); | 1106 | emit editTodoSignal(mActiveItem->todo()); |
1091 | } | 1107 | } |
1092 | } | 1108 | } |
1093 | void KOTodoView::cloneTodo() | 1109 | void KOTodoView::cloneTodo() |
1094 | { | 1110 | { |
1095 | if (mActiveItem) { | 1111 | if (mActiveItem) { |
1096 | emit cloneTodoSignal((Incidence*)mActiveItem->todo()); | 1112 | emit cloneTodoSignal((Incidence*)mActiveItem->todo()); |
1097 | } | 1113 | } |
1098 | } | 1114 | } |
1099 | void KOTodoView::cancelTodo() | 1115 | void KOTodoView::cancelTodo() |
1100 | { | 1116 | { |
1101 | if (mActiveItem) { | 1117 | if (mActiveItem) { |
1102 | emit cancelTodoSignal((Incidence*)mActiveItem->todo()); | 1118 | emit cancelTodoSignal((Incidence*)mActiveItem->todo()); |
1103 | } | 1119 | } |
1104 | } | 1120 | } |
1105 | void KOTodoView::moveTodo() | 1121 | void KOTodoView::moveTodo() |
1106 | { | 1122 | { |
1107 | if (mActiveItem) { | 1123 | if (mActiveItem) { |
1108 | emit moveTodoSignal((Incidence*)mActiveItem->todo()); | 1124 | emit moveTodoSignal((Incidence*)mActiveItem->todo()); |
1109 | } | 1125 | } |
1110 | } | 1126 | } |
1111 | void KOTodoView::beamTodo() | 1127 | void KOTodoView::beamTodo() |
1112 | { | 1128 | { |
1113 | if (mActiveItem) { | 1129 | if (mActiveItem) { |
1114 | emit beamTodoSignal((Incidence*)mActiveItem->todo()); | 1130 | emit beamTodoSignal((Incidence*)mActiveItem->todo()); |
1115 | } | 1131 | } |
1116 | } | 1132 | } |
1117 | 1133 | ||
1118 | 1134 | ||
1119 | void KOTodoView::showTodo() | 1135 | void KOTodoView::showTodo() |
1120 | { | 1136 | { |
1121 | if (mActiveItem) { | 1137 | if (mActiveItem) { |
1122 | emit showTodoSignal(mActiveItem->todo()); | 1138 | emit showTodoSignal(mActiveItem->todo()); |
1123 | } | 1139 | } |
1124 | } | 1140 | } |
1125 | 1141 | ||
1126 | void KOTodoView::deleteTodo() | 1142 | void KOTodoView::deleteTodo() |
1127 | { | 1143 | { |
1128 | if (mActiveItem) { | 1144 | if (mActiveItem) { |
1129 | emit deleteTodoSignal(mActiveItem->todo()); | 1145 | emit deleteTodoSignal(mActiveItem->todo()); |
1130 | } | 1146 | } |
1131 | } | 1147 | } |
1132 | 1148 | ||
1133 | void KOTodoView::setNewPriority(int index) | 1149 | void KOTodoView::setNewPriority(int index) |
1134 | { | 1150 | { |
1135 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { | 1151 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { |
1136 | mActiveItem->todo()->setPriority(mPriority[index]); | 1152 | mActiveItem->todo()->setPriority(mPriority[index]); |
1137 | mActiveItem->construct(); | 1153 | mActiveItem->construct(); |
1138 | todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED); | 1154 | todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED); |
1139 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); | 1155 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); |
1140 | } | 1156 | } |
1141 | } | 1157 | } |
1142 | 1158 | ||
1143 | void KOTodoView::setNewPercentage(int index) | 1159 | void KOTodoView::setNewPercentage(int index) |
1144 | { | 1160 | { |
1145 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { | 1161 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { |
1146 | 1162 | ||
1147 | if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { | 1163 | if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { |
1148 | mActiveItem->setOn( true ); | 1164 | mActiveItem->setOn( true ); |
1149 | return; | 1165 | return; |
1150 | } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { | 1166 | } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { |
1151 | KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent())); | 1167 | KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent())); |
1152 | if ( par && par->isOn() ) | 1168 | if ( par && par->isOn() ) |
1153 | par->setOn( false ); | 1169 | par->setOn( false ); |
1154 | } | 1170 | } |
1155 | if (mPercentage[index] == 100) { | 1171 | if (mPercentage[index] == 100) { |
1156 | mActiveItem->todo()->setCompleted(QDateTime::currentDateTime()); | 1172 | mActiveItem->todo()->setCompleted(QDateTime::currentDateTime()); |
1157 | } else { | 1173 | } else { |
1158 | mActiveItem->todo()->setCompleted(false); | 1174 | mActiveItem->todo()->setCompleted(false); |
1159 | } | 1175 | } |
1160 | mActiveItem->todo()->setPercentComplete(mPercentage[index]); | 1176 | mActiveItem->todo()->setPercentComplete(mPercentage[index]); |
1161 | mActiveItem->construct(); | 1177 | mActiveItem->construct(); |
1162 | todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED); | 1178 | todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED); |
1163 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); | 1179 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); |
1164 | } | 1180 | } |
1165 | } | 1181 | } |
1166 | 1182 | ||
1167 | 1183 | void KOTodoView::fillCategories () | |
1168 | QPopupMenu * KOTodoView::getCategoryPopupMenu (KOTodoViewItem *todoItem) | ||
1169 | { | 1184 | { |
1170 | if ( !mCategoryPopupMenu ) { | ||
1171 | mCategoryPopupMenu = new QPopupMenu (this); | ||
1172 | mCategoryPopupMenu->setCheckable (true); | ||
1173 | connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int))); | ||
1174 | } | ||
1175 | mCategoryPopupMenu->clear(); | 1185 | mCategoryPopupMenu->clear(); |
1176 | QStringList checkedCategories = todoItem->todo()->categories (); | 1186 | if ( ! mActiveItem ) return; |
1177 | 1187 | QStringList checkedCategories = mActiveItem->todo()->categories (); | |
1178 | for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin (); | 1188 | for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin (); |
1179 | it != KOPrefs::instance()->mCustomCategories.end (); | 1189 | it != KOPrefs::instance()->mCustomCategories.end (); |
1180 | ++it) { | 1190 | ++it) { |
1181 | int index = mCategoryPopupMenu->insertItem (*it); | 1191 | int index = mCategoryPopupMenu->insertItem (*it); |
1182 | mCategory[index] = *it; | 1192 | mCategory[index] = *it; |
1183 | if (checkedCategories.find (*it) != checkedCategories.end ()) mCategoryPopupMenu->setItemChecked (index, true); | 1193 | if (checkedCategories.find (*it) != checkedCategories.end ()) mCategoryPopupMenu->setItemChecked (index, true); |
1184 | } | 1194 | } |
1185 | return mCategoryPopupMenu; | 1195 | } |
1196 | void KOTodoView::fillCal () | ||
1197 | { | ||
1198 | mCalPopupMenu->clear(); | ||
1199 | if (!mActiveItem) return; | ||
1200 | bool readO = mActiveItem->todo()->isReadOnly(); | ||
1201 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | ||
1202 | while ( kkf ) { | ||
1203 | int index = mCalPopupMenu->insertItem( kkf->mName, kkf->mCalNumber); | ||
1204 | if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO ) | ||
1205 | mCalPopupMenu->setItemEnabled( index, false ); | ||
1206 | mCalPopupMenu->setItemChecked (index, kkf->mCalNumber == mActiveItem->todo()->calID()); | ||
1207 | kkf = KOPrefs::instance()->mCalendars.next(); | ||
1208 | } | ||
1209 | } | ||
1210 | void KOTodoView::changedCal (int index ) | ||
1211 | { | ||
1212 | if (!mActiveItem) return; | ||
1213 | mActiveItem->todo()->setCalID( index ); | ||
1214 | mActiveItem->construct(); | ||
1186 | } | 1215 | } |
1187 | void KOTodoView::changedCategories(int index) | 1216 | void KOTodoView::changedCategories(int index) |
1188 | { | 1217 | { |
1189 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { | 1218 | if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) { |
1190 | QStringList categories = mActiveItem->todo()->categories (); | 1219 | QStringList categories = mActiveItem->todo()->categories (); |
1191 | QString colcat = categories.first(); | 1220 | QString colcat = categories.first(); |
1192 | if (categories.find (mCategory[index]) != categories.end ()) | 1221 | if (categories.find (mCategory[index]) != categories.end ()) |
1193 | categories.remove (mCategory[index]); | 1222 | categories.remove (mCategory[index]); |
1194 | else | 1223 | else |
1195 | categories.insert (categories.end(), mCategory[index]); | 1224 | categories.insert (categories.end(), mCategory[index]); |
1196 | categories.sort (); | 1225 | categories.sort (); |
1197 | if ( !colcat.isEmpty() ) { | 1226 | if ( !colcat.isEmpty() ) { |
1198 | if ( categories.find ( colcat ) != categories.end () ) { | 1227 | if ( categories.find ( colcat ) != categories.end () ) { |
1199 | categories.remove( colcat ); | 1228 | categories.remove( colcat ); |
1200 | categories.prepend( colcat ); | 1229 | categories.prepend( colcat ); |
1201 | } | 1230 | } |
1202 | } | 1231 | } |
1203 | mActiveItem->todo()->setCategories (categories); | 1232 | mActiveItem->todo()->setCategories (categories); |
1204 | mActiveItem->construct(); | 1233 | mActiveItem->construct(); |
1205 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); | 1234 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); |
1206 | todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED); | 1235 | todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED); |
1207 | } | 1236 | } |
1208 | } | 1237 | } |
1209 | void KOTodoView::itemDoubleClicked(QListViewItem *item) | 1238 | void KOTodoView::itemDoubleClicked(QListViewItem *item) |
1210 | { | 1239 | { |
1211 | if ( pendingSubtodo != 0 ) { | 1240 | if ( pendingSubtodo != 0 ) { |
1212 | topLevelWidget()->setCaption(i18n("Reparenting aborted!")); | 1241 | topLevelWidget()->setCaption(i18n("Reparenting aborted!")); |
1213 | } | 1242 | } |
1214 | pendingSubtodo = 0; | 1243 | pendingSubtodo = 0; |
1215 | //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); | 1244 | //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); |
1216 | int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() ); | 1245 | int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() ); |
1217 | //qDebug("ROW %d ", row); | 1246 | //qDebug("ROW %d ", row); |
1218 | if (!item) { | 1247 | if (!item) { |
1219 | newTodo(); | 1248 | newTodo(); |
1220 | return; | 1249 | return; |
1221 | } else { | 1250 | } else { |
1222 | if ( row == 1 ) { | 1251 | if ( row == 1 ) { |
1223 | mActiveItem = (KOTodoViewItem *) item; | 1252 | mActiveItem = (KOTodoViewItem *) item; |
1224 | newSubTodo(); | 1253 | newSubTodo(); |
1225 | return; | 1254 | return; |
1226 | } | 1255 | } |
1227 | if ( row == 5 || row == 6 || row == 2) { | 1256 | if ( row == 5 || row == 6 || row == 2) { |
1228 | mActiveItem = (KOTodoViewItem *) item; | 1257 | mActiveItem = (KOTodoViewItem *) item; |
1229 | Todo * t = mActiveItem->todo(); | 1258 | Todo * t = mActiveItem->todo(); |
1230 | if ( t->isRunning() ) { | 1259 | if ( t->isRunning() ) { |
1231 | if ( t->runTime() < 15) { | 1260 | if ( t->runTime() < 15) { |
1232 | t->stopRunning(); | 1261 | t->stopRunning(); |
1233 | mActiveItem->construct(); | 1262 | mActiveItem->construct(); |
1234 | topLevelWidget()->setCaption(i18n("Todo stopped - no data saved because runtime was < 15 sec!")); | 1263 | topLevelWidget()->setCaption(i18n("Todo stopped - no data saved because runtime was < 15 sec!")); |
1235 | return; | 1264 | return; |
1236 | } | 1265 | } |
1237 | else | 1266 | else |
1238 | toggleRunningItem(); | 1267 | toggleRunningItem(); |
1239 | return; | 1268 | return; |
1240 | } else { | 1269 | } else { |
1241 | t->setRunning( true ); | 1270 | t->setRunning( true ); |
1242 | mActiveItem->construct(); | 1271 | mActiveItem->construct(); |
1243 | topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!")); | 1272 | topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!")); |
1244 | return; | 1273 | return; |
1245 | } | 1274 | } |
1246 | } | 1275 | } |
1247 | } | 1276 | } |
1248 | if ( KOPrefs::instance()->mEditOnDoubleClick ) | 1277 | if ( KOPrefs::instance()->mEditOnDoubleClick ) |
1249 | editItem( item ); | 1278 | editItem( item ); |
1250 | else | 1279 | else |
1251 | showItem( item , QPoint(), 0 ); | 1280 | showItem( item , QPoint(), 0 ); |
1252 | } | 1281 | } |
1253 | void KOTodoView::toggleRunningItem() | 1282 | void KOTodoView::toggleRunningItem() |
1254 | { | 1283 | { |
1255 | // qDebug("KOTodoView::toggleRunning() "); | 1284 | // qDebug("KOTodoView::toggleRunning() "); |
1256 | if ( ! mActiveItem ) | 1285 | if ( ! mActiveItem ) |
1257 | return; | 1286 | return; |
1258 | Todo * t = mActiveItem->todo(); | 1287 | Todo * t = mActiveItem->todo(); |
1259 | if ( t->isRunning() ) { | 1288 | if ( t->isRunning() ) { |
1260 | KOStopTodoPrefs tp ( t, this ); | 1289 | KOStopTodoPrefs tp ( t, this ); |
1261 | if (QApplication::desktop()->width() <= 800 ){ | 1290 | if (QApplication::desktop()->width() <= 800 ){ |
1262 | int wid = tp.width(); | 1291 | int wid = tp.width(); |
1263 | int hei = tp.height(); | 1292 | int hei = tp.height(); |
1264 | int xx = (QApplication::desktop()->width()-wid)/2; | 1293 | int xx = (QApplication::desktop()->width()-wid)/2; |
1265 | int yy = (QApplication::desktop()->height()-hei)/2; | 1294 | int yy = (QApplication::desktop()->height()-hei)/2; |
1266 | tp.setGeometry( xx,yy,wid,hei ); | 1295 | tp.setGeometry( xx,yy,wid,hei ); |
1267 | } | 1296 | } |
1268 | tp.exec(); | 1297 | tp.exec(); |
1269 | mActiveItem->construct(); | 1298 | mActiveItem->construct(); |
1270 | } else { | 1299 | } else { |
1271 | KOStartTodoPrefs tp ( t->summary(), this ); | 1300 | KOStartTodoPrefs tp ( t->summary(), this ); |
1272 | if (QApplication::desktop()->width() <= 800 ){ | 1301 | if (QApplication::desktop()->width() <= 800 ){ |
1273 | int wid = tp.width(); | 1302 | int wid = tp.width(); |
1274 | int hei = tp.height(); | 1303 | int hei = tp.height(); |
1275 | int xx = (QApplication::desktop()->width()-wid)/2; | 1304 | int xx = (QApplication::desktop()->width()-wid)/2; |
1276 | int yy = (QApplication::desktop()->height()-hei)/2; | 1305 | int yy = (QApplication::desktop()->height()-hei)/2; |
1277 | tp.setGeometry( xx,yy,wid,hei ); | 1306 | tp.setGeometry( xx,yy,wid,hei ); |
1278 | } | 1307 | } |
1279 | if ( !tp.exec() ) return; | 1308 | if ( !tp.exec() ) return; |
1280 | if ( tp.stopAll() ) { | 1309 | if ( tp.stopAll() ) { |
1281 | mCalendar->stopAllTodos(); | 1310 | mCalendar->stopAllTodos(); |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 9ae7f53..79cc756 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -79,225 +79,227 @@ private: | |||
79 | class KOStartTodoPrefs : public QDialog | 79 | class KOStartTodoPrefs : public QDialog |
80 | { | 80 | { |
81 | Q_OBJECT | 81 | Q_OBJECT |
82 | public: | 82 | public: |
83 | KOStartTodoPrefs( QString sum, QWidget *parent=0, const char *name=0 ) ; | 83 | KOStartTodoPrefs( QString sum, QWidget *parent=0, const char *name=0 ) ; |
84 | 84 | ||
85 | bool stopAll() { return mStopAll; } | 85 | bool stopAll() { return mStopAll; } |
86 | private slots: | 86 | private slots: |
87 | void doStop(); | 87 | void doStop(); |
88 | private: | 88 | private: |
89 | bool mStopAll; | 89 | bool mStopAll; |
90 | 90 | ||
91 | }; | 91 | }; |
92 | 92 | ||
93 | class KOTodoListView : public KListView | 93 | class KOTodoListView : public KListView |
94 | { | 94 | { |
95 | Q_OBJECT | 95 | Q_OBJECT |
96 | public: | 96 | public: |
97 | KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0); | 97 | KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0); |
98 | virtual ~KOTodoListView() {} | 98 | virtual ~KOTodoListView() {} |
99 | 99 | ||
100 | signals: | 100 | signals: |
101 | void paintNeeded(); | 101 | void paintNeeded(); |
102 | void todoDropped(Todo *, int); | 102 | void todoDropped(Todo *, int); |
103 | void double_Clicked(QListViewItem *item); | 103 | void double_Clicked(QListViewItem *item); |
104 | void reparentTodoSignal( Todo *,Todo * ); | 104 | void reparentTodoSignal( Todo *,Todo * ); |
105 | void unparentTodoSignal(Todo *); | 105 | void unparentTodoSignal(Todo *); |
106 | void deleteTodo( Todo * ); | 106 | void deleteTodo( Todo * ); |
107 | protected: | 107 | protected: |
108 | void wheelEvent (QWheelEvent *e); | 108 | void wheelEvent (QWheelEvent *e); |
109 | void contentsDragEnterEvent(QDragEnterEvent *); | 109 | void contentsDragEnterEvent(QDragEnterEvent *); |
110 | void contentsDragMoveEvent(QDragMoveEvent *); | 110 | void contentsDragMoveEvent(QDragMoveEvent *); |
111 | void contentsDragLeaveEvent(QDragLeaveEvent *); | 111 | void contentsDragLeaveEvent(QDragLeaveEvent *); |
112 | void contentsDropEvent(QDropEvent *); | 112 | void contentsDropEvent(QDropEvent *); |
113 | 113 | ||
114 | void contentsMousePressEvent(QMouseEvent *); | 114 | void contentsMousePressEvent(QMouseEvent *); |
115 | void contentsMouseMoveEvent(QMouseEvent *); | 115 | void contentsMouseMoveEvent(QMouseEvent *); |
116 | void contentsMouseReleaseEvent(QMouseEvent *); | 116 | void contentsMouseReleaseEvent(QMouseEvent *); |
117 | void contentsMouseDoubleClickEvent(QMouseEvent *); | 117 | void contentsMouseDoubleClickEvent(QMouseEvent *); |
118 | 118 | ||
119 | private: | 119 | private: |
120 | void paintEvent(QPaintEvent * pevent); | 120 | void paintEvent(QPaintEvent * pevent); |
121 | bool internalDrop; | 121 | bool internalDrop; |
122 | QString mName; | 122 | QString mName; |
123 | Calendar *mCalendar; | 123 | Calendar *mCalendar; |
124 | QPoint mPressPos; | 124 | QPoint mPressPos; |
125 | bool mMousePressed; | 125 | bool mMousePressed; |
126 | QListViewItem *mOldCurrent; | 126 | QListViewItem *mOldCurrent; |
127 | bool mFlagKeyPressed; | 127 | bool mFlagKeyPressed; |
128 | void keyPressEvent ( QKeyEvent * ) ; | 128 | void keyPressEvent ( QKeyEvent * ) ; |
129 | void keyReleaseEvent ( QKeyEvent * ) ; | 129 | void keyReleaseEvent ( QKeyEvent * ) ; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | 132 | ||
133 | /** | 133 | /** |
134 | This is the line-edit on top of the todoview for fast addition of new todos | 134 | This is the line-edit on top of the todoview for fast addition of new todos |
135 | */ | 135 | */ |
136 | class KOQuickTodo : public QLineEdit | 136 | class KOQuickTodo : public QLineEdit |
137 | { | 137 | { |
138 | public: | 138 | public: |
139 | KOQuickTodo(QWidget *parent=0); | 139 | KOQuickTodo(QWidget *parent=0); |
140 | protected: | 140 | protected: |
141 | void focusInEvent(QFocusEvent *ev); | 141 | void focusInEvent(QFocusEvent *ev); |
142 | void focusOutEvent(QFocusEvent *ev); | 142 | void focusOutEvent(QFocusEvent *ev); |
143 | }; | 143 | }; |
144 | 144 | ||
145 | 145 | ||
146 | /** | 146 | /** |
147 | This class provides a multi-column list view of todo events. | 147 | This class provides a multi-column list view of todo events. |
148 | 148 | ||
149 | @short multi-column list view of todo events. | 149 | @short multi-column list view of todo events. |
150 | @author Cornelius Schumacher <schumacher@kde.org> | 150 | @author Cornelius Schumacher <schumacher@kde.org> |
151 | */ | 151 | */ |
152 | class KOTodoView : public KOrg::BaseView | 152 | class KOTodoView : public KOrg::BaseView |
153 | { | 153 | { |
154 | Q_OBJECT | 154 | Q_OBJECT |
155 | public: | 155 | public: |
156 | KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 ); | 156 | KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 ); |
157 | ~KOTodoView(); | 157 | ~KOTodoView(); |
158 | 158 | ||
159 | QPtrList<Incidence> selectedIncidences(); | 159 | QPtrList<Incidence> selectedIncidences(); |
160 | QPtrList<Todo> selectedTodos(); | 160 | QPtrList<Todo> selectedTodos(); |
161 | 161 | ||
162 | DateList selectedDates() | 162 | DateList selectedDates() |
163 | {DateList q; | 163 | {DateList q; |
164 | return q;} | 164 | return q;} |
165 | 165 | ||
166 | /** Return number of shown dates. TodoView does not show dates, */ | 166 | /** Return number of shown dates. TodoView does not show dates, */ |
167 | int currentDateCount() { return 0; } | 167 | int currentDateCount() { return 0; } |
168 | 168 | ||
169 | void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td); | 169 | void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td); |
170 | 170 | ||
171 | void setDocumentId( const QString & ); | 171 | void setDocumentId( const QString & ); |
172 | 172 | ||
173 | void saveLayout(KConfig *config, const QString &group) const; | 173 | void saveLayout(KConfig *config, const QString &group) const; |
174 | void restoreLayout(KConfig *config, const QString &group); | 174 | void restoreLayout(KConfig *config, const QString &group); |
175 | /** Create a popup menu to set categories */ | ||
176 | QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem); | ||
177 | void setNavigator( DateNavigator* nav ) {mNavigator = nav;} | 175 | void setNavigator( DateNavigator* nav ) {mNavigator = nav;} |
178 | QString getWhatsThisText(QPoint p); | 176 | QString getWhatsThisText(QPoint p); |
179 | void clearList() {mTodoListView->clear(); } | 177 | void clearList() {mTodoListView->clear(); } |
180 | 178 | ||
181 | public slots: | 179 | public slots: |
182 | void updateView(); | 180 | void updateView(); |
183 | void updateConfig(); | 181 | void updateConfig(); |
184 | 182 | ||
185 | void changeEventDisplay(Event *, int); | 183 | void changeEventDisplay(Event *, int); |
186 | 184 | ||
187 | void showDates(const QDate &start, const QDate &end); | 185 | void showDates(const QDate &start, const QDate &end); |
188 | void showEvents(QPtrList<Event> eventList); | 186 | void showEvents(QPtrList<Event> eventList); |
189 | 187 | ||
190 | void clearSelection(); | 188 | void clearSelection(); |
191 | void jumpToDate (); | 189 | void jumpToDate (); |
192 | 190 | ||
193 | void editItem(QListViewItem *item); | 191 | void editItem(QListViewItem *item); |
194 | void showItem(QListViewItem *item,const QPoint &,int); | 192 | void showItem(QListViewItem *item,const QPoint &,int); |
195 | void popupMenu(QListViewItem *item,const QPoint &,int); | 193 | void popupMenu(QListViewItem *item,const QPoint &,int); |
196 | void newTodo(); | 194 | void newTodo(); |
197 | void newSubTodo(); | 195 | void newSubTodo(); |
198 | void unparentTodo(); | 196 | void unparentTodo(); |
199 | void reparentTodo(); | 197 | void reparentTodo(); |
200 | void showTodo(); | 198 | void showTodo(); |
201 | void editTodo(); | 199 | void editTodo(); |
202 | void cloneTodo(); | 200 | void cloneTodo(); |
203 | void cancelTodo(); | 201 | void cancelTodo(); |
204 | void moveTodo(); | 202 | void moveTodo(); |
205 | void beamTodo(); | 203 | void beamTodo(); |
206 | void deleteTodo(); | 204 | void deleteTodo(); |
207 | 205 | ||
208 | void setNewPriority(int); | 206 | void setNewPriority(int); |
209 | void setNewPercentage(int); | 207 | void setNewPercentage(int); |
210 | void changedCategories(int); | 208 | void changedCategories(int); |
211 | 209 | ||
212 | void setAllOpen(); | 210 | void setAllOpen(); |
213 | void setAllClose(); | 211 | void setAllClose(); |
214 | void setAllFlat(); | 212 | void setAllFlat(); |
215 | void displayAllFlat(); | 213 | void displayAllFlat(); |
216 | 214 | ||
217 | void purgeCompleted(); | 215 | void purgeCompleted(); |
218 | void toggleCompleted(); | 216 | void toggleCompleted(); |
219 | void toggleRunning(); | 217 | void toggleRunning(); |
220 | void toggleQuickTodo(); | 218 | void toggleQuickTodo(); |
221 | void updateTodo( Todo *, int ); | 219 | void updateTodo( Todo *, int ); |
222 | 220 | ||
223 | void itemClicked(QListViewItem *); | 221 | void itemClicked(QListViewItem *); |
224 | void itemStateChanged(QListViewItem *); | 222 | void itemStateChanged(QListViewItem *); |
225 | void modified(bool); | 223 | void modified(bool); |
226 | void itemDoubleClicked(QListViewItem *item); | 224 | void itemDoubleClicked(QListViewItem *item); |
227 | void resetFocusToList(); | 225 | void resetFocusToList(); |
226 | void fillCategories (); | ||
227 | void fillCal (); | ||
228 | void changedCal (int); | ||
228 | 229 | ||
229 | signals: | 230 | signals: |
230 | void newTodoSignal(); | 231 | void newTodoSignal(); |
231 | void newSubTodoSignal(Todo *); | 232 | void newSubTodoSignal(Todo *); |
232 | void unparentTodoSignal(Todo *); | 233 | void unparentTodoSignal(Todo *); |
233 | void reparentTodoSignal( Todo *,Todo * ); | 234 | void reparentTodoSignal( Todo *,Todo * ); |
234 | void showTodoSignal(Todo *); | 235 | void showTodoSignal(Todo *); |
235 | 236 | ||
236 | void editTodoSignal(Todo *); | 237 | void editTodoSignal(Todo *); |
237 | void deleteTodoSignal(Todo *); | 238 | void deleteTodoSignal(Todo *); |
238 | void todoModifiedSignal (Todo *, int); | 239 | void todoModifiedSignal (Todo *, int); |
239 | 240 | ||
240 | void isModified(bool); | 241 | void isModified(bool); |
241 | void cloneTodoSignal( Incidence * ); | 242 | void cloneTodoSignal( Incidence * ); |
242 | void cancelTodoSignal( Incidence * ); | 243 | void cancelTodoSignal( Incidence * ); |
243 | void moveTodoSignal( Incidence * ); | 244 | void moveTodoSignal( Incidence * ); |
244 | void beamTodoSignal( Incidence * ); | 245 | void beamTodoSignal( Incidence * ); |
245 | void purgeCompletedSignal(); | 246 | void purgeCompletedSignal(); |
246 | 247 | ||
247 | protected slots: | 248 | protected slots: |
248 | void toggleRunningItem(); | 249 | void toggleRunningItem(); |
249 | void paintNeeded(); | 250 | void paintNeeded(); |
250 | void processSelectionChange(); | 251 | void processSelectionChange(); |
251 | void addQuickTodo(); | 252 | void addQuickTodo(); |
252 | void setTodoModified( Todo* ); | 253 | void setTodoModified( Todo* ); |
253 | void todoModified(Todo *, int ); | 254 | void todoModified(Todo *, int ); |
254 | 255 | ||
255 | private: | 256 | private: |
256 | /* | 257 | /* |
257 | * the TodoEditor approach is rather unscaling in the long | 258 | * the TodoEditor approach is rather unscaling in the long |
258 | * run. | 259 | * run. |
259 | * Korganizer keeps it in memory and we need to update | 260 | * Korganizer keeps it in memory and we need to update |
260 | * 1. make KOTodoViewItem a QObject again? | 261 | * 1. make KOTodoViewItem a QObject again? |
261 | * 2. add a public method for setting one todo modified? | 262 | * 2. add a public method for setting one todo modified? |
262 | * 3. add a private method for setting a todo modified + friend here? | 263 | * 3. add a private method for setting a todo modified + friend here? |
263 | * -- zecke 2002-07-08 | 264 | * -- zecke 2002-07-08 |
264 | */ | 265 | */ |
265 | KOTodoViewWhatsThis* mKOTodoViewWhatsThis; | 266 | KOTodoViewWhatsThis* mKOTodoViewWhatsThis; |
266 | friend class KOTodoListView; | 267 | friend class KOTodoListView; |
267 | void paintEvent(QPaintEvent * pevent); | 268 | void paintEvent(QPaintEvent * pevent); |
268 | bool mPendingUpdateBeforeRepaint; | 269 | bool mPendingUpdateBeforeRepaint; |
269 | friend class KOTodoViewItem; | 270 | friend class KOTodoViewItem; |
270 | QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo); | 271 | QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo); |
271 | void restoreItemState( QListViewItem * ); | 272 | void restoreItemState( QListViewItem * ); |
272 | 273 | ||
273 | bool checkTodo( Todo * ); | 274 | bool checkTodo( Todo * ); |
274 | bool isFlatDisplay; | 275 | bool isFlatDisplay; |
275 | void setOpen( QListViewItem*, bool setOpen); | 276 | void setOpen( QListViewItem*, bool setOpen); |
276 | KOTodoListView *mTodoListView; | 277 | KOTodoListView *mTodoListView; |
277 | QPopupMenu *mItemPopupMenu; | 278 | QPopupMenu *mItemPopupMenu; |
278 | QPopupMenu *mPopupMenu; | 279 | QPopupMenu *mPopupMenu; |
279 | QPopupMenu *mPriorityPopupMenu; | 280 | QPopupMenu *mPriorityPopupMenu; |
280 | QPopupMenu *mPercentageCompletedPopupMenu; | 281 | QPopupMenu *mPercentageCompletedPopupMenu; |
281 | QPopupMenu *mCategoryPopupMenu; | 282 | QPopupMenu *mCategoryPopupMenu; |
283 | QPopupMenu *mCalPopupMenu; | ||
282 | 284 | ||
283 | QMap<int, int> mPercentage; | 285 | QMap<int, int> mPercentage; |
284 | QMap<int, int> mPriority; | 286 | QMap<int, int> mPriority; |
285 | QMap<int, QString> mCategory; | 287 | QMap<int, QString> mCategory; |
286 | KOTodoViewItem *mActiveItem; | 288 | KOTodoViewItem *mActiveItem; |
287 | 289 | ||
288 | QMap<Todo *,KOTodoViewItem *> mTodoMap; | 290 | QMap<Todo *,KOTodoViewItem *> mTodoMap; |
289 | QString mName; | 291 | QString mName; |
290 | 292 | ||
291 | DocPrefs *mDocPrefs; | 293 | DocPrefs *mDocPrefs; |
292 | QString mCurrentDoc; | 294 | QString mCurrentDoc; |
293 | KOQuickTodo *mQuickAdd; | 295 | KOQuickTodo *mQuickAdd; |
294 | bool mBlockUpdate; | 296 | bool mBlockUpdate; |
295 | void keyPressEvent ( QKeyEvent * ) ; | 297 | void keyPressEvent ( QKeyEvent * ) ; |
296 | KOTodoViewItem * pendingSubtodo; | 298 | KOTodoViewItem * pendingSubtodo; |
297 | DateNavigator* mNavigator; | 299 | DateNavigator* mNavigator; |
298 | void storeCurrentItem(); | 300 | void storeCurrentItem(); |
299 | void resetCurrentItem(); | 301 | void resetCurrentItem(); |
300 | Incidence * mCurItem, *mCurItemRootParent, *mCurItemParent,*mCurItemAbove; | 302 | Incidence * mCurItem, *mCurItemRootParent, *mCurItemParent,*mCurItemAbove; |
301 | }; | 303 | }; |
302 | 304 | ||
303 | #endif | 305 | #endif |