-rw-r--r-- | ReleaseNotes.txt | 18 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 53 | ||||
-rw-r--r-- | korganizer/kodaymatrix.h | 1 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 3 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 11 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 9 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 11 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
9 files changed, 86 insertions, 26 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 01c34cc..f2adfc8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt | |||
@@ -1,250 +1,254 @@ | |||
1 | 1 | ||
2 | KDE-Pim/Pi is available for four platforms: | 2 | KDE-Pim/Pi is available for four platforms: |
3 | 3 | ||
4 | 1) Windows 32 (not available for all releases) | 4 | 1) Windows 32 (not available for all releases) |
5 | 2) Zaurus Sharp ROM, gcc 2.95 compiled | 5 | 2) Zaurus Sharp ROM, gcc 2.95 compiled |
6 | 3) OpenZaurus ROM, gcc 3.xx compiled (not available for all releases) | 6 | 3) OpenZaurus ROM, gcc 3.xx compiled (not available for all releases) |
7 | 4) Linux Desktop (SuSE 9.2) (not available for all releases) | 7 | 4) Linux Desktop (SuSE 9.2) (not available for all releases) |
8 | 8 | ||
9 | Contents of the packages and how to install: | 9 | Contents of the packages and how to install: |
10 | 10 | ||
11 | 11 | ||
12 | ***************************************************** | 12 | ***************************************************** |
13 | 1) Windows 32 | 13 | 1) Windows 32 |
14 | ***************************************************** | 14 | ***************************************************** |
15 | NOTE: | 15 | NOTE: |
16 | There are two version for Windows available: | 16 | There are two version for Windows available: |
17 | The file | 17 | The file |
18 | kdepim_2.0.8_for_Windows.exe.zip, wich is for Windows 2000/XP | 18 | kdepim_2.1.2_for_Windows.exe.zip, wich is for Windows 2000/XP |
19 | and the file | 19 | and the file |
20 | kdepim_2.0.8_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME. | 20 | kdepim_2.1.2_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME. |
21 | The functionality is almost the same, but in the version for Windows 98/ME | 21 | The functionality is almost the same, but in the version for Windows 98/ME |
22 | is "Import from Outlook" disabled to make it running on Windows 98/ME. | 22 | is "Import from Outlook" disabled to make it running on Windows 98/ME. |
23 | 23 | ||
24 | Filename: kdepim_2.0.8_for_Windows.exe.zip | 24 | Filename: kdepim_2.1.2_for_Windows.exe.zip |
25 | Package contains: | 25 | Package contains: |
26 | KO/Pi | 26 | KO/Pi |
27 | KA/Pi | 27 | KA/Pi |
28 | Phone access(kammu.exe) | 28 | Phone access(kammu.exe) |
29 | Libs for file, dir, qtopia resources. | 29 | Libs for file, dir, qtopia resources. |
30 | 30 | ||
31 | Download file. | 31 | Download file. |
32 | Unzip the file, then you are almost done. | 32 | Unzip the file, then you are almost done. |
33 | When installing these package for the first time, | 33 | When installing these package for the first time, |
34 | you will need to install some needed dlls which are | 34 | you will need to install some needed dlls which are |
35 | available in an extra package "kdepim334.dll". This additional package contains | 35 | available in an extra package "kdepim334.dll". This additional package contains |
36 | the Qt3 library qt-mt334.dll and the MSVC library msvcr71.dll | 36 | the Qt3 library qt-mt334.dll and the MSVC library msvcr71.dll |
37 | and the MSVC library mfc71u.dll. | 37 | and the MSVC library mfc71u.dll. |
38 | You can download the "kdepim334.dll" package at: | 38 | You can download the "kdepim334.dll" package at: |
39 | http://sourceforge.net/projects/kdepimpi/ | 39 | http://sourceforge.net/projects/kdepimpi/ |
40 | Please choose there package/project/file: | 40 | Please choose there package/project/file: |
41 | general Files for KDE/Pim | 41 | general Files for KDE/Pim |
42 | Needed Windows Dlls | 42 | Needed Windows Dlls |
43 | kdepim334dll.zip | 43 | kdepim334dll.zip |
44 | 44 | ||
45 | For details read the file | 45 | For details read the file |
46 | Migration-Howto.txt in the package. | 46 | Migration-Howto.txt in the package. |
47 | 47 | ||
48 | 48 | ||
49 | ***************************************************** | 49 | ***************************************************** |
50 | 2) Zaurus Sharp ROM, gcc 2.95 compiled | 50 | 2) Zaurus Sharp ROM, gcc 2.95 compiled |
51 | ***************************************************** | 51 | ***************************************************** |
52 | Filename: kdepim_X.X.X_for_SharpROM.ipk.zip | 52 | Filename: kdepim_X.X.X_for_SharpROM.ipk.zip |
53 | Package contains: | 53 | Package contains: |
54 | kaddressbook_X.X.X_arm.ipk | 54 | kaddressbook_X.X.X_arm.ipk |
55 | korganizer-alarm_X.X.X_arm.ipk | 55 | korganizer-alarm_X.X.X_arm.ipk |
56 | kmicrokdelibs_X.X.X_arm.ipk | 56 | kmicrokdelibs_X.X.X_arm.ipk |
57 | kmobilephoneaccess_X.X.X_arm.ipk | 57 | kmobilephoneaccess_X.X.X_arm.ipk |
58 | ksharpPIM-DTMaccess_X.X.X_arm.ipk | 58 | ksharpPIM-DTMaccess_X.X.X_arm.ipk |
59 | kopiemail_X.X.X_arm.ipk | 59 | kopiemail_X.X.X_arm.ipk |
60 | pimTABicon_X.X.X_arm.ipk | 60 | pimTABicon_X.X.X_arm.ipk |
61 | korganizer_X.X.X_arm.ipk | 61 | korganizer_X.X.X_arm.ipk |
62 | pwmanager_X.X.X_arm.ipk | 62 | pwmanager_X.X.X_arm.ipk |
63 | 63 | ||
64 | This package is for users of the Sharp ROM and clones. | 64 | This package is for users of the Sharp ROM and clones. |
65 | Users of old OpenZaurus releases, which are gcc2.95 | 65 | Users of old OpenZaurus releases, which are gcc2.95 |
66 | compiled can use it as well. | 66 | compiled can use it as well. |
67 | 67 | ||
68 | CONTENT: | 68 | CONTENT: |
69 | 69 | ||
70 | File kmicrokdelibs_X.X.X_arm.ipk: | 70 | File kmicrokdelibs_X.X.X_arm.ipk: |
71 | The libs in this file are needed to run | 71 | The libs in this file are needed to run |
72 | any of the included programs. | 72 | any of the included programs. |
73 | Install it. | 73 | Install it. |
74 | 74 | ||
75 | File kaddressbook_X.X.X_arm.ipk: | 75 | File kaddressbook_X.X.X_arm.ipk: |
76 | Contains KA/Pi addressbook program and needed additional libs. | 76 | Contains KA/Pi addressbook program and needed additional libs. |
77 | 77 | ||
78 | File korganizer-alarm_X.X.X_arm.ipk: | 78 | File korganizer-alarm_X.X.X_arm.ipk: |
79 | Contains KO/Pi calendar program and needed additional libs. | 79 | Contains KO/Pi calendar program and needed additional libs. |
80 | 80 | ||
81 | File kopiemail_X.X.X_arm.ipk: | 81 | File kopiemail_X.X.X_arm.ipk: |
82 | Contains OM/Pi email program and needed additional libs. | 82 | Contains OM/Pi email program and needed additional libs. |
83 | You need external lib openssl to run OM/Pi. | ||
83 | 84 | ||
84 | File pwmanager_X.X.X_arm.ipk: | 85 | File pwmanager_X.X.X_arm.ipk: |
85 | Contains PwM/Pi password manager program. | 86 | Contains PwM/Pi password manager program. |
86 | 87 | ||
87 | File ksharpPIM-DTMaccess_X.X.X_arm.ipk: | 88 | File ksharpPIM-DTMaccess_X.X.X_arm.ipk: |
88 | Contains needed program/lib to sync KA/Pi and KO/Pi | 89 | Contains needed program/lib to sync KA/Pi and KO/Pi |
89 | with the Sharp PIM applications on the Zaurus, | 90 | with the Sharp PIM applications on the Zaurus, |
90 | which use the new Sharp DMT Pim format. | 91 | which use the new Sharp DMT Pim format. |
91 | 92 | ||
92 | File korganizer-alarm_X.X.X_arm.ipk: | 93 | File korganizer-alarm_X.X.X_arm.ipk: |
93 | Provides an alarm applet to get informed about alarms. | 94 | Provides an alarm applet to get informed about alarms. |
94 | The Zaurus will wake up from suspend | 95 | The Zaurus will wake up from suspend |
95 | if an event triggers an alarm. | 96 | if an event triggers an alarm. |
96 | 97 | ||
97 | File kmobilephoneaccess_X.X.X_arm.ipk: | 98 | File kmobilephoneaccess_X.X.X_arm.ipk: |
98 | Contains a command line tool for accessing mobile phones. | 99 | Contains a command line tool for accessing mobile phones. |
99 | It is used from Kx/Pi to sync with / export to | 100 | It is used from Kx/Pi to sync with / export to |
100 | mobile phones. It is not working very well, please do not | 101 | mobile phones. It is not working very well, please do not |
101 | expect too much. | 102 | expect too much. |
102 | 103 | ||
103 | File pimTABicon_X.X.X_arm.ipk: | 104 | File pimTABicon_X.X.X_arm.ipk: |
104 | If you insatll a program of the package, you may get | 105 | If you insatll a program of the package, you may get |
105 | a new TAB wchich is called Pim. | 106 | a new TAB wchich is called Pim. |
106 | If you did not have had this TAB on your Z, that | 107 | If you did not have had this TAB on your Z, that |
107 | TAB will not display an icon. | 108 | TAB will not display an icon. |
108 | Install this small package to assihn an icon to | 109 | Install this small package to assihn an icon to |
109 | the new Pim TAB. | 110 | the new Pim TAB. |
110 | 111 | ||
111 | 112 | ||
112 | Unzip package and install the apps in the usual way. | 113 | Unzip package and install the apps in the usual way. |
114 | You need external lib openssl to run OM/Pi. | ||
113 | 115 | ||
114 | To get the character conversion in OM/Pi working, please download | 116 | To get the character conversion in OM/Pi working, please download |
115 | at the sourceforge project site the package | 117 | at the sourceforge project site the package |
116 | sr-character-conversion_SharpROM_arm.ipk.zip | 118 | sr-character-conversion_SharpROM_arm.ipk.zip |
117 | from the section "general files for KDE/Pim" | 119 | from the section "general files for KDE/Pim" |
118 | Instructions how to install this package are in a ReadMe in this file. | 120 | Instructions how to install this package are in a ReadMe in this file. |
119 | 121 | ||
120 | ***************************************************** | 122 | ***************************************************** |
121 | 3) OpenZaurus ROM, gcc 3.xx compiled | 123 | 3) OpenZaurus ROM, gcc 3.xx compiled |
122 | ***************************************************** | 124 | ***************************************************** |
123 | Filename: kdepim_X.X.X_for_OZ-gcc3xx.ipk.zip | 125 | Filename: kdepim_X.X.X_for_OZ-gcc3xx.ipk.zip |
124 | Package contains: | 126 | Package contains: |
125 | kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk | 127 | kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk |
126 | kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk | 128 | kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk |
127 | kopiemail_OZ-gcc3xx_X.X.X_arm.ipk | 129 | kopiemail_OZ-gcc3xx_X.X.X_arm.ipk |
128 | korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk | 130 | korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk |
129 | korganizer_OZ-gcc3xx_X.X.X_arm.ipk | 131 | korganizer_OZ-gcc3xx_X.X.X_arm.ipk |
130 | kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk | 132 | kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk |
131 | pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk | 133 | pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk |
132 | pwmanager_OZ-gcc3xx_X.X.X_arm.ipk | 134 | pwmanager_OZ-gcc3xx_X.X.X_arm.ipk |
133 | 135 | ||
134 | 136 | ||
135 | This package is for users of the Open Zaurus ROM 3.3.6, | 137 | This package is for users of the Open Zaurus ROM 3.3.6, |
136 | compiled by coredump (aka known as Hentges-Rom). | 138 | compiled by coredump (aka known as Hentges-Rom). |
137 | The programs may run on the new | 139 | The programs may run on the new |
138 | Open Zaurus Release 3.5.1 as well, but | 140 | Open Zaurus Release 3.5.1 as well, but |
139 | they cannot be installed there properly, | 141 | they cannot be installed there properly, |
140 | because the package manager of OZ needs more | 142 | because the package manager of OZ needs more |
141 | information in the ipk files to install them properly. | 143 | information in the ipk files to install them properly. |
142 | 144 | ||
143 | If you have Open Zaurus 3.5.1, you should use | 145 | If you have Open Zaurus 3.5.1, you should use |
144 | the packages of the OZ 3.5.1 feed, | 146 | the packages of the OZ 3.5.1 feed, |
145 | compiled and maintained by Hrw. | 147 | compiled and maintained by Hrw. |
146 | Do not ask the OZ people about problems with these | 148 | Do not ask the OZ people about problems with these |
147 | packages, they cannot help you. | 149 | packages, they cannot help you. |
148 | 150 | ||
149 | CONTENT: | 151 | CONTENT: |
150 | 152 | ||
151 | By the way, I cannot help you as well, because I | 153 | By the way, I cannot help you as well, because I |
152 | am not using OZ. | 154 | am not using OZ. |
153 | 155 | ||
154 | File kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk: | 156 | File kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk: |
155 | The libs in this file are needed to run | 157 | The libs in this file are needed to run |
156 | any of the included programs. | 158 | any of the included programs. |
157 | Install it. | 159 | Install it. |
158 | 160 | ||
159 | File kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk: | 161 | File kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk: |
160 | Contains KA/Pi addressbook program and needed additional libs. | 162 | Contains KA/Pi addressbook program and needed additional libs. |
161 | 163 | ||
162 | File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk: | 164 | File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk: |
163 | Contains KO/Pi calendar program and needed additional libs. | 165 | Contains KO/Pi calendar program and needed additional libs. |
164 | 166 | ||
165 | File kopiemail_OZ-gcc3xx_X.X.X_arm.ipk: | 167 | File kopiemail_OZ-gcc3xx_X.X.X_arm.ipk: |
166 | Contains OM/Pi email program and needed additional libs. | 168 | Contains OM/Pi email program and needed additional libs. |
169 | You need external lib openssl to run OM/Pi. | ||
167 | 170 | ||
168 | File pwmanager_OZ-gcc3xx_X.X.X_arm.ipk: | 171 | File pwmanager_OZ-gcc3xx_X.X.X_arm.ipk: |
169 | Contains PwM/Pi password manager program. | 172 | Contains PwM/Pi password manager program. |
170 | 173 | ||
171 | File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk: | 174 | File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk: |
172 | Provides an alarm applet to get informed about alarms. | 175 | Provides an alarm applet to get informed about alarms. |
173 | The Zaurus will wake up from suspend | 176 | The Zaurus will wake up from suspend |
174 | if an event triggers an alarm. | 177 | if an event triggers an alarm. |
175 | 178 | ||
176 | File kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk: | 179 | File kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk: |
177 | Contains a command line tool for accessing mobile phones. | 180 | Contains a command line tool for accessing mobile phones. |
178 | It is used from Kx/Pi to sync with / export to | 181 | It is used from Kx/Pi to sync with / export to |
179 | mobile phones. It is not working very well, please do not | 182 | mobile phones. It is not working very well, please do not |
180 | expect too much. | 183 | expect too much. |
181 | 184 | ||
182 | File pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk: | 185 | File pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk: |
183 | If you insatll a program of the package, you may get | 186 | If you insatll a program of the package, you may get |
184 | a new TAB wchich is called Pim. | 187 | a new TAB wchich is called Pim. |
185 | If you did not have had this TAB on your Z, that | 188 | If you did not have had this TAB on your Z, that |
186 | TAB will not display an icon. | 189 | TAB will not display an icon. |
187 | Install this small package to assihn an icon to | 190 | Install this small package to assihn an icon to |
188 | the new Pim TAB. | 191 | the new Pim TAB. |
189 | 192 | ||
190 | Unzip package and install the apps in the usual way. | 193 | Unzip package and install the apps in the usual way. |
194 | You need external lib openssl to run OM/Pi. | ||
191 | 195 | ||
192 | To get the character conversion in OM/Pi working, please download | 196 | To get the character conversion in OM/Pi working, please download |
193 | at the sourceforge project site the package | 197 | at the sourceforge project site the package |
194 | oz-character-conversion_OZ-gcc3xx_arm.ipk.zip | 198 | oz-character-conversion_OZ-gcc3xx_arm.ipk.zip |
195 | from the section "general files for KDE/Pim" | 199 | from the section "general files for KDE/Pim" |
196 | Instructions how to install this package are in a ReadMe in this file. | 200 | Instructions how to install this package are in a ReadMe in this file. |
197 | 201 | ||
198 | 202 | ||
199 | ***************************************************** | 203 | ***************************************************** |
200 | 4) Linux Desktop (SuSE 9.2) | 204 | 4) Linux Desktop (SuSE 9.2) |
201 | ***************************************************** | 205 | ***************************************************** |
202 | Filename: KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm | 206 | Filename: KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm |
203 | Package contains: | 207 | Package contains: |
204 | KAddessbook/Pi | 208 | KAddessbook/Pi |
205 | KOrganizer/Pi | 209 | KOrganizer/Pi |
206 | PasswordManager/Pi | 210 | PasswordManager/Pi |
207 | KPhone/Pi | 211 | KPhone/Pi |
208 | KTimeTracker/Pi | 212 | KTimeTracker/Pi |
209 | KOPieMail/Pi | 213 | KOPieMail/Pi |
210 | and the needed microkde libs. | 214 | and the needed microkde libs. |
211 | 215 | ||
212 | Download file and install it on console with | 216 | Download file and install it on console with |
213 | su | 217 | su |
214 | rpm -ihv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm | 218 | rpm -ihv KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm |
215 | Note: | 219 | Note: |
216 | If you want to update, please do it with | 220 | If you want to update, please do it with |
217 | rpm -Uhv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm | 221 | rpm -Uhv KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm |
218 | (Uninstall with rpm -e KDE-Pim-Pi-2.0.8-SuSE_9.2) | 222 | (Uninstall with rpm -e KDE-Pim-Pi-2.1.2-SuSE_9.2) |
219 | 223 | ||
220 | Here is the information, | 224 | Here is the information, |
221 | provided in the rpm file about the content: | 225 | provided in the rpm file about the content: |
222 | 226 | ||
223 | This package contains the platform-independent PIM programs from | 227 | This package contains the platform-independent PIM programs from |
224 | www.pi-sync.info, compiled for SuSE 9.2: | 228 | www.pi-sync.info, compiled for SuSE 9.2: |
225 | KTimeTacker/Pi | 229 | KTimeTacker/Pi |
226 | KPhone/Pi | 230 | KPhone/Pi |
227 | KAddressbook/Pi | 231 | KAddressbook/Pi |
228 | KOrganizer/Pi | 232 | KOrganizer/Pi |
229 | PasswordManager/Pi | 233 | PasswordManager/Pi |
230 | KOPieMail/Pi | 234 | KOPieMail/Pi |
231 | 235 | ||
232 | These applications do not need anything from the KDE-desktop | 236 | These applications do not need anything from the KDE-desktop |
233 | at all to run on Linux. However, there is a dependency from | 237 | at all to run on Linux. However, there is a dependency from |
234 | two KDE libs, because a small command line program is included | 238 | two KDE libs, because a small command line program is included |
235 | to make it possible to sync with the KDE-desktop applications. | 239 | to make it possible to sync with the KDE-desktop applications. |
236 | 240 | ||
237 | These applications are independent from the KDE-desktop | 241 | These applications are independent from the KDE-desktop |
238 | environment. That means, nothing of your existing | 242 | environment. That means, nothing of your existing |
239 | KDE-desktop setup will be changed, or any data | 243 | KDE-desktop setup will be changed, or any data |
240 | (calendar-addressbook) used by the KDE-desktop | 244 | (calendar-addressbook) used by the KDE-desktop |
241 | applications will be changed or accessed. | 245 | applications will be changed or accessed. |
242 | These applications stores their data and config in | 246 | These applications stores their data and config in |
243 | $HOME/kdepim/ | 247 | $HOME/kdepim/ |
244 | However, because the same file format is used, | 248 | However, because the same file format is used, |
245 | an easy exchange of data with the KDE-desktop | 249 | an easy exchange of data with the KDE-desktop |
246 | is possible. | 250 | is possible. |
247 | A small command line program is included | 251 | A small command line program is included |
248 | to make it possible to sync with the KDE-desktop applications. | 252 | to make it possible to sync with the KDE-desktop applications. |
249 | You do not need to call this program from the commandline, | 253 | You do not need to call this program from the commandline, |
250 | it is called from the KDE-Pim/Pi apps when you choose there: | 254 | it is called from the KDE-Pim/Pi apps when you choose there: |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 7fa92bf..5693112 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -464,65 +464,65 @@ | |||
464 | { "Use light color for highlight current day","Helle Farbe für >>heute<< Hervorhebung" }, | 464 | { "Use light color for highlight current day","Helle Farbe für >>heute<< Hervorhebung" }, |
465 | { "Highlight selection in Time Edit","Hebe Auswahl in Zeit Edit hervor" }, | 465 | { "Highlight selection in Time Edit","Hebe Auswahl in Zeit Edit hervor" }, |
466 | { "Hold fullscreen on view change","Behalte Vollbild bei Ansichswechsel" }, | 466 | { "Hold fullscreen on view change","Behalte Vollbild bei Ansichswechsel" }, |
467 | { "Hold non-fullscreen on view change","Behalte Nicht-Vollbild bei Ansichtsw." }, | 467 | { "Hold non-fullscreen on view change","Behalte Nicht-Vollbild bei Ansichtsw." }, |
468 | { "Event list view uses full window","Listenansicht nutzt Vollbild" }, | 468 | { "Event list view uses full window","Listenansicht nutzt Vollbild" }, |
469 | { "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" }, | 469 | { "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" }, |
470 | { "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" }, | 470 | { "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" }, |
471 | { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" }, | 471 | { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" }, |
472 | { "ViewChange","Ansichtswechsel" }, | 472 | { "ViewChange","Ansichtswechsel" }, |
473 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, | 473 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, |
474 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, | 474 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, |
475 | { "File","Datei" }, | 475 | { "File","Datei" }, |
476 | { "Clone...","Dupliziere.." }, | 476 | { "Clone...","Dupliziere.." }, |
477 | { "Move...","Bewege..." }, | 477 | { "Move...","Bewege..." }, |
478 | { "Beam...","Sende via IR..." }, | 478 | { "Beam...","Sende via IR..." }, |
479 | { "&Clone...","Dupliziere.." }, | 479 | { "&Clone...","Dupliziere.." }, |
480 | { "&Move...","Bewege..." }, | 480 | { "&Move...","Bewege..." }, |
481 | { "&Beam...","Sende via IR..." }, | 481 | { "&Beam...","Sende via IR..." }, |
482 | { "Show Completed","Zeige erledigte Todos" }, | 482 | { "Show Completed","Zeige erledigte Todos" }, |
483 | { "Show Quick Todo","Zeige Quick Todo" }, | 483 | { "Show Quick Todo","Zeige Quick Todo" }, |
484 | { "Unparent Todo","Un-sub Todo" }, | 484 | { "Unparent Todo","Un-sub Todo" }, |
485 | { "Save selected to file...","Speichere Selektierte..." }, | 485 | { "Save selected to file...","Speichere Selektierte..." }, |
486 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, | 486 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, |
487 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, | 487 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, |
488 | { "Beam selected via IR","Sende Selekt. via IR..." }, | 488 | { "Beam selected via IR","Sende Selekt. via IR..." }, |
489 | { "Search","Suchen" }, | 489 | { "Search","Suchen" }, |
490 | { "Date Picker","Datum auswählen" }, | 490 | { "Date Picker","Datum auswählen" }, |
491 | { "Day View","Tagesansicht" }, | 491 | { "Day View","Tagesansicht" }, |
492 | { "Work Week","Arbeitswoche" }, | 492 | { "Work Week","Arbeitswoche" }, |
493 | { "Week","Wochenansicht" }, | 493 | { "Week","Wochenansicht" }, |
494 | { "Month","Monatsansicht" }, | 494 | { "Month","Monatsansicht" }, |
495 | { "Todo View","Todo Liste" }, | 495 | { "Todo View","Todo Liste" }, |
496 | { "Journal","Journal Ansicht" }, | 496 | { "Journal","Journal" }, |
497 | { "Next days","Nächste Tage" }, | 497 | { "Next days","Nächste Tage" }, |
498 | { "Print agenda selection...","Drucke Agendaselektion..." }, | 498 | { "Print agenda selection...","Drucke Agendaselektion..." }, |
499 | { "Toggle DateNavigator","Navigator umschalten" }, | 499 | { "Toggle DateNavigator","Navigator umschalten" }, |
500 | { "Toggle FilterView","Filteransicht umschalten" }, | 500 | { "Toggle FilterView","Filteransicht umschalten" }, |
501 | { "Prev. month","Vorheriger Monat" }, | 501 | { "Prev. month","Vorheriger Monat" }, |
502 | { "Go backward","Gehe zurück" }, | 502 | { "Go backward","Gehe zurück" }, |
503 | { "Go forward","Gehe weiter" }, | 503 | { "Go forward","Gehe weiter" }, |
504 | { "Synchronize","Synchronisieren" }, | 504 | { "Synchronize","Synchronisieren" }, |
505 | { "AgendaSize","Agendagröße" }, | 505 | { "AgendaSize","Agendagröße" }, |
506 | { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" }, | 506 | { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" }, |
507 | { "Import last file","Importiere letzte Datei" }, | 507 | { "Import last file","Importiere letzte Datei" }, |
508 | { "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." }, | 508 | { "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." }, |
509 | { "Load Calendar Backup","Lade Kalender Backup" }, | 509 | { "Load Calendar Backup","Lade Kalender Backup" }, |
510 | { "Save Calendar Backup","Speichere Kalender Backup" }, | 510 | { "Save Calendar Backup","Speichere Kalender Backup" }, |
511 | { "Export VCalendar","Exportiere VCalendar" }, | 511 | { "Export VCalendar","Exportiere VCalendar" }, |
512 | { "Manage new categories...","Verwalte neue Kategorien..." }, | 512 | { "Manage new categories...","Verwalte neue Kategorien..." }, |
513 | { "Beam complete calendar...","Sende kompletten Kalender via IR" }, | 513 | { "Beam complete calendar...","Sende kompletten Kalender via IR" }, |
514 | { "Beam filtered calendar...","Sende gefilterten Kalender via IR" }, | 514 | { "Beam filtered calendar...","Sende gefilterten Kalender via IR" }, |
515 | { "Remote via ssh","Über Netzwerk via ssh" }, | 515 | { "Remote via ssh","Über Netzwerk via ssh" }, |
516 | { "With local file","Mit lokaler Datei" }, | 516 | { "With local file","Mit lokaler Datei" }, |
517 | { "With last file","Mit letzter Datei" }, | 517 | { "With last file","Mit letzter Datei" }, |
518 | { "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" }, | 518 | { "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" }, |
519 | { "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" }, | 519 | { "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" }, |
520 | { "Save filename","Speichern: Dateinamen wählen" }, | 520 | { "Save filename","Speichern: Dateinamen wählen" }, |
521 | { "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" }, | 521 | { "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" }, |
522 | { "KO/Pi: Warning!","KO/Pi: Warnung!" }, | 522 | { "KO/Pi: Warning!","KO/Pi: Warnung!" }, |
523 | { "Overwrite!","Überschreibe!" }, | 523 | { "Overwrite!","Überschreibe!" }, |
524 | { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" }, | 524 | { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" }, |
525 | { "All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n","Alle selektierten Einträge werden\nunwiederbringlich gelöscht.\n(Löschen kann auf dem\nPDA einige Zeit dauern)\n" }, | 525 | { "All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n","Alle selektierten Einträge werden\nunwiederbringlich gelöscht.\n(Löschen kann auf dem\nPDA einige Zeit dauern)\n" }, |
526 | { "KO/Pi Confirmation","KO/Pi Bestätigung" }, | 526 | { "KO/Pi Confirmation","KO/Pi Bestätigung" }, |
527 | { "Close dialog to abort deletion!","Schließe Dialog um das Löschen abzubrechen!" }, | 527 | { "Close dialog to abort deletion!","Schließe Dialog um das Löschen abzubrechen!" }, |
528 | { "Deleting item %d ...","Lösche Eintrag %d ..." }, | 528 | { "Deleting item %d ...","Lösche Eintrag %d ..." }, |
@@ -1298,63 +1298,63 @@ | |||
1298 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, | 1298 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, |
1299 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, | 1299 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, |
1300 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, | 1300 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, |
1301 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, | 1301 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, |
1302 | { "%1 days\n","%1 Tagen\n" }, | 1302 | { "%1 days\n","%1 Tagen\n" }, |
1303 | { "1 day\n","1 Tag\n" }, | 1303 | { "1 day\n","1 Tag\n" }, |
1304 | { "%1 hours\n","%1 Stunden\n" }, | 1304 | { "%1 hours\n","%1 Stunden\n" }, |
1305 | { "1 hour\n","1 Stunde\n" }, | 1305 | { "1 hour\n","1 Stunde\n" }, |
1306 | { "%1 minutes\n","%1 Minuten\n" }, | 1306 | { "%1 minutes\n","%1 Minuten\n" }, |
1307 | { "1 minute\n","1 Minute\n" }, | 1307 | { "1 minute\n","1 Minute\n" }, |
1308 | { "Only one toolbar","Nur eine Toolbar" }, | 1308 | { "Only one toolbar","Nur eine Toolbar" }, |
1309 | { "Print","Drucke" }, | 1309 | { "Print","Drucke" }, |
1310 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, | 1310 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, |
1311 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, | 1311 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, |
1312 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, | 1312 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, |
1313 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, | 1313 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, |
1314 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, | 1314 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, |
1315 | { "KO/Pi Printout","KO/Pi Ausdruck" }, | 1315 | { "KO/Pi Printout","KO/Pi Ausdruck" }, |
1316 | { "Print unscaled","Drucke unskaliert" }, | 1316 | { "Print unscaled","Drucke unskaliert" }, |
1317 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, | 1317 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, |
1318 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, | 1318 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, |
1319 | { "Printout Mode","Druck Modus" }, | 1319 | { "Printout Mode","Druck Modus" }, |
1320 | { "Filter menu icon","Filtermenu Icon" }, | 1320 | { "Filter menu icon","Filtermenu Icon" }, |
1321 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, | 1321 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, |
1322 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, | 1322 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, |
1323 | { "%1d","%1t" }, | 1323 | { "%1d","%1t" }, |
1324 | { "%1h","%1std" }, | 1324 | { "%1h","%1std" }, |
1325 | { "%1min","%1min" }, | 1325 | { "%1min","%1min" }, |
1326 | { "( %1 before )","( %1 vorher )" }, | 1326 | { "( %1 before )","( %1 vorher )" }, |
1327 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, | 1327 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, |
1328 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, | 1328 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, |
1329 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, | 1329 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, |
1330 | { "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" }, | 1330 | { "Show Sync Events","Zeige Sync-Ereignisse" }, |
1331 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, | 1331 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, |
1332 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, | 1332 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, |
1333 | { " on "," am " }, | 1333 | { " on "," am " }, |
1334 | { "On: ","Am: " }, | 1334 | { "On: ","Am: " }, |
1335 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, | 1335 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, |
1336 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, | 1336 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, |
1337 | { "Color for running todos:","Farbe für laufende Todos:" }, | 1337 | { "Color for running todos:","Farbe für laufende Todos:" }, |
1338 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, | 1338 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, |
1339 | { "Todo is started","Todo is gestarted" }, | 1339 | { "Todo is started","Todo is gestarted" }, |
1340 | { "Stop todo","Stoppe Todo" }, | 1340 | { "Stop todo","Stoppe Todo" }, |
1341 | { "Todo is stopped","Todo ist gestoppt" }, | 1341 | { "Todo is stopped","Todo ist gestoppt" }, |
1342 | { "Start todo","Starte Todo" }, | 1342 | { "Start todo","Starte Todo" }, |
1343 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, | 1343 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, |
1344 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, | 1344 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, |
1345 | { "Todo has subtodos","Todo hat Untertodos" }, | 1345 | { "Todo has subtodos","Todo hat Untertodos" }, |
1346 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, | 1346 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, |
1347 | { "Colors","Farben" }, | 1347 | { "Colors","Farben" }, |
1348 | { "Click on new parent item","Klicke auf neues Übertodo" }, | 1348 | { "Click on new parent item","Klicke auf neues Übertodo" }, |
1349 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, | 1349 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, |
1350 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, | 1350 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, |
1351 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, | 1351 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, |
1352 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, | 1352 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, |
1353 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | 1353 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
1354 | { "times","Zeiten" }, | 1354 | { "times","Zeiten" }, |
1355 | { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" }, | 1355 | { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" }, |
1356 | { "","" }, | 1356 | { "","" }, |
1357 | { "","" }, | 1357 | { "","" }, |
1358 | { "","" }, | 1358 | { "","" }, |
1359 | { "","" }, | 1359 | { "","" }, |
1360 | { "","" }, | 1360 | { "","" }, |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 17a1d13..df606d0 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -337,86 +337,91 @@ void KODayMatrix::updateView() | |||
337 | { | 337 | { |
338 | updateView(startdate); | 338 | updateView(startdate); |
339 | } | 339 | } |
340 | void KODayMatrix::repaintViewTimed() | 340 | void KODayMatrix::repaintViewTimed() |
341 | { | 341 | { |
342 | mRedrawNeeded = true; | 342 | mRedrawNeeded = true; |
343 | // bDays.fill( false); | 343 | // bDays.fill( false); |
344 | //pDays.fill( false); | 344 | //pDays.fill( false); |
345 | //hDays.fill( false); | 345 | //hDays.fill( false); |
346 | //eDays.fill( false); | 346 | //eDays.fill( false); |
347 | mRepaintTimer->stop(); | 347 | mRepaintTimer->stop(); |
348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
349 | int i; | 349 | int i; |
350 | for(i = 0; i < NUMDAYS; i++) { | 350 | for(i = 0; i < NUMDAYS; i++) { |
351 | if ( ( (i+startDay) % 7 == 0 ) ) { | 351 | if ( ( (i+startDay) % 7 == 0 ) ) { |
352 | pDays.setBit(i); | 352 | pDays.setBit(i); |
353 | } | 353 | } |
354 | } | 354 | } |
355 | repaint(false); | 355 | repaint(false); |
356 | } | 356 | } |
357 | void KODayMatrix::computeEvent(Event *event, int i ) | 357 | void KODayMatrix::computeEvent(Event *event, int i ) |
358 | { | 358 | { |
359 | QString holiStr = mHolidays[i]; | 359 | QString holiStr = mHolidays[i]; |
360 | if ( event->isHoliday()) { | 360 | if ( event->isHoliday()) { |
361 | pDays.setBit(i); | 361 | pDays.setBit(i); |
362 | hDays.setBit(i); | 362 | hDays.setBit(i); |
363 | if ( !holiStr.isEmpty() ) | 363 | if ( !holiStr.isEmpty() ) |
364 | holiStr += "\n"; | 364 | holiStr += "\n"; |
365 | holiStr += event->summary(); | 365 | holiStr += event->summary(); |
366 | if ( !event->location().isEmpty() ) | 366 | if ( !event->location().isEmpty() ) |
367 | holiStr += " (" + event->location() + ")"; | 367 | holiStr += " (" + event->location() + ")"; |
368 | mHolidays[i] =holiStr ; | 368 | mHolidays[i] =holiStr ; |
369 | eDays.setBit(i); | ||
369 | } | 370 | } |
371 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) { | ||
370 | if ( event->isBirthday()) { | 372 | if ( event->isBirthday()) { |
371 | pDays.setBit(i); | 373 | pDays.setBit(i); |
372 | if ( !holiStr.isEmpty() ) | 374 | if ( !holiStr.isEmpty() ) |
373 | holiStr += "\n"; | 375 | holiStr += "\n"; |
374 | holiStr += i18n("Birthday") + ": "+event->summary(); | 376 | holiStr += i18n("Birthday") + ": "+event->summary(); |
375 | if ( !event->location().isEmpty() ) | 377 | if ( !event->location().isEmpty() ) |
376 | holiStr += " (" + event->location() + ")"; | 378 | holiStr += " (" + event->location() + ")"; |
377 | bDays.setBit(i); | 379 | bDays.setBit(i); |
378 | mHolidays[i] =holiStr ; | 380 | mHolidays[i] =holiStr ; |
379 | } | 381 | } |
382 | } | ||
383 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) | ||
380 | eDays.setBit(i); | 384 | eDays.setBit(i); |
381 | } | 385 | } |
382 | void KODayMatrix::updateViewTimed() | 386 | void KODayMatrix::updateViewTimed() |
383 | { | 387 | { |
384 | mUpdateTimer->stop(); | 388 | mUpdateTimer->stop(); |
385 | if ( !mCalendar ) { | 389 | if ( !mCalendar ) { |
386 | qDebug("NOT CAL "); | 390 | qDebug("NOT CAL "); |
387 | return; | 391 | return; |
388 | } | 392 | } |
389 | #if 1 | 393 | #if 1 |
390 | 394 | ||
395 | |||
391 | int i; | 396 | int i; |
392 | int timeSpan = NUMDAYS-1; | 397 | int timeSpan = NUMDAYS-1; |
393 | QPtrList<Event> events = mCalendar->events(); | 398 | QPtrList<Event> events = mCalendar->events(); |
394 | Event *event; | 399 | Event *event; |
395 | QDateTime dt; | 400 | QDateTime dt; |
396 | bool ok; | 401 | bool ok; |
397 | bDays.fill( false); | 402 | bDays.fill( false); |
398 | pDays.fill( false); | 403 | pDays.fill( false); |
399 | hDays.fill( false); | 404 | hDays.fill( false); |
400 | eDays.fill( false); | 405 | eDays.fill( false); |
401 | mHolidays.clear(); | 406 | mHolidays.clear(); |
402 | QDate mStartDate = days[0]; | 407 | QDate mStartDate = days[0]; |
403 | QDate endDate = mStartDate.addDays( timeSpan ); | 408 | QDate endDate = mStartDate.addDays( timeSpan ); |
404 | for( event = events.first(); event; event = events.next() ) { // for event | 409 | for( event = events.first(); event; event = events.next() ) { // for event |
405 | ushort recurType = event->recurrence()->doesRecur(); | 410 | ushort recurType = event->recurrence()->doesRecur(); |
406 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 411 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
407 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 412 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
408 | continue; | 413 | continue; |
409 | } | 414 | } |
410 | if ( event->doesRecur() ) { | 415 | if ( event->doesRecur() ) { |
411 | bool last; | 416 | bool last; |
412 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | 417 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); |
413 | QDateTime incidenceEnd; | 418 | QDateTime incidenceEnd; |
414 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 419 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
415 | bool invalid = false; | 420 | bool invalid = false; |
416 | while( true ) { | 421 | while( true ) { |
417 | if ( incidenceStart.isValid() ) { | 422 | if ( incidenceStart.isValid() ) { |
418 | incidenceEnd = incidenceStart.addDays( eventlen ); | 423 | incidenceEnd = incidenceStart.addDays( eventlen ); |
419 | int st = incidenceStart.date().daysTo( endDate ); | 424 | int st = incidenceStart.date().daysTo( endDate ); |
420 | if ( st >= 0 ) { // start before timeend | 425 | if ( st >= 0 ) { // start before timeend |
421 | int end = mStartDate.daysTo( incidenceEnd.date() ); | 426 | int end = mStartDate.daysTo( incidenceEnd.date() ); |
422 | if ( end >= 0 ) { // end after timestart --- got one! | 427 | if ( end >= 0 ) { // end after timestart --- got one! |
@@ -440,132 +445,164 @@ void KODayMatrix::updateViewTimed() | |||
440 | } | 445 | } |
441 | if ( last ) | 446 | if ( last ) |
442 | break; | 447 | break; |
443 | bool ok; | 448 | bool ok; |
444 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 449 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
445 | if ( ! ok ) | 450 | if ( ! ok ) |
446 | break; | 451 | break; |
447 | if ( incidenceStart.date() > endDate ) | 452 | if ( incidenceStart.date() > endDate ) |
448 | break; | 453 | break; |
449 | } | 454 | } |
450 | } else { // no recur | 455 | } else { // no recur |
451 | int st = event->dtStart().date().daysTo( endDate ); | 456 | int st = event->dtStart().date().daysTo( endDate ); |
452 | if ( st >= 0 ) { // start before timeend | 457 | if ( st >= 0 ) { // start before timeend |
453 | int end = mStartDate.daysTo( event->dtEnd().date() ); | 458 | int end = mStartDate.daysTo( event->dtEnd().date() ); |
454 | if ( end >= 0 ) { // end after timestart --- got one! | 459 | if ( end >= 0 ) { // end after timestart --- got one! |
455 | //normalize | 460 | //normalize |
456 | st = timeSpan - st; | 461 | st = timeSpan - st; |
457 | if ( st < 0 ) st = 0; | 462 | if ( st < 0 ) st = 0; |
458 | if ( end > timeSpan ) end = timeSpan; | 463 | if ( end > timeSpan ) end = timeSpan; |
459 | int iii; | 464 | int iii; |
460 | for ( iii = st;iii<= end;++iii) | 465 | for ( iii = st;iii<= end;++iii) |
461 | computeEvent( event, iii ); | 466 | computeEvent( event, iii ); |
462 | } | 467 | } |
463 | } | 468 | } |
464 | } | 469 | } |
465 | } | 470 | } |
466 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 471 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
467 | for(i = 0; i < NUMDAYS; i++) { | 472 | for(i = 0; i < NUMDAYS; i++) { |
468 | if ( ( (i+startDay) % 7 == 0 ) ) { | 473 | if ( ( (i+startDay) % 7 == 0 ) ) { |
469 | pDays.setBit(i); | 474 | pDays.setBit(i); |
470 | } | 475 | } |
471 | } | 476 | } |
472 | 477 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | |
473 | #if 0 | 478 | bDays.fill( false); |
474 | // insert due todos | 479 | // insert due todos |
475 | QPtrList<Todo> todos = calendar()->todos( ); | 480 | QPtrList<Todo> todos = mCalendar->todos( ); |
476 | Todo *todo; | 481 | Todo *todo; |
477 | for(todo = todos.first(); todo; todo = todos.next()) { | 482 | for(todo = todos.first(); todo; todo = todos.next()) { |
478 | //insertTodo( todo ); | 483 | //insertTodo( todo ); |
479 | if ( todo->hasDueDate() ) { | 484 | if ( todo->hasDueDate() ) { |
480 | int day = mStartDate.daysTo( todo->dtDue().date() ); | 485 | int day = mStartDate.daysTo( todo->dtDue().date() ); |
481 | if ( day >= 0 && day < timeSpan + 1) { | 486 | if ( day >= 0 && day < timeSpan + 1) { |
482 | (*cells)[day]->insertTodo( todo ); | 487 | int i = day; |
488 | QString holiStr = mHolidays[i]; | ||
489 | pDays.setBit(i); | ||
490 | if ( !holiStr.isEmpty() ) | ||
491 | holiStr += "\n"; | ||
492 | holiStr += i18n("Todo") + ": "+todo->summary(); | ||
493 | if ( !todo->location().isEmpty() ) | ||
494 | holiStr += " (" + todo->location() + ")"; | ||
495 | bDays.setBit(i); | ||
496 | mHolidays[i] =holiStr ; | ||
497 | eDays.setBit(i); | ||
483 | } | 498 | } |
484 | } | 499 | } |
485 | } | 500 | } |
486 | #endif | 501 | } |
502 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | ||
503 | bDays.fill( false); | ||
504 | // insert due todos | ||
505 | QPtrList<Journal> todos = mCalendar->journals( ); | ||
506 | Journal *todo; | ||
507 | for(todo = todos.first(); todo; todo = todos.next()) { | ||
508 | int day = mStartDate.daysTo( todo->dtStart().date() ); | ||
509 | if ( day >= 0 && day < timeSpan + 1) { | ||
510 | int i = day; | ||
511 | QString holiStr = mHolidays[i]; | ||
512 | pDays.setBit(i); | ||
513 | if ( !holiStr.isEmpty() ) | ||
514 | holiStr += "\n"; | ||
515 | holiStr += i18n("Journal"); | ||
516 | bDays.setBit(i); | ||
517 | mHolidays[i] =holiStr ; | ||
518 | eDays.setBit(i); | ||
487 | 519 | ||
520 | } | ||
521 | } | ||
522 | } | ||
488 | #else | 523 | #else |
489 | //qDebug("KODayMatrix::updateViewTimed "); | 524 | //qDebug("KODayMatrix::updateViewTimed "); |
490 | for(int i = 0; i < NUMDAYS; i++) { | 525 | for(int i = 0; i < NUMDAYS; i++) { |
491 | // if events are set for the day then remember to draw it bold | 526 | // if events are set for the day then remember to draw it bold |
492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 527 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
493 | Event *event; | 528 | Event *event; |
494 | int numEvents = eventlist.count(); | 529 | int numEvents = eventlist.count(); |
495 | QString holiStr = ""; | 530 | QString holiStr = ""; |
496 | bDays.clearBit(i); | 531 | bDays.clearBit(i); |
497 | hDays.clearBit(i); | 532 | hDays.clearBit(i); |
498 | eDays.clearBit(i); | 533 | eDays.clearBit(i); |
499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 534 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
500 | ushort recurType = event->recurrence()->doesRecur(); | 535 | ushort recurType = event->recurrence()->doesRecur(); |
501 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 536 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
502 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 537 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
503 | numEvents--; | 538 | numEvents--; |
504 | } | 539 | } |
505 | if ( event->isHoliday()) { | 540 | if ( event->isHoliday()) { |
506 | hDays.setBit(i); | 541 | hDays.setBit(i); |
507 | if ( !holiStr.isEmpty() ) | 542 | if ( !holiStr.isEmpty() ) |
508 | holiStr += "\n"; | 543 | holiStr += "\n"; |
509 | holiStr += event->summary(); | 544 | holiStr += event->summary(); |
510 | if ( !event->location().isEmpty() ) | 545 | if ( !event->location().isEmpty() ) |
511 | holiStr += " (" + event->location() + ")"; | 546 | holiStr += " (" + event->location() + ")"; |
512 | } | 547 | } |
513 | if ( event->isBirthday()) { | 548 | if ( event->isBirthday()) { |
514 | if ( !holiStr.isEmpty() ) | 549 | if ( !holiStr.isEmpty() ) |
515 | holiStr += "\n"; | 550 | holiStr += "\n"; |
516 | holiStr += i18n("Birthday") + ": "+event->summary(); | 551 | holiStr += i18n("Birthday") + ": "+event->summary(); |
517 | if ( !event->location().isEmpty() ) | 552 | if ( !event->location().isEmpty() ) |
518 | holiStr += " (" + event->location() + ")"; | 553 | holiStr += " (" + event->location() + ")"; |
519 | bDays.setBit(i); | 554 | bDays.setBit(i); |
520 | } | 555 | } |
521 | } | 556 | } |
522 | if ( numEvents ) | 557 | if ( numEvents ) |
523 | eDays.setBit(i); | 558 | eDays.setBit(i); |
524 | //if it is a holy day then draw it red. Sundays are consider holidays, too | 559 | //if it is a holy day then draw it red. Sundays are consider holidays, too |
525 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || | 560 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || |
526 | !holiStr.isEmpty()) { | 561 | !holiStr.isEmpty()) { |
527 | mHolidays[i] = holiStr; | 562 | mHolidays[i] = holiStr; |
528 | } else { | 563 | } else { |
529 | mHolidays[i] = QString::null; | 564 | mHolidays[i] = QString::null; |
530 | } | 565 | } |
531 | } | 566 | } |
532 | #endif | 567 | #endif |
533 | mRedrawNeeded = true; | 568 | mRedrawNeeded = true; |
534 | if ( ! mPendingUpdateBeforeRepaint ) | 569 | if ( ! mPendingUpdateBeforeRepaint ) |
535 | repaint(false); | 570 | repaint(false); |
536 | } | 571 | } |
537 | void KODayMatrix::updateView(QDate actdate) | 572 | void KODayMatrix::updateView(QDate actdate) |
538 | { | 573 | { |
539 | 574 | if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView ) | |
575 | mRedrawNeeded = true; | ||
576 | mLastView = KOPrefs::instance()->mCurrentDisplayedView; | ||
540 | if ( ! actdate.isValid() ) { | 577 | if ( ! actdate.isValid() ) { |
541 | //qDebug("date not valid "); | 578 | //qDebug("date not valid "); |
542 | return; | 579 | return; |
543 | } | 580 | } |
544 | mDayChanged = false; | 581 | mDayChanged = false; |
545 | //flag to indicate if the starting day of the matrix has changed by this call | 582 | //flag to indicate if the starting day of the matrix has changed by this call |
546 | //mDayChanged = false; | 583 | //mDayChanged = false; |
547 | // if a new startdate is to be set then apply Cornelius's calculation | 584 | // if a new startdate is to be set then apply Cornelius's calculation |
548 | // of the first day to be shown | 585 | // of the first day to be shown |
549 | if (actdate != startdate) { | 586 | if (actdate != startdate) { |
550 | // reset index of selection according to shift of starting date from startdate to actdate | 587 | // reset index of selection according to shift of starting date from startdate to actdate |
551 | if (mSelStart != NOSELECTION) { | 588 | if (mSelStart != NOSELECTION) { |
552 | int tmp = actdate.daysTo(startdate); | 589 | int tmp = actdate.daysTo(startdate); |
553 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; | 590 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; |
554 | // shift selection if new one would be visible at least partly ! | 591 | // shift selection if new one would be visible at least partly ! |
555 | 592 | ||
556 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { | 593 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { |
557 | // nested if is required for next X display pushed from a different month - correction required | 594 | // nested if is required for next X display pushed from a different month - correction required |
558 | // otherwise, for month forward and backward, it must be avoided | 595 | // otherwise, for month forward and backward, it must be avoided |
559 | if( mSelStart > NUMDAYS || mSelStart < 0 ) | 596 | if( mSelStart > NUMDAYS || mSelStart < 0 ) |
560 | mSelStart = mSelStart + tmp; | 597 | mSelStart = mSelStart + tmp; |
561 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) | 598 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) |
562 | mSelEnd = mSelEnd + tmp; | 599 | mSelEnd = mSelEnd + tmp; |
563 | } | 600 | } |
564 | } | 601 | } |
565 | startdate = actdate; | 602 | startdate = actdate; |
566 | mDayChanged = true; | 603 | mDayChanged = true; |
567 | recalculateToday(); | 604 | recalculateToday(); |
568 | mRedrawNeeded = true; | 605 | mRedrawNeeded = true; |
569 | } | 606 | } |
570 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); | 607 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); |
571 | if ( !isVisible() ) { | 608 | if ( !isVisible() ) { |
@@ -1023,67 +1060,67 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
1023 | p.setPen(mTodayPen); | 1060 | p.setPen(mTodayPen); |
1024 | 1061 | ||
1025 | 1062 | ||
1026 | int addCol = 0; | 1063 | int addCol = 0; |
1027 | int addRow = 0; | 1064 | int addRow = 0; |
1028 | if (rowModulo) { | 1065 | if (rowModulo) { |
1029 | if ( row >= 6 - rowModulo ) | 1066 | if ( row >= 6 - rowModulo ) |
1030 | addRow = row - 5 + rowModulo; | 1067 | addRow = row - 5 + rowModulo; |
1031 | } | 1068 | } |
1032 | if ( colModulo ) { | 1069 | if ( colModulo ) { |
1033 | if ( col >= 7 - colModulo ) | 1070 | if ( col >= 7 - colModulo ) |
1034 | addCol = col - 6 + colModulo-1; | 1071 | addCol = col - 6 + colModulo-1; |
1035 | } | 1072 | } |
1036 | 1073 | ||
1037 | addCol += 1; | 1074 | addCol += 1; |
1038 | if ( row == 0 ) | 1075 | if ( row == 0 ) |
1039 | addRow = 1; | 1076 | addRow = 1; |
1040 | p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1); | 1077 | p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1); |
1041 | p.setPen(tmppen); | 1078 | p.setPen(tmppen); |
1042 | } | 1079 | } |
1043 | 1080 | ||
1044 | // if any events are on that day then draw it using a bold font | 1081 | // if any events are on that day then draw it using a bold font |
1045 | if ( eDays.testBit(i) ) { | 1082 | if ( eDays.testBit(i) ) { |
1046 | QFont myFont = font(); | 1083 | QFont myFont = font(); |
1047 | myFont.setBold(true); | 1084 | myFont.setBold(true); |
1048 | p.setFont(myFont); | 1085 | p.setFont(myFont); |
1049 | } | 1086 | } |
1050 | 1087 | ||
1051 | // if it is a holiday then use the default holiday color | 1088 | // if it is a holiday then use the default holiday color |
1052 | if ( pDays.testBit(i)) { | 1089 | if ( pDays.testBit(i)) { |
1053 | if ( bDays.testBit(i) ) { | 1090 | if ( bDays.testBit(i) ) { |
1054 | if ( hDays.testBit(i) ) | 1091 | if ( hDays.testBit(i) ) |
1055 | p.setPen(QColor(Qt::green)); | 1092 | p.setPen(QColor(0,200,0)); |
1056 | else | 1093 | else |
1057 | p.setPen(QColor(Qt::green).dark()); | 1094 | p.setPen(QColor(Qt::blue)); |
1058 | } else { | 1095 | } else { |
1059 | if (actcol == mDefaultTextColor ) { | 1096 | if (actcol == mDefaultTextColor ) { |
1060 | p.setPen(KOPrefs::instance()->mHolidayColor); | 1097 | p.setPen(KOPrefs::instance()->mHolidayColor); |
1061 | } else { | 1098 | } else { |
1062 | p.setPen(mHolidayColorShaded); | 1099 | p.setPen(mHolidayColorShaded); |
1063 | } | 1100 | } |
1064 | } | 1101 | } |
1065 | } | 1102 | } |
1066 | 1103 | ||
1067 | // draw selected days with special color | 1104 | // draw selected days with special color |
1068 | // DO NOT specially highlight holidays in selection ! | 1105 | // DO NOT specially highlight holidays in selection ! |
1069 | if (i >= mSelStartT && i <= mSelEndT) { | 1106 | if (i >= mSelStartT && i <= mSelEndT) { |
1070 | ;//p.setPen(mSelectedDaysColor); | 1107 | ;//p.setPen(mSelectedDaysColor); |
1071 | } | 1108 | } |
1072 | 1109 | ||
1073 | int addCol = 0; | 1110 | int addCol = 0; |
1074 | int addRow = 0; | 1111 | int addRow = 0; |
1075 | if ( colModulo ) { | 1112 | if ( colModulo ) { |
1076 | if ( col >= 7 - colModulo ) | 1113 | if ( col >= 7 - colModulo ) |
1077 | addCol = col - 7 + colModulo; | 1114 | addCol = col - 7 + colModulo; |
1078 | } | 1115 | } |
1079 | if ( rowModulo ) { | 1116 | if ( rowModulo ) { |
1080 | if ( row >= 6 - rowModulo ) | 1117 | if ( row >= 6 - rowModulo ) |
1081 | addRow = row - 5 + rowModulo; | 1118 | addRow = row - 5 + rowModulo; |
1082 | } | 1119 | } |
1083 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); | 1120 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); |
1084 | ++addCol;//++addCol; | 1121 | ++addCol;//++addCol; |
1085 | if ( row == 0) | 1122 | if ( row == 0) |
1086 | addRow = 1; | 1123 | addRow = 1; |
1087 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, | 1124 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, |
1088 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); | 1125 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); |
1089 | 1126 | ||
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index b686bd7..a3216d6 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h | |||
@@ -198,64 +198,65 @@ signals: | |||
198 | * | 198 | * |
199 | * @param daylist list of days that have been selected by the user | 199 | * @param daylist list of days that have been selected by the user |
200 | */ | 200 | */ |
201 | void selected( const KCal::DateList &daylist ); | 201 | void selected( const KCal::DateList &daylist ); |
202 | 202 | ||
203 | /** emitted if the user has dropped an event inside the matrix | 203 | /** emitted if the user has dropped an event inside the matrix |
204 | * | 204 | * |
205 | * @param event the dropped calendar event | 205 | * @param event the dropped calendar event |
206 | */ | 206 | */ |
207 | void eventDropped(Event *event); | 207 | void eventDropped(Event *event); |
208 | 208 | ||
209 | protected: | 209 | protected: |
210 | 210 | ||
211 | void paintEvent(QPaintEvent *ev); | 211 | void paintEvent(QPaintEvent *ev); |
212 | 212 | ||
213 | void mousePressEvent (QMouseEvent* e); | 213 | void mousePressEvent (QMouseEvent* e); |
214 | 214 | ||
215 | void mouseReleaseEvent (QMouseEvent* e); | 215 | void mouseReleaseEvent (QMouseEvent* e); |
216 | 216 | ||
217 | void mouseMoveEvent (QMouseEvent* e); | 217 | void mouseMoveEvent (QMouseEvent* e); |
218 | 218 | ||
219 | void dragEnterEvent(QDragEnterEvent *); | 219 | void dragEnterEvent(QDragEnterEvent *); |
220 | 220 | ||
221 | void dragMoveEvent(QDragMoveEvent *); | 221 | void dragMoveEvent(QDragMoveEvent *); |
222 | 222 | ||
223 | void dragLeaveEvent(QDragLeaveEvent *); | 223 | void dragLeaveEvent(QDragLeaveEvent *); |
224 | 224 | ||
225 | void dropEvent(QDropEvent *); | 225 | void dropEvent(QDropEvent *); |
226 | 226 | ||
227 | void resizeEvent(QResizeEvent *); | 227 | void resizeEvent(QResizeEvent *); |
228 | 228 | ||
229 | private: | 229 | private: |
230 | int mLastView; | ||
230 | void computeEvent(Event *even, int dayindex ); | 231 | void computeEvent(Event *even, int dayindex ); |
231 | int oldW, oldH; | 232 | int oldW, oldH; |
232 | bool mRedrawNeeded; | 233 | bool mRedrawNeeded; |
233 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; | 234 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; |
234 | bool mouseDown; | 235 | bool mouseDown; |
235 | QBitArray bDays; | 236 | QBitArray bDays; |
236 | QBitArray hDays; | 237 | QBitArray hDays; |
237 | QBitArray eDays; | 238 | QBitArray eDays; |
238 | QBitArray pDays; | 239 | QBitArray pDays; |
239 | QPixmap myPix; | 240 | QPixmap myPix; |
240 | QTimer* mUpdateTimer; | 241 | QTimer* mUpdateTimer; |
241 | QTimer* mRepaintTimer; | 242 | QTimer* mRepaintTimer; |
242 | bool mDayChanged; | 243 | bool mDayChanged; |
243 | bool mPendingUpdateBeforeRepaint; | 244 | bool mPendingUpdateBeforeRepaint; |
244 | 245 | ||
245 | /** returns the index of the day located at the matrix's widget (x,y) position. | 246 | /** returns the index of the day located at the matrix's widget (x,y) position. |
246 | * | 247 | * |
247 | * @param x horizontal coordinate | 248 | * @param x horizontal coordinate |
248 | * @param y vertical coordinate | 249 | * @param y vertical coordinate |
249 | */ | 250 | */ |
250 | int getDayIndexFrom(int x, int y); | 251 | int getDayIndexFrom(int x, int y); |
251 | 252 | ||
252 | /** calculates a "shaded" color from the supplied color object. | 253 | /** calculates a "shaded" color from the supplied color object. |
253 | * (Copied from Cornelius's kdpdatebutton.cpp) | 254 | * (Copied from Cornelius's kdpdatebutton.cpp) |
254 | * | 255 | * |
255 | * @param color source based on which a shaded color should be calculated. | 256 | * @param color source based on which a shaded color should be calculated. |
256 | */ | 257 | */ |
257 | QColor getShadedColor(QColor color); | 258 | QColor getShadedColor(QColor color); |
258 | 259 | ||
259 | /** number of days to be displayed. For now there is no support for any other number then 42. | 260 | /** number of days to be displayed. For now there is no support for any other number then 42. |
260 | so change it at your own risk :o) */ | 261 | so change it at your own risk :o) */ |
261 | static const int NUMDAYS; | 262 | static const int NUMDAYS; |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 843526d..ae61db6 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1528,64 +1528,67 @@ void KOMonthView::updateView() | |||
1528 | incidenceEnd = incidenceStart.addDays( eventlen ); | 1528 | incidenceEnd = incidenceStart.addDays( eventlen ); |
1529 | int st = incidenceStart.date().daysTo( endDate ); | 1529 | int st = incidenceStart.date().daysTo( endDate ); |
1530 | if ( st >= 0 ) { // start before timeend | 1530 | if ( st >= 0 ) { // start before timeend |
1531 | int end = mStartDate.daysTo( incidenceEnd.date() ); | 1531 | int end = mStartDate.daysTo( incidenceEnd.date() ); |
1532 | if ( end >= 0 ) { // end after timestart --- got one! | 1532 | if ( end >= 0 ) { // end after timestart --- got one! |
1533 | //normalize | 1533 | //normalize |
1534 | st = timeSpan - st; | 1534 | st = timeSpan - st; |
1535 | if ( st < 0 ) st = 0; | 1535 | if ( st < 0 ) st = 0; |
1536 | if ( end > timeSpan ) end = timeSpan; | 1536 | if ( end > timeSpan ) end = timeSpan; |
1537 | int iii; | 1537 | int iii; |
1538 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); | 1538 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); |
1539 | for ( iii = st;iii<= end;++iii) | 1539 | for ( iii = st;iii<= end;++iii) |
1540 | (*cells)[iii]->insertEvent( event ); | 1540 | (*cells)[iii]->insertEvent( event ); |
1541 | } | 1541 | } |
1542 | } | 1542 | } |
1543 | } else { | 1543 | } else { |
1544 | if ( invalid ) | 1544 | if ( invalid ) |
1545 | break; | 1545 | break; |
1546 | invalid = true; | 1546 | invalid = true; |
1547 | //qDebug("invalid %s", event->summary().latin1()); | 1547 | //qDebug("invalid %s", event->summary().latin1()); |
1548 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | 1548 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
1549 | } | 1549 | } |
1550 | if ( last ) | 1550 | if ( last ) |
1551 | break; | 1551 | break; |
1552 | bool ok; | 1552 | bool ok; |
1553 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 1553 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
1554 | if ( ! ok ) | 1554 | if ( ! ok ) |
1555 | break; | 1555 | break; |
1556 | if ( incidenceStart.date() > endDate ) | 1556 | if ( incidenceStart.date() > endDate ) |
1557 | break; | 1557 | break; |
1558 | } | 1558 | } |
1559 | } else { // no recur | 1559 | } else { // no recur |
1560 | if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) | ||
1561 | if ( event->uid().left(15) == QString("last-syncEvent-") ) | ||
1562 | continue; | ||
1560 | int st = event->dtStart().date().daysTo( endDate ); | 1563 | int st = event->dtStart().date().daysTo( endDate ); |
1561 | if ( st >= 0 ) { // start before timeend | 1564 | if ( st >= 0 ) { // start before timeend |
1562 | int end = mStartDate.daysTo( event->dtEnd().date() ); | 1565 | int end = mStartDate.daysTo( event->dtEnd().date() ); |
1563 | if ( end >= 0 ) { // end after timestart --- got one! | 1566 | if ( end >= 0 ) { // end after timestart --- got one! |
1564 | //normalize | 1567 | //normalize |
1565 | st = timeSpan - st; | 1568 | st = timeSpan - st; |
1566 | if ( st < 0 ) st = 0; | 1569 | if ( st < 0 ) st = 0; |
1567 | if ( end > timeSpan ) end = timeSpan; | 1570 | if ( end > timeSpan ) end = timeSpan; |
1568 | int iii; | 1571 | int iii; |
1569 | for ( iii = st;iii<= end;++iii) | 1572 | for ( iii = st;iii<= end;++iii) |
1570 | (*cells)[iii]->insertEvent( event ); | 1573 | (*cells)[iii]->insertEvent( event ); |
1571 | } | 1574 | } |
1572 | } | 1575 | } |
1573 | } | 1576 | } |
1574 | } | 1577 | } |
1575 | // insert due todos | 1578 | // insert due todos |
1576 | QPtrList<Todo> todos = calendar()->todos( ); | 1579 | QPtrList<Todo> todos = calendar()->todos( ); |
1577 | Todo *todo; | 1580 | Todo *todo; |
1578 | for(todo = todos.first(); todo; todo = todos.next()) { | 1581 | for(todo = todos.first(); todo; todo = todos.next()) { |
1579 | //insertTodo( todo ); | 1582 | //insertTodo( todo ); |
1580 | if ( todo->hasDueDate() ) { | 1583 | if ( todo->hasDueDate() ) { |
1581 | int day = mStartDate.daysTo( todo->dtDue().date() ); | 1584 | int day = mStartDate.daysTo( todo->dtDue().date() ); |
1582 | if ( day >= 0 && day < timeSpan + 1) { | 1585 | if ( day >= 0 && day < timeSpan + 1) { |
1583 | (*cells)[day]->insertTodo( todo ); | 1586 | (*cells)[day]->insertTodo( todo ); |
1584 | } | 1587 | } |
1585 | } | 1588 | } |
1586 | } | 1589 | } |
1587 | 1590 | ||
1588 | for( i = 0; i < timeSpan+1; ++i ) { | 1591 | for( i = 0; i < timeSpan+1; ++i ) { |
1589 | (*cells)[i]->finishUpdateCell(); | 1592 | (*cells)[i]->finishUpdateCell(); |
1590 | } | 1593 | } |
1591 | processSelectionChange(); | 1594 | processSelectionChange(); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index cb9c272..d9d7924 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -827,68 +827,65 @@ void KOPrefsDialog::setupViewsTab() | |||
827 | 827 | ||
828 | 828 | ||
829 | QHBox* hdummy = new QHBox(topFrame); | 829 | QHBox* hdummy = new QHBox(topFrame); |
830 | new QLabel(i18n("Days in What's Next:"),hdummy); | 830 | new QLabel(i18n("Days in What's Next:"),hdummy); |
831 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); | 831 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); |
832 | 832 | ||
833 | topLayout->addWidget(hdummy,ii++,0); | 833 | topLayout->addWidget(hdummy,ii++,0); |
834 | 834 | ||
835 | QHBox *prioBox = new QHBox(topFrame); | 835 | QHBox *prioBox = new QHBox(topFrame); |
836 | // intervalBox->setSpacing(mSpacingHint); | 836 | // intervalBox->setSpacing(mSpacingHint); |
837 | topLayout->addWidget(prioBox,ii++,0); | 837 | topLayout->addWidget(prioBox,ii++,0); |
838 | 838 | ||
839 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); | 839 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); |
840 | mPrioSpin = new QSpinBox(0,5,1,prioBox); | 840 | mPrioSpin = new QSpinBox(0,5,1,prioBox); |
841 | if ( QApplication::desktop()->width() < 300 ) | 841 | if ( QApplication::desktop()->width() < 300 ) |
842 | mPrioSpin->setFixedWidth( 40 ); | 842 | mPrioSpin->setFixedWidth( 40 ); |
843 | 843 | ||
844 | KPrefsDialogWidBool *passwdk = | 844 | KPrefsDialogWidBool *passwdk = |
845 | 845 | ||
846 | addWidBool(i18n("Show events, that are done"), | 846 | addWidBool(i18n("Show events, that are done"), |
847 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); | 847 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); |
848 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 848 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
849 | passwdk = | 849 | passwdk = |
850 | addWidBool(i18n("Show parent To-Do's"), | 850 | addWidBool(i18n("Show parent To-Do's"), |
851 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | 851 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); |
852 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 852 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
853 | 853 | ||
854 | passwdk = | 854 | passwdk = |
855 | addWidBool(i18n("Show location"), | 855 | addWidBool(i18n("Show location"), |
856 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | 856 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); |
857 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 857 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
858 | 858 | ||
859 | passwdk = | 859 | |
860 | addWidBool(i18n("Show Sync Events in WN+Agenda"), | ||
861 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
862 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
863 | passwdk = | 860 | passwdk = |
864 | addWidBool(i18n("Use short date in WN+Event view"), | 861 | addWidBool(i18n("Use short date in WN+Event view"), |
865 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 862 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
866 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 863 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
867 | 864 | ||
868 | 865 | ||
869 | 866 | ||
870 | 867 | ||
871 | // *********************** Todo View | 868 | // *********************** Todo View |
872 | 869 | ||
873 | topFrame = addPage(i18n("Todo View"),0,0); | 870 | topFrame = addPage(i18n("Todo View"),0,0); |
874 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 871 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
875 | 872 | ||
876 | topLayout = new QGridLayout(topFrame,4,1); | 873 | topLayout = new QGridLayout(topFrame,4,1); |
877 | topLayout->setSpacing(mSpacingHint); | 874 | topLayout->setSpacing(mSpacingHint); |
878 | topLayout->setMargin(mMarginHint); | 875 | topLayout->setMargin(mMarginHint); |
879 | ii = 0; | 876 | ii = 0; |
880 | dummy = | 877 | dummy = |
881 | addWidBool(i18n("Hide not running Todos in To-do view"), | 878 | addWidBool(i18n("Hide not running Todos in To-do view"), |
882 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); | 879 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); |
883 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 880 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
884 | 881 | ||
885 | 882 | ||
886 | KPrefsDialogWidBool *showCompletedTodo = | 883 | KPrefsDialogWidBool *showCompletedTodo = |
887 | addWidBool(i18n("To-do view shows completed Todos"), | 884 | addWidBool(i18n("To-do view shows completed Todos"), |
888 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); | 885 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); |
889 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); | 886 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); |
890 | dummy = | 887 | dummy = |
891 | addWidBool(i18n("To-do view shows complete as 'xx %'"), | 888 | addWidBool(i18n("To-do view shows complete as 'xx %'"), |
892 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); | 889 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); |
893 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 890 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
894 | 891 | ||
@@ -924,64 +921,70 @@ dummy = | |||
924 | widLayout->addWidget( todoDueTodayColor->label() ); | 921 | widLayout->addWidget( todoDueTodayColor->label() ); |
925 | widLayout->addWidget( todoDueTodayColor->button() ); | 922 | widLayout->addWidget( todoDueTodayColor->button() ); |
926 | topLayout->addWidget(wid,ii++,0); | 923 | topLayout->addWidget(wid,ii++,0); |
927 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); | 924 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); |
928 | 925 | ||
929 | // Todo overdue color | 926 | // Todo overdue color |
930 | wid = new QWidget( topFrame ); | 927 | wid = new QWidget( topFrame ); |
931 | widLayout = new QHBoxLayout(wid); | 928 | widLayout = new QHBoxLayout(wid); |
932 | KPrefsDialogWidColor *todoOverdueColor = | 929 | KPrefsDialogWidColor *todoOverdueColor = |
933 | addWidColor(i18n("Todo overdue color:"), | 930 | addWidColor(i18n("Todo overdue color:"), |
934 | &(KOPrefs::instance()->mTodoOverdueColor),wid); | 931 | &(KOPrefs::instance()->mTodoOverdueColor),wid); |
935 | widLayout->addWidget(todoOverdueColor->label()); | 932 | widLayout->addWidget(todoOverdueColor->label()); |
936 | widLayout->addWidget(todoOverdueColor->button()); | 933 | widLayout->addWidget(todoOverdueColor->button()); |
937 | topLayout->addWidget(wid,ii++,0); | 934 | topLayout->addWidget(wid,ii++,0); |
938 | 935 | ||
939 | dummy = | 936 | dummy = |
940 | addWidBool(i18n("Colors are applied to text"), | 937 | addWidBool(i18n("Colors are applied to text"), |
941 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); | 938 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); |
942 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 939 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
943 | 940 | ||
944 | dummy = | 941 | dummy = |
945 | addWidBool(i18n("Allday Agenda view shows todos"), | 942 | addWidBool(i18n("Allday Agenda view shows todos"), |
946 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); | 943 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); |
947 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 944 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
948 | 945 | ||
949 | 946 | ||
950 | topFrame = addPage(i18n("View Options"),0,0); | 947 | topFrame = addPage(i18n("View Options"),0,0); |
951 | 948 | ||
952 | topLayout = new QGridLayout(topFrame,4,1); | 949 | topLayout = new QGridLayout(topFrame,4,1); |
953 | topLayout->setSpacing(mSpacingHint); | 950 | topLayout->setSpacing(mSpacingHint); |
954 | topLayout->setMargin(mMarginHint); | 951 | topLayout->setMargin(mMarginHint); |
955 | ii = 0; | 952 | ii = 0; |
953 | |||
954 | dummy = | ||
955 | addWidBool(i18n("Show Sync Events"), | ||
956 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
957 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
958 | |||
956 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); | 959 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); |
957 | topLayout->addWidget(lab ,ii++,0); | 960 | topLayout->addWidget(lab ,ii++,0); |
958 | 961 | ||
959 | dummy = addWidBool(i18n("Details"), | 962 | dummy = addWidBool(i18n("Details"), |
960 | &(KOPrefs::instance()->mEVshowDetails),topFrame); | 963 | &(KOPrefs::instance()->mEVshowDetails),topFrame); |
961 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 964 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
962 | dummy = addWidBool(i18n("Created time"), | 965 | dummy = addWidBool(i18n("Created time"), |
963 | &(KOPrefs::instance()->mEVshowCreated),topFrame); | 966 | &(KOPrefs::instance()->mEVshowCreated),topFrame); |
964 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 967 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
965 | dummy = addWidBool(i18n("Last modified time"), | 968 | dummy = addWidBool(i18n("Last modified time"), |
966 | &(KOPrefs::instance()->mEVshowChanged),topFrame); | 969 | &(KOPrefs::instance()->mEVshowChanged),topFrame); |
967 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 970 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
968 | 971 | ||
969 | 972 | ||
970 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); | 973 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); |
971 | topLayout->addWidget(lab ,ii++,0); | 974 | topLayout->addWidget(lab ,ii++,0); |
972 | 975 | ||
973 | dummy = addWidBool(i18n("Details"), | 976 | dummy = addWidBool(i18n("Details"), |
974 | &(KOPrefs::instance()->mWTshowDetails),topFrame); | 977 | &(KOPrefs::instance()->mWTshowDetails),topFrame); |
975 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 978 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
976 | dummy = addWidBool(i18n("Created time"), | 979 | dummy = addWidBool(i18n("Created time"), |
977 | &(KOPrefs::instance()->mWTshowCreated),topFrame); | 980 | &(KOPrefs::instance()->mWTshowCreated),topFrame); |
978 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 981 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
979 | dummy = addWidBool(i18n("Last modified time"), | 982 | dummy = addWidBool(i18n("Last modified time"), |
980 | &(KOPrefs::instance()->mWTshowChanged),topFrame); | 983 | &(KOPrefs::instance()->mWTshowChanged),topFrame); |
981 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 984 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
982 | 985 | ||
983 | 986 | ||
984 | topFrame = addPage(i18n("Alarm"),0,0); | 987 | topFrame = addPage(i18n("Alarm"),0,0); |
985 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 988 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
986 | 989 | ||
987 | topLayout = new QGridLayout(topFrame,2,1); | 990 | topLayout = new QGridLayout(topFrame,2,1); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 3aa9b6c..2e5a943 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -288,64 +288,65 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
288 | ++flagResetViewChangeDate; | 288 | ++flagResetViewChangeDate; |
289 | //mFlagShowNextxDays = false; | 289 | //mFlagShowNextxDays = false; |
290 | //if(view == mCurrentView) return; | 290 | //if(view == mCurrentView) return; |
291 | if ( view == 0 ) { | 291 | if ( view == 0 ) { |
292 | view = mCurrentView; | 292 | view = mCurrentView; |
293 | if ( view == 0 ) | 293 | if ( view == 0 ) |
294 | return; | 294 | return; |
295 | } | 295 | } |
296 | bool callupdate = !(view == mCurrentView); | 296 | bool callupdate = !(view == mCurrentView); |
297 | bool full = fullScreen; | 297 | bool full = fullScreen; |
298 | if(view == mCurrentView && view != mWhatsNextView ) { | 298 | if(view == mCurrentView && view != mWhatsNextView ) { |
299 | if ( mCurrentAgendaView < 0 ) | 299 | if ( mCurrentAgendaView < 0 ) |
300 | return; | 300 | return; |
301 | if ( view != mMonthView ) | 301 | if ( view != mMonthView ) |
302 | full = mMainView->leftFrame()->isVisible(); | 302 | full = mMainView->leftFrame()->isVisible(); |
303 | } else { | 303 | } else { |
304 | if ( view == mMonthView && mMonthView) | 304 | if ( view == mMonthView && mMonthView) |
305 | ;//mMonthView->skipResize = true ; | 305 | ;//mMonthView->skipResize = true ; |
306 | mCurrentView = view; | 306 | mCurrentView = view; |
307 | // bool full = fullScreen; | 307 | // bool full = fullScreen; |
308 | bool isFull = !mMainView->leftFrame()->isVisible(); | 308 | bool isFull = !mMainView->leftFrame()->isVisible(); |
309 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) | 309 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) |
310 | full = true; | 310 | full = true; |
311 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) | 311 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) |
312 | full = false; | 312 | full = false; |
313 | } | 313 | } |
314 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 314 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
315 | //raiseCurrentView( full ); | 315 | //raiseCurrentView( full ); |
316 | mMainView->processIncidenceSelection( 0 ); | 316 | mMainView->processIncidenceSelection( 0 ); |
317 | //mMainView->updateView(); | 317 | //mMainView->updateView(); |
318 | raiseCurrentView( full, callupdate ); | 318 | raiseCurrentView( full, callupdate ); |
319 | mMainView->adaptNavigationUnits(); | 319 | mMainView->adaptNavigationUnits(); |
320 | mMainView->updateUnmanagedViews(); | ||
320 | } | 321 | } |
321 | 322 | ||
322 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | 323 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) |
323 | { | 324 | { |
324 | mCurrentAgendaView = 0; | 325 | mCurrentAgendaView = 0; |
325 | if ( fullScreen ) { | 326 | if ( fullScreen ) { |
326 | mMainView->leftFrame()->hide(); | 327 | mMainView->leftFrame()->hide(); |
327 | } else { | 328 | } else { |
328 | mMainView->leftFrame()->show(); | 329 | mMainView->leftFrame()->show(); |
329 | } | 330 | } |
330 | //if ( mCurrentView == mMonthView ) qApp->processEvents(); | 331 | //if ( mCurrentView == mMonthView ) qApp->processEvents(); |
331 | emit signalFullScreen( !fullScreen ); | 332 | emit signalFullScreen( !fullScreen ); |
332 | if ( callUpdateView ) | 333 | if ( callUpdateView ) |
333 | mMainView->updateView(); | 334 | mMainView->updateView(); |
334 | 335 | ||
335 | if ( globalFlagBlockAgenda == 5 ) { | 336 | if ( globalFlagBlockAgenda == 5 ) { |
336 | globalFlagBlockAgenda = 4; | 337 | globalFlagBlockAgenda = 4; |
337 | globalFlagBlockAgendaItemPaint = 1; | 338 | globalFlagBlockAgendaItemPaint = 1; |
338 | } | 339 | } |
339 | mMainView->viewStack()->raiseWidget(mCurrentView); | 340 | mMainView->viewStack()->raiseWidget(mCurrentView); |
340 | if ( globalFlagBlockAgenda == 4 ) { | 341 | if ( globalFlagBlockAgenda == 4 ) { |
341 | if ( mCurrentView == mAgendaView ) { | 342 | if ( mCurrentView == mAgendaView ) { |
342 | //globalFlagBlockAgenda =1 ; | 343 | //globalFlagBlockAgenda =1 ; |
343 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 344 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
344 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); | 345 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); |
345 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 346 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
346 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); | 347 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); |
347 | qApp->processEvents(); | 348 | qApp->processEvents(); |
348 | //qDebug("qApp->processEvents() "); | 349 | //qDebug("qApp->processEvents() "); |
349 | globalFlagBlockAgenda = 0; | 350 | globalFlagBlockAgenda = 0; |
350 | mAgendaView->repaintAgenda(); | 351 | mAgendaView->repaintAgenda(); |
351 | 352 | ||
@@ -368,110 +369,112 @@ void KOViewManager::updateView() | |||
368 | } | 369 | } |
369 | 370 | ||
370 | void KOViewManager::updateView(const QDate &start, const QDate &end) | 371 | void KOViewManager::updateView(const QDate &start, const QDate &end) |
371 | { | 372 | { |
372 | // kdDebug() << "KOViewManager::updateView()" << endl; | 373 | // kdDebug() << "KOViewManager::updateView()" << endl; |
373 | 374 | ||
374 | if (mCurrentView) mCurrentView->showDates(start, end); | 375 | if (mCurrentView) mCurrentView->showDates(start, end); |
375 | 376 | ||
376 | if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView(); | 377 | if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView(); |
377 | } | 378 | } |
378 | 379 | ||
379 | 380 | ||
380 | void KOViewManager::updateWNview() | 381 | void KOViewManager::updateWNview() |
381 | { | 382 | { |
382 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) | 383 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) |
383 | mWhatsNextView->updateView(); | 384 | mWhatsNextView->updateView(); |
384 | if ( mCurrentView == mMonthView && mMonthView ) | 385 | if ( mCurrentView == mMonthView && mMonthView ) |
385 | mMonthView->updateView(); | 386 | mMonthView->updateView(); |
386 | 387 | ||
387 | } | 388 | } |
388 | void KOViewManager::showWhatsNextView() | 389 | void KOViewManager::showWhatsNextView() |
389 | { | 390 | { |
390 | if (!mWhatsNextView) { | 391 | if (!mWhatsNextView) { |
391 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), | 392 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), |
392 | "KOViewManager::WhatsNextView"); | 393 | "KOViewManager::WhatsNextView"); |
393 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); | 394 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); |
394 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); | 395 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); |
395 | addView(mWhatsNextView); | 396 | addView(mWhatsNextView); |
396 | connect(this, SIGNAL( printWNV() ), | 397 | connect(this, SIGNAL( printWNV() ), |
397 | mWhatsNextView, SLOT( printMe() ) ); | 398 | mWhatsNextView, SLOT( printMe() ) ); |
398 | } | 399 | } |
399 | globalFlagBlockAgenda = 1; | 400 | globalFlagBlockAgenda = 1; |
401 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; | ||
400 | showView(mWhatsNextView, true ); | 402 | showView(mWhatsNextView, true ); |
401 | //mWhatsNextView->updateView(); | 403 | //mWhatsNextView->updateView(); |
402 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; | 404 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; |
403 | } | 405 | } |
404 | 406 | ||
405 | void KOViewManager::slotprintWNV() | 407 | void KOViewManager::slotprintWNV() |
406 | { | 408 | { |
407 | if (!mWhatsNextView) | 409 | if (!mWhatsNextView) |
408 | showWhatsNextView(); | 410 | showWhatsNextView(); |
409 | emit printWNV(); | 411 | emit printWNV(); |
410 | 412 | ||
411 | } | 413 | } |
412 | void KOViewManager::showListView() | 414 | void KOViewManager::showListView() |
413 | { | 415 | { |
414 | if (!mListView) { | 416 | if (!mListView) { |
415 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); | 417 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); |
416 | addView(mListView); | 418 | addView(mListView); |
417 | 419 | ||
418 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), | 420 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), |
419 | mMainView, SLOT(showIncidence(Incidence *))); | 421 | mMainView, SLOT(showIncidence(Incidence *))); |
420 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), | 422 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), |
421 | mMainView, SLOT(editIncidence(Incidence *))); | 423 | mMainView, SLOT(editIncidence(Incidence *))); |
422 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 424 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
423 | mMainView, SLOT(deleteIncidence(Incidence *))); | 425 | mMainView, SLOT(deleteIncidence(Incidence *))); |
424 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), | 426 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), |
425 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 427 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
426 | connect( mListView, SIGNAL( signalNewEvent() ), | 428 | connect( mListView, SIGNAL( signalNewEvent() ), |
427 | mMainView, SLOT( newEvent() ) ); | 429 | mMainView, SLOT( newEvent() ) ); |
428 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); | 430 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); |
429 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 431 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
430 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 432 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
431 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 433 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
432 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 434 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
433 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 435 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
434 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 436 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
435 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 437 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
436 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 438 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
437 | } | 439 | } |
438 | // bool temp = mFlagShowNextxDays; | 440 | // bool temp = mFlagShowNextxDays; |
439 | //globalFlagBlockPainting = true; | 441 | //globalFlagBlockPainting = true; |
440 | globalFlagBlockAgenda = 1; | 442 | globalFlagBlockAgenda = 1; |
441 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { | 443 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { |
442 | mMainView->setBlockShowDates( true ); | 444 | mMainView->setBlockShowDates( true ); |
443 | mMainView->dateNavigator()->selectMonth(); | 445 | mMainView->dateNavigator()->selectMonth(); |
444 | mMainView->setBlockShowDates( false ); | 446 | mMainView->setBlockShowDates( false ); |
445 | } | 447 | } |
448 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | ||
446 | showView(mListView, KOPrefs::instance()->mFullViewTodo); | 449 | showView(mListView, KOPrefs::instance()->mFullViewTodo); |
447 | //mFlagShowNextxDays = temp; | 450 | //mFlagShowNextxDays = temp; |
448 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 451 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
449 | } | 452 | } |
450 | 453 | ||
451 | void KOViewManager::showAgendaView( bool fullScreen ) | 454 | void KOViewManager::showAgendaView( bool fullScreen ) |
452 | { | 455 | { |
453 | 456 | ||
454 | mMainView->dialogManager()->hideSearchDialog(); | 457 | mMainView->dialogManager()->hideSearchDialog(); |
455 | // qDebug("KOViewManager::showAgendaView "); | 458 | // qDebug("KOViewManager::showAgendaView "); |
456 | bool full; | 459 | bool full; |
457 | full = fullScreen; | 460 | full = fullScreen; |
458 | if (!mAgendaView) { | 461 | if (!mAgendaView) { |
459 | full = false; | 462 | full = false; |
460 | mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); | 463 | mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); |
461 | addView(mAgendaView); | 464 | addView(mAgendaView); |
462 | #ifndef DESKTOP_VERSION | 465 | #ifndef DESKTOP_VERSION |
463 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); | 466 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); |
464 | #endif | 467 | #endif |
465 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), | 468 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), |
466 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); | 469 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); |
467 | 470 | ||
468 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW | 471 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW |
469 | 472 | ||
470 | connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate ))); | 473 | connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate ))); |
471 | 474 | ||
472 | connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)), | 475 | connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)), |
473 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); | 476 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); |
474 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), | 477 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), |
475 | mMainView, SLOT(newEvent(QDateTime))); | 478 | mMainView, SLOT(newEvent(QDateTime))); |
476 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), | 479 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), |
477 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); | 480 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); |
@@ -481,122 +484,124 @@ void KOViewManager::showAgendaView( bool fullScreen ) | |||
481 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), | 484 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), |
482 | mMainView, SLOT(editIncidence(Incidence *))); | 485 | mMainView, SLOT(editIncidence(Incidence *))); |
483 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), | 486 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), |
484 | mMainView, SLOT(showIncidence(Incidence *))); | 487 | mMainView, SLOT(showIncidence(Incidence *))); |
485 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 488 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
486 | mMainView, SLOT(deleteIncidence(Incidence *))); | 489 | mMainView, SLOT(deleteIncidence(Incidence *))); |
487 | 490 | ||
488 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), | 491 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), |
489 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 492 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
490 | 493 | ||
491 | connect(mAgendaView, SIGNAL( toggleExpand() ), | 494 | connect(mAgendaView, SIGNAL( toggleExpand() ), |
492 | mMainView, SLOT( toggleExpand() ) ); | 495 | mMainView, SLOT( toggleExpand() ) ); |
493 | 496 | ||
494 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), | 497 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), |
495 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; | 498 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; |
496 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), | 499 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), |
497 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; | 500 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; |
498 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); | 501 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); |
499 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, | 502 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, |
500 | SLOT( updateTodo( Todo *, int ) ) ); | 503 | SLOT( updateTodo( Todo *, int ) ) ); |
501 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), | 504 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), |
502 | mMainView, SIGNAL( todoModified( Todo *, int ))); | 505 | mMainView, SIGNAL( todoModified( Todo *, int ))); |
503 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 506 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
504 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 507 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
505 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 508 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
506 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 509 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
507 | connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), | 510 | connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), |
508 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); | 511 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); |
509 | mAgendaView->readSettings(); | 512 | mAgendaView->readSettings(); |
510 | mAgendaView->updateConfig(); | 513 | mAgendaView->updateConfig(); |
511 | } | 514 | } |
512 | 515 | ||
516 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; | ||
513 | showView( mAgendaView, full); | 517 | showView( mAgendaView, full); |
514 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; | 518 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; |
515 | } | 519 | } |
516 | 520 | ||
517 | void KOViewManager::showDayView() | 521 | void KOViewManager::showDayView() |
518 | { | 522 | { |
519 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 523 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
520 | mFlagShowNextxDays = false; | 524 | mFlagShowNextxDays = false; |
521 | globalFlagBlockLabel = 1; | 525 | globalFlagBlockLabel = 1; |
522 | globalFlagBlockAgenda = 1; | 526 | globalFlagBlockAgenda = 1; |
523 | if ( mCurrentAgendaView != 1 ) | 527 | if ( mCurrentAgendaView != 1 ) |
524 | mCurrentAgendaView = -1; | 528 | mCurrentAgendaView = -1; |
525 | showAgendaView(); | 529 | showAgendaView(); |
526 | qApp->processEvents(); | 530 | qApp->processEvents(); |
527 | globalFlagBlockAgenda = 2; | 531 | globalFlagBlockAgenda = 2; |
528 | globalFlagBlockLabel = 0; | 532 | globalFlagBlockLabel = 0; |
529 | mMainView->dateNavigator()->selectDates( 1 ); | 533 | mMainView->dateNavigator()->selectDates( 1 ); |
530 | mCurrentAgendaView = 1 ; | 534 | mCurrentAgendaView = 1 ; |
531 | 535 | ||
532 | } | 536 | } |
533 | 537 | ||
534 | void KOViewManager::showWorkWeekView() | 538 | void KOViewManager::showWorkWeekView() |
535 | { | 539 | { |
536 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 540 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
537 | mFlagShowNextxDays = false; | 541 | mFlagShowNextxDays = false; |
538 | globalFlagBlockAgenda = 1; | 542 | globalFlagBlockAgenda = 1; |
539 | globalFlagBlockLabel = 1; | 543 | globalFlagBlockLabel = 1; |
540 | if ( mCurrentAgendaView != 5 ) | 544 | if ( mCurrentAgendaView != 5 ) |
541 | mCurrentAgendaView = -1; | 545 | mCurrentAgendaView = -1; |
542 | showAgendaView(); | 546 | showAgendaView(); |
543 | qApp->processEvents(); | 547 | qApp->processEvents(); |
544 | globalFlagBlockAgenda = 2; | 548 | globalFlagBlockAgenda = 2; |
545 | globalFlagBlockLabel = 0; | 549 | globalFlagBlockLabel = 0; |
546 | mMainView->dateNavigator()->selectWorkWeek(); | 550 | mMainView->dateNavigator()->selectWorkWeek(); |
547 | mCurrentAgendaView = 5 ; | 551 | mCurrentAgendaView = 5 ; |
548 | 552 | ||
549 | } | 553 | } |
550 | 554 | ||
551 | void KOViewManager::showWeekView() | 555 | void KOViewManager::showWeekView() |
552 | { | 556 | { |
553 | 557 | ||
554 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 558 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
555 | mFlagShowNextxDays = false; | 559 | mFlagShowNextxDays = false; |
556 | globalFlagBlockAgenda = 1; | 560 | globalFlagBlockAgenda = 1; |
557 | globalFlagBlockLabel = 1; | 561 | globalFlagBlockLabel = 1; |
558 | if ( mCurrentAgendaView != 7 ) | 562 | if ( mCurrentAgendaView != 7 ) |
559 | mCurrentAgendaView = -1; | 563 | mCurrentAgendaView = -1; |
560 | showAgendaView(); | 564 | showAgendaView(); |
561 | qApp->processEvents(); | 565 | qApp->processEvents(); |
562 | globalFlagBlockAgenda = 2; | 566 | globalFlagBlockAgenda = 2; |
563 | globalFlagBlockLabel = 0; | 567 | globalFlagBlockLabel = 0; |
564 | mMainView->dateNavigator()->selectWeek(); | 568 | mMainView->dateNavigator()->selectWeek(); |
565 | mCurrentAgendaView = 7 ; | 569 | mCurrentAgendaView = 7 ; |
566 | } | 570 | } |
567 | 571 | ||
568 | void KOViewManager::showNextXView() | 572 | void KOViewManager::showNextXView() |
569 | { | 573 | { |
570 | 574 | ||
575 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | ||
571 | globalFlagBlockAgenda = 1; | 576 | globalFlagBlockAgenda = 1; |
572 | if ( mCurrentAgendaView != 3 ) | 577 | if ( mCurrentAgendaView != 3 ) |
573 | mCurrentAgendaView = -1; | 578 | mCurrentAgendaView = -1; |
574 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 579 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
575 | globalFlagBlockAgenda = 2; | 580 | globalFlagBlockAgenda = 2; |
576 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 581 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
577 | KOPrefs::instance()->mNextXDays ); | 582 | KOPrefs::instance()->mNextXDays ); |
578 | mFlagShowNextxDays = true; | 583 | mFlagShowNextxDays = true; |
579 | mCurrentAgendaView = 3 ; | 584 | mCurrentAgendaView = 3 ; |
580 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | 585 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; |
581 | } | 586 | } |
582 | bool KOViewManager::showsNextDays() | 587 | bool KOViewManager::showsNextDays() |
583 | { | 588 | { |
584 | return mFlagShowNextxDays; | 589 | return mFlagShowNextxDays; |
585 | } | 590 | } |
586 | void KOViewManager::createMonthView() | 591 | void KOViewManager::createMonthView() |
587 | { | 592 | { |
588 | if (!mMonthView) { | 593 | if (!mMonthView) { |
589 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 594 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
590 | 595 | ||
591 | addView(mMonthView); | 596 | addView(mMonthView); |
592 | // mMonthView->show(); | 597 | // mMonthView->show(); |
593 | // SIGNALS/SLOTS FOR MONTH VIEW | 598 | // SIGNALS/SLOTS FOR MONTH VIEW |
594 | 599 | ||
595 | connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate ))); | 600 | connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate ))); |
596 | 601 | ||
597 | connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)), | 602 | connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)), |
598 | mMainView, SLOT(newTodoDateTime(QDateTime, bool))); | 603 | mMainView, SLOT(newTodoDateTime(QDateTime, bool))); |
599 | 604 | ||
600 | 605 | ||
601 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 606 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
602 | mMainView, SLOT(newEvent(QDateTime))); | 607 | mMainView, SLOT(newEvent(QDateTime))); |
@@ -626,92 +631,94 @@ if (!mMonthView) { | |||
626 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 631 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
627 | mMainView, SLOT ( showDay( QDate ) ) ); | 632 | mMainView, SLOT ( showDay( QDate ) ) ); |
628 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 633 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
629 | connect( mMonthView, SIGNAL(nextMonth() ), | 634 | connect( mMonthView, SIGNAL(nextMonth() ), |
630 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 635 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
631 | connect( mMonthView, SIGNAL(prevMonth() ), | 636 | connect( mMonthView, SIGNAL(prevMonth() ), |
632 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 637 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
633 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), | 638 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), |
634 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); | 639 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); |
635 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), | 640 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), |
636 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); | 641 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); |
637 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), | 642 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), |
638 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); | 643 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); |
639 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), | 644 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), |
640 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); | 645 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); |
641 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), | 646 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), |
642 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); | 647 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); |
643 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), | 648 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), |
644 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); | 649 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); |
645 | 650 | ||
646 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 651 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
647 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); | 652 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); |
648 | 653 | ||
649 | 654 | ||
650 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), | 655 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), |
651 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); | 656 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); |
652 | 657 | ||
653 | } | 658 | } |
654 | } | 659 | } |
655 | void KOViewManager::showMonthViewWeek() | 660 | void KOViewManager::showMonthViewWeek() |
656 | { | 661 | { |
657 | createMonthView(); | 662 | createMonthView(); |
663 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; | ||
658 | globalFlagBlockAgenda = 1; | 664 | globalFlagBlockAgenda = 1; |
659 | bool full = true; | 665 | bool full = true; |
660 | if ( mCurrentView == mMonthView) | 666 | if ( mCurrentView == mMonthView) |
661 | full = mMainView->leftFrame()->isVisible(); | 667 | full = mMainView->leftFrame()->isVisible(); |
662 | if ( !KOPrefs::instance()->mMonthViewWeek ) { | 668 | if ( !KOPrefs::instance()->mMonthViewWeek ) { |
663 | mMonthView->switchView(); | 669 | mMonthView->switchView(); |
664 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 670 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
665 | full = false; | 671 | full = false; |
666 | else | 672 | else |
667 | full = true; | 673 | full = true; |
668 | } | 674 | } |
669 | mMainView->dateNavigator()->selectWeek(); | 675 | mMainView->dateNavigator()->selectWeek(); |
670 | showView(mMonthView, full ); | 676 | showView(mMonthView, full ); |
671 | mMonthView->setKeyBFocus(); | 677 | mMonthView->setKeyBFocus(); |
672 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; | 678 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; |
673 | } | 679 | } |
674 | 680 | ||
675 | void KOViewManager::showMonth( const QDate & date ) | 681 | void KOViewManager::showMonth( const QDate & date ) |
676 | { | 682 | { |
677 | mMainView->dateNavigator()->blockSignals( true ); | 683 | mMainView->dateNavigator()->blockSignals( true ); |
678 | mMainView->dateNavigator()->selectDate( date ); | 684 | mMainView->dateNavigator()->selectDate( date ); |
679 | mMainView->dateNavigator()->blockSignals( false ); | 685 | mMainView->dateNavigator()->blockSignals( false ); |
680 | showMonthView(); | 686 | showMonthView(); |
681 | } | 687 | } |
682 | void KOViewManager::showMonthView() | 688 | void KOViewManager::showMonthView() |
683 | { | 689 | { |
684 | 690 | ||
685 | createMonthView(); | 691 | createMonthView(); |
692 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; | ||
686 | globalFlagBlockAgenda = 1; | 693 | globalFlagBlockAgenda = 1; |
687 | //mFlagShowNextxDays = false; | 694 | //mFlagShowNextxDays = false; |
688 | bool full = true; | 695 | bool full = true; |
689 | if ( mCurrentView == mMonthView) | 696 | if ( mCurrentView == mMonthView) |
690 | full = mMainView->leftFrame()->isVisible(); | 697 | full = mMainView->leftFrame()->isVisible(); |
691 | // if(mMonthView == mCurrentView) return; | 698 | // if(mMonthView == mCurrentView) return; |
692 | if ( KOPrefs::instance()->mMonthViewWeek ) { | 699 | if ( KOPrefs::instance()->mMonthViewWeek ) { |
693 | mMonthView->switchView(); | 700 | mMonthView->switchView(); |
694 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 701 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
695 | full = false; | 702 | full = false; |
696 | else | 703 | else |
697 | full = true; | 704 | full = true; |
698 | } | 705 | } |
699 | mMainView->dateNavigator()->selectMonth(); | 706 | mMainView->dateNavigator()->selectMonth(); |
700 | 707 | ||
701 | showView(mMonthView, full ); | 708 | showView(mMonthView, full ); |
702 | mMonthView->setKeyBFocus(); | 709 | mMonthView->setKeyBFocus(); |
703 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; | 710 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; |
704 | 711 | ||
705 | } | 712 | } |
706 | 713 | ||
707 | void KOViewManager::showTodoView() | 714 | void KOViewManager::showTodoView() |
708 | { | 715 | { |
709 | //mFlagShowNextxDays = false; | 716 | //mFlagShowNextxDays = false; |
710 | if ( !mTodoView ) { | 717 | if ( !mTodoView ) { |
711 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), | 718 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), |
712 | "KOViewManager::TodoView" ); | 719 | "KOViewManager::TodoView" ); |
713 | 720 | ||
714 | addView( mTodoView ); | 721 | addView( mTodoView ); |
715 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); | 722 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); |
716 | 723 | ||
717 | // SIGNALS/SLOTS FOR TODO VIEW | 724 | // SIGNALS/SLOTS FOR TODO VIEW |
@@ -725,82 +732,84 @@ void KOViewManager::showTodoView() | |||
725 | mMainView, SLOT( editTodo( Todo * ) ) ); | 732 | mMainView, SLOT( editTodo( Todo * ) ) ); |
726 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), | 733 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), |
727 | mMainView, SLOT( deleteTodo( Todo * ) ) ); | 734 | mMainView, SLOT( deleteTodo( Todo * ) ) ); |
728 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), | 735 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), |
729 | mMainView, SLOT( purgeCompleted() ) ); | 736 | mMainView, SLOT( purgeCompleted() ) ); |
730 | 737 | ||
731 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), | 738 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), |
732 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 739 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
733 | 740 | ||
734 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, | 741 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, |
735 | SLOT( updateConfig() ) ); | 742 | SLOT( updateConfig() ) ); |
736 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, | 743 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, |
737 | SLOT( updateTodo( Todo *, int ) ) ); | 744 | SLOT( updateTodo( Todo *, int ) ) ); |
738 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), | 745 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), |
739 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); | 746 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); |
740 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), | 747 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), |
741 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 748 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
742 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), | 749 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), |
743 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 750 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
744 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), | 751 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), |
745 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); | 752 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); |
746 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), | 753 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), |
747 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); | 754 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); |
748 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), | 755 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), |
749 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 756 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
750 | connect( mTodoView, SIGNAL( beamTodoSignal( Incidence * ) ), | 757 | connect( mTodoView, SIGNAL( beamTodoSignal( Incidence * ) ), |
751 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 758 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
752 | KConfig *config = KOGlobals::config(); | 759 | KConfig *config = KOGlobals::config(); |
753 | mTodoView->restoreLayout(config,"Todo View"); | 760 | mTodoView->restoreLayout(config,"Todo View"); |
754 | mTodoView->setNavigator( mMainView->dateNavigator() ); | 761 | mTodoView->setNavigator( mMainView->dateNavigator() ); |
755 | } | 762 | } |
756 | 763 | ||
764 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; | ||
757 | globalFlagBlockAgenda = 1; | 765 | globalFlagBlockAgenda = 1; |
758 | showView( mTodoView, true ); | 766 | showView( mTodoView, true ); |
759 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; | 767 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; |
760 | 768 | ||
761 | } | 769 | } |
762 | 770 | ||
763 | void KOViewManager::showJournalView() | 771 | void KOViewManager::showJournalView() |
764 | { | 772 | { |
765 | //mFlagShowNextxDays = false; | 773 | //mFlagShowNextxDays = false; |
766 | if (!mJournalView) { | 774 | if (!mJournalView) { |
767 | mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(), | 775 | mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(), |
768 | "KOViewManager::JournalView"); | 776 | "KOViewManager::JournalView"); |
769 | connect( mMainView, SIGNAL( configChanged() ), mJournalView, | 777 | connect( mMainView, SIGNAL( configChanged() ), mJournalView, |
770 | SLOT( updateConfig() ) ); | 778 | SLOT( updateConfig() ) ); |
771 | connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) ); | 779 | connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) ); |
772 | addView(mJournalView); | 780 | addView(mJournalView); |
773 | } | 781 | } |
774 | 782 | ||
783 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; | ||
775 | showView(mJournalView); | 784 | showView(mJournalView); |
776 | mMainView->dateNavigator()->selectDates( 1 ); | 785 | mMainView->dateNavigator()->selectDates( 1 ); |
777 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; | 786 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; |
778 | } | 787 | } |
779 | 788 | ||
780 | void KOViewManager::showTimeSpanView() | 789 | void KOViewManager::showTimeSpanView() |
781 | { | 790 | { |
782 | //mFlagShowNextxDays = false; | 791 | //mFlagShowNextxDays = false; |
783 | if (!mTimeSpanView) { | 792 | if (!mTimeSpanView) { |
784 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), | 793 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), |
785 | "KOViewManager::TimeSpanView"); | 794 | "KOViewManager::TimeSpanView"); |
786 | addView(mTimeSpanView); | 795 | addView(mTimeSpanView); |
787 | 796 | ||
788 | mTimeSpanView->readSettings(); | 797 | mTimeSpanView->readSettings(); |
789 | } | 798 | } |
790 | 799 | ||
791 | showView(mTimeSpanView); | 800 | showView(mTimeSpanView); |
792 | } | 801 | } |
793 | 802 | ||
794 | Incidence *KOViewManager::currentSelection() | 803 | Incidence *KOViewManager::currentSelection() |
795 | { | 804 | { |
796 | if (!mCurrentView) return 0; | 805 | if (!mCurrentView) return 0; |
797 | if ( mCurrentView == mListView ) { | 806 | if ( mCurrentView == mListView ) { |
798 | if ( mListView->currentItem() ) | 807 | if ( mListView->currentItem() ) |
799 | return mListView->currentItem(); | 808 | return mListView->currentItem(); |
800 | } | 809 | } |
801 | return mCurrentView->selectedIncidences().first(); | 810 | return mCurrentView->selectedIncidences().first(); |
802 | } | 811 | } |
803 | 812 | ||
804 | QDate KOViewManager::currentSelectionDate() | 813 | QDate KOViewManager::currentSelectionDate() |
805 | { | 814 | { |
806 | QDate qd; | 815 | QDate qd; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 95bef66..87cef20 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -157,74 +157,77 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
157 | else { | 157 | else { |
158 | if ( p->mToolBarUp ) | 158 | if ( p->mToolBarUp ) |
159 | tbd = Right; | 159 | tbd = Right; |
160 | else | 160 | else |
161 | tbd = Left; | 161 | tbd = Left; |
162 | } | 162 | } |
163 | if ( KOPrefs::instance()->mUseAppColors ) | 163 | if ( KOPrefs::instance()->mUseAppColors ) |
164 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 164 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
165 | globalFlagBlockStartup = 1; | 165 | globalFlagBlockStartup = 1; |
166 | iconToolBar = new QPEToolBar( this ); | 166 | iconToolBar = new QPEToolBar( this ); |
167 | addToolBar (iconToolBar , tbd ); | 167 | addToolBar (iconToolBar , tbd ); |
168 | 168 | ||
169 | #ifdef DESKTOP_VERSION | 169 | #ifdef DESKTOP_VERSION |
170 | if ( KOPrefs::instance()->mShowIconFilter ) | 170 | if ( KOPrefs::instance()->mShowIconFilter ) |
171 | #else | 171 | #else |
172 | if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) | 172 | if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) |
173 | #endif | 173 | #endif |
174 | 174 | ||
175 | { | 175 | { |
176 | if ( p->mToolBarHorF ) { | 176 | if ( p->mToolBarHorF ) { |
177 | if ( p->mToolBarUpF ) | 177 | if ( p->mToolBarUpF ) |
178 | tbd = Bottom; | 178 | tbd = Bottom; |
179 | else | 179 | else |
180 | tbd = Top; | 180 | tbd = Top; |
181 | } | 181 | } |
182 | else { | 182 | else { |
183 | if ( p->mToolBarUpF ) | 183 | if ( p->mToolBarUpF ) |
184 | tbd = Right; | 184 | tbd = Right; |
185 | else | 185 | else |
186 | tbd = Left; | 186 | tbd = Left; |
187 | } | 187 | } |
188 | filterToolBar = new QPEToolBar ( this ); | 188 | filterToolBar = new QPEToolBar ( this ); |
189 | filterMenubar = new QPEMenuBar( filterToolBar ); | 189 | filterMenubar = new QMenuBar( filterToolBar ); |
190 | QFontMetrics fm ( filterMenubar->font() ); | 190 | QFontMetrics fm ( filterMenubar->font() ); |
191 | 191 | ||
192 | filterPopupMenu = new QPopupMenu( this ); | 192 | filterPopupMenu = new QPopupMenu( this ); |
193 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 193 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
194 | QString addTest = "Ax"; | 194 | QString addTest = "A"; |
195 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); | ||
195 | #ifdef DESKTOP_VERSION | 196 | #ifdef DESKTOP_VERSION |
196 | addTest = "AAAx"; | 197 | addTest = "AAABBBCCCx"; |
198 | #else | ||
199 | addTest = "AAx"; | ||
197 | #endif | 200 | #endif |
198 | filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) ); | 201 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); |
199 | addToolBar (filterToolBar , tbd ); | 202 | addToolBar (filterToolBar , tbd ); |
200 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); | 203 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); |
201 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); | 204 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); |
202 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) | 205 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) |
203 | filterToolBar->hide(); | 206 | filterToolBar->hide(); |
204 | } else { | 207 | } else { |
205 | filterToolBar = 0; | 208 | filterToolBar = 0; |
206 | filterMenubar = 0; | 209 | filterMenubar = 0; |
207 | filterPopupMenu = 0; | 210 | filterPopupMenu = 0; |
208 | } | 211 | } |
209 | if ( p->mShowIconOnetoolbar ) { | 212 | if ( p->mShowIconOnetoolbar ) { |
210 | viewToolBar = iconToolBar ; | 213 | viewToolBar = iconToolBar ; |
211 | navigatorToolBar = iconToolBar ; | 214 | navigatorToolBar = iconToolBar ; |
212 | } else { | 215 | } else { |
213 | #ifndef DESKTOP_VERSION | 216 | #ifndef DESKTOP_VERSION |
214 | setToolBarsMovable( false ); | 217 | setToolBarsMovable( false ); |
215 | #endif | 218 | #endif |
216 | if ( p->mToolBarHorV ) { | 219 | if ( p->mToolBarHorV ) { |
217 | if ( p->mToolBarUpV ) | 220 | if ( p->mToolBarUpV ) |
218 | tbd = Bottom; | 221 | tbd = Bottom; |
219 | else | 222 | else |
220 | tbd = Top; | 223 | tbd = Top; |
221 | } | 224 | } |
222 | else { | 225 | else { |
223 | if ( p->mToolBarUpV ) | 226 | if ( p->mToolBarUpV ) |
224 | tbd = Right; | 227 | tbd = Right; |
225 | else | 228 | else |
226 | tbd = Left; | 229 | tbd = Left; |
227 | } | 230 | } |
228 | viewToolBar = new QPEToolBar( this ); | 231 | viewToolBar = new QPEToolBar( this ); |
229 | addToolBar (viewToolBar , tbd ); | 232 | addToolBar (viewToolBar , tbd ); |
230 | if ( p->mToolBarHorN ) { | 233 | if ( p->mToolBarHorN ) { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 45ed04d..8fd3d24 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -94,65 +94,65 @@ class MainWindow : public QMainWindow | |||
94 | void selectFilterPopup( int ); | 94 | void selectFilterPopup( int ); |
95 | void exportToPhone( int ); | 95 | void exportToPhone( int ); |
96 | void toggleBeamReceive(); | 96 | void toggleBeamReceive(); |
97 | void disableBR(bool); | 97 | void disableBR(bool); |
98 | signals: | 98 | signals: |
99 | void selectWeek ( int ); | 99 | void selectWeek ( int ); |
100 | private slots: | 100 | private slots: |
101 | void showConfigureAgenda(); | 101 | void showConfigureAgenda(); |
102 | void getFile( bool ); | 102 | void getFile( bool ); |
103 | void syncFileRequest(); | 103 | void syncFileRequest(); |
104 | 104 | ||
105 | protected: | 105 | protected: |
106 | void hideEvent ( QHideEvent * ); | 106 | void hideEvent ( QHideEvent * ); |
107 | QString sentSyncFile(); | 107 | QString sentSyncFile(); |
108 | void displayText( QString, QString); | 108 | void displayText( QString, QString); |
109 | void enableIncidenceActions( bool ); | 109 | void enableIncidenceActions( bool ); |
110 | 110 | ||
111 | private: | 111 | private: |
112 | bool mBRdisabled; | 112 | bool mBRdisabled; |
113 | #ifndef DESKTOP_VERSION | 113 | #ifndef DESKTOP_VERSION |
114 | QCopChannel* infrared; | 114 | QCopChannel* infrared; |
115 | #endif | 115 | #endif |
116 | QAction* brAction; | 116 | QAction* brAction; |
117 | KSyncManager* mSyncManager; | 117 | KSyncManager* mSyncManager; |
118 | bool mClosed; | 118 | bool mClosed; |
119 | void saveOnClose(); | 119 | void saveOnClose(); |
120 | bool mFlagKeyPressed; | 120 | bool mFlagKeyPressed; |
121 | bool mBlockAtStartup; | 121 | bool mBlockAtStartup; |
122 | QPEToolBar *iconToolBar; | 122 | QPEToolBar *iconToolBar; |
123 | QPEToolBar *viewToolBar; | 123 | QPEToolBar *viewToolBar; |
124 | QPEToolBar *navigatorToolBar; | 124 | QPEToolBar *navigatorToolBar; |
125 | QPEToolBar *filterToolBar; | 125 | QPEToolBar *filterToolBar; |
126 | QPEMenuBar *filterMenubar; | 126 | QMenuBar *filterMenubar; |
127 | QPopupMenu * filterPopupMenu; | 127 | QPopupMenu * filterPopupMenu; |
128 | void initActions(); | 128 | void initActions(); |
129 | void setDefaultPreferences(); | 129 | void setDefaultPreferences(); |
130 | void resizeEvent( QResizeEvent* e); | 130 | void resizeEvent( QResizeEvent* e); |
131 | void keyPressEvent ( QKeyEvent * ) ; | 131 | void keyPressEvent ( QKeyEvent * ) ; |
132 | void keyReleaseEvent ( QKeyEvent * ) ; | 132 | void keyReleaseEvent ( QKeyEvent * ) ; |
133 | QPopupMenu *configureToolBarMenu; | 133 | QPopupMenu *configureToolBarMenu; |
134 | QPopupMenu *selectFilterMenu; | 134 | QPopupMenu *selectFilterMenu; |
135 | QPopupMenu *selectFilterMenuTB; | 135 | QPopupMenu *selectFilterMenuTB; |
136 | QPopupMenu *configureAgendaMenu, *syncMenu; | 136 | QPopupMenu *configureAgendaMenu, *syncMenu; |
137 | CalendarLocal *mCalendar; | 137 | CalendarLocal *mCalendar; |
138 | CalendarView *mView; | 138 | CalendarView *mView; |
139 | QAction *mNewSubTodoAction; | 139 | QAction *mNewSubTodoAction; |
140 | QAction *mWeekAction; | 140 | QAction *mWeekAction; |
141 | QFont mWeekFont; | 141 | QFont mWeekFont; |
142 | QPixmap mWeekPixmap; | 142 | QPixmap mWeekPixmap; |
143 | QColor mWeekBgColor; | 143 | QColor mWeekBgColor; |
144 | 144 | ||
145 | QAction *mShowAction; | 145 | QAction *mShowAction; |
146 | QAction *mEditAction; | 146 | QAction *mEditAction; |
147 | QAction *mDeleteAction; | 147 | QAction *mDeleteAction; |
148 | QAction *mCloneAction; | 148 | QAction *mCloneAction; |
149 | QAction *mMoveAction; | 149 | QAction *mMoveAction; |
150 | QAction *mBeamAction; | 150 | QAction *mBeamAction; |
151 | QAction *mCancelAction; | 151 | QAction *mCancelAction; |
152 | 152 | ||
153 | QAction *mToggleNav; | 153 | QAction *mToggleNav; |
154 | QAction *mToggleFilter; | 154 | QAction *mToggleFilter; |
155 | QAction *mToggleAllday; | 155 | QAction *mToggleAllday; |
156 | QAction *actionFilterMenuTB; | 156 | QAction *actionFilterMenuTB; |
157 | 157 | ||
158 | void closeEvent( QCloseEvent* ce ); | 158 | void closeEvent( QCloseEvent* ce ); |