-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index c598214..53eb428 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,248 +1,252 @@ | |||
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.0.26 ************ | ||
4 | |||
5 | And again fixed some bugs. | ||
6 | |||
3 | ********** VERSION 2.0.25 ************ | 7 | ********** VERSION 2.0.25 ************ |
4 | 8 | ||
5 | And again fixed some bugs. | 9 | And again fixed some bugs. |
6 | 10 | ||
7 | ********** VERSION 2.0.24 ************ | 11 | ********** VERSION 2.0.24 ************ |
8 | 12 | ||
9 | Fixed again a lot of small bugs. | 13 | Fixed again a lot of small bugs. |
10 | Some performance optimizations in date navigator. | 14 | Some performance optimizations in date navigator. |
11 | Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row. | 15 | Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row. |
12 | 16 | ||
13 | ********** VERSION 2.0.23 ************ | 17 | ********** VERSION 2.0.23 ************ |
14 | 18 | ||
15 | Fixed again a lot of small and strange bugs, e.g. the missing toolbar of KA/Pi after a new installation. | 19 | Fixed again a lot of small and strange bugs, e.g. the missing toolbar of KA/Pi after a new installation. |
16 | Fixed the (agenda) layout of KO/Pi on 5500er. | 20 | Fixed the (agenda) layout of KO/Pi on 5500er. |
17 | Some usebility enhancements (e.g. reselection the current item of the todo view after some changes). | 21 | Some usebility enhancements (e.g. reselection the current item of the todo view after some changes). |
18 | 22 | ||
19 | ********** VERSION 2.0.22 ************ | 23 | ********** VERSION 2.0.22 ************ |
20 | 24 | ||
21 | KO/Pi: | 25 | KO/Pi: |
22 | Fix for creating events/todos via the abgenda context menu. | 26 | Fix for creating events/todos via the abgenda context menu. |
23 | Added option to split toolbar to 3 toolbars. | 27 | Added option to split toolbar to 3 toolbars. |
24 | (Toolbar moving s disabled for this option due to a bug in Qt somewhere). | 28 | (Toolbar moving s disabled for this option due to a bug in Qt somewhere). |
25 | Added option to show one small filter-view-toolbar. | 29 | Added option to show one small filter-view-toolbar. |
26 | Added a print option to the desktop version: | 30 | Added a print option to the desktop version: |
27 | Now you can print out the view of the "Event Viewer". | 31 | Now you can print out the view of the "Event Viewer". |
28 | That means you can print all data of one particular event/todo. | 32 | That means you can print all data of one particular event/todo. |
29 | Added scaling options to printout of Event Viewer and What'sNext View. | 33 | Added scaling options to printout of Event Viewer and What'sNext View. |
30 | Fixed some problems in the month view in "week start sunday" mode. | 34 | Fixed some problems in the month view in "week start sunday" mode. |
31 | KA/Pi: | 35 | KA/Pi: |
32 | Added two more config options. | 36 | Added two more config options. |
33 | Fixed resizing problem of address request dialog when orientation was switched. | 37 | Fixed resizing problem of address request dialog when orientation was switched. |
34 | Cleaned up the menu structure. | 38 | Cleaned up the menu structure. |
35 | Fixed some more problems. | 39 | Fixed some more problems. |
36 | 40 | ||
37 | Fixed the annoying problem that scrolling continued after the key was released in KO/Pi Monthview and the KA/Pi views. | 41 | Fixed the annoying problem that scrolling continued after the key was released in KO/Pi Monthview and the KA/Pi views. |
38 | 42 | ||
39 | And, this is a really cool option (Ben did suggest it): | 43 | And, this is a really cool option (Ben did suggest it): |
40 | Now KO/Pi and KA/Pi can be run from a USB stick: | 44 | Now KO/Pi and KA/Pi can be run from a USB stick: |
41 | All data is read from and written to the stick. | 45 | All data is read from and written to the stick. |
42 | You can enable this in the global configure option TAB with: | 46 | You can enable this in the global configure option TAB with: |
43 | Save using LOCAL storage. | 47 | Save using LOCAL storage. |
44 | Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well. I will put a memory stick version for teh next stable release online. | 48 | Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well. I will put a memory stick version for teh next stable release online. |
45 | 49 | ||
46 | ********** VERSION 2.0.21 ************ | 50 | ********** VERSION 2.0.21 ************ |
47 | 51 | ||
48 | Fixed another SMTP problem in OM/Pi. | 52 | Fixed another SMTP problem in OM/Pi. |
49 | Some small changed in the new datenavigator in KO/Pi. | 53 | Some small changed in the new datenavigator in KO/Pi. |
50 | Changed default setting for new filter in KA/Pi to "exclude categories". | 54 | Changed default setting for new filter in KA/Pi to "exclude categories". |
51 | Changed the default font size for 640x480 display . | 55 | Changed the default font size for 640x480 display . |
52 | Changed popup menu behaviour in agenda and list view. | 56 | Changed popup menu behaviour in agenda and list view. |
53 | Fixed some layout problems of the date label size in the month view. | 57 | Fixed some layout problems of the date label size in the month view. |
54 | Made month view update faster. | 58 | Made month view update faster. |
55 | Made first datenavigator repainting faster. | 59 | Made first datenavigator repainting faster. |
56 | Changed the title of the event/todo edit dialogs. | 60 | Changed the title of the event/todo edit dialogs. |
57 | Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course). | 61 | Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course). |
58 | Many small usebility fixes in KO/Pi. | 62 | Many small usebility fixes in KO/Pi. |
59 | Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi. | 63 | Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi. |
60 | The set of possible "next views" are the views you have toolbar buttons for. | 64 | The set of possible "next views" are the views you have toolbar buttons for. |
61 | 65 | ||
62 | Made alarm sound working on Linux. | 66 | Made alarm sound working on Linux. |
63 | 67 | ||
64 | KO/Pi alarm applet changed: | 68 | KO/Pi alarm applet changed: |
65 | Made buttons in alarm dialog much bigger. | 69 | Made buttons in alarm dialog much bigger. |
66 | Made setting of timer more user friendly by showing the actual timer fire time and making the buttons in the timer settings much bigger. | 70 | Made setting of timer more user friendly by showing the actual timer fire time and making the buttons in the timer settings much bigger. |
67 | The goal was it to make it possible to use a finger tip ( and not the stylus ) on the touchscreen to adjust the settings. | 71 | The goal was it to make it possible to use a finger tip ( and not the stylus ) on the touchscreen to adjust the settings. |
68 | 72 | ||
69 | And because this version is realeased at Easter, I added an Easter-egg: | 73 | And because this version is realeased at Easter, I added an Easter-egg: |
70 | With a new undocumented command you can get a message box about the next alarm. | 74 | With a new undocumented command you can get a message box about the next alarm. |
71 | Good luck to find it! | 75 | Good luck to find it! |
72 | 76 | ||
73 | 77 | ||
74 | 78 | ||
75 | ********** VERSION 2.0.20 ************ | 79 | ********** VERSION 2.0.20 ************ |
76 | 80 | ||
77 | Two small fixes in OM/Pi. | 81 | Two small fixes in OM/Pi. |
78 | 82 | ||
79 | Better resizing of the new datenavigator in KO/Pi. | 83 | Better resizing of the new datenavigator in KO/Pi. |
80 | 84 | ||
81 | ********** VERSION 2.0.19 ************ | 85 | ********** VERSION 2.0.19 ************ |
82 | KO/Pi: | 86 | KO/Pi: |
83 | Enhancements and bugfixes in the new datenavigator. | 87 | Enhancements and bugfixes in the new datenavigator. |
84 | Bugfix in this changelog: | 88 | Bugfix in this changelog: |
85 | The datenavigator was changed in version 2.0.18, not the datepicker. | 89 | The datenavigator was changed in version 2.0.18, not the datepicker. |
86 | 90 | ||
87 | ********** VERSION 2.0.18 ************ | 91 | ********** VERSION 2.0.18 ************ |
88 | KO/Pi: | 92 | KO/Pi: |
89 | Fixed some minor problems. | 93 | Fixed some minor problems. |
90 | Cleaned up the KO/Pi config dialog. | 94 | Cleaned up the KO/Pi config dialog. |
91 | Fixed problem moving events in aganda view. | 95 | Fixed problem moving events in aganda view. |
92 | Made datepicker scaleable, i.e. if the datenavigator shows now a | 96 | Made datepicker scaleable, i.e. if the datenavigator shows now a |
93 | datenavigator matrix depending on its size. | 97 | datenavigator matrix depending on its size. |
94 | Birthdays are now displayed green in the datenavigator. | 98 | Birthdays are now displayed green in the datenavigator. |
95 | What'sThis Help in datenavigator shows all events of the day. | 99 | What'sThis Help in datenavigator shows all events of the day. |
96 | 100 | ||
97 | OM/Pi: | 101 | OM/Pi: |
98 | Updated the backend mail library to the latest version. | 102 | Updated the backend mail library to the latest version. |
99 | Please backup your mail before using this version. | 103 | Please backup your mail before using this version. |
100 | 104 | ||
101 | ********** VERSION 2.0.17 ************ | 105 | ********** VERSION 2.0.17 ************ |
102 | 106 | ||
103 | KO/Pi: | 107 | KO/Pi: |
104 | Tooltips in month view were not sorted. Fixed. | 108 | Tooltips in month view were not sorted. Fixed. |
105 | Daylabel in agenda view ( for display of one day ) was too short. Fixed. | 109 | Daylabel in agenda view ( for display of one day ) was too short. Fixed. |
106 | Conflict display dialog for syncing was not on top of other windows. Fixed. | 110 | Conflict display dialog for syncing was not on top of other windows. Fixed. |
107 | Fixed some minor problems. | 111 | Fixed some minor problems. |
108 | 112 | ||
109 | Fixed an endless loop when importing vcs file with RESOURCES entry. | 113 | Fixed an endless loop when importing vcs file with RESOURCES entry. |
110 | 114 | ||
111 | ********** VERSION 2.0.16 ************ | 115 | ********** VERSION 2.0.16 ************ |
112 | OM/Pi: | 116 | OM/Pi: |
113 | Fixed the SMTP account setting the option. | 117 | Fixed the SMTP account setting the option. |
114 | Fixed something in mail sending. | 118 | Fixed something in mail sending. |
115 | 119 | ||
116 | KO/Pi: | 120 | KO/Pi: |
117 | Added possibility to export selected events/todos as vcal file. | 121 | Added possibility to export selected events/todos as vcal file. |
118 | 122 | ||
119 | ********** VERSION 2.0.15 ************ | 123 | ********** VERSION 2.0.15 ************ |
120 | 124 | ||
121 | PwM/Pi: | 125 | PwM/Pi: |
122 | Added keyboard shorcuts for | 126 | Added keyboard shorcuts for |
123 | - toggling summary view (space bar) | 127 | - toggling summary view (space bar) |
124 | - delete item (delete + backspace key) | 128 | - delete item (delete + backspace key) |
125 | - add new item ( i + n key) | 129 | - add new item ( i + n key) |
126 | Fixed length of info in the title. | 130 | Fixed length of info in the title. |
127 | 131 | ||
128 | KO/Pi-KA/Pi: | 132 | KO/Pi-KA/Pi: |
129 | Changed "ME" menu bar entry to an icon. | 133 | Changed "ME" menu bar entry to an icon. |
130 | 134 | ||
131 | KO/Pi: | 135 | KO/Pi: |
132 | Fixed two minor bugs in displaying todos. | 136 | Fixed two minor bugs in displaying todos. |
133 | If in month view a cell is selected, the key shortcut "d" shows now that date. | 137 | If in month view a cell is selected, the key shortcut "d" shows now that date. |
134 | Added complete info for a todo in month view as an icon left of the text. | 138 | Added complete info for a todo in month view as an icon left of the text. |
135 | Fixed problems of displaying data when "<" or ">" are used in summary/location/description. | 139 | Fixed problems of displaying data when "<" or ">" are used in summary/location/description. |
136 | Fixed problem of search dialog size when switching displays. | 140 | Fixed problem of search dialog size when switching displays. |
137 | Cancel key now closes date picker. | 141 | Cancel key now closes date picker. |
138 | Rearranged KO/Pi file menu structure. | 142 | Rearranged KO/Pi file menu structure. |
139 | 143 | ||
140 | OM/Pi: | 144 | OM/Pi: |
141 | Added to the SMTP account setting the option | 145 | Added to the SMTP account setting the option |
142 | "No secure connection". | 146 | "No secure connection". |
143 | You have to configure your SMTP accounts again, sorry. | 147 | You have to configure your SMTP accounts again, sorry. |
144 | 148 | ||
145 | KA/Pi: | 149 | KA/Pi: |
146 | Added support for importing quoted-printable. | 150 | Added support for importing quoted-printable. |
147 | Support was added by Peter P.. Thanks, Peter! | 151 | Support was added by Peter P.. Thanks, Peter! |
148 | 152 | ||
149 | 153 | ||
150 | ********** VERSION 2.0.14 ************ | 154 | ********** VERSION 2.0.14 ************ |
151 | 155 | ||
152 | Made Passwordmanager PwM/Pi more userfriendly: | 156 | Made Passwordmanager PwM/Pi more userfriendly: |
153 | Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. | 157 | Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. |
154 | Fixed bug in KO/Pi todo printing. | 158 | Fixed bug in KO/Pi todo printing. |
155 | Made Qtopia calendar import possible on desktop . | 159 | Made Qtopia calendar import possible on desktop . |
156 | 160 | ||
157 | ********** VERSION 2.0.13 ************ | 161 | ********** VERSION 2.0.13 ************ |
158 | 162 | ||
159 | Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. | 163 | Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. |
160 | 164 | ||
161 | In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". | 165 | In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". |
162 | 166 | ||
163 | OM/Pi: | 167 | OM/Pi: |
164 | Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails. | 168 | Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails. |
165 | Added missing German translation. | 169 | Added missing German translation. |
166 | Added warning if path is specified in local folder settings of account config. | 170 | Added warning if path is specified in local folder settings of account config. |
167 | 171 | ||
168 | ********** VERSION 2.0.12 ************ | 172 | ********** VERSION 2.0.12 ************ |
169 | 173 | ||
170 | KO/Pi: | 174 | KO/Pi: |
171 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. | 175 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. |
172 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. | 176 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. |
173 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. | 177 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. |
174 | 178 | ||
175 | Fixed problem in pi-sync mode when wrong password was sent. | 179 | Fixed problem in pi-sync mode when wrong password was sent. |
176 | 180 | ||
177 | OM/Pi: | 181 | OM/Pi: |
178 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. | 182 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. |
179 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. | 183 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. |
180 | 184 | ||
181 | ********** VERSION 2.0.11 ************ | 185 | ********** VERSION 2.0.11 ************ |
182 | 186 | ||
183 | Fixed some problems in pi-sync mode | 187 | Fixed some problems in pi-sync mode |
184 | (e.g. details of events were not synced properly) | 188 | (e.g. details of events were not synced properly) |
185 | 189 | ||
186 | ********** VERSION 2.0.10 ************ | 190 | ********** VERSION 2.0.10 ************ |
187 | 191 | ||
188 | KO/Pi: | 192 | KO/Pi: |
189 | In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view. | 193 | In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view. |
190 | This is fixed. | 194 | This is fixed. |
191 | Changed the search dialog a bit to make it more user friendly. | 195 | Changed the search dialog a bit to make it more user friendly. |
192 | (E.g.: Removed message box about "no items found" and set key focus to search line edit after search). | 196 | (E.g.: Removed message box about "no items found" and set key focus to search line edit after search). |
193 | 197 | ||
194 | Added config option to hide the week number in KO/Pi toolbar. | 198 | Added config option to hide the week number in KO/Pi toolbar. |
195 | 199 | ||
196 | ********** VERSION 2.0.9 ************ | 200 | ********** VERSION 2.0.9 ************ |
197 | 201 | ||
198 | Made month view icons for multiday events a bit nicer. | 202 | Made month view icons for multiday events a bit nicer. |
199 | Some minor fixes in KO/Pi | 203 | Some minor fixes in KO/Pi |
200 | (e.g. go to today did not work for new week view properly). | 204 | (e.g. go to today did not work for new week view properly). |
201 | 205 | ||
202 | 206 | ||
203 | ********** VERSION 2.0.8 ************ | 207 | ********** VERSION 2.0.8 ************ |
204 | 208 | ||
205 | Fixed a problem in dependency info in the ipk files for the Zaurus. | 209 | Fixed a problem in dependency info in the ipk files for the Zaurus. |
206 | 210 | ||
207 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. | 211 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. |
208 | 212 | ||
209 | Added a "go today" button to the datepicker. | 213 | Added a "go today" button to the datepicker. |
210 | 214 | ||
211 | Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) | 215 | Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) |
212 | and made it configureable to show these values. | 216 | and made it configureable to show these values. |
213 | 217 | ||
214 | Fixed a problem for events (from external iCal files) that do have a duration but no end date. | 218 | Fixed a problem for events (from external iCal files) that do have a duration but no end date. |
215 | 219 | ||
216 | 220 | ||
217 | ********** VERSION 2.0.7 ************ | 221 | ********** VERSION 2.0.7 ************ |
218 | 222 | ||
219 | Added global application font settings | 223 | Added global application font settings |
220 | (for all KDE-Pim/Pi apps) to the general settings. | 224 | (for all KDE-Pim/Pi apps) to the general settings. |
221 | 225 | ||
222 | Fixed a problem in OM/Pi when trying to login to some IMAP servers | 226 | Fixed a problem in OM/Pi when trying to login to some IMAP servers |
223 | (like the IMAP server of Apple: mail.mac.com ) | 227 | (like the IMAP server of Apple: mail.mac.com ) |
224 | 228 | ||
225 | Added recurring todos to KO/Pi. | 229 | Added recurring todos to KO/Pi. |
226 | 230 | ||
227 | 231 | ||
228 | ********** VERSION 2.0.6 ************ | 232 | ********** VERSION 2.0.6 ************ |
229 | 233 | ||
230 | Stable release 2.0.6! | 234 | Stable release 2.0.6! |
231 | 235 | ||
232 | Some bugfixes in the pi-sync mode. | 236 | Some bugfixes in the pi-sync mode. |
233 | Added German translation for pi-sync mode. | 237 | Added German translation for pi-sync mode. |
234 | 238 | ||
235 | KO/Pi: | 239 | KO/Pi: |
236 | Made the todolist using alternate background. | 240 | Made the todolist using alternate background. |
237 | 241 | ||
238 | Other minor fixes in KO/Pi. | 242 | Other minor fixes in KO/Pi. |
239 | 243 | ||
240 | 244 | ||
241 | You can find the complete changelog | 245 | You can find the complete changelog |
242 | from version 1.7.7 to 2.0.5 | 246 | from version 1.7.7 to 2.0.5 |
243 | in the source package or on | 247 | in the source package or on |
244 | 248 | ||
245 | http://www.pi-sync.net/html/changelog.html | 249 | http://www.pi-sync.net/html/changelog.html |
246 | 250 | ||
247 | 251 | ||
248 | 252 | ||
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index af64b99..0fcda8e 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,84 +1,84 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.25 | 3 | Version: 2.0.26 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.info, compiled for SuSE 9.2: | 13 | www.pi-sync.info, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
28 | KDE-desktop setup will be changed, or any data | 28 | KDE-desktop setup will be changed, or any data |
29 | (calendar-addressbook) used by the KDE-desktop | 29 | (calendar-addressbook) used by the KDE-desktop |
30 | applications will be changed or accessed. | 30 | applications will be changed or accessed. |
31 | These applications stores their data and config in | 31 | These applications stores their data and config in |
32 | $HOME/kdepim/ | 32 | $HOME/kdepim/ |
33 | However, because the same file format is used, | 33 | However, because the same file format is used, |
34 | an easy exchange of data with the KDE-desktop | 34 | an easy exchange of data with the KDE-desktop |
35 | is possible. | 35 | is possible. |
36 | A small command line program is included | 36 | A small command line program is included |
37 | to make it possible to sync with the KDE-desktop applications. | 37 | to make it possible to sync with the KDE-desktop applications. |
38 | You do not need to call this program from the commandline, | 38 | You do not need to call this program from the commandline, |
39 | it is called from the KDE-Pim/Pi apps when you choose there: | 39 | it is called from the KDE-Pim/Pi apps when you choose there: |
40 | Sync with KDE_Desktop. | 40 | Sync with KDE_Desktop. |
41 | If something is going wrong, please start the | 41 | If something is going wrong, please start the |
42 | KDE-Pim/Pi program itself from the console to get detailed output. | 42 | KDE-Pim/Pi program itself from the console to get detailed output. |
43 | 43 | ||
44 | After installation, you should have a | 44 | After installation, you should have a |
45 | PIM-pi | 45 | PIM-pi |
46 | folder in your KDE start menu, where you can | 46 | folder in your KDE start menu, where you can |
47 | start the applications from. | 47 | start the applications from. |
48 | 48 | ||
49 | These programs makes it possible to sync your Zaurus easily | 49 | These programs makes it possible to sync your Zaurus easily |
50 | (with the KDE-Pim/Pi programs running on the Zaurus) | 50 | (with the KDE-Pim/Pi programs running on the Zaurus) |
51 | with the KDE-desktop calendar/addressbook data. | 51 | with the KDE-desktop calendar/addressbook data. |
52 | If you want to use that, you have to update your | 52 | If you want to use that, you have to update your |
53 | KDE-desktop to version 3.3.0 or higher. | 53 | KDE-desktop to version 3.3.0 or higher. |
54 | SuSE 9.2 contains KDE 3.3.0 such that no update is needed. | 54 | SuSE 9.2 contains KDE 3.3.0 such that no update is needed. |
55 | Actually - after the (non difficult) configuration is set up - | 55 | Actually - after the (non difficult) configuration is set up - |
56 | with two mouseklicks on the Zaurus, | 56 | with two mouseklicks on the Zaurus, |
57 | the Zaurus syncs with the corresponding KDE-Pim/Pi | 57 | the Zaurus syncs with the corresponding KDE-Pim/Pi |
58 | program on the Linux Desktop which syncs automatically | 58 | program on the Linux Desktop which syncs automatically |
59 | with the KDE-desktop data. | 59 | with the KDE-desktop data. |
60 | 60 | ||
61 | If you want to use the KDE-desktop calendar/addressbook applications, | 61 | If you want to use the KDE-desktop calendar/addressbook applications, |
62 | just install these apps in this package and use them as a syncing tool for the | 62 | just install these apps in this package and use them as a syncing tool for the |
63 | Zaurus <-> KDE-desktop sync. | 63 | Zaurus <-> KDE-desktop sync. |
64 | The sync requires a network connection from your Zaurus to | 64 | The sync requires a network connection from your Zaurus to |
65 | the PC. A detailed Sync HowTo is available in the | 65 | the PC. A detailed Sync HowTo is available in the |
66 | Help menu of the applications. | 66 | Help menu of the applications. |
67 | 67 | ||
68 | These applications makes it also possible, that you can sync | 68 | These applications makes it also possible, that you can sync |
69 | (or just export the data to) your mobile phone with your | 69 | (or just export the data to) your mobile phone with your |
70 | data of the KDE-desktop calendar/addressbook applications. | 70 | data of the KDE-desktop calendar/addressbook applications. |
71 | This is tested and working for Nokia mobile phones, | 71 | This is tested and working for Nokia mobile phones, |
72 | it may work with others as well. | 72 | it may work with others as well. |
73 | (More info about that: -> Sync HowTo) | 73 | (More info about that: -> Sync HowTo) |
74 | 74 | ||
75 | NOTE: | 75 | NOTE: |
76 | When using SuSE 9.1 you have to update your KDE to 3.3.x | 76 | When using SuSE 9.1 you have to update your KDE to 3.3.x |
77 | and you have to make an online update in SuSE 9.1 to make it | 77 | and you have to make an online update in SuSE 9.1 to make it |
78 | possible to get the infrared connection working, such that | 78 | possible to get the infrared connection working, such that |
79 | you can sync your (Nokia) mobile phone via infrared. | 79 | you can sync your (Nokia) mobile phone via infrared. |
80 | 80 | ||
81 | %files | 81 | %files |
82 | /opt/kde3/share/applnk/PIM-pi/ | 82 | /opt/kde3/share/applnk/PIM-pi/ |
83 | /opt/kdepimpi/ | 83 | /opt/kdepimpi/ |
84 | /usr/lib/libmicro* | 84 | /usr/lib/libmicro* |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 00ef145..8512a07 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1,1007 +1,1007 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Requires the Qt and KDE widget libraries, available at no cost at | 4 | Requires the Qt and KDE widget libraries, available at no cost at |
5 | http://www.troll.no and http://www.kde.org respectively | 5 | http://www.troll.no and http://www.kde.org respectively |
6 | 6 | ||
7 | Copyright (c) 1997, 1998, 1999 | 7 | Copyright (c) 1997, 1998, 1999 |
8 | Preston Brown (preston.brown@yale.edu) | 8 | Preston Brown (preston.brown@yale.edu) |
9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) | 9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) |
10 | Ian Dawes (iadawes@globalserve.net) | 10 | Ian Dawes (iadawes@globalserve.net) |
11 | Laszlo Boloni (boloni@cs.purdue.edu) | 11 | Laszlo Boloni (boloni@cs.purdue.edu) |
12 | 12 | ||
13 | Copyright (c) 2000, 2001, 2002 | 13 | Copyright (c) 2000, 2001, 2002 |
14 | Cornelius Schumacher <schumacher@kde.org> | 14 | Cornelius Schumacher <schumacher@kde.org> |
15 | 15 | ||
16 | This program is free software; you can redistribute it and/or modify | 16 | This program is free software; you can redistribute it and/or modify |
17 | it under the terms of the GNU General Public License as published by | 17 | it under the terms of the GNU General Public License as published by |
18 | the Free Software Foundation; either version 2 of the License, or | 18 | the Free Software Foundation; either version 2 of the License, or |
19 | (at your option) any later version. | 19 | (at your option) any later version. |
20 | 20 | ||
21 | This program is distributed in the hope that it will be useful, | 21 | This program is distributed in the hope that it will be useful, |
22 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 22 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the | 23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the |
24 | GNU General Public License for more details. | 24 | GNU General Public License for more details. |
25 | 25 | ||
26 | You should have received a copy of the GNU General Public License | 26 | You should have received a copy of the GNU General Public License |
27 | along with this program; if not, write to the Free Software | 27 | along with this program; if not, write to the Free Software |
28 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 28 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | 32 | ||
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | #include <qradiobutton.h> | 34 | #include <qradiobutton.h> |
35 | #include <qbuttongroup.h> | 35 | #include <qbuttongroup.h> |
36 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | #include <qclipboard.h> | 37 | #include <qclipboard.h> |
38 | #include <qcursor.h> | 38 | #include <qcursor.h> |
39 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
40 | #include <qprogressbar.h> | 40 | #include <qprogressbar.h> |
41 | #include <qmultilineedit.h> | 41 | #include <qmultilineedit.h> |
42 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | #include <qwidgetstack.h> | 43 | #include <qwidgetstack.h> |
44 | #include <qptrlist.h> | 44 | #include <qptrlist.h> |
45 | #include <qregexp.h> | 45 | #include <qregexp.h> |
46 | #include <qgroupbox.h> | 46 | #include <qgroupbox.h> |
47 | #include <qfile.h> | 47 | #include <qfile.h> |
48 | #include <qdir.h> | 48 | #include <qdir.h> |
49 | #ifndef KORG_NOSPLITTER | 49 | #ifndef KORG_NOSPLITTER |
50 | #include <qsplitter.h> | 50 | #include <qsplitter.h> |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #include <kglobal.h> | 53 | #include <kglobal.h> |
54 | #include <kdebug.h> | 54 | #include <kdebug.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | #include <kmessagebox.h> | 57 | #include <kmessagebox.h> |
58 | #include <knotifyclient.h> | 58 | #include <knotifyclient.h> |
59 | #include <kconfig.h> | 59 | #include <kconfig.h> |
60 | 60 | ||
61 | #include <libkdepim/ksyncprefsdialog.h> | 61 | #include <libkdepim/ksyncprefsdialog.h> |
62 | #include <krun.h> | 62 | #include <krun.h> |
63 | #include <kdirwatch.h> | 63 | #include <kdirwatch.h> |
64 | #include <libkdepim/kdatepicker.h> | 64 | #include <libkdepim/kdatepicker.h> |
65 | #include <libkdepim/ksyncprofile.h> | 65 | #include <libkdepim/ksyncprofile.h> |
66 | #include <libkdepim/kpimglobalprefs.h> | 66 | #include <libkdepim/kpimglobalprefs.h> |
67 | 67 | ||
68 | #include <libkcal/vcaldrag.h> | 68 | #include <libkcal/vcaldrag.h> |
69 | #include <libkcal/icaldrag.h> | 69 | #include <libkcal/icaldrag.h> |
70 | #include <libkcal/icalformat.h> | 70 | #include <libkcal/icalformat.h> |
71 | #include <libkcal/vcalformat.h> | 71 | #include <libkcal/vcalformat.h> |
72 | #include <libkcal/scheduler.h> | 72 | #include <libkcal/scheduler.h> |
73 | #include <libkcal/calendarlocal.h> | 73 | #include <libkcal/calendarlocal.h> |
74 | #include <libkcal/journal.h> | 74 | #include <libkcal/journal.h> |
75 | #include <libkcal/calfilter.h> | 75 | #include <libkcal/calfilter.h> |
76 | #include <libkcal/attendee.h> | 76 | #include <libkcal/attendee.h> |
77 | #include <libkcal/dndfactory.h> | 77 | #include <libkcal/dndfactory.h> |
78 | #include <libkcal/freebusy.h> | 78 | #include <libkcal/freebusy.h> |
79 | #include <libkcal/filestorage.h> | 79 | #include <libkcal/filestorage.h> |
80 | #include <libkcal/calendarresources.h> | 80 | #include <libkcal/calendarresources.h> |
81 | #include <libkcal/qtopiaformat.h> | 81 | #include <libkcal/qtopiaformat.h> |
82 | #include "../kalarmd/alarmdialog.h" | 82 | #include "../kalarmd/alarmdialog.h" |
83 | 83 | ||
84 | #ifndef DESKTOP_VERSION | 84 | #ifndef DESKTOP_VERSION |
85 | #include <libkcal/sharpformat.h> | 85 | #include <libkcal/sharpformat.h> |
86 | #include <externalapphandler.h> | 86 | #include <externalapphandler.h> |
87 | #endif | 87 | #endif |
88 | #include <libkcal/phoneformat.h> | 88 | #include <libkcal/phoneformat.h> |
89 | #ifndef KORG_NOMAIL | 89 | #ifndef KORG_NOMAIL |
90 | #include "komailclient.h" | 90 | #include "komailclient.h" |
91 | #endif | 91 | #endif |
92 | #ifndef KORG_NOPRINTER | 92 | #ifndef KORG_NOPRINTER |
93 | #include "calprinter.h" | 93 | #include "calprinter.h" |
94 | #endif | 94 | #endif |
95 | #ifndef KORG_NOPLUGINS | 95 | #ifndef KORG_NOPLUGINS |
96 | #include "kocore.h" | 96 | #include "kocore.h" |
97 | #endif | 97 | #endif |
98 | #include "koeventeditor.h" | 98 | #include "koeventeditor.h" |
99 | #include "kotodoeditor.h" | 99 | #include "kotodoeditor.h" |
100 | #include "koprefs.h" | 100 | #include "koprefs.h" |
101 | #include "koeventviewerdialog.h" | 101 | #include "koeventviewerdialog.h" |
102 | #include "publishdialog.h" | 102 | #include "publishdialog.h" |
103 | #include "kofilterview.h" | 103 | #include "kofilterview.h" |
104 | #include "koglobals.h" | 104 | #include "koglobals.h" |
105 | #include "koviewmanager.h" | 105 | #include "koviewmanager.h" |
106 | #include "koagendaview.h" | 106 | #include "koagendaview.h" |
107 | #include "kodialogmanager.h" | 107 | #include "kodialogmanager.h" |
108 | #include "outgoingdialog.h" | 108 | #include "outgoingdialog.h" |
109 | #include "incomingdialog.h" | 109 | #include "incomingdialog.h" |
110 | #include "datenavigatorcontainer.h" | 110 | #include "datenavigatorcontainer.h" |
111 | #include "statusdialog.h" | 111 | #include "statusdialog.h" |
112 | #include "kdatenavigator.h" | 112 | #include "kdatenavigator.h" |
113 | #include "kotodoview.h" | 113 | #include "kotodoview.h" |
114 | #include "datenavigator.h" | 114 | #include "datenavigator.h" |
115 | #include "resourceview.h" | 115 | #include "resourceview.h" |
116 | #include "navigatorbar.h" | 116 | #include "navigatorbar.h" |
117 | #include "searchdialog.h" | 117 | #include "searchdialog.h" |
118 | #include "mainwindow.h" | 118 | #include "mainwindow.h" |
119 | 119 | ||
120 | #include "calendarview.h" | 120 | #include "calendarview.h" |
121 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
122 | #include <qtopia/alarmserver.h> | 122 | #include <qtopia/alarmserver.h> |
123 | #endif | 123 | #endif |
124 | #ifndef _WIN32_ | 124 | #ifndef _WIN32_ |
125 | #include <stdlib.h> | 125 | #include <stdlib.h> |
126 | #include <stdio.h> | 126 | #include <stdio.h> |
127 | #include <unistd.h> | 127 | #include <unistd.h> |
128 | #else | 128 | #else |
129 | #include <qprocess.h> | 129 | #include <qprocess.h> |
130 | #endif | 130 | #endif |
131 | 131 | ||
132 | #ifdef DESKTOP_VERSION | 132 | #ifdef DESKTOP_VERSION |
133 | #include <kabc/stdaddressbook.h> | 133 | #include <kabc/stdaddressbook.h> |
134 | #endif | 134 | #endif |
135 | using namespace KOrg; | 135 | using namespace KOrg; |
136 | using namespace KCal; | 136 | using namespace KCal; |
137 | extern int globalFlagBlockAgenda; | 137 | extern int globalFlagBlockAgenda; |
138 | extern int globalFlagBlockStartup; | 138 | extern int globalFlagBlockStartup; |
139 | 139 | ||
140 | 140 | ||
141 | 141 | ||
142 | class KOBeamPrefs : public QDialog | 142 | class KOBeamPrefs : public QDialog |
143 | { | 143 | { |
144 | public: | 144 | public: |
145 | KOBeamPrefs( QWidget *parent=0, const char *name=0 ) : | 145 | KOBeamPrefs( QWidget *parent=0, const char *name=0 ) : |
146 | QDialog( parent, name, true ) | 146 | QDialog( parent, name, true ) |
147 | { | 147 | { |
148 | setCaption( i18n("Beam Options") ); | 148 | setCaption( i18n("Beam Options") ); |
149 | QVBoxLayout* lay = new QVBoxLayout( this ); | 149 | QVBoxLayout* lay = new QVBoxLayout( this ); |
150 | lay->setSpacing( 3 ); | 150 | lay->setSpacing( 3 ); |
151 | lay->setMargin( 3 ); | 151 | lay->setMargin( 3 ); |
152 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("File format"), this ); | 152 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("File format"), this ); |
153 | lay->addWidget( format ); | 153 | lay->addWidget( format ); |
154 | format->setExclusive ( true ) ; | 154 | format->setExclusive ( true ) ; |
155 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); | 155 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); |
156 | lay->addWidget( time ); time->setExclusive ( true ) ; | 156 | lay->addWidget( time ); time->setExclusive ( true ) ; |
157 | vcal = new QRadioButton(" vCalendar ", format ); | 157 | vcal = new QRadioButton(" vCalendar ", format ); |
158 | ical = new QRadioButton(" iCalendar ", format ); | 158 | ical = new QRadioButton(" iCalendar ", format ); |
159 | vcal->setChecked( true ); | 159 | vcal->setChecked( true ); |
160 | tz = new QRadioButton(i18n(" With timezone "), time ); | 160 | tz = new QRadioButton(i18n(" With timezone "), time ); |
161 | local = new QRadioButton(i18n(" Local time "), time ); | 161 | local = new QRadioButton(i18n(" Local time "), time ); |
162 | tz->setChecked( true ); | 162 | tz->setChecked( true ); |
163 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); | 163 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); |
164 | lay->addWidget( ok ); | 164 | lay->addWidget( ok ); |
165 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 165 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
166 | lay->addWidget( cancel ); | 166 | lay->addWidget( cancel ); |
167 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 167 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
168 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 168 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
169 | resize( 200, 200 ); | 169 | resize( 200, 200 ); |
170 | } | 170 | } |
171 | 171 | ||
172 | bool beamVcal() { return vcal->isChecked(); } | 172 | bool beamVcal() { return vcal->isChecked(); } |
173 | bool beamLocal() { return local->isChecked(); } | 173 | bool beamLocal() { return local->isChecked(); } |
174 | private: | 174 | private: |
175 | QRadioButton* vcal, *ical, *local, *tz; | 175 | QRadioButton* vcal, *ical, *local, *tz; |
176 | }; | 176 | }; |
177 | class KOCatPrefs : public QDialog | 177 | class KOCatPrefs : public QDialog |
178 | { | 178 | { |
179 | public: | 179 | public: |
180 | KOCatPrefs( QWidget *parent=0, const char *name=0 ) : | 180 | KOCatPrefs( QWidget *parent=0, const char *name=0 ) : |
181 | QDialog( parent, name, true ) | 181 | QDialog( parent, name, true ) |
182 | { | 182 | { |
183 | setCaption( i18n("Manage new Categories") ); | 183 | setCaption( i18n("Manage new Categories") ); |
184 | QVBoxLayout* lay = new QVBoxLayout( this ); | 184 | QVBoxLayout* lay = new QVBoxLayout( this ); |
185 | lay->setSpacing( 3 ); | 185 | lay->setSpacing( 3 ); |
186 | lay->setMargin( 3 ); | 186 | lay->setMargin( 3 ); |
187 | QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); | 187 | QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); |
188 | lay->addWidget( lab ); | 188 | lay->addWidget( lab ); |
189 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); | 189 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); |
190 | lay->addWidget( format ); | 190 | lay->addWidget( format ); |
191 | format->setExclusive ( true ) ; | 191 | format->setExclusive ( true ) ; |
192 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); | 192 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); |
193 | new QRadioButton(i18n("Remove from Events/Todos"), format ); | 193 | new QRadioButton(i18n("Remove from Events/Todos"), format ); |
194 | addCatBut->setChecked( true ); | 194 | addCatBut->setChecked( true ); |
195 | QPushButton * ok = new QPushButton( i18n("OK"), this ); | 195 | QPushButton * ok = new QPushButton( i18n("OK"), this ); |
196 | lay->addWidget( ok ); | 196 | lay->addWidget( ok ); |
197 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 197 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
198 | lay->addWidget( cancel ); | 198 | lay->addWidget( cancel ); |
199 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 199 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
200 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 200 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
201 | resize( 200, 200 ); | 201 | resize( 200, 200 ); |
202 | } | 202 | } |
203 | 203 | ||
204 | bool addCat() { return addCatBut->isChecked(); } | 204 | bool addCat() { return addCatBut->isChecked(); } |
205 | private: | 205 | private: |
206 | QRadioButton* addCatBut; | 206 | QRadioButton* addCatBut; |
207 | }; | 207 | }; |
208 | 208 | ||
209 | 209 | ||
210 | 210 | ||
211 | CalendarView::CalendarView( CalendarResources *calendar, | 211 | CalendarView::CalendarView( CalendarResources *calendar, |
212 | QWidget *parent, const char *name ) | 212 | QWidget *parent, const char *name ) |
213 | : CalendarViewBase( parent, name ), | 213 | : CalendarViewBase( parent, name ), |
214 | mCalendar( calendar ), | 214 | mCalendar( calendar ), |
215 | mResourceManager( calendar->resourceManager() ) | 215 | mResourceManager( calendar->resourceManager() ) |
216 | { | 216 | { |
217 | 217 | ||
218 | mEventEditor = 0; | 218 | mEventEditor = 0; |
219 | mTodoEditor = 0; | 219 | mTodoEditor = 0; |
220 | 220 | ||
221 | init(); | 221 | init(); |
222 | } | 222 | } |
223 | 223 | ||
224 | CalendarView::CalendarView( Calendar *calendar, | 224 | CalendarView::CalendarView( Calendar *calendar, |
225 | QWidget *parent, const char *name ) | 225 | QWidget *parent, const char *name ) |
226 | : CalendarViewBase( parent, name ), | 226 | : CalendarViewBase( parent, name ), |
227 | mCalendar( calendar ), | 227 | mCalendar( calendar ), |
228 | mResourceManager( 0 ) | 228 | mResourceManager( 0 ) |
229 | { | 229 | { |
230 | 230 | ||
231 | mEventEditor = 0; | 231 | mEventEditor = 0; |
232 | mTodoEditor = 0; | 232 | mTodoEditor = 0; |
233 | init(); | 233 | init(); |
234 | } | 234 | } |
235 | 235 | ||
236 | void CalendarView::init() | 236 | void CalendarView::init() |
237 | { | 237 | { |
238 | mNextAlarmDateTime = QDateTime::currentDateTime(); | 238 | mNextAlarmDateTime = QDateTime::currentDateTime(); |
239 | setFocusPolicy ( WheelFocus ); | 239 | setFocusPolicy ( NoFocus ); |
240 | mViewerCallerIsSearchDialog = false; | 240 | mViewerCallerIsSearchDialog = false; |
241 | mBlockShowDates = false; | 241 | mBlockShowDates = false; |
242 | beamDialog = new KOBeamPrefs(); | 242 | beamDialog = new KOBeamPrefs(); |
243 | mDatePickerMode = 0; | 243 | mDatePickerMode = 0; |
244 | mCurrentSyncDevice = ""; | 244 | mCurrentSyncDevice = ""; |
245 | writeLocale(); | 245 | writeLocale(); |
246 | mViewManager = new KOViewManager( this ); | 246 | mViewManager = new KOViewManager( this ); |
247 | mDialogManager = new KODialogManager( this ); | 247 | mDialogManager = new KODialogManager( this ); |
248 | mEventViewerDialog = 0; | 248 | mEventViewerDialog = 0; |
249 | mModified = false; | 249 | mModified = false; |
250 | mReadOnly = false; | 250 | mReadOnly = false; |
251 | mSelectedIncidence = 0; | 251 | mSelectedIncidence = 0; |
252 | mCalPrinter = 0; | 252 | mCalPrinter = 0; |
253 | mFilters.setAutoDelete(true); | 253 | mFilters.setAutoDelete(true); |
254 | 254 | ||
255 | mCalendar->registerObserver( this ); | 255 | mCalendar->registerObserver( this ); |
256 | // TODO: Make sure that view is updated, when calendar is changed. | 256 | // TODO: Make sure that view is updated, when calendar is changed. |
257 | 257 | ||
258 | mStorage = new FileStorage( mCalendar ); | 258 | mStorage = new FileStorage( mCalendar ); |
259 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); | 259 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); |
260 | 260 | ||
261 | QBoxLayout *topLayout = (QBoxLayout*)layout(); | 261 | QBoxLayout *topLayout = (QBoxLayout*)layout(); |
262 | #ifndef KORG_NOSPLITTER | 262 | #ifndef KORG_NOSPLITTER |
263 | // create the main layout frames. | 263 | // create the main layout frames. |
264 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); | 264 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); |
265 | topLayout->addWidget(mPanner); | 265 | topLayout->addWidget(mPanner); |
266 | 266 | ||
267 | mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner, | 267 | mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner, |
268 | "CalendarView::LeftFrame"); | 268 | "CalendarView::LeftFrame"); |
269 | mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize); | 269 | mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize); |
270 | 270 | ||
271 | mDateNavigator = new DateNavigatorContainer( mLeftSplitter, | 271 | mDateNavigator = new DateNavigatorContainer( mLeftSplitter, |
272 | "CalendarView::DateNavigator" ); | 272 | "CalendarView::DateNavigator" ); |
273 | 273 | ||
274 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); | 274 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); |
275 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); | 275 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); |
276 | mTodoList->setNavigator( mNavigator ); | 276 | mTodoList->setNavigator( mNavigator ); |
277 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); | 277 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); |
278 | 278 | ||
279 | #ifdef KORG_NORESOURCEVIEW | 279 | #ifdef KORG_NORESOURCEVIEW |
280 | mResourceView = 0; | 280 | mResourceView = 0; |
281 | #else | 281 | #else |
282 | if ( mResourceManager ) { | 282 | if ( mResourceManager ) { |
283 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); | 283 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); |
284 | mResourceView->updateView(); | 284 | mResourceView->updateView(); |
285 | connect( mResourceView, SIGNAL( resourcesChanged() ), | 285 | connect( mResourceView, SIGNAL( resourcesChanged() ), |
286 | SLOT( updateView() ) ); | 286 | SLOT( updateView() ) ); |
287 | } else { | 287 | } else { |
288 | mResourceView = 0; | 288 | mResourceView = 0; |
289 | } | 289 | } |
290 | #endif | 290 | #endif |
291 | QWidget *rightBox = new QWidget( mPanner ); | 291 | QWidget *rightBox = new QWidget( mPanner ); |
292 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 292 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
293 | 293 | ||
294 | mRightFrame = new QWidgetStack( rightBox ); | 294 | mRightFrame = new QWidgetStack( rightBox ); |
295 | rightLayout->addWidget( mRightFrame, 1 ); | 295 | rightLayout->addWidget( mRightFrame, 1 ); |
296 | 296 | ||
297 | mLeftFrame = mLeftSplitter; | 297 | mLeftFrame = mLeftSplitter; |
298 | #else | 298 | #else |
299 | //QWidget *mainBox = new QWidget( this ); | 299 | //QWidget *mainBox = new QWidget( this ); |
300 | //QWidget *leftFrame = new QWidget( mainBox ); | 300 | //QWidget *leftFrame = new QWidget( mainBox ); |
301 | //QBoxLayout * mainBoxLayout; | 301 | //QBoxLayout * mainBoxLayout; |
302 | if ( KOPrefs::instance()->mVerticalScreen ) { | 302 | if ( KOPrefs::instance()->mVerticalScreen ) { |
303 | //mainBoxLayout = new QVBoxLayout(mainBox); | 303 | //mainBoxLayout = new QVBoxLayout(mainBox); |
304 | //leftFrameLayout = new QHBoxLayout(leftFrame ); | 304 | //leftFrameLayout = new QHBoxLayout(leftFrame ); |
305 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); | 305 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); |
306 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 306 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
307 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; | 307 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; |
308 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 308 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
309 | } else { | 309 | } else { |
310 | //mainBoxLayout = new QHBoxLayout(mainBox); | 310 | //mainBoxLayout = new QHBoxLayout(mainBox); |
311 | //leftFrameLayout = new QVBoxLayout(leftFrame ); | 311 | //leftFrameLayout = new QVBoxLayout(leftFrame ); |
312 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 312 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
313 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); | 313 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); |
314 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); | 314 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); |
315 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 315 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
316 | } | 316 | } |
317 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 317 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
318 | //QBoxLayout * leftFrameLayout; | 318 | //QBoxLayout * leftFrameLayout; |
319 | topLayout->addWidget( mMainFrame ); | 319 | topLayout->addWidget( mMainFrame ); |
320 | //mainBoxLayout->addWidget (mLeftFrame); | 320 | //mainBoxLayout->addWidget (mLeftFrame); |
321 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, | 321 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
322 | "CalendarView::DateNavigator" ); | 322 | "CalendarView::DateNavigator" ); |
323 | #if 0 | 323 | #if 0 |
324 | // FIXME | 324 | // FIXME |
325 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | 325 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, |
326 | "CalendarView::DateNavigator", QDate::currentDate()); | 326 | "CalendarView::DateNavigator", QDate::currentDate()); |
327 | #endif | 327 | #endif |
328 | // mDateNavigator->blockSignals( true ); | 328 | // mDateNavigator->blockSignals( true ); |
329 | //leftFrameLayout->addWidget( mDateNavigator ); | 329 | //leftFrameLayout->addWidget( mDateNavigator ); |
330 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); | 330 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
331 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); | 331 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
332 | mTodoList->setNavigator( mNavigator ); | 332 | mTodoList->setNavigator( mNavigator ); |
333 | #if 0 | 333 | #if 0 |
334 | if ( QApplication::desktop()->width() < 480 ) { | 334 | if ( QApplication::desktop()->width() < 480 ) { |
335 | leftFrameLayout->addWidget(mFilterView); | 335 | leftFrameLayout->addWidget(mFilterView); |
336 | leftFrameLayout->addWidget(mTodoList, 2 ); | 336 | leftFrameLayout->addWidget(mTodoList, 2 ); |
337 | 337 | ||
338 | } else { | 338 | } else { |
339 | leftFrameLayout->addWidget(mTodoList,2 ); | 339 | leftFrameLayout->addWidget(mTodoList,2 ); |
340 | leftFrameLayout->addWidget(mFilterView ); | 340 | leftFrameLayout->addWidget(mFilterView ); |
341 | } | 341 | } |
342 | #endif | 342 | #endif |
343 | mFilterView->hide(); | 343 | mFilterView->hide(); |
344 | QWidget *rightBox = new QWidget( mMainFrame ); | 344 | QWidget *rightBox = new QWidget( mMainFrame ); |
345 | //mainBoxLayout->addWidget ( rightBox, 10 ); | 345 | //mainBoxLayout->addWidget ( rightBox, 10 ); |
346 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 346 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
347 | mRightFrame = new QWidgetStack( rightBox ); | 347 | mRightFrame = new QWidgetStack( rightBox ); |
348 | rightLayout->addWidget( mRightFrame, 10 ); | 348 | rightLayout->addWidget( mRightFrame, 10 ); |
349 | 349 | ||
350 | //mLeftFrame = (QWidget *)leftFrame; | 350 | //mLeftFrame = (QWidget *)leftFrame; |
351 | if ( KOPrefs::instance()->mVerticalScreen ) { | 351 | if ( KOPrefs::instance()->mVerticalScreen ) { |
352 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); | 352 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); |
353 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); | 353 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); |
354 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 354 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); |
355 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 355 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); |
356 | } else { | 356 | } else { |
357 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); | 357 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); |
358 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 358 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
359 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 359 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
360 | } | 360 | } |
361 | if ( !KOPrefs::instance()->mShowDateNavigator) | 361 | if ( !KOPrefs::instance()->mShowDateNavigator) |
362 | mDateNavigator->hide(); | 362 | mDateNavigator->hide(); |
363 | //qDebug("Calendarview Size %d %d ", width(), height()); | 363 | //qDebug("Calendarview Size %d %d ", width(), height()); |
364 | #endif | 364 | #endif |
365 | 365 | ||
366 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 366 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
367 | SLOT( showDates( const KCal::DateList & ) ) ); | 367 | SLOT( showDates( const KCal::DateList & ) ) ); |
368 | 368 | ||
369 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 369 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
370 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 370 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
371 | 371 | ||
372 | 372 | ||
373 | 373 | ||
374 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), | 374 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), |
375 | mViewManager, SLOT( showMonth( const QDate & ) ) ); | 375 | mViewManager, SLOT( showMonth( const QDate & ) ) ); |
376 | 376 | ||
377 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 377 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
378 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 378 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
379 | 379 | ||
380 | connect( mDateNavigator, SIGNAL( goPrevYear() ), | 380 | connect( mDateNavigator, SIGNAL( goPrevYear() ), |
381 | mNavigator, SLOT( selectPreviousYear() ) ); | 381 | mNavigator, SLOT( selectPreviousYear() ) ); |
382 | connect( mDateNavigator, SIGNAL( goNextYear() ), | 382 | connect( mDateNavigator, SIGNAL( goNextYear() ), |
383 | mNavigator, SLOT( selectNextYear() ) ); | 383 | mNavigator, SLOT( selectNextYear() ) ); |
384 | connect( mDateNavigator, SIGNAL( goPrevMonth() ), | 384 | connect( mDateNavigator, SIGNAL( goPrevMonth() ), |
385 | mNavigator, SLOT( selectPreviousMonth() ) ); | 385 | mNavigator, SLOT( selectPreviousMonth() ) ); |
386 | connect( mDateNavigator, SIGNAL( goNextMonth() ), | 386 | connect( mDateNavigator, SIGNAL( goNextMonth() ), |
387 | mNavigator, SLOT( selectNextMonth() ) ); | 387 | mNavigator, SLOT( selectNextMonth() ) ); |
388 | 388 | ||
389 | connect( mDateNavigator, SIGNAL( goPrevious() ), | 389 | connect( mDateNavigator, SIGNAL( goPrevious() ), |
390 | mNavigator, SLOT( selectPrevious() ) ); | 390 | mNavigator, SLOT( selectPrevious() ) ); |
391 | connect( mDateNavigator, SIGNAL( goNext() ), | 391 | connect( mDateNavigator, SIGNAL( goNext() ), |
392 | mNavigator, SLOT( selectNext() ) ); | 392 | mNavigator, SLOT( selectNext() ) ); |
393 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), | 393 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), |
394 | mNavigator, SLOT( slotMonthSelect( int ) ) ); | 394 | mNavigator, SLOT( slotMonthSelect( int ) ) ); |
395 | 395 | ||
396 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 396 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
397 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 397 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
398 | #if 0 | 398 | #if 0 |
399 | connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ), | 399 | connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ), |
400 | SLOT( incidenceAdded( Incidence *) ) ); | 400 | SLOT( incidenceAdded( Incidence *) ) ); |
401 | #endif | 401 | #endif |
402 | // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView())); | 402 | // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView())); |
403 | 403 | ||
404 | connect( this, SIGNAL( configChanged() ), | 404 | connect( this, SIGNAL( configChanged() ), |
405 | mDateNavigator, SLOT( updateConfig() ) ); | 405 | mDateNavigator, SLOT( updateConfig() ) ); |
406 | 406 | ||
407 | connect( mTodoList, SIGNAL( newTodoSignal() ), | 407 | connect( mTodoList, SIGNAL( newTodoSignal() ), |
408 | SLOT( newTodo() ) ); | 408 | SLOT( newTodo() ) ); |
409 | connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ), | 409 | connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ), |
410 | SLOT( newSubTodo( Todo * ) ) ); | 410 | SLOT( newSubTodo( Todo * ) ) ); |
411 | connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ), | 411 | connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ), |
412 | SLOT( editTodo( Todo * ) ) ); | 412 | SLOT( editTodo( Todo * ) ) ); |
413 | connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ), | 413 | connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ), |
414 | SLOT( showTodo( Todo *) ) ); | 414 | SLOT( showTodo( Todo *) ) ); |
415 | connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ), | 415 | connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ), |
416 | SLOT( deleteTodo( Todo *) ) ); | 416 | SLOT( deleteTodo( Todo *) ) ); |
417 | connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) ); | 417 | connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) ); |
418 | connect( mTodoList, SIGNAL( purgeCompletedSignal() ), | 418 | connect( mTodoList, SIGNAL( purgeCompletedSignal() ), |
419 | SLOT( purgeCompleted() ) ); | 419 | SLOT( purgeCompleted() ) ); |
420 | connect( mTodoList, SIGNAL( todoModifiedSignal( Todo *, int ) ), | 420 | connect( mTodoList, SIGNAL( todoModifiedSignal( Todo *, int ) ), |
421 | SIGNAL( todoModified( Todo *, int ) ) ); | 421 | SIGNAL( todoModified( Todo *, int ) ) ); |
422 | 422 | ||
423 | connect( mTodoList, SIGNAL( cloneTodoSignal( Incidence * ) ), | 423 | connect( mTodoList, SIGNAL( cloneTodoSignal( Incidence * ) ), |
424 | this, SLOT ( cloneIncidence( Incidence * ) ) ); | 424 | this, SLOT ( cloneIncidence( Incidence * ) ) ); |
425 | connect( mTodoList, SIGNAL( cancelTodoSignal( Incidence * ) ), | 425 | connect( mTodoList, SIGNAL( cancelTodoSignal( Incidence * ) ), |
426 | this, SLOT (cancelIncidence( Incidence * ) ) ); | 426 | this, SLOT (cancelIncidence( Incidence * ) ) ); |
427 | 427 | ||
428 | connect( mTodoList, SIGNAL( moveTodoSignal( Incidence * ) ), | 428 | connect( mTodoList, SIGNAL( moveTodoSignal( Incidence * ) ), |
429 | this, SLOT ( moveIncidence( Incidence * ) ) ); | 429 | this, SLOT ( moveIncidence( Incidence * ) ) ); |
430 | connect( mTodoList, SIGNAL( beamTodoSignal( Incidence * ) ), | 430 | connect( mTodoList, SIGNAL( beamTodoSignal( Incidence * ) ), |
431 | this, SLOT ( beamIncidence( Incidence * ) ) ); | 431 | this, SLOT ( beamIncidence( Incidence * ) ) ); |
432 | 432 | ||
433 | connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ), | 433 | connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ), |
434 | this, SLOT ( todo_unsub( Todo * ) ) ); | 434 | this, SLOT ( todo_unsub( Todo * ) ) ); |
435 | 435 | ||
436 | connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), | 436 | connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), |
437 | this, SLOT ( todo_resub( Todo *,Todo * ) ) ); | 437 | this, SLOT ( todo_resub( Todo *,Todo * ) ) ); |
438 | connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList, | 438 | connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList, |
439 | SLOT( updateTodo( Todo *, int ) ) ); | 439 | SLOT( updateTodo( Todo *, int ) ) ); |
440 | connect( this, SIGNAL( todoModified( Todo *, int )), this, | 440 | connect( this, SIGNAL( todoModified( Todo *, int )), this, |
441 | SLOT( changeTodoDisplay( Todo *, int ) ) ); | 441 | SLOT( changeTodoDisplay( Todo *, int ) ) ); |
442 | 442 | ||
443 | 443 | ||
444 | connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) ); | 444 | connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) ); |
445 | connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) ); | 445 | connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) ); |
446 | connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) ); | 446 | connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) ); |
447 | connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) ); | 447 | connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) ); |
448 | 448 | ||
449 | 449 | ||
450 | 450 | ||
451 | 451 | ||
452 | 452 | ||
453 | connect(QApplication::clipboard(),SIGNAL(dataChanged()), | 453 | connect(QApplication::clipboard(),SIGNAL(dataChanged()), |
454 | SLOT(checkClipboard())); | 454 | SLOT(checkClipboard())); |
455 | connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ), | 455 | connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ), |
456 | SLOT( processTodoListSelection( Incidence * ) ) ); | 456 | SLOT( processTodoListSelection( Incidence * ) ) ); |
457 | connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool))); | 457 | connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool))); |
458 | 458 | ||
459 | // kdDebug() << "CalendarView::CalendarView() done" << endl; | 459 | // kdDebug() << "CalendarView::CalendarView() done" << endl; |
460 | 460 | ||
461 | mDateFrame = new QVBox(0,0,WType_Popup); | 461 | mDateFrame = new QVBox(0,0,WType_Popup); |
462 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 462 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
463 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 463 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); |
464 | mDateFrame->setLineWidth(3); | 464 | mDateFrame->setLineWidth(3); |
465 | mDateFrame->hide(); | 465 | mDateFrame->hide(); |
466 | mDateFrame->setCaption( i18n( "Pick a date to display")); | 466 | mDateFrame->setCaption( i18n( "Pick a date to display")); |
467 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); | 467 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); |
468 | 468 | ||
469 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); | 469 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); |
470 | 470 | ||
471 | mEventEditor = mDialogManager->getEventEditor(); | 471 | mEventEditor = mDialogManager->getEventEditor(); |
472 | mTodoEditor = mDialogManager->getTodoEditor(); | 472 | mTodoEditor = mDialogManager->getTodoEditor(); |
473 | 473 | ||
474 | mFlagEditDescription = false; | 474 | mFlagEditDescription = false; |
475 | 475 | ||
476 | mSuspendTimer = new QTimer( this ); | 476 | mSuspendTimer = new QTimer( this ); |
477 | mAlarmTimer = new QTimer( this ); | 477 | mAlarmTimer = new QTimer( this ); |
478 | mRecheckAlarmTimer = new QTimer( this ); | 478 | mRecheckAlarmTimer = new QTimer( this ); |
479 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); | 479 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); |
480 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); | 480 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); |
481 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); | 481 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); |
482 | mAlarmDialog = new AlarmDialog( this ); | 482 | mAlarmDialog = new AlarmDialog( this ); |
483 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); | 483 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); |
484 | mAlarmDialog->setServerNotification( false ); | 484 | mAlarmDialog->setServerNotification( false ); |
485 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); | 485 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); |
486 | 486 | ||
487 | 487 | ||
488 | #ifndef DESKTOP_VERSION | 488 | #ifndef DESKTOP_VERSION |
489 | //US listen for arriving address resultsets | 489 | //US listen for arriving address resultsets |
490 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 490 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
491 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 491 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
492 | #endif | 492 | #endif |
493 | mDateNavigator->setCalendar( mCalendar ); | 493 | mDateNavigator->setCalendar( mCalendar ); |
494 | } | 494 | } |
495 | 495 | ||
496 | 496 | ||
497 | CalendarView::~CalendarView() | 497 | CalendarView::~CalendarView() |
498 | { | 498 | { |
499 | // kdDebug() << "~CalendarView()" << endl; | 499 | // kdDebug() << "~CalendarView()" << endl; |
500 | //qDebug("CalendarView::~CalendarView() "); | 500 | //qDebug("CalendarView::~CalendarView() "); |
501 | delete mDialogManager; | 501 | delete mDialogManager; |
502 | delete mViewManager; | 502 | delete mViewManager; |
503 | delete mStorage; | 503 | delete mStorage; |
504 | delete mDateFrame ; | 504 | delete mDateFrame ; |
505 | delete beamDialog; | 505 | delete beamDialog; |
506 | delete mEventViewerDialog; | 506 | delete mEventViewerDialog; |
507 | //kdDebug() << "~CalendarView() done" << endl; | 507 | //kdDebug() << "~CalendarView() done" << endl; |
508 | } | 508 | } |
509 | 509 | ||
510 | void CalendarView::showDay( QDate d ) | 510 | void CalendarView::showDay( QDate d ) |
511 | { | 511 | { |
512 | dateNavigator()->blockSignals( true ); | 512 | dateNavigator()->blockSignals( true ); |
513 | dateNavigator()->selectDate( d ); | 513 | dateNavigator()->selectDate( d ); |
514 | dateNavigator()->blockSignals( false ); | 514 | dateNavigator()->blockSignals( false ); |
515 | mViewManager->showDayView(); | 515 | mViewManager->showDayView(); |
516 | //dateNavigator()->selectDate( d ); | 516 | //dateNavigator()->selectDate( d ); |
517 | } | 517 | } |
518 | void CalendarView::timerAlarm() | 518 | void CalendarView::timerAlarm() |
519 | { | 519 | { |
520 | //qDebug("CalendarView::timerAlarm() "); | 520 | //qDebug("CalendarView::timerAlarm() "); |
521 | computeAlarm(mAlarmNotification ); | 521 | computeAlarm(mAlarmNotification ); |
522 | } | 522 | } |
523 | 523 | ||
524 | void CalendarView::suspendAlarm() | 524 | void CalendarView::suspendAlarm() |
525 | { | 525 | { |
526 | //qDebug(" CalendarView::suspendAlarm() "); | 526 | //qDebug(" CalendarView::suspendAlarm() "); |
527 | computeAlarm(mSuspendAlarmNotification ); | 527 | computeAlarm(mSuspendAlarmNotification ); |
528 | 528 | ||
529 | } | 529 | } |
530 | 530 | ||
531 | void CalendarView::startAlarm( QString mess , QString filename) | 531 | void CalendarView::startAlarm( QString mess , QString filename) |
532 | { | 532 | { |
533 | 533 | ||
534 | topLevelWidget()->showNormal(); | 534 | topLevelWidget()->showNormal(); |
535 | topLevelWidget()->setActiveWindow(); | 535 | topLevelWidget()->setActiveWindow(); |
536 | topLevelWidget()->raise(); | 536 | topLevelWidget()->raise(); |
537 | 537 | ||
538 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); | 538 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); |
539 | QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); | 539 | QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); |
540 | 540 | ||
541 | } | 541 | } |
542 | 542 | ||
543 | void CalendarView::checkNextTimerAlarm() | 543 | void CalendarView::checkNextTimerAlarm() |
544 | { | 544 | { |
545 | mCalendar->checkAlarmForIncidence( 0, true ); | 545 | mCalendar->checkAlarmForIncidence( 0, true ); |
546 | } | 546 | } |
547 | 547 | ||
548 | void CalendarView::computeAlarm( QString msg ) | 548 | void CalendarView::computeAlarm( QString msg ) |
549 | { | 549 | { |
550 | 550 | ||
551 | QString mess = msg; | 551 | QString mess = msg; |
552 | QString mAlarmMessage = mess.mid( 9 ); | 552 | QString mAlarmMessage = mess.mid( 9 ); |
553 | QString filename = MainWindow::resourcePath(); | 553 | QString filename = MainWindow::resourcePath(); |
554 | filename += "koalarm.wav"; | 554 | filename += "koalarm.wav"; |
555 | QString tempfilename; | 555 | QString tempfilename; |
556 | if ( mess.left( 13 ) == "suspend_alarm") { | 556 | if ( mess.left( 13 ) == "suspend_alarm") { |
557 | bool error = false; | 557 | bool error = false; |
558 | int len = mess.mid( 13 ).find("+++"); | 558 | int len = mess.mid( 13 ).find("+++"); |
559 | if ( len < 2 ) | 559 | if ( len < 2 ) |
560 | error = true; | 560 | error = true; |
561 | else { | 561 | else { |
562 | tempfilename = mess.mid( 13, len ); | 562 | tempfilename = mess.mid( 13, len ); |
563 | if ( !QFile::exists( tempfilename ) ) | 563 | if ( !QFile::exists( tempfilename ) ) |
564 | error = true; | 564 | error = true; |
565 | } | 565 | } |
566 | if ( ! error ) { | 566 | if ( ! error ) { |
567 | filename = tempfilename; | 567 | filename = tempfilename; |
568 | } | 568 | } |
569 | mAlarmMessage = mess.mid( 13+len+3 ); | 569 | mAlarmMessage = mess.mid( 13+len+3 ); |
570 | //qDebug("suspend file %s ",tempfilename.latin1() ); | 570 | //qDebug("suspend file %s ",tempfilename.latin1() ); |
571 | startAlarm( mAlarmMessage, filename); | 571 | startAlarm( mAlarmMessage, filename); |
572 | return; | 572 | return; |
573 | } | 573 | } |
574 | if ( mess.left( 11 ) == "timer_alarm") { | 574 | if ( mess.left( 11 ) == "timer_alarm") { |
575 | //mTimerTime = 0; | 575 | //mTimerTime = 0; |
576 | startAlarm( mess.mid( 11 ), filename ); | 576 | startAlarm( mess.mid( 11 ), filename ); |
577 | return; | 577 | return; |
578 | } | 578 | } |
579 | if ( mess.left( 10 ) == "proc_alarm") { | 579 | if ( mess.left( 10 ) == "proc_alarm") { |
580 | bool error = false; | 580 | bool error = false; |
581 | int len = mess.mid( 10 ).find("+++"); | 581 | int len = mess.mid( 10 ).find("+++"); |
582 | if ( len < 2 ) | 582 | if ( len < 2 ) |
583 | error = true; | 583 | error = true; |
584 | else { | 584 | else { |
585 | tempfilename = mess.mid( 10, len ); | 585 | tempfilename = mess.mid( 10, len ); |
586 | if ( !QFile::exists( tempfilename ) ) | 586 | if ( !QFile::exists( tempfilename ) ) |
587 | error = true; | 587 | error = true; |
588 | } | 588 | } |
589 | if ( error ) { | 589 | if ( error ) { |
590 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; | 590 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; |
591 | mAlarmMessage += mess.mid( 10+len+3+9 ); | 591 | mAlarmMessage += mess.mid( 10+len+3+9 ); |
592 | } else { | 592 | } else { |
593 | //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); | 593 | //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); |
594 | //qDebug("-----system command %s ",tempfilename.latin1() ); | 594 | //qDebug("-----system command %s ",tempfilename.latin1() ); |
595 | #ifndef _WIN32_ | 595 | #ifndef _WIN32_ |
596 | if ( vfork () == 0 ) { | 596 | if ( vfork () == 0 ) { |
597 | execl ( tempfilename.latin1(), 0 ); | 597 | execl ( tempfilename.latin1(), 0 ); |
598 | return; | 598 | return; |
599 | } | 599 | } |
600 | #else | 600 | #else |
601 | QProcess* p = new QProcess(); | 601 | QProcess* p = new QProcess(); |
602 | p->addArgument( tempfilename.latin1() ); | 602 | p->addArgument( tempfilename.latin1() ); |
603 | p->start(); | 603 | p->start(); |
604 | return; | 604 | return; |
605 | #endif | 605 | #endif |
606 | 606 | ||
607 | return; | 607 | return; |
608 | } | 608 | } |
609 | 609 | ||
610 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); | 610 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); |
611 | } | 611 | } |
612 | if ( mess.left( 11 ) == "audio_alarm") { | 612 | if ( mess.left( 11 ) == "audio_alarm") { |
613 | bool error = false; | 613 | bool error = false; |
614 | int len = mess.mid( 11 ).find("+++"); | 614 | int len = mess.mid( 11 ).find("+++"); |
615 | if ( len < 2 ) | 615 | if ( len < 2 ) |
616 | error = true; | 616 | error = true; |
617 | else { | 617 | else { |
618 | tempfilename = mess.mid( 11, len ); | 618 | tempfilename = mess.mid( 11, len ); |
619 | if ( !QFile::exists( tempfilename ) ) | 619 | if ( !QFile::exists( tempfilename ) ) |
620 | error = true; | 620 | error = true; |
621 | } | 621 | } |
622 | if ( ! error ) { | 622 | if ( ! error ) { |
623 | filename = tempfilename; | 623 | filename = tempfilename; |
624 | } | 624 | } |
625 | mAlarmMessage = mess.mid( 11+len+3+9 ); | 625 | mAlarmMessage = mess.mid( 11+len+3+9 ); |
626 | //qDebug("audio file command %s ",tempfilename.latin1() ); | 626 | //qDebug("audio file command %s ",tempfilename.latin1() ); |
627 | } | 627 | } |
628 | if ( mess.left( 9 ) == "cal_alarm") { | 628 | if ( mess.left( 9 ) == "cal_alarm") { |
629 | mAlarmMessage = mess.mid( 9 ) ; | 629 | mAlarmMessage = mess.mid( 9 ) ; |
630 | } | 630 | } |
631 | 631 | ||
632 | startAlarm( mAlarmMessage, filename ); | 632 | startAlarm( mAlarmMessage, filename ); |
633 | 633 | ||
634 | 634 | ||
635 | } | 635 | } |
636 | 636 | ||
637 | void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString ¬i ) | 637 | void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString ¬i ) |
638 | { | 638 | { |
639 | //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 639 | //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
640 | 640 | ||
641 | mSuspendAlarmNotification = noti; | 641 | mSuspendAlarmNotification = noti; |
642 | int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; | 642 | int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; |
643 | //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000); | 643 | //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000); |
644 | mSuspendTimer->start( ms , true ); | 644 | mSuspendTimer->start( ms , true ); |
645 | 645 | ||
646 | } | 646 | } |
647 | 647 | ||
648 | void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) | 648 | void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) |
649 | { | 649 | { |
650 | mNextAlarmDateTime = qdt; | 650 | mNextAlarmDateTime = qdt; |
651 | //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 651 | //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
652 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 652 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
653 | #ifndef DESKTOP_VERSION | 653 | #ifndef DESKTOP_VERSION |
654 | AlarmServer::addAlarm ( qdt,"koalarm", noti.latin1() ); | 654 | AlarmServer::addAlarm ( qdt,"koalarm", noti.latin1() ); |
655 | #endif | 655 | #endif |
656 | return; | 656 | return; |
657 | } | 657 | } |
658 | int maxSec; | 658 | int maxSec; |
659 | //maxSec = 5; //testing only | 659 | //maxSec = 5; //testing only |
660 | maxSec = 86400+3600; // one day+1hour | 660 | maxSec = 86400+3600; // one day+1hour |
661 | mAlarmNotification = noti; | 661 | mAlarmNotification = noti; |
662 | int sec = QDateTime::currentDateTime().secsTo( qdt ); | 662 | int sec = QDateTime::currentDateTime().secsTo( qdt ); |
663 | if ( sec > maxSec ) { | 663 | if ( sec > maxSec ) { |
664 | mRecheckAlarmTimer->start( maxSec * 1000 ); | 664 | mRecheckAlarmTimer->start( maxSec * 1000 ); |
665 | // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); | 665 | // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); |
666 | return; | 666 | return; |
667 | } else { | 667 | } else { |
668 | mRecheckAlarmTimer->stop(); | 668 | mRecheckAlarmTimer->stop(); |
669 | } | 669 | } |
670 | //qDebug("Alarm timer started with secs: %d ", sec); | 670 | //qDebug("Alarm timer started with secs: %d ", sec); |
671 | mAlarmTimer->start( sec *1000 , true ); | 671 | mAlarmTimer->start( sec *1000 , true ); |
672 | 672 | ||
673 | } | 673 | } |
674 | // called by mRecheckAlarmTimer to get next alarm | 674 | // called by mRecheckAlarmTimer to get next alarm |
675 | // we need this, because a QTimer has only a max range of 25 days | 675 | // we need this, because a QTimer has only a max range of 25 days |
676 | void CalendarView::recheckTimerAlarm() | 676 | void CalendarView::recheckTimerAlarm() |
677 | { | 677 | { |
678 | mAlarmTimer->stop(); | 678 | mAlarmTimer->stop(); |
679 | mRecheckAlarmTimer->stop(); | 679 | mRecheckAlarmTimer->stop(); |
680 | mCalendar->checkAlarmForIncidence( 0, true ); | 680 | mCalendar->checkAlarmForIncidence( 0, true ); |
681 | } | 681 | } |
682 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) | 682 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) |
683 | { | 683 | { |
684 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 684 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
685 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 685 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
686 | #ifndef DESKTOP_VERSION | 686 | #ifndef DESKTOP_VERSION |
687 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); | 687 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); |
688 | #endif | 688 | #endif |
689 | return; | 689 | return; |
690 | } | 690 | } |
691 | mAlarmTimer->stop(); | 691 | mAlarmTimer->stop(); |
692 | } | 692 | } |
693 | void CalendarView::selectWeekNum ( int num ) | 693 | void CalendarView::selectWeekNum ( int num ) |
694 | { | 694 | { |
695 | dateNavigator()->blockSignals( true ); | 695 | dateNavigator()->blockSignals( true ); |
696 | dateNavigator()->selectWeek( num ); | 696 | dateNavigator()->selectWeek( num ); |
697 | dateNavigator()->blockSignals( false ); | 697 | dateNavigator()->blockSignals( false ); |
698 | mViewManager->showWeekView(); | 698 | mViewManager->showWeekView(); |
699 | } | 699 | } |
700 | KOViewManager *CalendarView::viewManager() | 700 | KOViewManager *CalendarView::viewManager() |
701 | { | 701 | { |
702 | return mViewManager; | 702 | return mViewManager; |
703 | } | 703 | } |
704 | 704 | ||
705 | KODialogManager *CalendarView::dialogManager() | 705 | KODialogManager *CalendarView::dialogManager() |
706 | { | 706 | { |
707 | return mDialogManager; | 707 | return mDialogManager; |
708 | } | 708 | } |
709 | 709 | ||
710 | QDate CalendarView::startDate() | 710 | QDate CalendarView::startDate() |
711 | { | 711 | { |
712 | DateList dates = mNavigator->selectedDates(); | 712 | DateList dates = mNavigator->selectedDates(); |
713 | 713 | ||
714 | return dates.first(); | 714 | return dates.first(); |
715 | } | 715 | } |
716 | 716 | ||
717 | QDate CalendarView::endDate() | 717 | QDate CalendarView::endDate() |
718 | { | 718 | { |
719 | DateList dates = mNavigator->selectedDates(); | 719 | DateList dates = mNavigator->selectedDates(); |
720 | 720 | ||
721 | return dates.last(); | 721 | return dates.last(); |
722 | } | 722 | } |
723 | 723 | ||
724 | 724 | ||
725 | void CalendarView::createPrinter() | 725 | void CalendarView::createPrinter() |
726 | { | 726 | { |
727 | #ifndef KORG_NOPRINTER | 727 | #ifndef KORG_NOPRINTER |
728 | if (!mCalPrinter) { | 728 | if (!mCalPrinter) { |
729 | mCalPrinter = new CalPrinter(this, mCalendar); | 729 | mCalPrinter = new CalPrinter(this, mCalendar); |
730 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); | 730 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); |
731 | } | 731 | } |
732 | #endif | 732 | #endif |
733 | } | 733 | } |
734 | 734 | ||
735 | 735 | ||
736 | //KOPrefs::instance()->mWriteBackFile | 736 | //KOPrefs::instance()->mWriteBackFile |
737 | //KOPrefs::instance()->mWriteBackExistingOnly | 737 | //KOPrefs::instance()->mWriteBackExistingOnly |
738 | 738 | ||
739 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 739 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
740 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 740 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
741 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 741 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
742 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | 742 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); |
743 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); | 743 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); |
744 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); | 744 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); |
745 | 745 | ||
746 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) | 746 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) |
747 | { | 747 | { |
748 | 748 | ||
749 | // 0 equal | 749 | // 0 equal |
750 | // 1 take local | 750 | // 1 take local |
751 | // 2 take remote | 751 | // 2 take remote |
752 | // 3 cancel | 752 | // 3 cancel |
753 | QDateTime lastSync = mLastCalendarSync; | 753 | QDateTime lastSync = mLastCalendarSync; |
754 | QDateTime localMod = local->lastModified(); | 754 | QDateTime localMod = local->lastModified(); |
755 | QDateTime remoteMod = remote->lastModified(); | 755 | QDateTime remoteMod = remote->lastModified(); |
756 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 756 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
757 | bool remCh, locCh; | 757 | bool remCh, locCh; |
758 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 758 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
759 | //if ( remCh ) | 759 | //if ( remCh ) |
760 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 760 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
761 | locCh = ( localMod > mLastCalendarSync ); | 761 | locCh = ( localMod > mLastCalendarSync ); |
762 | if ( !remCh && ! locCh ) { | 762 | if ( !remCh && ! locCh ) { |
763 | //qDebug("both not changed "); | 763 | //qDebug("both not changed "); |
764 | lastSync = localMod.addDays(1); | 764 | lastSync = localMod.addDays(1); |
765 | if ( mode <= SYNC_PREF_ASK ) | 765 | if ( mode <= SYNC_PREF_ASK ) |
766 | return 0; | 766 | return 0; |
767 | } else { | 767 | } else { |
768 | if ( locCh ) { | 768 | if ( locCh ) { |
769 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); | 769 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); |
770 | lastSync = localMod.addDays( -1 ); | 770 | lastSync = localMod.addDays( -1 ); |
771 | if ( !remCh ) | 771 | if ( !remCh ) |
772 | remoteMod = ( lastSync.addDays( -1 ) ); | 772 | remoteMod = ( lastSync.addDays( -1 ) ); |
773 | } else { | 773 | } else { |
774 | //qDebug(" not loc changed "); | 774 | //qDebug(" not loc changed "); |
775 | lastSync = localMod.addDays( 1 ); | 775 | lastSync = localMod.addDays( 1 ); |
776 | if ( remCh ) | 776 | if ( remCh ) |
777 | remoteMod =( lastSync.addDays( 1 ) ); | 777 | remoteMod =( lastSync.addDays( 1 ) ); |
778 | 778 | ||
779 | } | 779 | } |
780 | } | 780 | } |
781 | full = true; | 781 | full = true; |
782 | if ( mode < SYNC_PREF_ASK ) | 782 | if ( mode < SYNC_PREF_ASK ) |
783 | mode = SYNC_PREF_ASK; | 783 | mode = SYNC_PREF_ASK; |
784 | } else { | 784 | } else { |
785 | if ( localMod == remoteMod ) | 785 | if ( localMod == remoteMod ) |
786 | // if ( local->revision() == remote->revision() ) | 786 | // if ( local->revision() == remote->revision() ) |
787 | return 0; | 787 | return 0; |
788 | 788 | ||
789 | } | 789 | } |
790 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 790 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
791 | 791 | ||
792 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); | 792 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); |
793 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); | 793 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); |
794 | //full = true; //debug only | 794 | //full = true; //debug only |
795 | if ( full ) { | 795 | if ( full ) { |
796 | bool equ = false; | 796 | bool equ = false; |
797 | if ( local->type() == "Event" ) { | 797 | if ( local->type() == "Event" ) { |
798 | equ = (*((Event*) local) == *((Event*) remote)); | 798 | equ = (*((Event*) local) == *((Event*) remote)); |
799 | } | 799 | } |
800 | else if ( local->type() =="Todo" ) | 800 | else if ( local->type() =="Todo" ) |
801 | equ = (*((Todo*) local) == (*(Todo*) remote)); | 801 | equ = (*((Todo*) local) == (*(Todo*) remote)); |
802 | else if ( local->type() =="Journal" ) | 802 | else if ( local->type() =="Journal" ) |
803 | equ = (*((Journal*) local) == *((Journal*) remote)); | 803 | equ = (*((Journal*) local) == *((Journal*) remote)); |
804 | if ( equ ) { | 804 | if ( equ ) { |
805 | //qDebug("equal "); | 805 | //qDebug("equal "); |
806 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 806 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
807 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 807 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
808 | } | 808 | } |
809 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 809 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
810 | return 0; | 810 | return 0; |
811 | 811 | ||
812 | }//else //debug only | 812 | }//else //debug only |
813 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 813 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
814 | } | 814 | } |
815 | int result; | 815 | int result; |
816 | bool localIsNew; | 816 | bool localIsNew; |
817 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , localMod.toString().latin1() , remoteMod.toString().latin1() ); | 817 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , localMod.toString().latin1() , remoteMod.toString().latin1() ); |
818 | 818 | ||
819 | 819 | ||
820 | // ************************************************ | 820 | // ************************************************ |
821 | // ************************************************ | 821 | // ************************************************ |
822 | // ************************************************ | 822 | // ************************************************ |
823 | // We may have that lastSync > remoteMod AND lastSync > localMod | 823 | // We may have that lastSync > remoteMod AND lastSync > localMod |
824 | // BUT remoteMod != localMod | 824 | // BUT remoteMod != localMod |
825 | 825 | ||
826 | 826 | ||
827 | if ( full && mode < SYNC_PREF_NEWEST ) | 827 | if ( full && mode < SYNC_PREF_NEWEST ) |
828 | mode = SYNC_PREF_ASK; | 828 | mode = SYNC_PREF_ASK; |
829 | 829 | ||
830 | switch( mode ) { | 830 | switch( mode ) { |
831 | case SYNC_PREF_LOCAL: | 831 | case SYNC_PREF_LOCAL: |
832 | if ( lastSync > remoteMod ) | 832 | if ( lastSync > remoteMod ) |
833 | return 1; | 833 | return 1; |
834 | if ( lastSync > localMod ) | 834 | if ( lastSync > localMod ) |
835 | return 2; | 835 | return 2; |
836 | return 1; | 836 | return 1; |
837 | break; | 837 | break; |
838 | case SYNC_PREF_REMOTE: | 838 | case SYNC_PREF_REMOTE: |
839 | if ( lastSync > localMod ) | 839 | if ( lastSync > localMod ) |
840 | return 2; | 840 | return 2; |
841 | if ( lastSync > remoteMod ) | 841 | if ( lastSync > remoteMod ) |
842 | return 1; | 842 | return 1; |
843 | return 2; | 843 | return 2; |
844 | break; | 844 | break; |
845 | case SYNC_PREF_NEWEST: | 845 | case SYNC_PREF_NEWEST: |
846 | if ( localMod >= remoteMod ) | 846 | if ( localMod >= remoteMod ) |
847 | return 1; | 847 | return 1; |
848 | else | 848 | else |
849 | return 2; | 849 | return 2; |
850 | break; | 850 | break; |
851 | case SYNC_PREF_ASK: | 851 | case SYNC_PREF_ASK: |
852 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 852 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
853 | if ( lastSync > remoteMod && lastSync > localMod) | 853 | if ( lastSync > remoteMod && lastSync > localMod) |
854 | return 0; | 854 | return 0; |
855 | if ( lastSync > remoteMod ) | 855 | if ( lastSync > remoteMod ) |
856 | return 1; | 856 | return 1; |
857 | if ( lastSync > localMod ) | 857 | if ( lastSync > localMod ) |
858 | return 2; | 858 | return 2; |
859 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 859 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
860 | localIsNew = localMod >= remoteMod; | 860 | localIsNew = localMod >= remoteMod; |
861 | if ( localIsNew ) | 861 | if ( localIsNew ) |
862 | getEventViewerDialog()->setColorMode( 1 ); | 862 | getEventViewerDialog()->setColorMode( 1 ); |
863 | else | 863 | else |
864 | getEventViewerDialog()->setColorMode( 2 ); | 864 | getEventViewerDialog()->setColorMode( 2 ); |
865 | getEventViewerDialog()->setIncidence(local); | 865 | getEventViewerDialog()->setIncidence(local); |
866 | if ( localIsNew ) | 866 | if ( localIsNew ) |
867 | getEventViewerDialog()->setColorMode( 2 ); | 867 | getEventViewerDialog()->setColorMode( 2 ); |
868 | else | 868 | else |
869 | getEventViewerDialog()->setColorMode( 1 ); | 869 | getEventViewerDialog()->setColorMode( 1 ); |
870 | getEventViewerDialog()->addIncidence(remote); | 870 | getEventViewerDialog()->addIncidence(remote); |
871 | getEventViewerDialog()->setColorMode( 0 ); | 871 | getEventViewerDialog()->setColorMode( 0 ); |
872 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); | 872 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); |
873 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); | 873 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); |
874 | getEventViewerDialog()->showMe(); | 874 | getEventViewerDialog()->showMe(); |
875 | result = getEventViewerDialog()->executeS( localIsNew ); | 875 | result = getEventViewerDialog()->executeS( localIsNew ); |
876 | return result; | 876 | return result; |
877 | 877 | ||
878 | break; | 878 | break; |
879 | case SYNC_PREF_FORCE_LOCAL: | 879 | case SYNC_PREF_FORCE_LOCAL: |
880 | return 1; | 880 | return 1; |
881 | break; | 881 | break; |
882 | case SYNC_PREF_FORCE_REMOTE: | 882 | case SYNC_PREF_FORCE_REMOTE: |
883 | return 2; | 883 | return 2; |
884 | break; | 884 | break; |
885 | 885 | ||
886 | default: | 886 | default: |
887 | // SYNC_PREF_TAKE_BOTH not implemented | 887 | // SYNC_PREF_TAKE_BOTH not implemented |
888 | break; | 888 | break; |
889 | } | 889 | } |
890 | return 0; | 890 | return 0; |
891 | } | 891 | } |
892 | Event* CalendarView::getLastSyncEvent() | 892 | Event* CalendarView::getLastSyncEvent() |
893 | { | 893 | { |
894 | Event* lse; | 894 | Event* lse; |
895 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 895 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
896 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); | 896 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); |
897 | if (!lse) { | 897 | if (!lse) { |
898 | lse = new Event(); | 898 | lse = new Event(); |
899 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); | 899 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); |
900 | QString sum = ""; | 900 | QString sum = ""; |
901 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 901 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
902 | sum = "E: "; | 902 | sum = "E: "; |
903 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); | 903 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); |
904 | lse->setDtStart( mLastCalendarSync ); | 904 | lse->setDtStart( mLastCalendarSync ); |
905 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 905 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
906 | lse->setCategories( i18n("SyncEvent") ); | 906 | lse->setCategories( i18n("SyncEvent") ); |
907 | lse->setReadOnly( true ); | 907 | lse->setReadOnly( true ); |
908 | mCalendar->addEvent( lse ); | 908 | mCalendar->addEvent( lse ); |
909 | } | 909 | } |
910 | 910 | ||
911 | return lse; | 911 | return lse; |
912 | 912 | ||
913 | } | 913 | } |
914 | 914 | ||
915 | // we check, if the to delete event has a id for a profile | 915 | // we check, if the to delete event has a id for a profile |
916 | // if yes, we set this id in the profile to delete | 916 | // if yes, we set this id in the profile to delete |
917 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 917 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) |
918 | { | 918 | { |
919 | if ( lastSync.count() == 0 ) { | 919 | if ( lastSync.count() == 0 ) { |
920 | //qDebug(" lastSync.count() == 0"); | 920 | //qDebug(" lastSync.count() == 0"); |
921 | return; | 921 | return; |
922 | } | 922 | } |
923 | if ( toDelete->type() == "Journal" ) | 923 | if ( toDelete->type() == "Journal" ) |
924 | return; | 924 | return; |
925 | 925 | ||
926 | Event* eve = lastSync.first(); | 926 | Event* eve = lastSync.first(); |
927 | 927 | ||
928 | while ( eve ) { | 928 | while ( eve ) { |
929 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name | 929 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name |
930 | if ( !id.isEmpty() ) { | 930 | if ( !id.isEmpty() ) { |
931 | QString des = eve->description(); | 931 | QString des = eve->description(); |
932 | QString pref = "e"; | 932 | QString pref = "e"; |
933 | if ( toDelete->type() == "Todo" ) | 933 | if ( toDelete->type() == "Todo" ) |
934 | pref = "t"; | 934 | pref = "t"; |
935 | des += pref+ id + ","; | 935 | des += pref+ id + ","; |
936 | eve->setReadOnly( false ); | 936 | eve->setReadOnly( false ); |
937 | eve->setDescription( des ); | 937 | eve->setDescription( des ); |
938 | //qDebug("setdes %s ", des.latin1()); | 938 | //qDebug("setdes %s ", des.latin1()); |
939 | eve->setReadOnly( true ); | 939 | eve->setReadOnly( true ); |
940 | } | 940 | } |
941 | eve = lastSync.next(); | 941 | eve = lastSync.next(); |
942 | } | 942 | } |
943 | 943 | ||
944 | } | 944 | } |
945 | void CalendarView::checkExternalId( Incidence * inc ) | 945 | void CalendarView::checkExternalId( Incidence * inc ) |
946 | { | 946 | { |
947 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 947 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
948 | checkExternSyncEvent( lastSync, inc ); | 948 | checkExternSyncEvent( lastSync, inc ); |
949 | 949 | ||
950 | } | 950 | } |
951 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 951 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
952 | { | 952 | { |
953 | bool syncOK = true; | 953 | bool syncOK = true; |
954 | int addedEvent = 0; | 954 | int addedEvent = 0; |
955 | int addedEventR = 0; | 955 | int addedEventR = 0; |
956 | int deletedEventR = 0; | 956 | int deletedEventR = 0; |
957 | int deletedEventL = 0; | 957 | int deletedEventL = 0; |
958 | int changedLocal = 0; | 958 | int changedLocal = 0; |
959 | int changedRemote = 0; | 959 | int changedRemote = 0; |
960 | int filteredIN = 0; | 960 | int filteredIN = 0; |
961 | int filteredOUT = 0; | 961 | int filteredOUT = 0; |
962 | //QPtrList<Event> el = local->rawEvents(); | 962 | //QPtrList<Event> el = local->rawEvents(); |
963 | Event* eventR; | 963 | Event* eventR; |
964 | QString uid; | 964 | QString uid; |
965 | int take; | 965 | int take; |
966 | Event* eventL; | 966 | Event* eventL; |
967 | Event* eventRSync; | 967 | Event* eventRSync; |
968 | Event* eventLSync; | 968 | Event* eventLSync; |
969 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 969 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
970 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 970 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
971 | bool fullDateRange = false; | 971 | bool fullDateRange = false; |
972 | local->resetTempSyncStat(); | 972 | local->resetTempSyncStat(); |
973 | mLastCalendarSync = QDateTime::currentDateTime(); | 973 | mLastCalendarSync = QDateTime::currentDateTime(); |
974 | if ( mSyncManager->syncWithDesktop() ) { | 974 | if ( mSyncManager->syncWithDesktop() ) { |
975 | remote->resetPilotStat(1); | 975 | remote->resetPilotStat(1); |
976 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 976 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
977 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; | 977 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; |
978 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); | 978 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); |
979 | } else { | 979 | } else { |
980 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 980 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
981 | } | 981 | } |
982 | } | 982 | } |
983 | QDateTime modifiedCalendar = mLastCalendarSync; | 983 | QDateTime modifiedCalendar = mLastCalendarSync; |
984 | eventLSync = getLastSyncEvent(); | 984 | eventLSync = getLastSyncEvent(); |
985 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 985 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
986 | if ( eventR ) { | 986 | if ( eventR ) { |
987 | eventRSync = (Event*) eventR->clone(); | 987 | eventRSync = (Event*) eventR->clone(); |
988 | remote->deleteEvent(eventR ); | 988 | remote->deleteEvent(eventR ); |
989 | 989 | ||
990 | } else { | 990 | } else { |
991 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { | 991 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { |
992 | eventRSync = (Event*)eventLSync->clone(); | 992 | eventRSync = (Event*)eventLSync->clone(); |
993 | } else { | 993 | } else { |
994 | fullDateRange = true; | 994 | fullDateRange = true; |
995 | eventRSync = new Event(); | 995 | eventRSync = new Event(); |
996 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 996 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
997 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 997 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
998 | eventRSync->setDtStart( mLastCalendarSync ); | 998 | eventRSync->setDtStart( mLastCalendarSync ); |
999 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 999 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
1000 | eventRSync->setCategories( i18n("SyncEvent") ); | 1000 | eventRSync->setCategories( i18n("SyncEvent") ); |
1001 | } | 1001 | } |
1002 | } | 1002 | } |
1003 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 1003 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
1004 | fullDateRange = true; | 1004 | fullDateRange = true; |
1005 | 1005 | ||
1006 | if ( ! fullDateRange ) { | 1006 | if ( ! fullDateRange ) { |
1007 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 1007 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
@@ -1 +1 @@ | |||
version = "2.0.25"; | version = "2.0.26"; | ||