-rw-r--r-- | bin/kdepim/korganizer/featuresKOPI.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 6 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 8 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 6 | ||||
-rw-r--r-- | korganizer/koviewmanager.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 53 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 24 |
7 files changed, 56 insertions, 46 deletions
diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt index 7f4009c..ab6b224 100644 --- a/bin/kdepim/korganizer/featuresKOPI.txt +++ b/bin/kdepim/korganizer/featuresKOPI.txt | |||
@@ -170,39 +170,42 @@ This recurrence is automatically added to the list | |||
170 | of recurrence exceptions and a non-recurring clone is created. | 170 | of recurrence exceptions and a non-recurring clone is created. |
171 | To cancel a recurrence, create an exception by moving it | 171 | To cancel a recurrence, create an exception by moving it |
172 | and then move it back and cancel it. | 172 | and then move it back and cancel it. |
173 | 4) | 173 | 4) |
174 | Accessing the week in agenda view from the month view: | 174 | Accessing the week in agenda view from the month view: |
175 | In the month view there are on the left week numbers displayed. | 175 | In the month view there are on the left week numbers displayed. |
176 | Click on a week number to see this week in the agenda view. | 176 | Click on a week number to see this week in the agenda view. |
177 | 5) | 177 | 5) |
178 | Navigation in month view: | 178 | Navigation in month view: |
179 | If you select the month view with the icon in the toolbar, | 179 | If you select the month view with the icon in the toolbar, |
180 | the selected data range in the date navigator | 180 | the selected data range in the date navigator |
181 | is set automatically to the complete month. | 181 | is set automatically to the complete month. |
182 | (Click on month view and then the space bar to see the | 182 | (Click on month view and then the space bar to see the |
183 | selected data range in the date navigator). | 183 | selected data range in the date navigator). |
184 | If you select in the data navigator | 184 | If you select in the data navigator |
185 | (automatically by clicking on the month view or manually) | 185 | (automatically by clicking on the month view or manually) |
186 | a date range from the first of the month to the | 186 | a date range from the first of the month to the |
187 | 28.-31. of the month (the 28.-31. is valid for every month!) | 187 | 28.-31. of the month (the 28.-31. is valid for every month!) |
188 | then the (month-)navigation keys will select automatically the | 188 | then the (month-)navigation keys will select automatically the |
189 | complete next month as date range. | 189 | complete next month as date range. |
190 | 6) | 190 | 6) |
191 | Navigation in agenda view: | 191 | Navigation in agenda view: |
192 | If you select (as an example) 4 days in the date navigator | 192 | If you select (as an example) 4 days in the date navigator |
193 | the (week-) navigation key will select the same 4 days in the next week. | 193 | the (week-) navigation key will select the same 4 days in the next week. |
194 | If you want to get the next 4 days after the selected 4 days selected, | 194 | If you want to get the next 4 days after the selected 4 days selected, |
195 | you have to switch the navigation mode to "next days mode" | 195 | you have to switch the navigation mode to "next days mode" |
196 | by clicking on the next days icons. | 196 | by clicking on the next days icons. |
197 | Now the next days from today are selected, but after selecting | 197 | Now the next days from today are selected, but after selecting |
198 | 4 days in the day navigator the (week-) navigation key | 198 | 4 days in the day navigator the (week-) navigation key |
199 | will select the next 4 days. | 199 | will select the next 4 days. |
200 | The "next days mode" is turned off by clicking on the | 200 | The "next days mode" is turned off by clicking on the |
201 | week view, work week view or day view button. | 201 | week view, work week view or day view button. |
202 | The agenda view has "time labels" on the left, which displays the hours from 0-24. | ||
203 | If you press the mouse on the timelabels and move it up/down you can | ||
204 | increase/decrease the agenda size quickly. | ||
202 | 205 | ||
203 | 206 | ||
204 | 207 | ||
205 | 208 | ||
206 | 209 | ||
207 | 210 | ||
208 | 211 | ||
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 73940c6..35d2812 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -46,67 +46,64 @@ | |||
46 | { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" }, | 46 | { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" }, |
47 | { "Actions","Aktionen" }, | 47 | { "Actions","Aktionen" }, |
48 | { "Add Filter","Filter Hinzufügen" }, | 48 | { "Add Filter","Filter Hinzufügen" }, |
49 | { "&Add","Hinzufügen" }, | 49 | { "&Add","Hinzufügen" }, |
50 | { "Add","Hinzufügen" }, | 50 | { "Add","Hinzufügen" }, |
51 | { "Additional email addresses:","Zusätzliche E-Mail Adressen:" }, | 51 | { "Additional email addresses:","Zusätzliche E-Mail Adressen:" }, |
52 | { "Additional email address:","Zusätzliche E-Mail Adresse:" }, | 52 | { "Additional email address:","Zusätzliche E-Mail Adresse:" }, |
53 | { "&Addressbook","&Adressbuch" }, | 53 | { "&Addressbook","&Adressbuch" }, |
54 | { "Address &Book...","Adress&buch..." }, | 54 | { "Address &Book...","Adress&buch..." }, |
55 | { "Agenda Size","Agende Größe" }, | 55 | { "Agenda Size","Agende Größe" }, |
56 | { "Agenda Size:","Größe der Agenda:" }, | 56 | { "Agenda Size:","Größe der Agenda:" }, |
57 | { "Agenda view:","Agenda Ansicht:" }, | 57 | { "Agenda view:","Agenda Ansicht:" }, |
58 | { "Agenda view background color:","Hintergrund der Agenda Ansicht:" }, | 58 | { "Agenda view background color:","Hintergrund der Agenda Ansicht:" }, |
59 | { "All attendees","Alle Teilnehmer" }, | 59 | { "All attendees","Alle Teilnehmer" }, |
60 | { "AllDayAgenda Height:","Höhe Ganztages Agenda:" }, | 60 | { "AllDayAgenda Height:","Höhe Ganztages Agenda:" }, |
61 | { "All day event","Ganztägig" }, | 61 | { "All day event","Ganztägig" }, |
62 | { "Anonymous","Anonym" }, | 62 | { "Anonymous","Anonym" }, |
63 | { "Apply","Anwenden" }, | 63 | { "Apply","Anwenden" }, |
64 | { "Apr","Apr" }, | 64 | { "Apr","Apr" }, |
65 | { "April","April" }, | 65 | { "April","April" }, |
66 | {"Ask for every entry on conflict","Frage bei Konflikten nach"}, | 66 | {"Ask for every entry on conflict","Frage bei Konflikten nach"}, |
67 | { "Ask for preferences before syncing","Vor dem Syncronisieren nachfragen" }, | 67 | { "Ask for preferences before syncing","Vor dem Syncronisieren nachfragen" }, |
68 | { "Ask for quit when closing KO/Pi","Vor dem Beenden von KO/Pi nachfragen" }, | 68 | { "Ask for quit when closing KO/Pi","Vor dem Beenden von KO/Pi nachfragen" }, |
69 | { "Attendees","Teilnehmer" }, | 69 | { "Attendees","Teilnehmer" }, |
70 | { "Aug","Aug" }, | 70 | { "Aug","Aug" }, |
71 | { "August","August" }, | 71 | { "August","August" }, |
72 | { "Auto-Save","Automatisches Abspeichern" }, | 72 | { "Auto-Save","Automatisches Abspeichern" }, |
73 | { "Auto save delay in minutes:","Verzög.autom.Speichern in Min" }, | 73 | { "Auto save delay in minutes:","Verzög.autom.Speichern in Min" }, |
74 | { "Auto saving...","Automatische Sicherung..." }, | 74 | { "Auto saving...","Automatische Sicherung..." }, |
75 | { "Begin on:","Starte mit:" }, | 75 | { "Begin on:","Starte mit:" }, |
76 | { "Begins on: %1","Starte mit: %1" }, | 76 | { "Begins on: %1","Starte mit: %1" }, |
77 | { "<b>From:</b> %1 <b>To:</b> %2","<b>Vom:</b> %1 <b>Zum:</b> %2" }, | 77 | { "<b>From:</b> %1 <b>To:</b> %2","<b>Vom:</b> %1 <b>Zum:</b> %2" }, |
78 | { "Bigger","Größer" }, | ||
79 | { "Biggest","Riesig" }, | ||
80 | { "Big","Groß" }, | ||
81 | { "<b>On:</b> %1","<b>Am:</b> %1" }, | 78 | { "<b>On:</b> %1","<b>Am:</b> %1" }, |
82 | { "<b>On:</b> %1 <b>From:S</b> %2 <b>To:</b> %3","<b>Am:</b> %1 <b>Vom:S</b> %2 <b>Zum:</b> %3" }, | 79 | { "<b>On:</b> %1 <b>From:S</b> %2 <b>To:</b> %3","<b>Am:</b> %1 <b>Vom:S</b> %2 <b>Zum:</b> %3" }, |
83 | { "<b>Original event:</b><p>","<b>Original Termin:</b><p>" }, | 80 | { "<b>Original event:</b><p>","<b>Original Termin:</b><p>" }, |
84 | { " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" }, | 81 | { " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" }, |
85 | { "Busy","Belegt" }, | 82 | { "Busy","Belegt" }, |
86 | { "&Cancel","Abbre&chen" }, | 83 | { "&Cancel","Abbre&chen" }, |
87 | { "Cancel","Abbrechen" }, | 84 | { "Cancel","Abbrechen" }, |
88 | { "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" }, | 85 | { "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" }, |
89 | { "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." }, | 86 | { "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." }, |
90 | { "Categories...","Kategorien..." }, | 87 | { "Categories...","Kategorien..." }, |
91 | { "Categories","Kategorien" }, | 88 | { "Categories","Kategorien" }, |
92 | { "Category","Kategorie" }, | 89 | { "Category","Kategorie" }, |
93 | { "Center View","Zentriere Ansicht" }, | 90 | { "Center View","Zentriere Ansicht" }, |
94 | { "Change","Ändere" }, | 91 | { "Change","Ändere" }, |
95 | { "Cinema","Kino" }, | 92 | { "Cinema","Kino" }, |
96 | { "Click to add a new Todo","Hier klicken, um ein neues Todo anzulegen" }, | 93 | { "Click to add a new Todo","Hier klicken, um ein neues Todo anzulegen" }, |
97 | { "Clone Item","Klone Eintrag" }, | 94 | { "Clone Item","Klone Eintrag" }, |
98 | { "&Close","S&chließen" }, | 95 | { "&Close","S&chließen" }, |
99 | { "Close","Schließen" }, | 96 | { "Close","Schließen" }, |
100 | { "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" }, | 97 | { "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" }, |
101 | { "Colors","Farben" }, | 98 | { "Colors","Farben" }, |
102 | { "completed","erledigt" }, | 99 | { "completed","erledigt" }, |
103 | { "completed on %1","erledigt am %1" }, | 100 | { "completed on %1","erledigt am %1" }, |
104 | { "Complete","Erledigt" }, | 101 | { "Complete","Erledigt" }, |
105 | { "Confidential","Vertraulich" }, | 102 | { "Confidential","Vertraulich" }, |
106 | { "Configure...","Einstellungen..." }, | 103 | { "Configure...","Einstellungen..." }, |
107 | { "Confirm &deletes","Löschvogang bestätigen" }, | 104 | { "Confirm &deletes","Löschvogang bestätigen" }, |
108 | { "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." }, | 105 | { "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." }, |
109 | { "Counter-event Viewer","Terminzähler Ansicht" }, | 106 | { "Counter-event Viewer","Terminzähler Ansicht" }, |
110 | { "Daily ending hour:","Feierabend:" }, | 107 | { "Daily ending hour:","Feierabend:" }, |
111 | { "Daily starting hour:","Anfangszeit:" }, | 108 | { "Daily starting hour:","Anfangszeit:" }, |
112 | { "Daily","Täglich" }, | 109 | { "Daily","Täglich" }, |
@@ -377,65 +374,64 @@ | |||
377 | { "Start date: %1","Start Datum: %1" }, | 374 | { "Start date: %1","Start Datum: %1" }, |
378 | { "Start Time","Start Zeit" }, | 375 | { "Start Time","Start Zeit" }, |
379 | { "Status:","Status:" }, | 376 | { "Status:","Status:" }, |
380 | { "Status","Status:" }, | 377 | { "Status","Status:" }, |
381 | { "Summaries","Titel" }, | 378 | { "Summaries","Titel" }, |
382 | { "Summary:","Titel:" }, | 379 | { "Summary:","Titel:" }, |
383 | { "Summary","Titel" }, | 380 | { "Summary","Titel" }, |
384 | { "Sunday","Sonntag" }, | 381 | { "Sunday","Sonntag" }, |
385 | { "Sun","So" }, | 382 | { "Sun","So" }, |
386 | { "Sync preferences:","Sync Einstellungen" }, | 383 | { "Sync preferences:","Sync Einstellungen" }, |
387 | { "Sync Prefs","Sync Einstellungen" }, | 384 | { "Sync Prefs","Sync Einstellungen" }, |
388 | { "Syncronize","Daten abgleich" }, | 385 | { "Syncronize","Daten abgleich" }, |
389 | { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, | 386 | { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, |
390 | { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, | 387 | { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, |
391 | { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, | 388 | { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, |
392 | { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, | 389 | { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, |
393 | { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, | 390 | { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, |
394 | { "Template...","Vorlage..." }, | 391 | { "Template...","Vorlage..." }, |
395 | { "This day","Dieser Tag" }, | 392 | { "This day","Dieser Tag" }, |
396 | { "This is an experimental feature. ","Dieses Feature ist experimentel" }, | 393 | { "This is an experimental feature. ","Dieses Feature ist experimentel" }, |
397 | { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, | 394 | { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, |
398 | { "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, | 395 | { "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, |
399 | { "Thu","Do" }, | 396 | { "Thu","Do" }, |
400 | { "Thursday","Donnerstag" }, | 397 | { "Thursday","Donnerstag" }, |
401 | { "Time associated","Mit Zeit" }, | 398 | { "Time associated","Mit Zeit" }, |
402 | { "Time bar:","Uhrzeit Zeile:" }, | 399 | { "Time bar:","Uhrzeit Zeile:" }, |
403 | { "Time && Date","Zeit und Datum" }, | 400 | { "Time && Date","Zeit und Datum" }, |
404 | { "Time Format","Zeit Format" }, | 401 | { "Time Format","Zeit Format" }, |
405 | { "Time Format(nr):","Zeit Format(Neustart!)" }, | 402 | { "Time Format(nr):","Zeit Format(Neustart!)" }, |
406 | { "Date Labels:","Datumsleiste:" }, | 403 | { "Date Labels:","Datumsleiste:" }, |
407 | { "Time: ","Zeit: " }, | 404 | { "Time: ","Zeit: " }, |
408 | { "Timezone:","Zeitzone:" }, | 405 | { "Timezone:","Zeitzone:" }, |
409 | { "Tiny","Sehr klein" }, | ||
410 | { "To: ","Bis: " }, | 406 | { "To: ","Bis: " }, |
411 | { "To:","Bis:" }, | 407 | { "To:","Bis:" }, |
412 | { "Today: ","Heute: " }, | 408 | { "Today: ","Heute: " }, |
413 | { "Todo due today color:","Heute fällige To-Do's" }, | 409 | { "Todo due today color:","Heute fällige To-Do's" }, |
414 | { "To-do items:","To-Do items:" }, | 410 | { "To-do items:","To-Do items:" }, |
415 | { "Todo overdue color:","Überfällige To-Do's" }, | 411 | { "Todo overdue color:","Überfällige To-Do's" }, |
416 | { "Todo","Todo" }, | 412 | { "Todo","Todo" }, |
417 | { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, | 413 | { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, |
418 | { "ToDoView:","Todo Ansicht:" }, | 414 | { "ToDoView:","Todo Ansicht:" }, |
419 | { "Toggle Alarm","Wechsle Alarm" }, | 415 | { "Toggle Alarm","Wechsle Alarm" }, |
420 | { "Toggle Allday","Umschalten Ganztag" }, | 416 | { "Toggle Allday","Umschalten Ganztag" }, |
421 | { "Tomorrow: ","Morgen: " }, | 417 | { "Tomorrow: ","Morgen: " }, |
422 | { "Tue","Di" }, | 418 | { "Tue","Di" }, |
423 | { "Tuesday","Dienstag" }, | 419 | { "Tuesday","Dienstag" }, |
424 | { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" }, | 420 | { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" }, |
425 | { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." }, | 421 | { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." }, |
426 | { "Unknown","Unbekannt" }, | 422 | { "Unknown","Unbekannt" }, |
427 | { "Up","Hinauf" }, | 423 | { "Up","Hinauf" }, |
428 | { "Use password (if not, ask when syncing)","Passwort: (sonst jedesmal anfragen)" }, | 424 | { "Use password (if not, ask when syncing)","Passwort: (sonst jedesmal anfragen)" }, |
429 | { "User defined","Benutzerdefiniert" }, | 425 | { "User defined","Benutzerdefiniert" }, |
430 | { "User long date:","Format langes Datum:" }, | 426 | { "User long date:","Format langes Datum:" }, |
431 | { "User short date:","Forma kurzes Datum:" }, | 427 | { "User short date:","Forma kurzes Datum:" }, |
432 | { "View","Ansicht" }, | 428 | { "View","Ansicht" }, |
433 | { "View Fonts","Schriftarten Ansichten" }, | 429 | { "View Fonts","Schriftarten Ansichten" }, |
434 | { "Views","Ansichten" }, | 430 | { "Views","Ansichten" }, |
435 | { "Wed","Mi" }, | 431 | { "Wed","Mi" }, |
436 | { "Wednesday","Mittwoch" }, | 432 | { "Wednesday","Mittwoch" }, |
437 | { "Week %1","Woche %1" }, | 433 | { "Week %1","Woche %1" }, |
438 | { "Weekly","Wöchentlich" }, | 434 | { "Weekly","Wöchentlich" }, |
439 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | 435 | { "Week starts on Sunday","Woche beginnt Sonntags" }, |
440 | { "What's Next View:","What's Next Anz." }, | 436 | { "What's Next View:","What's Next Anz." }, |
441 | { "What's next ?","Was kommt als nächstes?(What's Next)" }, | 437 | { "What's next ?","Was kommt als nächstes?(What's Next)" }, |
@@ -1166,36 +1162,36 @@ | |||
1166 | { "Include &priority of the item","Inclusive Priorität des Items" }, | 1162 | { "Include &priority of the item","Inclusive Priorität des Items" }, |
1167 | { "Items to Print","Zu druckende Items" }, | 1163 | { "Items to Print","Zu druckende Items" }, |
1168 | { "&From:","Von:" }, | 1164 | { "&From:","Von:" }, |
1169 | { "&To:","Bis:" }, | 1165 | { "&To:","Bis:" }, |
1170 | { "Print &all todo items","Drucke alle Todo Items" }, | 1166 | { "Print &all todo items","Drucke alle Todo Items" }, |
1171 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, | 1167 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, |
1172 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, | 1168 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, |
1173 | { "Todo List","Todo Liste" }, | 1169 | { "Todo List","Todo Liste" }, |
1174 | { "&Title:","&Titel:" }, | 1170 | { "&Title:","&Titel:" }, |
1175 | { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" }, | 1171 | { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" }, |
1176 | { "Todo list","Todo Liste" }, | 1172 | { "Todo list","Todo Liste" }, |
1177 | { "&Print...","Drucke..." }, | 1173 | { "&Print...","Drucke..." }, |
1178 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, | 1174 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, |
1179 | { "[Unconfigured]","[Unkonfiguriert]" }, | 1175 | { "[Unconfigured]","[Unkonfiguriert]" }, |
1180 | { "OK","OK" }, | 1176 | { "OK","OK" }, |
1181 | { "FilterEditor","FilterEditor" }, | 1177 | { "FilterEditor","FilterEditor" }, |
1182 | { "Include","Inclusive" }, | 1178 | { "Include","Inclusive" }, |
1183 | { "Exclude","Exclusive" }, | 1179 | { "Exclude","Exclusive" }, |
1184 | { "Edit Selection...","Editiere Selektion..." }, | 1180 | { "Edit Selection...","Editiere Selektion..." }, |
1185 | { "recurring events","wiederholende Ereignisse" }, | 1181 | { "recurring events","wiederholende Ereignisse" }, |
1186 | { "completed to-dos","erledigte Todos" }, | 1182 | { "completed to-dos","erledigte Todos" }, |
1187 | { "events","Ereignisse" }, | 1183 | { "events","Ereignisse" }, |
1188 | { "todos","Todos" }, | 1184 | { "todos","Todos" }, |
1189 | { "journals","Journale" }, | 1185 | { "journals","Journale" }, |
1190 | { "public","öffentlich" }, | 1186 | { "public","öffentlich" }, |
1191 | { "private","privat" }, | 1187 | { "private","privat" }, |
1192 | { "confidential","vertraulich" }, | 1188 | { "confidential","vertraulich" }, |
1193 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, | 1189 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, |
1194 | { "Yesterday","Gestern" }, | 1190 | { "Yesterday","Gestern" }, |
1195 | { "Day after tomorrow","Übermorgen" }, | 1191 | { "Day after tomorrow","Übermorgen" }, |
1196 | { "Tomorrow","Morgen" }, | 1192 | { "Tomorrow","Morgen" }, |
1197 | { "Day before yesterday","Vorgestern" }, | 1193 | { "Day before yesterday","Vorgestern" }, |
1198 | { "","" }, | 1194 | { "Size %1","Größe %1" }, |
1199 | { "","" }, | 1195 | { "","" }, |
1200 | { "","" }, | 1196 | { "","" }, |
1201 | { "","" }, | 1197 | { "","" }, |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 05216a7..f54f7bc 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -187,81 +187,81 @@ void TimeLabels::updateConfig() | |||
187 | // update HourSize | 187 | // update HourSize |
188 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 188 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
189 | resizeContents(50,mRows * mCellHeight); | 189 | resizeContents(50,mRows * mCellHeight); |
190 | } | 190 | } |
191 | 191 | ||
192 | /** update time label positions */ | 192 | /** update time label positions */ |
193 | void TimeLabels::positionChanged() | 193 | void TimeLabels::positionChanged() |
194 | { | 194 | { |
195 | int adjustment = mAgenda->contentsY(); | 195 | int adjustment = mAgenda->contentsY(); |
196 | setContentsPos(0, adjustment); | 196 | setContentsPos(0, adjustment); |
197 | } | 197 | } |
198 | 198 | ||
199 | /** */ | 199 | /** */ |
200 | void TimeLabels::setAgenda(KOAgenda* agenda) | 200 | void TimeLabels::setAgenda(KOAgenda* agenda) |
201 | { | 201 | { |
202 | mAgenda = agenda; | 202 | mAgenda = agenda; |
203 | } | 203 | } |
204 | 204 | ||
205 | void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) | 205 | void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) |
206 | { | 206 | { |
207 | mMouseDownY = e->pos().y(); | 207 | mMouseDownY = e->pos().y(); |
208 | mOrgCap = topLevelWidget()->caption(); | 208 | mOrgCap = topLevelWidget()->caption(); |
209 | } | 209 | } |
210 | 210 | ||
211 | void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) | 211 | void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) |
212 | { | 212 | { |
213 | int diff = mMouseDownY - e->pos().y(); | 213 | int diff = mMouseDownY - e->pos().y(); |
214 | if ( diff < 10 && diff > -10 ) | 214 | if ( diff < 10 && diff > -10 ) |
215 | return; | 215 | return; |
216 | int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; | 216 | int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; |
217 | if ( tSize < 4 ) | 217 | if ( tSize < 4 ) |
218 | tSize = 4; | 218 | tSize = 4; |
219 | if ( tSize > 18 ) | 219 | if ( tSize > 22 ) |
220 | tSize = 18; | 220 | tSize = 22; |
221 | tSize = (tSize-2)/2; | 221 | tSize = (tSize-2)/2; |
222 | topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); | 222 | topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); |
223 | 223 | ||
224 | } | 224 | } |
225 | void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) | 225 | void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) |
226 | { | 226 | { |
227 | topLevelWidget()->setCaption( mOrgCap ); | 227 | topLevelWidget()->setCaption( mOrgCap ); |
228 | int diff = mMouseDownY - e->pos().y(); | 228 | int diff = mMouseDownY - e->pos().y(); |
229 | if ( diff < 10 && diff > -10 ) | 229 | if ( diff < 10 && diff > -10 ) |
230 | return; | 230 | return; |
231 | int tSize = KOPrefs::instance()->mHourSize + (diff/10); | 231 | int tSize = KOPrefs::instance()->mHourSize + (diff/10); |
232 | if ( tSize < 4 ) | 232 | if ( tSize < 4 ) |
233 | tSize = 4; | 233 | tSize = 4; |
234 | if ( tSize > 18 ) | 234 | if ( tSize > 22 ) |
235 | tSize = 18; | 235 | tSize = 22; |
236 | tSize = (tSize/2)*2; | 236 | tSize = (tSize/2)*2; |
237 | if ( tSize == KOPrefs::instance()->mHourSize ) | 237 | if ( tSize == KOPrefs::instance()->mHourSize ) |
238 | return; | 238 | return; |
239 | KOPrefs::instance()->mHourSize = tSize; | 239 | KOPrefs::instance()->mHourSize = tSize; |
240 | emit scaleChanged(); | 240 | emit scaleChanged(); |
241 | } | 241 | } |
242 | 242 | ||
243 | /** This is called in response to repaint() */ | 243 | /** This is called in response to repaint() */ |
244 | void TimeLabels::paintEvent(QPaintEvent*) | 244 | void TimeLabels::paintEvent(QPaintEvent*) |
245 | { | 245 | { |
246 | 246 | ||
247 | // kdDebug() << "paintevent..." << endl; | 247 | // kdDebug() << "paintevent..." << endl; |
248 | // this is another hack! | 248 | // this is another hack! |
249 | // QPainter painter(this); | 249 | // QPainter painter(this); |
250 | //QString c | 250 | //QString c |
251 | repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); | 251 | repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); |
252 | } | 252 | } |
253 | 253 | ||
254 | //////////////////////////////////////////////////////////////////////////// | 254 | //////////////////////////////////////////////////////////////////////////// |
255 | 255 | ||
256 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) | 256 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) |
257 | : QFrame(parent,name) | 257 | : QFrame(parent,name) |
258 | { | 258 | { |
259 | mColumns = 1; | 259 | mColumns = 1; |
260 | mTopBox = 0; | 260 | mTopBox = 0; |
261 | mLocation = loc; | 261 | mLocation = loc; |
262 | mTopLayout = 0; | 262 | mTopLayout = 0; |
263 | mPaintWidget = 0; | 263 | mPaintWidget = 0; |
264 | mXOffset = 0; | 264 | mXOffset = 0; |
265 | if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); | 265 | if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); |
266 | else mPixmap = SmallIcon("1downarrow"); | 266 | else mPixmap = SmallIcon("1downarrow"); |
267 | mEnabled.resize(mColumns); | 267 | mEnabled.resize(mColumns); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e255b83..94c459b 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -153,86 +153,88 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
153 | full = false; | 153 | full = false; |
154 | } | 154 | } |
155 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 155 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
156 | //raiseCurrentView( full ); | 156 | //raiseCurrentView( full ); |
157 | mMainView->processIncidenceSelection( 0 ); | 157 | mMainView->processIncidenceSelection( 0 ); |
158 | mMainView->updateView(); | 158 | mMainView->updateView(); |
159 | raiseCurrentView( full ); | 159 | raiseCurrentView( full ); |
160 | mMainView->adaptNavigationUnits(); | 160 | mMainView->adaptNavigationUnits(); |
161 | } | 161 | } |
162 | 162 | ||
163 | void KOViewManager::raiseCurrentView( bool fullScreen ) | 163 | void KOViewManager::raiseCurrentView( bool fullScreen ) |
164 | { | 164 | { |
165 | //qDebug("raiseCurrentView "); | 165 | //qDebug("raiseCurrentView "); |
166 | mCurrentAgendaView = 0; | 166 | mCurrentAgendaView = 0; |
167 | int wid = mMainView->width() ; | 167 | int wid = mMainView->width() ; |
168 | int hei = mMainView->height(); | 168 | int hei = mMainView->height(); |
169 | if ( mCurrentView == mMonthView ) { | 169 | if ( mCurrentView == mMonthView ) { |
170 | mMainView->navigatorBar()->show(); | 170 | mMainView->navigatorBar()->show(); |
171 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 171 | hei -= mMainView->navigatorBar()->sizeHint().height(); |
172 | //mMainView->navigatorBar()->hide(); | 172 | //mMainView->navigatorBar()->hide(); |
173 | } else { | 173 | } else { |
174 | mMainView->navigatorBar()->hide(); | 174 | mMainView->navigatorBar()->hide(); |
175 | } | 175 | } |
176 | if ( fullScreen ) { | 176 | if ( fullScreen ) { |
177 | mMainView->leftFrame()->hide(); | 177 | mMainView->leftFrame()->hide(); |
178 | } else { | 178 | } else { |
179 | mMainView->leftFrame()->show(); | 179 | mMainView->leftFrame()->show(); |
180 | if ( KOPrefs::instance()->mVerticalScreen ) | 180 | if ( KOPrefs::instance()->mVerticalScreen ) |
181 | hei -= mMainView->leftFrame()->height(); | 181 | hei -= mMainView->leftFrame()->height(); |
182 | else | 182 | else |
183 | wid -= mMainView->leftFrame()->width(); | 183 | wid -= mMainView->leftFrame()->width(); |
184 | } | 184 | } |
185 | 185 | emit signalFullScreen( !fullScreen ); | |
186 | if ( globalFlagBlockAgenda == 5 ) { | 186 | if ( globalFlagBlockAgenda == 5 ) { |
187 | globalFlagBlockAgenda = 4; | 187 | globalFlagBlockAgenda = 4; |
188 | globalFlagBlockAgendaItemPaint = 1; | 188 | globalFlagBlockAgendaItemPaint = 1; |
189 | } | 189 | } |
190 | mMainView->viewStack()->raiseWidget(mCurrentView); | 190 | mMainView->viewStack()->raiseWidget(mCurrentView); |
191 | if ( globalFlagBlockAgenda == 4 ) { | 191 | if ( globalFlagBlockAgenda == 4 ) { |
192 | if ( mCurrentView == mAgendaView ) { | 192 | if ( mCurrentView == mAgendaView ) { |
193 | //globalFlagBlockAgenda =1 ; | 193 | //globalFlagBlockAgenda =1 ; |
194 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 194 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
195 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); | 195 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); |
196 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 196 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
197 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); | 197 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); |
198 | qApp->processEvents(); | 198 | qApp->processEvents(); |
199 | //qDebug("qApp->processEvents() "); | 199 | //qDebug("qApp->processEvents() "); |
200 | globalFlagBlockAgenda = 0; | 200 | globalFlagBlockAgenda = 0; |
201 | mAgendaView->repaintAgenda(); | 201 | mAgendaView->repaintAgenda(); |
202 | 202 | ||
203 | } | 203 | } |
204 | globalFlagBlockAgenda = 0; | 204 | globalFlagBlockAgenda = 0; |
205 | } | 205 | } |
206 | emit signalAgendaView( mCurrentView == mAgendaView ); | ||
206 | //qDebug("raiseCurrentView ende "); | 207 | //qDebug("raiseCurrentView ende "); |
208 | |||
207 | } | 209 | } |
208 | 210 | ||
209 | void KOViewManager::updateView() | 211 | void KOViewManager::updateView() |
210 | { | 212 | { |
211 | // qDebug("KOViewManager::updateView() "); | 213 | // qDebug("KOViewManager::updateView() "); |
212 | // if we are updating mTodoView, we get endless recursion | 214 | // if we are updating mTodoView, we get endless recursion |
213 | if ( mTodoView == mCurrentView ) | 215 | if ( mTodoView == mCurrentView ) |
214 | return; | 216 | return; |
215 | if ( mCurrentView ) mCurrentView->updateView(); | 217 | if ( mCurrentView ) mCurrentView->updateView(); |
216 | 218 | ||
217 | } | 219 | } |
218 | 220 | ||
219 | void KOViewManager::updateView(const QDate &start, const QDate &end) | 221 | void KOViewManager::updateView(const QDate &start, const QDate &end) |
220 | { | 222 | { |
221 | // kdDebug() << "KOViewManager::updateView()" << endl; | 223 | // kdDebug() << "KOViewManager::updateView()" << endl; |
222 | 224 | ||
223 | if (mCurrentView) mCurrentView->showDates(start, end); | 225 | if (mCurrentView) mCurrentView->showDates(start, end); |
224 | 226 | ||
225 | if (mTodoView) mTodoView->updateView(); | 227 | if (mTodoView) mTodoView->updateView(); |
226 | } | 228 | } |
227 | 229 | ||
228 | 230 | ||
229 | void KOViewManager::updateWNview() | 231 | void KOViewManager::updateWNview() |
230 | { | 232 | { |
231 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) | 233 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) |
232 | mWhatsNextView->updateView(); | 234 | mWhatsNextView->updateView(); |
233 | 235 | ||
234 | } | 236 | } |
235 | void KOViewManager::showWhatsNextView() | 237 | void KOViewManager::showWhatsNextView() |
236 | { | 238 | { |
237 | if (!mWhatsNextView) { | 239 | if (!mWhatsNextView) { |
238 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), | 240 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), |
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 3c251fb..c8c7a7a 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h | |||
@@ -50,64 +50,66 @@ class KOViewManager : public QObject | |||
50 | public: | 50 | public: |
51 | KOViewManager( CalendarView * ); | 51 | KOViewManager( CalendarView * ); |
52 | virtual ~KOViewManager(); | 52 | virtual ~KOViewManager(); |
53 | 53 | ||
54 | /** changes the view to be the currently selected view */ | 54 | /** changes the view to be the currently selected view */ |
55 | void showView(KOrg::BaseView *, bool fullScreen = false ); | 55 | void showView(KOrg::BaseView *, bool fullScreen = false ); |
56 | void updateWNview(); | 56 | void updateWNview(); |
57 | void readSettings(KConfig *config); | 57 | void readSettings(KConfig *config); |
58 | void writeSettings(KConfig *config); | 58 | void writeSettings(KConfig *config); |
59 | bool showsNextDays(); | 59 | bool showsNextDays(); |
60 | /** Read which view was shown last from config file */ | 60 | /** Read which view was shown last from config file */ |
61 | void readCurrentView(KConfig *); | 61 | void readCurrentView(KConfig *); |
62 | /** Write which view is currently shown to config file */ | 62 | /** Write which view is currently shown to config file */ |
63 | void writeCurrentView(KConfig *); | 63 | void writeCurrentView(KConfig *); |
64 | 64 | ||
65 | KOrg::BaseView *currentView(); | 65 | KOrg::BaseView *currentView(); |
66 | 66 | ||
67 | void setDocumentId( const QString & ); | 67 | void setDocumentId( const QString & ); |
68 | 68 | ||
69 | void updateView( const QDate &start, const QDate &end ); | 69 | void updateView( const QDate &start, const QDate &end ); |
70 | 70 | ||
71 | void raiseCurrentView( bool fullScreen = false ); | 71 | void raiseCurrentView( bool fullScreen = false ); |
72 | 72 | ||
73 | void addView(KOrg::BaseView *); | 73 | void addView(KOrg::BaseView *); |
74 | 74 | ||
75 | Incidence *currentSelection(); | 75 | Incidence *currentSelection(); |
76 | QDate currentSelectionDate(); | 76 | QDate currentSelectionDate(); |
77 | 77 | ||
78 | KOAgendaView *agendaView() const { return mAgendaView; } | 78 | KOAgendaView *agendaView() const { return mAgendaView; } |
79 | 79 | ||
80 | signals: | 80 | signals: |
81 | void printWNV(); | 81 | void printWNV(); |
82 | void signalFullScreen( bool ); | ||
83 | void signalAgendaView( bool ); | ||
82 | public slots: | 84 | public slots: |
83 | void updateView(); | 85 | void updateView(); |
84 | void showWhatsNextView(); | 86 | void showWhatsNextView(); |
85 | void showListView(); | 87 | void showListView(); |
86 | void showAgendaView( bool fullScreen = false ); | 88 | void showAgendaView( bool fullScreen = false ); |
87 | void showDayView(); | 89 | void showDayView(); |
88 | void showWorkWeekView(); | 90 | void showWorkWeekView(); |
89 | void showWeekView(); | 91 | void showWeekView(); |
90 | void showNextXView(); | 92 | void showNextXView(); |
91 | void showMonthView(); | 93 | void showMonthView(); |
92 | void showTodoView(); | 94 | void showTodoView(); |
93 | void showJournalView(); | 95 | void showJournalView(); |
94 | void showTimeSpanView(); | 96 | void showTimeSpanView(); |
95 | 97 | ||
96 | private: | 98 | private: |
97 | CalendarView *mMainView; | 99 | CalendarView *mMainView; |
98 | 100 | ||
99 | int mCurrentAgendaView; | 101 | int mCurrentAgendaView; |
100 | KOAgendaView *mAgendaView; | 102 | KOAgendaView *mAgendaView; |
101 | KOListView *mListView; | 103 | KOListView *mListView; |
102 | KOMonthView *mMonthView; | 104 | KOMonthView *mMonthView; |
103 | KOTodoView *mTodoView; | 105 | KOTodoView *mTodoView; |
104 | KOWhatsNextView *mWhatsNextView; | 106 | KOWhatsNextView *mWhatsNextView; |
105 | KOJournalView *mJournalView; | 107 | KOJournalView *mJournalView; |
106 | KOTimeSpanView *mTimeSpanView; | 108 | KOTimeSpanView *mTimeSpanView; |
107 | 109 | ||
108 | KOrg::BaseView *mCurrentView; // currently active event view | 110 | KOrg::BaseView *mCurrentView; // currently active event view |
109 | 111 | ||
110 | int mAgendaViewMode; | 112 | int mAgendaViewMode; |
111 | bool mFlagShowNextxDays; | 113 | bool mFlagShowNextxDays; |
112 | 114 | ||
113 | }; | 115 | }; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 877b6f2..145b36c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -516,131 +516,141 @@ void MainWindow::initActions() | |||
516 | syncMenu = new QPopupMenu( this ); | 516 | syncMenu = new QPopupMenu( this ); |
517 | configureAgendaMenu = new QPopupMenu( this ); | 517 | configureAgendaMenu = new QPopupMenu( this ); |
518 | configureToolBarMenu = new QPopupMenu( this ); | 518 | configureToolBarMenu = new QPopupMenu( this ); |
519 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 519 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
520 | if ( KOPrefs::instance()->mShowFullMenu ) { | 520 | if ( KOPrefs::instance()->mShowFullMenu ) { |
521 | QMenuBar *menuBar1; | 521 | QMenuBar *menuBar1; |
522 | menuBar1 = menuBar(); | 522 | menuBar1 = menuBar(); |
523 | menuBar1->insertItem( i18n("File"), importMenu ); | 523 | menuBar1->insertItem( i18n("File"), importMenu ); |
524 | menuBar1->insertItem( i18n("View"), viewMenu ); | 524 | menuBar1->insertItem( i18n("View"), viewMenu ); |
525 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 525 | menuBar1->insertItem( i18n("Actions"), actionMenu ); |
526 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 526 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
527 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 527 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
528 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 528 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
529 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); | 529 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); |
530 | menuBar1->insertItem( i18n("Help"), helpMenu ); | 530 | menuBar1->insertItem( i18n("Help"), helpMenu ); |
531 | } else { | 531 | } else { |
532 | QPEMenuBar *menuBar1; | 532 | QPEMenuBar *menuBar1; |
533 | menuBar1 = new QPEMenuBar( iconToolBar ); | 533 | menuBar1 = new QPEMenuBar( iconToolBar ); |
534 | QPopupMenu *menuBar = new QPopupMenu( this ); | 534 | QPopupMenu *menuBar = new QPopupMenu( this ); |
535 | menuBar1->insertItem( i18n("ME"), menuBar); | 535 | menuBar1->insertItem( i18n("ME"), menuBar); |
536 | menuBar->insertItem( i18n("File"), importMenu ); | 536 | menuBar->insertItem( i18n("File"), importMenu ); |
537 | menuBar->insertItem( i18n("View"), viewMenu ); | 537 | menuBar->insertItem( i18n("View"), viewMenu ); |
538 | menuBar->insertItem( i18n("Actions"), actionMenu ); | 538 | menuBar->insertItem( i18n("Actions"), actionMenu ); |
539 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 539 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
540 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 540 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
541 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 541 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
542 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); | 542 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); |
543 | menuBar->insertItem( i18n("Help"), helpMenu ); | 543 | menuBar->insertItem( i18n("Help"), helpMenu ); |
544 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 544 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
545 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); | 545 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); |
546 | } | 546 | } |
547 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); | 547 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |
548 | connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) ); | 548 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |
549 | 549 | ||
550 | // ****************** | 550 | // ****************** |
551 | QAction *action; | 551 | QAction *action; |
552 | QIconSet icon; | 552 | QIconSet icon; |
553 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); | 553 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); |
554 | configureToolBarMenu->setCheckable( true ); | 554 | configureToolBarMenu->setCheckable( true ); |
555 | 555 | ||
556 | QString pathString = ""; | 556 | QString pathString = ""; |
557 | if ( !p->mToolBarMiniIcons ) { | 557 | if ( !p->mToolBarMiniIcons ) { |
558 | if ( QApplication::desktop()->width() < 480 ) | 558 | if ( QApplication::desktop()->width() < 480 ) |
559 | pathString += "icons16/"; | 559 | pathString += "icons16/"; |
560 | } else | 560 | } else |
561 | pathString += "iconsmini/"; | 561 | pathString += "iconsmini/"; |
562 | configureAgendaMenu->setCheckable( true ); | 562 | configureAgendaMenu->setCheckable( true ); |
563 | configureAgendaMenu->insertItem(i18n("Tiny"), 4 ); | 563 | int iii ; |
564 | configureAgendaMenu->insertItem(i18n("Small"), 6 ); | 564 | for ( iii = 1;iii<= 10 ;++iii ){ |
565 | configureAgendaMenu->insertItem(i18n("Medium"), 8 ); | 565 | configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); |
566 | configureAgendaMenu->insertItem(i18n("Normal"), 10 ); | 566 | } |
567 | configureAgendaMenu->insertItem(i18n("Large"), 12 ); | ||
568 | configureAgendaMenu->insertItem(i18n("Big"), 14 ); | ||
569 | configureAgendaMenu->insertItem(i18n("Bigger"), 16 ); | ||
570 | configureAgendaMenu->insertItem(i18n("Biggest"), 18 ); | ||
571 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); | 567 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); |
572 | 568 | ||
569 | connect( configureAgendaMenu, SIGNAL( aboutToShow()), | ||
570 | this, SLOT( showConfigureAgenda( ) ) ); | ||
571 | |||
573 | icon = loadPixmap( pathString + "configure" ); | 572 | icon = loadPixmap( pathString + "configure" ); |
574 | action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); | 573 | action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); |
575 | action->addTo( actionMenu ); | 574 | action->addTo( actionMenu ); |
576 | connect( action, SIGNAL( activated() ), | 575 | connect( action, SIGNAL( activated() ), |
577 | mView, SLOT( edit_options() ) ); | 576 | mView, SLOT( edit_options() ) ); |
578 | actionMenu->insertSeparator(); | 577 | actionMenu->insertSeparator(); |
579 | 578 | ||
580 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 579 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
581 | action->addTo( actionMenu ); | 580 | action->addTo( actionMenu ); |
582 | connect( action, SIGNAL( activated() ), | 581 | connect( action, SIGNAL( activated() ), |
583 | mView, SLOT( undo_delete() ) ); | 582 | mView, SLOT( undo_delete() ) ); |
584 | actionMenu->insertSeparator(); | 583 | actionMenu->insertSeparator(); |
585 | 584 | ||
586 | icon = loadPixmap( pathString + "newevent" ); | 585 | icon = loadPixmap( pathString + "newevent" ); |
587 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 586 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
588 | configureToolBarMenu->insertSeparator(); | 587 | configureToolBarMenu->insertSeparator(); |
589 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 588 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
590 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 589 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
591 | ne_action->addTo( actionMenu ); | 590 | ne_action->addTo( actionMenu ); |
592 | connect( ne_action, SIGNAL( activated() ), | 591 | connect( ne_action, SIGNAL( activated() ), |
593 | mView, SLOT( newEvent() ) ); | 592 | mView, SLOT( newEvent() ) ); |
594 | icon = loadPixmap( pathString + "newtodo" ); | 593 | icon = loadPixmap( pathString + "newtodo" ); |
595 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 594 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
596 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 595 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
597 | nt_action->addTo( actionMenu ); | 596 | nt_action->addTo( actionMenu ); |
598 | connect( nt_action, SIGNAL( activated() ), | 597 | connect( nt_action, SIGNAL( activated() ), |
599 | mView, SLOT( newTodo() ) ); | 598 | mView, SLOT( newTodo() ) ); |
600 | icon = loadPixmap( pathString + "navi" ); | 599 | icon = loadPixmap( pathString + "navi" ); |
601 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 600 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
602 | action->addTo( viewMenu ); | 601 | action->addTo( viewMenu ); |
603 | connect( action, SIGNAL( activated() ), | 602 | connect( action, SIGNAL( activated() ), |
604 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 603 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
604 | mToggleNav = action ; | ||
605 | icon = loadPixmap( pathString + "filter" ); | 605 | icon = loadPixmap( pathString + "filter" ); |
606 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); | 606 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); |
607 | action->addTo( viewMenu ); | 607 | action->addTo( viewMenu ); |
608 | connect( action, SIGNAL( activated() ), | 608 | connect( action, SIGNAL( activated() ), |
609 | mView, SLOT( toggleFilter() ) ); | 609 | mView, SLOT( toggleFilter() ) ); |
610 | mToggleFilter = action; | ||
610 | icon = loadPixmap( pathString + "allday" ); | 611 | icon = loadPixmap( pathString + "allday" ); |
611 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 612 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
612 | action->addTo( viewMenu ); | 613 | action->addTo( viewMenu ); |
613 | connect( action, SIGNAL( activated() ), | 614 | connect( action, SIGNAL( activated() ), |
614 | mView, SLOT( toggleAllDaySize() ) ); | 615 | mView, SLOT( toggleAllDaySize() ) ); |
616 | mToggleAllday = action; | ||
617 | |||
618 | |||
619 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | ||
620 | mToggleNav, SLOT( setEnabled ( bool ) ) ); | ||
621 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | ||
622 | mToggleFilter, SLOT( setEnabled ( bool ) ) ); | ||
623 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | ||
624 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); | ||
615 | 625 | ||
616 | viewMenu->insertSeparator(); | 626 | viewMenu->insertSeparator(); |
617 | icon = loadPixmap( pathString + "picker" ); | 627 | icon = loadPixmap( pathString + "picker" ); |
618 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); | 628 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); |
619 | action->addTo( viewMenu ); | 629 | action->addTo( viewMenu ); |
620 | connect( action, SIGNAL( activated() ), | 630 | connect( action, SIGNAL( activated() ), |
621 | mView, SLOT( showDatePicker() ) ); | 631 | mView, SLOT( showDatePicker() ) ); |
622 | action->addTo( iconToolBar ); | 632 | action->addTo( iconToolBar ); |
623 | viewMenu->insertSeparator(); | 633 | viewMenu->insertSeparator(); |
624 | icon = loadPixmap( pathString + "list" ); | 634 | icon = loadPixmap( pathString + "list" ); |
625 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); | 635 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); |
626 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); | 636 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); |
627 | showlist_action->addTo( viewMenu ); | 637 | showlist_action->addTo( viewMenu ); |
628 | connect( showlist_action, SIGNAL( activated() ), | 638 | connect( showlist_action, SIGNAL( activated() ), |
629 | mView->viewManager(), SLOT( showListView() ) ); | 639 | mView->viewManager(), SLOT( showListView() ) ); |
630 | 640 | ||
631 | 641 | ||
632 | icon = loadPixmap( pathString + "day" ); | 642 | icon = loadPixmap( pathString + "day" ); |
633 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 643 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
634 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); | 644 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); |
635 | day1_action->addTo( viewMenu ); | 645 | day1_action->addTo( viewMenu ); |
636 | // action->addTo( toolBar ); | 646 | // action->addTo( toolBar ); |
637 | connect( day1_action, SIGNAL( activated() ), | 647 | connect( day1_action, SIGNAL( activated() ), |
638 | mView->viewManager(), SLOT( showDayView() ) ); | 648 | mView->viewManager(), SLOT( showDayView() ) ); |
639 | 649 | ||
640 | icon = loadPixmap( pathString + "workweek" ); | 650 | icon = loadPixmap( pathString + "workweek" ); |
641 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); | 651 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); |
642 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); | 652 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); |
643 | day5_action->addTo( viewMenu ); | 653 | day5_action->addTo( viewMenu ); |
644 | connect( day5_action, SIGNAL( activated() ), | 654 | connect( day5_action, SIGNAL( activated() ), |
645 | mView->viewManager(), SLOT( showWorkWeekView() ) ); | 655 | mView->viewManager(), SLOT( showWorkWeekView() ) ); |
646 | 656 | ||
@@ -1691,82 +1701,77 @@ void MainWindow::configureToolBar( int item ) | |||
1691 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); | 1701 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); |
1692 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); | 1702 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); |
1693 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); | 1703 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); |
1694 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); | 1704 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); |
1695 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); | 1705 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); |
1696 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); | 1706 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); |
1697 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); | 1707 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); |
1698 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); | 1708 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); |
1699 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 1709 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |
1700 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); | 1710 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); |
1701 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 1711 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
1702 | // initActions(); | 1712 | // initActions(); |
1703 | } | 1713 | } |
1704 | 1714 | ||
1705 | void MainWindow::setCaptionToDates() | 1715 | void MainWindow::setCaptionToDates() |
1706 | { | 1716 | { |
1707 | QString selDates; | 1717 | QString selDates; |
1708 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); | 1718 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); |
1709 | if (mView->startDate() < mView->endDate() ) | 1719 | if (mView->startDate() < mView->endDate() ) |
1710 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); | 1720 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); |
1711 | else { | 1721 | else { |
1712 | QString addString; | 1722 | QString addString; |
1713 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) | 1723 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) |
1714 | addString = i18n("Today"); | 1724 | addString = i18n("Today"); |
1715 | else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) | 1725 | else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) |
1716 | addString = i18n("Tomorrow"); | 1726 | addString = i18n("Tomorrow"); |
1717 | if ( !addString.isEmpty() ) | 1727 | if ( !addString.isEmpty() ) |
1718 | selDates = addString+", "+selDates ; | 1728 | selDates = addString+", "+selDates ; |
1719 | } | 1729 | } |
1720 | setCaption( i18n("Dates: ") + selDates ); | 1730 | setCaption( i18n("Dates: ") + selDates ); |
1721 | 1731 | ||
1722 | } | 1732 | } |
1723 | // parameter item == 0: reinit | 1733 | void MainWindow::showConfigureAgenda( ) |
1734 | { | ||
1735 | int iii; | ||
1736 | for ( iii = 1;iii<= 10 ;++iii ){ | ||
1737 | configureAgendaMenu->setItemChecked( (iii+1)*2, false ); | ||
1738 | } | ||
1739 | configureAgendaMenu->setItemChecked( KOPrefs::instance()->mHourSize, true ); | ||
1740 | } | ||
1724 | void MainWindow::configureAgenda( int item ) | 1741 | void MainWindow::configureAgenda( int item ) |
1725 | { | 1742 | { |
1726 | 1743 | if ( KOPrefs::instance()->mHourSize == item ) | |
1727 | KOPrefs *p = KOPrefs::instance(); | ||
1728 | |||
1729 | int i; | ||
1730 | // do not allow 4 for widgets higher than 480 | ||
1731 | // if ( QApplication::desktop()->height() > 480 ) { | ||
1732 | // if ( item == 4 ) | ||
1733 | // item = 6; | ||
1734 | // } | ||
1735 | for ( i = 4; i <= 18; i= i+2 ) | ||
1736 | configureAgendaMenu->setItemChecked( i, false ); | ||
1737 | configureAgendaMenu->setItemChecked( item, true ); | ||
1738 | if ( p->mHourSize == item ) | ||
1739 | return; | 1744 | return; |
1740 | p->mHourSize=item; | 1745 | KOPrefs::instance()->mHourSize=item; |
1741 | mView->viewManager()->agendaView()->updateConfig(); | 1746 | mView->viewManager()->agendaView()->updateConfig(); |
1742 | } | 1747 | } |
1743 | 1748 | ||
1744 | void MainWindow::saveCalendar() | 1749 | void MainWindow::saveCalendar() |
1745 | { | 1750 | { |
1746 | QString fn = KOPrefs::instance()->mLastSaveFile; | 1751 | QString fn = KOPrefs::instance()->mLastSaveFile; |
1747 | fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this ); | 1752 | fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this ); |
1748 | 1753 | ||
1749 | if ( fn == "" ) | 1754 | if ( fn == "" ) |
1750 | return; | 1755 | return; |
1751 | QFileInfo info; | 1756 | QFileInfo info; |
1752 | info.setFile( fn ); | 1757 | info.setFile( fn ); |
1753 | QString mes; | 1758 | QString mes; |
1754 | bool createbup = true; | 1759 | bool createbup = true; |
1755 | if ( info. exists() ) { | 1760 | if ( info. exists() ) { |
1756 | mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ; | 1761 | mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ; |
1757 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, | 1762 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, |
1758 | i18n("Overwrite!"), i18n("Cancel"), 0, | 1763 | i18n("Overwrite!"), i18n("Cancel"), 0, |
1759 | 0, 1 ); | 1764 | 0, 1 ); |
1760 | if ( result != 0 ) { | 1765 | if ( result != 0 ) { |
1761 | createbup = false; | 1766 | createbup = false; |
1762 | } | 1767 | } |
1763 | } | 1768 | } |
1764 | if ( createbup ) { | 1769 | if ( createbup ) { |
1765 | mView->saveCalendar( fn ); | 1770 | mView->saveCalendar( fn ); |
1766 | mes = i18n("KO/Pi:Saved %1").arg(fn); | 1771 | mes = i18n("KO/Pi:Saved %1").arg(fn); |
1767 | KOPrefs::instance()->mLastSaveFile = fn; | 1772 | KOPrefs::instance()->mLastSaveFile = fn; |
1768 | setCaption(mes); | 1773 | setCaption(mes); |
1769 | } | 1774 | } |
1770 | } | 1775 | } |
1771 | void MainWindow::loadCalendar() | 1776 | void MainWindow::loadCalendar() |
1772 | { | 1777 | { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 96e627e..6de0543 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -9,131 +9,133 @@ | |||
9 | #include <qregexp.h> | 9 | #include <qregexp.h> |
10 | 10 | ||
11 | #include <libkcal/incidence.h> | 11 | #include <libkcal/incidence.h> |
12 | #include "simplealarmclient.h" | 12 | #include "simplealarmclient.h" |
13 | #include <ksyncmanager.h> | 13 | #include <ksyncmanager.h> |
14 | #ifndef DESKTOP_VERSION | 14 | #ifndef DESKTOP_VERSION |
15 | #include <qcopchannel_qws.h> | 15 | #include <qcopchannel_qws.h> |
16 | #endif | 16 | #endif |
17 | class QAction; | 17 | class QAction; |
18 | class CalendarView; | 18 | class CalendarView; |
19 | class KSyncProfile; | 19 | class KSyncProfile; |
20 | #ifdef DESKTOP_VERSION | 20 | #ifdef DESKTOP_VERSION |
21 | 21 | ||
22 | #define QPEToolBar QToolBar | 22 | #define QPEToolBar QToolBar |
23 | #define QPEMenuBar QMenuBar | 23 | #define QPEMenuBar QMenuBar |
24 | #endif | 24 | #endif |
25 | class QPEToolBar; | 25 | class QPEToolBar; |
26 | 26 | ||
27 | 27 | ||
28 | namespace KCal { | 28 | namespace KCal { |
29 | class CalendarLocal; | 29 | class CalendarLocal; |
30 | } | 30 | } |
31 | 31 | ||
32 | using namespace KCal; | 32 | using namespace KCal; |
33 | 33 | ||
34 | class MainWindow : public QMainWindow | 34 | class MainWindow : public QMainWindow |
35 | { | 35 | { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | public: | 37 | public: |
38 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 38 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
39 | ~MainWindow(); | 39 | ~MainWindow(); |
40 | bool beamReceiveEnabled(); | 40 | bool beamReceiveEnabled(); |
41 | static QString defaultFileName(); | ||
42 | static QString syncFileName(); | ||
43 | static QString resourcePath(); | ||
41 | public slots: | 44 | public slots: |
42 | virtual void showMaximized (); | 45 | virtual void showMaximized (); |
43 | void configureAgenda( int ); | 46 | void configureAgenda( int ); |
44 | void recieve( const QCString& msg, const QByteArray& data ); | 47 | void recieve( const QCString& msg, const QByteArray& data ); |
45 | static QString defaultFileName(); | 48 | protected slots: |
46 | static QString syncFileName(); | ||
47 | static QString resourcePath(); | ||
48 | protected slots: | ||
49 | void setCaptionToDates(); | 49 | void setCaptionToDates(); |
50 | void about(); | 50 | void about(); |
51 | void licence(); | 51 | void licence(); |
52 | void faq(); | 52 | void faq(); |
53 | void usertrans(); | 53 | void usertrans(); |
54 | void features(); | 54 | void features(); |
55 | void synchowto(); | 55 | void synchowto(); |
56 | void kdesynchowto(); | 56 | void kdesynchowto(); |
57 | void multisynchowto(); | 57 | void multisynchowto(); |
58 | void whatsNew(); | 58 | void whatsNew(); |
59 | void keyBindings(); | 59 | void keyBindings(); |
60 | void aboutAutoSaving();; | 60 | void aboutAutoSaving();; |
61 | void aboutKnownBugs(); | 61 | void aboutKnownBugs(); |
62 | 62 | ||
63 | void processIncidenceSelection( Incidence * ); | 63 | void processIncidenceSelection( Incidence * ); |
64 | 64 | ||
65 | void importQtopia(); | 65 | void importQtopia(); |
66 | void importBday(); | 66 | void importBday(); |
67 | void importOL(); | 67 | void importOL(); |
68 | void importIcal(); | 68 | void importIcal(); |
69 | void importFile( QString, bool ); | 69 | void importFile( QString, bool ); |
70 | void quickImportIcal(); | 70 | void quickImportIcal(); |
71 | 71 | ||
72 | void slotModifiedChanged( bool ); | 72 | void slotModifiedChanged( bool ); |
73 | 73 | ||
74 | void save(); | 74 | void save(); |
75 | void configureToolBar( int ); | 75 | void configureToolBar( int ); |
76 | void printSel(); | 76 | void printSel(); |
77 | void printCal(); | 77 | void printCal(); |
78 | void saveCalendar(); | 78 | void saveCalendar(); |
79 | void loadCalendar(); | 79 | void loadCalendar(); |
80 | void exportVCalendar(); | 80 | void exportVCalendar(); |
81 | void fillFilterMenu(); | 81 | void fillFilterMenu(); |
82 | void selectFilter( int ); | 82 | void selectFilter( int ); |
83 | void exportToPhone( int ); | 83 | void exportToPhone( int ); |
84 | void toggleBeamReceive(); | 84 | void toggleBeamReceive(); |
85 | void disableBR(bool); | 85 | void disableBR(bool); |
86 | 86 | ||
87 | private slots: | ||
88 | void showConfigureAgenda(); | ||
89 | void getFile( bool ); | ||
90 | void syncFileRequest(); | ||
87 | 91 | ||
88 | protected: | 92 | protected: |
89 | void displayText( QString, QString); | 93 | void displayText( QString, QString); |
90 | |||
91 | void enableIncidenceActions( bool ); | 94 | void enableIncidenceActions( bool ); |
92 | 95 | ||
93 | private slots: | ||
94 | QSocket* piSocket; | ||
95 | QString piFileString; | ||
96 | QTime piTime; | ||
97 | void getFile( bool ); | ||
98 | void syncFileRequest(); | ||
99 | private: | 96 | private: |
100 | bool mBRdisabled; | 97 | bool mBRdisabled; |
101 | #ifndef DESKTOP_VERSION | 98 | #ifndef DESKTOP_VERSION |
102 | QCopChannel* infrared; | 99 | QCopChannel* infrared; |
103 | #endif | 100 | #endif |
104 | QAction* brAction; | 101 | QAction* brAction; |
105 | KSyncManager* mSyncManager; | 102 | KSyncManager* mSyncManager; |
106 | bool mClosed; | 103 | bool mClosed; |
107 | void saveOnClose(); | 104 | void saveOnClose(); |
108 | bool mFlagKeyPressed; | 105 | bool mFlagKeyPressed; |
109 | bool mBlockAtStartup; | 106 | bool mBlockAtStartup; |
110 | QPEToolBar *iconToolBar; | 107 | QPEToolBar *iconToolBar; |
111 | void initActions(); | 108 | void initActions(); |
112 | void setDefaultPreferences(); | 109 | void setDefaultPreferences(); |
113 | void keyPressEvent ( QKeyEvent * ) ; | 110 | void keyPressEvent ( QKeyEvent * ) ; |
114 | void keyReleaseEvent ( QKeyEvent * ) ; | 111 | void keyReleaseEvent ( QKeyEvent * ) ; |
115 | QPopupMenu *configureToolBarMenu; | 112 | QPopupMenu *configureToolBarMenu; |
116 | QPopupMenu *selectFilterMenu; | 113 | QPopupMenu *selectFilterMenu; |
117 | QPopupMenu *configureAgendaMenu, *syncMenu; | 114 | QPopupMenu *configureAgendaMenu, *syncMenu; |
118 | CalendarLocal *mCalendar; | 115 | CalendarLocal *mCalendar; |
119 | CalendarView *mView; | 116 | CalendarView *mView; |
120 | QAction *mNewSubTodoAction; | 117 | QAction *mNewSubTodoAction; |
121 | 118 | ||
122 | QAction *mShowAction; | 119 | QAction *mShowAction; |
123 | QAction *mEditAction; | 120 | QAction *mEditAction; |
124 | QAction *mDeleteAction; | 121 | QAction *mDeleteAction; |
125 | QAction *mCloneAction; | 122 | QAction *mCloneAction; |
126 | QAction *mMoveAction; | 123 | QAction *mMoveAction; |
127 | QAction *mBeamAction; | 124 | QAction *mBeamAction; |
128 | QAction *mCancelAction; | 125 | QAction *mCancelAction; |
129 | 126 | ||
127 | QAction *mToggleNav; | ||
128 | QAction *mToggleFilter; | ||
129 | QAction *mToggleAllday; | ||
130 | |||
131 | |||
130 | void closeEvent( QCloseEvent* ce ); | 132 | void closeEvent( QCloseEvent* ce ); |
131 | SimpleAlarmClient mAlarmClient; | 133 | SimpleAlarmClient mAlarmClient; |
132 | QTimer mSaveTimer; | 134 | QTimer mSaveTimer; |
133 | //bool mBlockSaveFlag; | 135 | //bool mBlockSaveFlag; |
134 | bool mCalendarModifiedFlag; | 136 | bool mCalendarModifiedFlag; |
135 | QPixmap loadPixmap( QString ); | 137 | QPixmap loadPixmap( QString ); |
136 | }; | 138 | }; |
137 | 139 | ||
138 | 140 | ||
139 | #endif | 141 | #endif |