summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt15
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/calendarview.cpp11
-rw-r--r--korganizer/calendarview.h1
-rw-r--r--korganizer/kolistview.cpp3
-rw-r--r--korganizer/kotodoview.cpp4
-rw-r--r--korganizer/mainwindow.cpp171
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--version2
9 files changed, 128 insertions, 82 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 3daf215..2bfdb2f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -288,49 +288,49 @@
288{ "Organizer","Organisator" }, 288{ "Organizer","Organisator" },
289{ "Owner: ","Besitzer: " }, 289{ "Owner: ","Besitzer: " },
290{ "Owner:","Besitzer:" }, 290{ "Owner:","Besitzer:" },
291{ "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" }, 291{ "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
292{ "Pick a date to display","Wähle einen Tag zum anzeigen aus" }, 292{ "Pick a date to display","Wähle einen Tag zum anzeigen aus" },
293{ "Please specify a valid due date.","Bitte gültiges Fälligkeitsdatum angeben."}, 293{ "Please specify a valid due date.","Bitte gültiges Fälligkeitsdatum angeben."},
294{ "Please specify a valid end date,\nfor example '%1'.","Bitte gültiges Enddatum angeben,\nz.B.'%1'." }, 294{ "Please specify a valid end date,\nfor example '%1'.","Bitte gültiges Enddatum angeben,\nz.B.'%1'." },
295{ "Please specify a valid start date.","Bitte gültiges Startdatum angeben." }, 295{ "Please specify a valid start date.","Bitte gültiges Startdatum angeben." },
296{ "Please specify a valid start date,\nfor example '%1'.","Bitte gültiges Startdatum angeben,\nz.B. '%1'." }, 296{ "Please specify a valid start date,\nfor example '%1'.","Bitte gültiges Startdatum angeben,\nz.B. '%1'." },
297{ "Please specify a valid start time.","Bitte gültige Startzeit angeben."}, 297{ "Please specify a valid start time.","Bitte gültige Startzeit angeben."},
298{ "Please specify a valid start time,\nfor example '%1'.","Bitte gültige Startzeit angeben,\nz.B. '%1'." }, 298{ "Please specify a valid start time,\nfor example '%1'.","Bitte gültige Startzeit angeben,\nz.B. '%1'." },
299{ "Preferences - some settings need a restart (nr)","Einstellungen - teilweise Neustart erforderlich (bn)" }, 299{ "Preferences - some settings need a restart (nr)","Einstellungen - teilweise Neustart erforderlich (bn)" },
300{ "&Previous Day","Vorheriger Tag" }, 300{ "&Previous Day","Vorheriger Tag" },
301{ "Previous month","Vorheriger Monat" }, 301{ "Previous month","Vorheriger Monat" },
302{ "Previous Month","Vorheriger Monat" }, 302{ "Previous Month","Vorheriger Monat" },
303{ "&Previous Week","Vorherige Woche" }, 303{ "&Previous Week","Vorherige Woche" },
304{ "Previous year","Vorheriges Jahr" }, 304{ "Previous year","Vorheriges Jahr" },
305{ "Previous Year","Vorheriges Jahr" }, 305{ "Previous Year","Vorheriges Jahr" },
306{ "Printing","Drucken" }, 306{ "Printing","Drucken" },
307{ "Priority:","Priorität:" }, 307{ "Priority:","Priorität:" },
308{ "Private","Privat" }, 308{ "Private","Privat" },
309{ "Proceed","Weiter" }, 309{ "Proceed","Weiter" },
310{ "Public","Öffentlich" }, 310{ "Public","Öffentlich" },
311{ "Purge","Entferne" }, 311{ "Purge","Entferne" },
312{ "Purge Completed","Entferne erledigte Todos" }, 312{ "Purge Completed...","Entferne erledigte Todos..." },
313{ "Purge Todos","Todos bereinigen" }, 313{ "Purge Todos","Todos bereinigen" },
314{ "read-only","schreibgeschützt" }, 314{ "read-only","schreibgeschützt" },
315{ "Recur every","Wiederh. alle" }, 315{ "Recur every","Wiederh. alle" },
316{ "Recur in the month of","Wiederh. im Monat" }, 316{ "Recur in the month of","Wiederh. im Monat" },
317{ "Recur on the","Wiederh. am" }, 317{ "Recur on the","Wiederh. am" },
318{ "Recur on this day","Wiederh. am diesen Tag" }, 318{ "Recur on this day","Wiederh. am diesen Tag" },
319{ "Recurrence Range...","Wiederholungs Zeitraum..." }, 319{ "Recurrence Range...","Wiederholungs Zeitraum..." },
320{ "Recurrence Range","Wiederholungs Zeitraum" }, 320{ "Recurrence Range","Wiederholungs Zeitraum" },
321{ "Recurrence Rule","Wiederholungs Regel" }, 321{ "Recurrence Rule","Wiederholungs Regel" },
322{ "Recurrence","Wiederholung" }, 322{ "Recurrence","Wiederholung" },
323{ "Recurs","Wiederholung" }, 323{ "Recurs","Wiederholung" },
324{"&Reject","Abweisen"}, 324{"&Reject","Abweisen"},
325{ "Reminder:","Alarm:" }, 325{ "Reminder:","Alarm:" },
326{ "Rem.:","Alarm:" }, 326{ "Rem.:","Alarm:" },
327{ "Rem.","Alarm:" }, 327{ "Rem.","Alarm:" },
328{ "Remote file:","Remote Datei:"}, 328{ "Remote file:","Remote Datei:"},
329{ "Remote IP:","Remote (ferne) IP:" }, 329{ "Remote IP:","Remote (ferne) IP:" },
330{ "Remote syncing (via ssh/scp) network settings ","Remote Sync (via ssh/scp) Netzwerk Einstellungen " }, 330{ "Remote syncing (via ssh/scp) network settings ","Remote Sync (via ssh/scp) Netzwerk Einstellungen " },
331{ "Remote user:","Remote Benutzer"}, 331{ "Remote user:","Remote Benutzer"},
332{ "&Remove","Entfe&rnen" }, 332{ "&Remove","Entfe&rnen" },
333{ "Remove","Entfernen" }, 333{ "Remove","Entfernen" },
334{ "Request response","Bemerkung anfordern" }, 334{ "Request response","Bemerkung anfordern" },
335{ "Role:","Rolle:" }, 335{ "Role:","Rolle:" },
336{ "Role","Rolle" }, 336{ "Role","Rolle" },
@@ -452,49 +452,49 @@
452{ "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" }, 452{ "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
453{ "minutely","minütlich" }, 453{ "minutely","minütlich" },
454{ "hourly","stündlich" }, 454{ "hourly","stündlich" },
455{ "daily","täglich" }, 455{ "daily","täglich" },
456{ "weekly","wöchentlich" }, 456{ "weekly","wöchentlich" },
457{ "monthly","monatlich" }, 457{ "monthly","monatlich" },
458{ "day-monthly","tag-monatlich" }, 458{ "day-monthly","tag-monatlich" },
459{ "month-yearly","monat-jährlich" }, 459{ "month-yearly","monat-jährlich" },
460{ "day-yearly","tag-jährlich" }, 460{ "day-yearly","tag-jährlich" },
461{ "position-yearly","pos-jährlich" }, 461{ "position-yearly","pos-jährlich" },
462{ "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" }, 462{ "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
463{ "Highlight current day in agenda","Hebe >>heute<< in Agenda hervor" }, 463{ "Highlight current day in agenda","Hebe >>heute<< in Agenda hervor" },
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" }, 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" },
@@ -524,49 +524,48 @@
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 ..." },
529{ "%d items remaining in list.","%d Einträge sind in der Liste verblieben." }, 529{ "%d items remaining in list.","%d Einträge sind in der Liste verblieben." },
530{ "Size","Größe" }, 530{ "Size","Größe" },
531{ "Date","Datum" }, 531{ "Date","Datum" },
532{ "Mime Type","Datei Typ" }, 532{ "Mime Type","Datei Typ" },
533{ "All Files","Alle Dateien" }, 533{ "All Files","Alle Dateien" },
534{ "Files","Dateien" }, 534{ "Files","Dateien" },
535{ "Documents","DoKumente" }, 535{ "Documents","DoKumente" },
536{ "Select Categories","Selektiere Kategorien" }, 536{ "Select Categories","Selektiere Kategorien" },
537{ " &Deselect All "," Auswahl aufheben " }, 537{ " &Deselect All "," Auswahl aufheben " },
538{ "A&dd","Hinzu" }, 538{ "A&dd","Hinzu" },
539{ "&Modify","Ändern" }, 539{ "&Modify","Ändern" },
540{ "Edit Categories","Editiere Kategorien" }, 540{ "Edit Categories","Editiere Kategorien" },
541{ " &Edit Categories "," &Editiere Kategorien " }, 541{ " &Edit Categories "," &Editiere Kategorien " },
542{ "Beam Options","Beam Einstellungen" }, 542{ "Beam Options","Beam Einstellungen" },
543{ " With timezone "," Mit Zeitzone " }, 543{ " With timezone "," Mit Zeitzone " },
544{ " Local time ", " Lokale Zeit " }, 544{ " Local time ", " Lokale Zeit " },
545{ "Manage new Categories","Verwalte neue Kategorien" }, 545{ "Manage new Categories","Verwalte neue Kategorien" },
546{ "Add to category list","Füge zur Kategorieliste hinzu" }, 546{ "Add to category list","Füge zur Kategorieliste hinzu" },
547{ "Remove from Events/Todos","Entferne von Terminen/Todos" }, 547{ "Remove from Events/Todos","Entferne von Terminen/Todos" },
548{ "After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nTerminen oder Todos geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
549{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" }, 548{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
550{ "File format","Datei Format" }, 549{ "File format","Datei Format" },
551{ "Time format","Zeit Format" }, 550{ "Time format","Zeit Format" },
552{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." }, 551{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
553{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" }, 552{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
554{ "h","Std" }, 553{ "h","Std" },
555{ "min","Min" }, 554{ "min","Min" },
556{ "hou","Std" }, 555{ "hou","Std" },
557{ "day","Tag" }, 556{ "day","Tag" },
558{ "French","Französich" }, 557{ "French","Französich" },
559{ "Time","Zeit" }, 558{ "Time","Zeit" },
560{ "Event Viewer","Termin Ansicht" }, 559{ "Event Viewer","Termin Ansicht" },
561{ "Cancel Sync","Sync Abbrechen" }, 560{ "Cancel Sync","Sync Abbrechen" },
562{ "Remote","Fern" }, 561{ "Remote","Fern" },
563{ "Local","Lokal" }, 562{ "Local","Lokal" },
564{ "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" }, 563{ "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
565{ "Local: ","Lokal: " }, 564{ "Local: ","Lokal: " },
566{ "Remote: ","Fern: " }, 565{ "Remote: ","Fern: " },
567{ "Last modified: ","Zuletzt geändert: " }, 566{ "Last modified: ","Zuletzt geändert: " },
568{ "Location: ","Ort: " }, 567{ "Location: ","Ort: " },
569{ "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" }, 568{ "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" },
570{ "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" }, 569{ "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" },
571{ "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " }, 570{ "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " },
572{ "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" }, 571{ "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" },
@@ -1445,28 +1444,38 @@
1445{ "male","männlich" }, 1444{ "male","männlich" },
1446{ "female","weiblich" }, 1445{ "female","weiblich" },
1447{ "Hide!","Verbergen!" }, 1446{ "Hide!","Verbergen!" },
1448{ "Show!","Anzeigen!" }, 1447{ "Show!","Anzeigen!" },
1449{ "Details","Details" }, 1448{ "Details","Details" },
1450{ "Profession","Beruf" }, 1449{ "Profession","Beruf" },
1451{ "Children","Kinder" }, 1450{ "Children","Kinder" },
1452{ "Department","Abteilung" }, 1451{ "Department","Abteilung" },
1453{ "Backup cancelled","Backup abgebrochen" }, 1452{ "Backup cancelled","Backup abgebrochen" },
1454{ "Backup globally disabled","Backup global abgeschaltet" }, 1453{ "Backup globally disabled","Backup global abgeschaltet" },
1455{ "Backup succesfully finished","Backup erfolgreich beendet" }, 1454{ "Backup succesfully finished","Backup erfolgreich beendet" },
1456{ "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, 1455{ "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
1457{ "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, 1456{ "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
1458{ "Birthdays","Geburtstage" }, 1457{ "Birthdays","Geburtstage" },
1459{ "KO/Pi import information!","KO/Pi Import Information!" }, 1458{ "KO/Pi import information!","KO/Pi Import Information!" },
1460{ "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, 1459{ "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
1461{ "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 1460{ "Cancel - do not start"," Abbrechen - Todo nicht starten" },
1462{ "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, 1461{ "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
1463{ "Reload","Neu laden" }, 1462{ "Reload","Neu laden" },
1464{ "Timezone settings","Zeitzoneneinstellung" }, 1463{ "Timezone settings","Zeitzoneneinstellung" },
1465{ "Title: ","Titel: " }, 1464{ "Title: ","Titel: " },
1466{ "Journal from: ","Journal vom: " }, 1465{ "Journal from: ","Journal vom: " },
1467{ "Journal: %1 from ","Journal: %1 vom " }, 1466{ "Journal: %1 from ","Journal: %1 vom " },
1468{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, 1467{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
1468{ "Selected Item","Ausgewähltes Item" },
1469{ "Select Date...","Wähle Datum..." },
1470{ "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
1471{ "Change category list now!","Ändere Kategorieliste jetzt!" },
1472{ "Edit category list...","Ändere Kategorieliste..." },
1473{ "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
1474{ "","" },
1475{ "","" },
1476{ "","" },
1477{ "","" },
1469{ "","" }, 1478{ "","" },
1470{ "","" }, 1479{ "","" },
1471{ "","" }, 1480{ "","" },
1472{ "","" }, \ No newline at end of file 1481{ "","" }, \ No newline at end of file
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 279bbd4..d29ab72 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,27 +1,27 @@
1Summary: A collection of PIM programs 1Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 2.1.11 3Version: 2.1.12
4Release: SuSE_9.2 4Release: SuSE_9.2
5Copyright:GPL 5Copyright:GPL
6Group: Productivity/Pim 6Group: Productivity/Pim
7Source:http://sourceforge.net/projects/kdepimpi/ 7Source:http://sourceforge.net/projects/kdepimpi/
8URL:http://sourceforge.net/projects/kdepimpi/ 8URL:http://sourceforge.net/projects/kdepimpi/
9Packager: zautrix 9Packager: zautrix
10 10
11%description 11%description
12This package contains the platform-independent PIM programs from 12This package contains the platform-independent PIM programs from
13www.pi-sync.info, compiled for SuSE 9.2: 13www.pi-sync.info, compiled for SuSE 9.2:
14KTimeTacker/Pi 14KTimeTacker/Pi
15KPhone/Pi 15KPhone/Pi
16KAddressbook/Pi 16KAddressbook/Pi
17KOrganizer/Pi 17KOrganizer/Pi
18PasswordManager/Pi 18PasswordManager/Pi
19KOPieMail/Pi 19KOPieMail/Pi
20 20
21These applications do not need anything from the KDE-desktop 21These applications do not need anything from the KDE-desktop
22at all to run on Linux. However, there is a dependency from 22at all to run on Linux. However, there is a dependency from
23two KDE libs, because a small command line program is included 23two KDE libs, because a small command line program is included
24to make it possible to sync with the KDE-desktop applications. 24to make it possible to sync with the KDE-desktop applications.
25 25
26These applications are independent from the KDE-desktop 26These applications are independent from the KDE-desktop
27environment. That means, nothing of your existing 27environment. That means, nothing of your existing
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index d0de233..c0f3be7 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -95,48 +95,49 @@
95#ifndef KORG_NOPLUGINS 95#ifndef KORG_NOPLUGINS
96#include "kocore.h" 96#include "kocore.h"
97#endif 97#endif
98#include "koeventeditor.h" 98#include "koeventeditor.h"
99#include "kotodoeditor.h" 99#include "kotodoeditor.h"
100#include "koprefs.h" 100#include "koprefs.h"
101#include "koeventviewerdialog.h" 101#include "koeventviewerdialog.h"
102#include "publishdialog.h" 102#include "publishdialog.h"
103#include "kofilterview.h" 103#include "kofilterview.h"
104#include "koglobals.h" 104#include "koglobals.h"
105#include "koviewmanager.h" 105#include "koviewmanager.h"
106#include "koagendaview.h" 106#include "koagendaview.h"
107#include "kodialogmanager.h" 107#include "kodialogmanager.h"
108#include "outgoingdialog.h" 108#include "outgoingdialog.h"
109#include "incomingdialog.h" 109#include "incomingdialog.h"
110#include "datenavigatorcontainer.h" 110#include "datenavigatorcontainer.h"
111#include "statusdialog.h" 111#include "statusdialog.h"
112#include "kdatenavigator.h" 112#include "kdatenavigator.h"
113#include "kotodoview.h" 113#include "kotodoview.h"
114#include "datenavigator.h" 114#include "datenavigator.h"
115#include "resourceview.h" 115#include "resourceview.h"
116#include "navigatorbar.h" 116#include "navigatorbar.h"
117#include "searchdialog.h" 117#include "searchdialog.h"
118#include "mainwindow.h" 118#include "mainwindow.h"
119#include "categoryeditdialog.h"
119 120
120#include "calendarview.h" 121#include "calendarview.h"
121#ifndef DESKTOP_VERSION 122#ifndef DESKTOP_VERSION
122#include <qtopia/alarmserver.h> 123#include <qtopia/alarmserver.h>
123#endif 124#endif
124#ifndef _WIN32_ 125#ifndef _WIN32_
125#include <stdlib.h> 126#include <stdlib.h>
126#include <stdio.h> 127#include <stdio.h>
127#include <unistd.h> 128#include <unistd.h>
128#else 129#else
129#include <qprocess.h> 130#include <qprocess.h>
130#endif 131#endif
131 132
132#ifdef DESKTOP_VERSION 133#ifdef DESKTOP_VERSION
133#include <kabc/stdaddressbook.h> 134#include <kabc/stdaddressbook.h>
134#endif 135#endif
135using namespace KOrg; 136using namespace KOrg;
136using namespace KCal; 137using namespace KCal;
137extern int globalFlagBlockAgenda; 138extern int globalFlagBlockAgenda;
138extern int globalFlagBlockStartup; 139extern int globalFlagBlockStartup;
139 140
140 141
141MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) 142MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent)
142 143
@@ -292,57 +293,57 @@ class KOBeamPrefs : public QDialog
292 QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); 293 QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this );
293 lay->addWidget( ok ); 294 lay->addWidget( ok );
294 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 295 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
295 lay->addWidget( cancel ); 296 lay->addWidget( cancel );
296 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 297 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
297 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 298 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
298 resize( 200, 200 ); 299 resize( 200, 200 );
299 } 300 }
300 301
301 bool beamVcal() { return vcal->isChecked(); } 302 bool beamVcal() { return vcal->isChecked(); }
302 bool beamLocal() { return local->isChecked(); } 303 bool beamLocal() { return local->isChecked(); }
303private: 304private:
304 QRadioButton* vcal, *ical, *local, *tz; 305 QRadioButton* vcal, *ical, *local, *tz;
305}; 306};
306class KOCatPrefs : public QDialog 307class KOCatPrefs : public QDialog
307{ 308{
308 public: 309 public:
309 KOCatPrefs( QWidget *parent=0, const char *name=0 ) : 310 KOCatPrefs( QWidget *parent=0, const char *name=0 ) :
310 QDialog( parent, name, true ) 311 QDialog( parent, name, true )
311 { 312 {
312 setCaption( i18n("Manage new Categories") ); 313 setCaption( i18n("Manage new Categories") );
313 QVBoxLayout* lay = new QVBoxLayout( this ); 314 QVBoxLayout* lay = new QVBoxLayout( this );
314 lay->setSpacing( 3 ); 315 lay->setSpacing( 3 );
315 lay->setMargin( 3 ); 316 lay->setMargin( 3 );
316 QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); 317 QLabel * lab = new QLabel( i18n("After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:"), this );
317 lay->addWidget( lab ); 318 lay->addWidget( lab );
318 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); 319 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
319 lay->addWidget( format ); 320 lay->addWidget( format );
320 format->setExclusive ( true ) ; 321 format->setExclusive ( true ) ;
321 addCatBut = new QRadioButton(i18n("Add to category list"), format ); 322 addCatBut = new QRadioButton(i18n("Add to category list"), format );
322 new QRadioButton(i18n("Remove from Events/Todos"), format ); 323 new QRadioButton(i18n("Remove from Events/Todos"), format );
323 addCatBut->setChecked( true ); 324 addCatBut->setChecked( true );
324 QPushButton * ok = new QPushButton( i18n("OK"), this ); 325 QPushButton * ok = new QPushButton( i18n("Change category list now!"), this );
325 lay->addWidget( ok ); 326 lay->addWidget( ok );
326 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 327 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
327 lay->addWidget( cancel ); 328 lay->addWidget( cancel );
328 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 329 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
329 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 330 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
330 resize( 200, 200 ); 331 resize( 200, 200 );
331 } 332 }
332 333
333 bool addCat() { return addCatBut->isChecked(); } 334 bool addCat() { return addCatBut->isChecked(); }
334private: 335private:
335 QRadioButton* addCatBut; 336 QRadioButton* addCatBut;
336}; 337};
337 338
338 339
339 340
340CalendarView::CalendarView( CalendarResources *calendar, 341CalendarView::CalendarView( CalendarResources *calendar,
341 QWidget *parent, const char *name ) 342 QWidget *parent, const char *name )
342 : CalendarViewBase( parent, name ), 343 : CalendarViewBase( parent, name ),
343 mCalendar( calendar ), 344 mCalendar( calendar ),
344 mResourceManager( calendar->resourceManager() ) 345 mResourceManager( calendar->resourceManager() )
345{ 346{
346 347
347 mEventEditor = 0; 348 mEventEditor = 0;
348 mTodoEditor = 0; 349 mTodoEditor = 0;
@@ -2797,48 +2798,54 @@ void CalendarView::removeCategories()
2797int CalendarView::addCategories() 2798int CalendarView::addCategories()
2798{ 2799{
2799 QPtrList<Incidence> incList = mCalendar->rawIncidences(); 2800 QPtrList<Incidence> incList = mCalendar->rawIncidences();
2800 QStringList catList = KOPrefs::instance()->mCustomCategories; 2801 QStringList catList = KOPrefs::instance()->mCustomCategories;
2801 QStringList catIncList; 2802 QStringList catIncList;
2802 Incidence* inc = incList.first(); 2803 Incidence* inc = incList.first();
2803 int i; 2804 int i;
2804 int count = 0; 2805 int count = 0;
2805 while ( inc ) { 2806 while ( inc ) {
2806 catIncList = inc->categories() ; 2807 catIncList = inc->categories() ;
2807 for( i = 0; i< catIncList.count(); ++i ) { 2808 for( i = 0; i< catIncList.count(); ++i ) {
2808 if ( !catList.contains (catIncList[i])) { 2809 if ( !catList.contains (catIncList[i])) {
2809 catList.append( catIncList[i] ); 2810 catList.append( catIncList[i] );
2810 //qDebug("add cat %s ", catIncList[i].latin1()); 2811 //qDebug("add cat %s ", catIncList[i].latin1());
2811 ++count; 2812 ++count;
2812 } 2813 }
2813 } 2814 }
2814 inc = incList.next(); 2815 inc = incList.next();
2815 } 2816 }
2816 catList.sort(); 2817 catList.sort();
2817 KOPrefs::instance()->mCustomCategories = catList; 2818 KOPrefs::instance()->mCustomCategories = catList;
2818 return count; 2819 return count;
2819} 2820}
2820 2821
2822void CalendarView::editCategories()
2823{
2824 qDebug("CalendarView::editCategories() ");
2825 KPIM::CategoryEditDialog ced (KOPrefs::instance(),this );
2826 ced.exec();
2827}
2821void CalendarView::manageCategories() 2828void CalendarView::manageCategories()
2822{ 2829{
2823 KOCatPrefs* cp = new KOCatPrefs(); 2830 KOCatPrefs* cp = new KOCatPrefs();
2824 cp->show(); 2831 cp->show();
2825 int w =cp->sizeHint().width() ; 2832 int w =cp->sizeHint().width() ;
2826 int h = cp->sizeHint().height() ; 2833 int h = cp->sizeHint().height() ;
2827 int dw = QApplication::desktop()->width(); 2834 int dw = QApplication::desktop()->width();
2828 int dh = QApplication::desktop()->height(); 2835 int dh = QApplication::desktop()->height();
2829 cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 2836 cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
2830 if ( !cp->exec() ) { 2837 if ( !cp->exec() ) {
2831 delete cp; 2838 delete cp;
2832 return; 2839 return;
2833 } 2840 }
2834 int count = 0; 2841 int count = 0;
2835 if ( cp->addCat() ) { 2842 if ( cp->addCat() ) {
2836 count = addCategories(); 2843 count = addCategories();
2837 if ( count ) { 2844 if ( count ) {
2838 topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! ")); 2845 topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
2839 writeSettings(); 2846 writeSettings();
2840 } else 2847 } else
2841 topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! ")); 2848 topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! "));
2842 } else { 2849 } else {
2843 removeCategories(); 2850 removeCategories();
2844 updateView(); 2851 updateView();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index f7e5366..3323a98 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -464,48 +464,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
464 464
465 void processMainViewSelection( Incidence * ); 465 void processMainViewSelection( Incidence * );
466 void processTodoListSelection( Incidence * ); 466 void processTodoListSelection( Incidence * );
467 467
468 void processIncidenceSelection( Incidence * ); 468 void processIncidenceSelection( Incidence * );
469 469
470 void purgeCompleted(); 470 void purgeCompleted();
471 bool removeCompletedSubTodos( Todo* ); 471 bool removeCompletedSubTodos( Todo* );
472 void slotCalendarChanged(); 472 void slotCalendarChanged();
473 bool importBday(); 473 bool importBday();
474 bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); 474 bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday );
475 bool importQtopia( const QString &categoriesFile, 475 bool importQtopia( const QString &categoriesFile,
476 const QString &datebookFile, 476 const QString &datebookFile,
477 const QString &tasklistFile ); 477 const QString &tasklistFile );
478 void syncExternal( int mode ); 478 void syncExternal( int mode );
479 void slotSelectPickerDate( QDate ) ; 479 void slotSelectPickerDate( QDate ) ;
480 void showDatePicker() ; 480 void showDatePicker() ;
481 void showDatePickerPopup() ; 481 void showDatePickerPopup() ;
482 void moveIncidence(Incidence *) ; 482 void moveIncidence(Incidence *) ;
483 void beamIncidence(Incidence *) ; 483 void beamIncidence(Incidence *) ;
484 void beamCalendar() ; 484 void beamCalendar() ;
485 void beamFilteredCalendar() ; 485 void beamFilteredCalendar() ;
486 void beamIncidenceList(QPtrList<Incidence>) ; 486 void beamIncidenceList(QPtrList<Incidence>) ;
487 void manageCategories(); 487 void manageCategories();
488 void editCategories();
488 int addCategories(); 489 int addCategories();
489 void removeCategories(); 490 void removeCategories();
490 void setSyncDevice( QString ); 491 void setSyncDevice( QString );
491 void setSyncName( QString ); 492 void setSyncName( QString );
492 void showDay( QDate ); 493 void showDay( QDate );
493 void undo_delete(); 494 void undo_delete();
494 protected slots: 495 protected slots:
495 void resetFocus(); 496 void resetFocus();
496 void scrollBarValue(int); 497 void scrollBarValue(int);
497 void slotViewerClosed(); 498 void slotViewerClosed();
498 void timerAlarm(); 499 void timerAlarm();
499 void suspendAlarm(); 500 void suspendAlarm();
500 void beamDone( Ir *ir ); 501 void beamDone( Ir *ir );
501 /** Select a view or adapt the current view to display the specified dates. */ 502 /** Select a view or adapt the current view to display the specified dates. */
502 void showDates( const KCal::DateList & ); 503 void showDates( const KCal::DateList & );
503 void selectWeekNum ( int ); 504 void selectWeekNum ( int );
504 505
505 public: 506 public:
506 // show a standard warning 507 // show a standard warning
507 // returns KMsgBox::yesNoCancel() 508 // returns KMsgBox::yesNoCancel()
508 int msgCalModified(); 509 int msgCalModified();
509 virtual bool sync(KSyncManager* manager, QString filename, int mode); 510 virtual bool sync(KSyncManager* manager, QString filename, int mode);
510 511
511 virtual bool syncExternal(KSyncManager* manager, QString resource); 512 virtual bool syncExternal(KSyncManager* manager, QString resource);
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 43e1113..517677c 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -417,49 +417,50 @@ void KOListView::setCalendar( int c )
417 incidence->accept(v); 417 incidence->accept(v);
418 } 418 }
419 incidence = delSel.next(); 419 incidence = delSel.next();
420 } 420 }
421 } 421 }
422 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 422 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
423 KopiCalendarFile * cal = calendars.first(); 423 KopiCalendarFile * cal = calendars.first();
424 while ( cal ) { 424 while ( cal ) {
425 mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); 425 mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
426 mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); 426 mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
427 mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); 427 mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
428 if ( cal->isStandard ) 428 if ( cal->isStandard )
429 mCalendar->setDefaultCalendar( cal->mCalNumber ); 429 mCalendar->setDefaultCalendar( cal->mCalNumber );
430 cal = calendars.next(); 430 cal = calendars.next();
431 } 431 }
432 mCalendar->setSyncEventsReadOnly(); 432 mCalendar->setSyncEventsReadOnly();
433 mCalendar->reInitAlarmSettings(); 433 mCalendar->reInitAlarmSettings();
434 434
435} 435}
436void KOListView::populateCalPopup() 436void KOListView::populateCalPopup()
437{ 437{
438 mCalPopup->clear(); 438 mCalPopup->clear();
439 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 439 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
440 while ( kkf ) { 440 while ( kkf ) {
441 mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); 441 int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
442 mCalPopup->setItemEnabled( index, !kkf->isReadOnly );
442 kkf = KOPrefs::instance()->mCalendars.next(); 443 kkf = KOPrefs::instance()->mCalendars.next();
443 } 444 }
444} 445}
445void KOListView::updateList() 446void KOListView::updateList()
446{ 447{
447 // qDebug(" KOListView::updateList() "); 448 // qDebug(" KOListView::updateList() ");
448 449
449} 450}
450 451
451void KOListView::clearList() 452void KOListView::clearList()
452{ 453{
453 clear (); 454 clear ();
454} 455}
455void KOListView::addCat( ) 456void KOListView::addCat( )
456{ 457{
457 setCategories( false ); 458 setCategories( false );
458} 459}
459void KOListView::setCat() 460void KOListView::setCat()
460{ 461{
461 setCategories( true ); 462 setCategories( true );
462} 463}
463 464
464void KOListView::setAlarm() 465void KOListView::setAlarm()
465{ 466{
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 873a776..8d354c8 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -580,62 +580,62 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
580 mItemPopupMenu->insertItem( i18n("Move..."), this, 580 mItemPopupMenu->insertItem( i18n("Move..."), this,
581 SLOT (moveTodo())); 581 SLOT (moveTodo()));
582#ifndef DESKTOP_VERSION 582#ifndef DESKTOP_VERSION
583 mItemPopupMenu->insertItem( i18n("Beam..."), this, 583 mItemPopupMenu->insertItem( i18n("Beam..."), this,
584 SLOT (beamTodo())); 584 SLOT (beamTodo()));
585#endif 585#endif
586 mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, 586 mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
587 SLOT (cancelTodo())); 587 SLOT (cancelTodo()));
588 mItemPopupMenu->insertSeparator(); 588 mItemPopupMenu->insertSeparator();
589 mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, 589 mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
590 SLOT (toggleRunningItem())); 590 SLOT (toggleRunningItem()));
591 mItemPopupMenu->insertSeparator(); 591 mItemPopupMenu->insertSeparator();
592 /* 592 /*
593 mItemPopupMenu->insertItem( i18n("New Todo..."), this, 593 mItemPopupMenu->insertItem( i18n("New Todo..."), this,
594 SLOT (newTodo())); 594 SLOT (newTodo()));
595 */ 595 */
596 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, 596 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
597 SLOT (newSubTodo())); 597 SLOT (newSubTodo()));
598 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, 598 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
599 SLOT (unparentTodo()),0,21); 599 SLOT (unparentTodo()),0,21);
600 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, 600 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
601 SLOT (reparentTodo()),0,22); 601 SLOT (reparentTodo()),0,22);
602 mItemPopupMenu->insertSeparator(); 602 mItemPopupMenu->insertSeparator();
603#if 0 603#if 0
604 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"), 604 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."),
605 this, SLOT( purgeCompleted() ) ); 605 this, SLOT( purgeCompleted() ) );
606 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), 606 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
607 this, SLOT( toggleCompleted() ),0, 33 ); 607 this, SLOT( toggleCompleted() ),0, 33 );
608 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), 608 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
609 this, SLOT( toggleQuickTodo() ),0, 34 ); 609 this, SLOT( toggleQuickTodo() ),0, 34 );
610 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 610 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
611 this, SLOT( toggleRunning() ),0, 35 ); 611 this, SLOT( toggleRunning() ),0, 35 );
612 612
613#endif 613#endif
614 mPopupMenu = new QPopupMenu(this); 614 mPopupMenu = new QPopupMenu(this);
615 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, 615 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
616 SLOT (newTodo()),0,1); 616 SLOT (newTodo()),0,1);
617 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"), 617 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."),
618 this, SLOT(purgeCompleted()),0,2); 618 this, SLOT(purgeCompleted()),0,2);
619 mPopupMenu->insertItem(i18n("Show Completed"), 619 mPopupMenu->insertItem(i18n("Show Completed"),
620 this, SLOT( toggleCompleted() ),0,3 ); 620 this, SLOT( toggleCompleted() ),0,3 );
621 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 621 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
622 this, SLOT( toggleRunning() ),0,5 ); 622 this, SLOT( toggleRunning() ),0,5 );
623 mPopupMenu->insertItem(i18n(" set all open","Display all opened"), 623 mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
624 this, SLOT( setAllOpen() ),0,6 ); 624 this, SLOT( setAllOpen() ),0,6 );
625 mPopupMenu->insertItem(i18n(" set all close","Display all closed"), 625 mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
626 this, SLOT( setAllClose() ),0,7 ); 626 this, SLOT( setAllClose() ),0,7 );
627 mPopupMenu->insertItem(i18n(" set all flat","Display all flat"), 627 mPopupMenu->insertItem(i18n(" set all flat","Display all flat"),
628 this, SLOT( setAllFlat() ),0,8 ); 628 this, SLOT( setAllFlat() ),0,8 );
629 mPopupMenu->insertSeparator(); 629 mPopupMenu->insertSeparator();
630 mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), 630 mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
631 this, SLOT( toggleQuickTodo() ),0,4 ); 631 this, SLOT( toggleQuickTodo() ),0,4 );
632 mDocPrefs = new DocPrefs( name ); 632 mDocPrefs = new DocPrefs( name );
633 633
634 mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu ); 634 mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu );
635 mPopupMenu->setCheckable( true ); 635 mPopupMenu->setCheckable( true );
636 mItemPopupMenu->setCheckable( true ); 636 mItemPopupMenu->setCheckable( true );
637 637
638 638
639 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo ); 639 mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo );
640 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo ); 640 mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo );
641 641
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 23537a6..a5d8824 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -633,48 +633,53 @@ void MainWindow::startMultiSync()
633#ifndef DESKTOP_VERSION 633#ifndef DESKTOP_VERSION
634 QCopEnvelope e("QPE/Application/kapi", "doRingSync"); 634 QCopEnvelope e("QPE/Application/kapi", "doRingSync");
635#endif 635#endif
636} 636}
637QPixmap MainWindow::loadPixmap( QString name ) 637QPixmap MainWindow::loadPixmap( QString name )
638{ 638{
639 return SmallIcon( name ); 639 return SmallIcon( name );
640 640
641} 641}
642void MainWindow::setUsesBigPixmaps ( bool b ) 642void MainWindow::setUsesBigPixmaps ( bool b )
643{ 643{
644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
645 if ( b ) 645 if ( b )
646 qDebug("KO: BigPixmaps are not supported "); 646 qDebug("KO: BigPixmaps are not supported ");
647} 647}
648void MainWindow::initActions() 648void MainWindow::initActions()
649{ 649{
650 //KOPrefs::instance()->mShowFullMenu 650 //KOPrefs::instance()->mShowFullMenu
651 iconToolBar->clear(); 651 iconToolBar->clear();
652 KOPrefs *p = KOPrefs::instance(); 652 KOPrefs *p = KOPrefs::instance();
653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
654 654
655 QPopupMenu *viewMenu = new QPopupMenu( this ); 655 QPopupMenu *viewMenu = new QPopupMenu( this );
656 QPopupMenu *actionMenu = new QPopupMenu( this ); 656 QPopupMenu *actionMenu = new QPopupMenu( this );
657#ifdef DESKTOP_VERSION
658 mCurrentItemMenu = actionMenu;
659#else
660 mCurrentItemMenu = new QPopupMenu ( this );
661#endif
657 QPopupMenu *importMenu = new QPopupMenu( this ); 662 QPopupMenu *importMenu = new QPopupMenu( this );
658 QPopupMenu *importMenu_X = new QPopupMenu( this ); 663 QPopupMenu *importMenu_X = new QPopupMenu( this );
659 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 664 QPopupMenu *exportMenu_X = new QPopupMenu( this );
660 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 665 QPopupMenu *beamMenu_X = new QPopupMenu( this );
661 selectFilterMenu = new QPopupMenu( this ); 666 selectFilterMenu = new QPopupMenu( this );
662 selectFilterMenu->setCheckable( true ); 667 selectFilterMenu->setCheckable( true );
663 syncMenu = new QPopupMenu( this ); 668 syncMenu = new QPopupMenu( this );
664 configureAgendaMenu = new QPopupMenu( this ); 669 configureAgendaMenu = new QPopupMenu( this );
665 configureToolBarMenu = new QPopupMenu( this ); 670 configureToolBarMenu = new QPopupMenu( this );
666 QPopupMenu *helpMenu = new QPopupMenu( this ); 671 QPopupMenu *helpMenu = new QPopupMenu( this );
667 QIconSet icon; 672 QIconSet icon;
668 int pixWid = 22, pixHei = 22; 673 int pixWid = 22, pixHei = 22;
669 QString pathString = ""; 674 QString pathString = "";
670 if ( !p->mToolBarMiniIcons ) { 675 if ( !p->mToolBarMiniIcons ) {
671 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 676 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
672 pathString += "icons16/"; 677 pathString += "icons16/";
673 pixWid = 18; pixHei = 16; 678 pixWid = 18; pixHei = 16;
674 } 679 }
675 } else { 680 } else {
676 pathString += "iconsmini/"; 681 pathString += "iconsmini/";
677 pixWid = 18; pixHei = 16; 682 pixWid = 18; pixHei = 16;
678 } 683 }
679 if ( KOPrefs::instance()->mShowFullMenu ) { 684 if ( KOPrefs::instance()->mShowFullMenu ) {
680 QMenuBar *menuBar1; 685 QMenuBar *menuBar1;
@@ -744,145 +749,184 @@ void MainWindow::initActions()
744 connect( actionFilterMenuTB, SIGNAL( activated() ), 749 connect( actionFilterMenuTB, SIGNAL( activated() ),
745 this, SLOT( fillFilterMenuTB() ) ); 750 this, SLOT( fillFilterMenuTB() ) );
746 actionFilterMenuTB->addTo( iconToolBar ); 751 actionFilterMenuTB->addTo( iconToolBar );
747 selectFilterMenuTB = new QPopupMenu( this ); 752 selectFilterMenuTB = new QPopupMenu( this );
748 selectFilterMenuTB->setCheckable( true ); 753 selectFilterMenuTB->setCheckable( true );
749 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 754 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
750 } 755 }
751 756
752 //#endif 757 //#endif
753 // ****************** 758 // ******************
754 QAction *action; 759 QAction *action;
755 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 760 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
756 configureToolBarMenu->setCheckable( true ); 761 configureToolBarMenu->setCheckable( true );
757 762
758 763
759 configureAgendaMenu->setCheckable( true ); 764 configureAgendaMenu->setCheckable( true );
760 int iii ; 765 int iii ;
761 for ( iii = 1;iii<= 10 ;++iii ){ 766 for ( iii = 1;iii<= 10 ;++iii ){
762 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 767 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
763 } 768 }
764 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 769 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
765 770
766 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 771 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
767 this, SLOT( showConfigureAgenda( ) ) ); 772 this, SLOT( showConfigureAgenda( ) ) );
773 icon = loadPixmap( pathString + "today" );
774 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
775 today_action->addTo( actionMenu );
776 connect( today_action, SIGNAL( activated() ),
777 mView, SLOT( goToday() ) );
778
779 icon = loadPixmap( pathString + "picker" );
780 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
781 dPickerAction->addTo( actionMenu );
782 connect( dPickerAction, SIGNAL( activated() ),
783 mView, SLOT( showDatePicker() ) );
784
785 icon = loadPixmap( pathString + "search" );
786 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
787 search_action->addTo( actionMenu );
788 connect( search_action, SIGNAL( activated() ),
789 mView->dialogManager(), SLOT( showSearchDialog() ) );
768 790
769 icon = loadPixmap( pathString + "configure" );
770 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
771 action->addTo( actionMenu );
772 connect( action, SIGNAL( activated() ),
773 mView, SLOT( edit_options() ) );
774 icon = loadPixmap( pathString + "configure" );
775 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
776 action->addTo( actionMenu );
777 connect( action, SIGNAL( activated() ),
778 mView, SLOT( edit_global_options() ) );
779 actionMenu->insertSeparator(); 791 actionMenu->insertSeparator();
792
793
780 794
781 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 795 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
782 action->addTo( actionMenu ); 796 action->addTo( actionMenu );
783 connect( action, SIGNAL( activated() ), 797 connect( action, SIGNAL( activated() ),
784 mView, SLOT( undo_delete() ) ); 798 mView, SLOT( undo_delete() ) );
785 actionMenu->insertSeparator();
786 799
787 icon = loadPixmap( pathString + "newevent" ); 800 icon = loadPixmap( pathString + "newevent" );
788 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 801 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
789 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 802 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
790 configureToolBarMenu->insertSeparator(); 803 configureToolBarMenu->insertSeparator();
791 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 804 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
792 configureToolBarMenu->insertSeparator(); 805 configureToolBarMenu->insertSeparator();
793 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 806 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
794 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 807 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
808
809#ifndef DESKTOP_VERSION
810 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
811#endif
812 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
813 mShowAction->addTo( mCurrentItemMenu );
814 connect( mShowAction, SIGNAL( activated() ),
815 mView, SLOT( showIncidence() ) );
816
817 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
818 mEditAction->addTo( mCurrentItemMenu );
819 connect( mEditAction, SIGNAL( activated() ),
820 mView, SLOT( editIncidence() ) );
821
822 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
823 mDeleteAction->addTo( mCurrentItemMenu );
824 connect( mDeleteAction, SIGNAL( activated() ),
825 mView, SLOT( deleteIncidence() ) );
826
827
828 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
829 mCloneAction->addTo( mCurrentItemMenu );
830 connect( mCloneAction, SIGNAL( activated() ),
831 mView, SLOT( cloneIncidence() ) );
832 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
833 mMoveAction->addTo( mCurrentItemMenu );
834 connect( mMoveAction, SIGNAL( activated() ),
835 mView, SLOT( moveIncidence() ) );
836 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
837 mBeamAction->addTo(mCurrentItemMenu );
838 connect( mBeamAction, SIGNAL( activated() ),
839 mView, SLOT( beamIncidence() ) );
840 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
841 mCancelAction->addTo( mCurrentItemMenu );
842 connect( mCancelAction, SIGNAL( activated() ),
843 mView, SLOT( toggleCancelIncidence() ) );
844#ifdef DESKTOP_VERSION
845 actionMenu->insertSeparator();
846#endif
847
848
795 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 849 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
796 ne_action->addTo( actionMenu ); 850 ne_action->addTo( actionMenu );
797 connect( ne_action, SIGNAL( activated() ), 851 connect( ne_action, SIGNAL( activated() ),
798 mView, SLOT( newEvent() ) ); 852 mView, SLOT( newEvent() ) );
799 icon = loadPixmap( pathString + "newtodo" ); 853 icon = loadPixmap( pathString + "newtodo" );
800 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 854 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
801 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 855 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
802 nt_action->addTo( actionMenu ); 856 nt_action->addTo( actionMenu );
803 connect( nt_action, SIGNAL( activated() ), 857 connect( nt_action, SIGNAL( activated() ),
804 mView, SLOT( newTodo() ) ); 858 mView, SLOT( newTodo() ) );
805 859
806 icon = loadPixmap( pathString + "today" ); 860
807 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
808 today_action->addTo( viewMenu );
809 connect( today_action, SIGNAL( activated() ),
810 mView, SLOT( goToday() ) );
811 viewMenu->insertSeparator();
812 861
813 // *********************** 862 // ***********************
814 if ( KOPrefs::instance()->mVerticalScreen ) { 863 if ( KOPrefs::instance()->mVerticalScreen ) {
815 icon = SmallIcon( "1updownarrow" ); 864 icon = SmallIcon( "1updownarrow" );
816 } else { 865 } else {
817 icon = SmallIcon("1leftrightarrow" ); 866 icon = SmallIcon("1leftrightarrow" );
818 } 867 }
819 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 868 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
820 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 869 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
821 FSaction->addTo( viewMenu ); 870 FSaction->addTo( viewMenu );
822 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 871 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
823 872
824 873
825 icon = loadPixmap( pathString + "filter" ); 874 icon = loadPixmap( pathString + "filter" );
826 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 875 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
827 icon = loadPixmap( pathString + "configure" ); 876 icon = loadPixmap( pathString + "configure" );
828 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); 877 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
829 action->addTo( viewMenu ); 878 action->addTo( viewMenu );
830 connect( action, SIGNAL( activated() ), 879 connect( action, SIGNAL( activated() ),
831 mView, SLOT( toggleFilter() ) ); 880 mView, SLOT( toggleFilter() ) );
832 mToggleFilter = action; 881 mToggleFilter = action;
833 icon = loadPixmap( pathString + "navi" ); 882 icon = loadPixmap( pathString + "navi" );
834 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 883 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
835 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 884 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
836 action->addTo( viewMenu ); 885 action->addTo( viewMenu );
837 connect( action, SIGNAL( activated() ), 886 connect( action, SIGNAL( activated() ),
838 mView, SLOT( toggleDateNavigatorWidget() ) ); 887 mView, SLOT( toggleDateNavigatorWidget() ) );
839 mToggleNav = action ; 888 mToggleNav = action ;
840 icon = loadPixmap( pathString + "allday" ); 889 icon = loadPixmap( pathString + "allday" );
841 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 890 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
842 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 891 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
843 action->addTo( viewMenu ); 892 action->addTo( viewMenu );
844 connect( action, SIGNAL( activated() ), 893 connect( action, SIGNAL( activated() ),
845 mView, SLOT( toggleAllDaySize() ) ); 894 mView, SLOT( toggleAllDaySize() ) );
846 mToggleAllday = action; 895 mToggleAllday = action;
847 896
848 897
849 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 898 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
850 mToggleNav, SLOT( setEnabled ( bool ) ) ); 899 mToggleNav, SLOT( setEnabled ( bool ) ) );
851 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 900 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
852 // mToggleFilter, SLOT( setEnabled ( bool ) ) ); 901 // mToggleFilter, SLOT( setEnabled ( bool ) ) );
853 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 902 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
854 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 903 mToggleAllday, SLOT( setEnabled ( bool ) ) );
855 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 904 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
856 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 905 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
857 906
858 viewMenu->insertSeparator(); 907
859 icon = loadPixmap( pathString + "picker" ); 908 dPickerAction->addTo( iconToolBar );
860 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
861 action->addTo( viewMenu );
862 connect( action, SIGNAL( activated() ),
863 mView, SLOT( showDatePicker() ) );
864 action->addTo( iconToolBar );
865 viewMenu->insertSeparator(); 909 viewMenu->insertSeparator();
866 910
867 if ( p-> mShowIconToggleFull ) 911 if ( p-> mShowIconToggleFull )
868 FSaction->addTo( iconToolBar ); 912 FSaction->addTo( iconToolBar );
869 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 913 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
870 914
871 //******************** 915 //********************
872 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 916 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
873 917
874 918
875 icon = loadPixmap( pathString + "whatsnext" ); 919 icon = loadPixmap( pathString + "whatsnext" );
876 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 920 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
877 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 921 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
878 whatsnext_action->addTo( viewMenu ); 922 whatsnext_action->addTo( viewMenu );
879 connect( whatsnext_action, SIGNAL( activated() ), 923 connect( whatsnext_action, SIGNAL( activated() ),
880 mView->viewManager(), SLOT( showWhatsNextView() ) ); 924 mView->viewManager(), SLOT( showWhatsNextView() ) );
881 925
882 icon = loadPixmap( pathString + "xdays" ); 926 icon = loadPixmap( pathString + "xdays" );
883 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 927 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
884 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 928 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
885 xdays_action->addTo( viewMenu ); 929 xdays_action->addTo( viewMenu );
886 connect( xdays_action, SIGNAL( activated() ), 930 connect( xdays_action, SIGNAL( activated() ),
887 mView->viewManager(), SLOT( showNextXView() ) ); 931 mView->viewManager(), SLOT( showNextXView() ) );
888 932
@@ -939,101 +983,82 @@ void MainWindow::initActions()
939 mView->viewManager(), SLOT( showListView() ) ); 983 mView->viewManager(), SLOT( showListView() ) );
940 984
941 icon = loadPixmap( pathString + "todo" ); 985 icon = loadPixmap( pathString + "todo" );
942 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 986 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
943 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 987 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
944 todoview_action->addTo( viewMenu ); 988 todoview_action->addTo( viewMenu );
945 connect( todoview_action, SIGNAL( activated() ), 989 connect( todoview_action, SIGNAL( activated() ),
946 mView->viewManager(), SLOT( showTodoView() ) ); 990 mView->viewManager(), SLOT( showTodoView() ) );
947 991
948 992
949 993
950#if 0 994#if 0
951 action = new QAction( "view_timespan", "Time Span", 0, this ); 995 action = new QAction( "view_timespan", "Time Span", 0, this );
952 action->addTo( viewMenu ); 996 action->addTo( viewMenu );
953 connect( action, SIGNAL( activated() ), 997 connect( action, SIGNAL( activated() ),
954 mView->viewManager(), SLOT( showTimeSpanView() ) ); 998 mView->viewManager(), SLOT( showTimeSpanView() ) );
955#endif 999#endif
956 1000
957 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 1001 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
958 this ); 1002 this );
959 mNewSubTodoAction->addTo( actionMenu ); 1003 mNewSubTodoAction->addTo( actionMenu );
960 connect( mNewSubTodoAction, SIGNAL( activated() ), 1004 connect( mNewSubTodoAction, SIGNAL( activated() ),
961 mView, SLOT( newSubTodo() ) ); 1005 mView, SLOT( newSubTodo() ) );
962 1006
963 actionMenu->insertSeparator(); 1007 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
964 1008 this );
965 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 1009 action->addTo( actionMenu );
966 mShowAction->addTo( actionMenu ); 1010 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
967 connect( mShowAction, SIGNAL( activated() ),
968 mView, SLOT( showIncidence() ) );
969 1011
970 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 1012
971 mEditAction->addTo( actionMenu ); 1013 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
972 connect( mEditAction, SIGNAL( activated() ),
973 mView, SLOT( editIncidence() ) );
974 1014
975 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
976 mDeleteAction->addTo( actionMenu );
977 connect( mDeleteAction, SIGNAL( activated() ),
978 mView, SLOT( deleteIncidence() ) );
979 1015
980 1016
981 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
982 mCloneAction->addTo( actionMenu );
983 connect( mCloneAction, SIGNAL( activated() ),
984 mView, SLOT( cloneIncidence() ) );
985 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
986 mMoveAction->addTo( actionMenu );
987 connect( mMoveAction, SIGNAL( activated() ),
988 mView, SLOT( moveIncidence() ) );
989 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
990 mBeamAction->addTo( actionMenu );
991 connect( mBeamAction, SIGNAL( activated() ),
992 mView, SLOT( beamIncidence() ) );
993 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
994 mCancelAction->addTo( actionMenu );
995 connect( mCancelAction, SIGNAL( activated() ),
996 mView, SLOT( toggleCancelIncidence() ) );
997
998 actionMenu->insertSeparator(); 1017 actionMenu->insertSeparator();
999 1018 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1000 action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
1001 this ); 1019 this );
1002 action->addTo( actionMenu ); 1020 action->addTo( actionMenu );
1003 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1021 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1004 1022
1005 icon = loadPixmap( pathString + "search" ); 1023 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1006 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 1024 this );
1007 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1025 action->addTo( actionMenu );
1008 search_action->addTo( actionMenu ); 1026 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1009 connect( search_action, SIGNAL( activated() ),
1010 mView->dialogManager(), SLOT( showSearchDialog() ) );
1011 1027
1012
1013 1028
1029 actionMenu->insertSeparator();
1030 icon = loadPixmap( pathString + "configure" );
1031 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
1032 action->addTo( actionMenu );
1033 connect( action, SIGNAL( activated() ),
1034 mView, SLOT( edit_options() ) );
1035 icon = loadPixmap( pathString + "configure" );
1036 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
1037 action->addTo( actionMenu );
1038 connect( action, SIGNAL( activated() ),
1039 mView, SLOT( edit_global_options() ) );
1014 if ( KOPrefs::instance()->mShowFullMenu ) { 1040 if ( KOPrefs::instance()->mShowFullMenu ) {
1015 actionMenu->insertSeparator();
1016 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1041 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1017 1042
1018 } 1043 }
1019 // actionMenu->insertSeparator(); 1044 // actionMenu->insertSeparator();
1020 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1045 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1021 this ); 1046 this );
1022 action->addTo( importMenu_X ); 1047 action->addTo( importMenu_X );
1023 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1048 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
1024 action = new QAction( "import_quick", i18n("Import last file"), 0, 1049 action = new QAction( "import_quick", i18n("Import last file"), 0,
1025 this ); 1050 this );
1026 action->addTo( importMenu_X ); 1051 action->addTo( importMenu_X );
1027 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1052 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1028 importMenu_X->insertSeparator(); 1053 importMenu_X->insertSeparator();
1029 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1054 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1030 this ); 1055 this );
1031 action->addTo( importMenu_X ); 1056 action->addTo( importMenu_X );
1032 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1057 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1033 //#ifndef DESKTOP_VERSION 1058 //#ifndef DESKTOP_VERSION
1034 importMenu_X->insertSeparator(); 1059 importMenu_X->insertSeparator();
1035 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1060 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1036 this ); 1061 this );
1037 action->addTo( importMenu_X ); 1062 action->addTo( importMenu_X );
1038 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1063 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1039 //#else 1064 //#else
@@ -1103,53 +1128,49 @@ void MainWindow::initActions()
1103 icon = loadPixmap( pathString + "print" ); 1128 icon = loadPixmap( pathString + "print" );
1104 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1129 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1105 action->addTo( beamMenu_X ); 1130 action->addTo( beamMenu_X );
1106 connect( action, SIGNAL( activated() ), 1131 connect( action, SIGNAL( activated() ),
1107 this, SLOT( printSel() ) ); 1132 this, SLOT( printSel() ) );
1108 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1133 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1109 action->addTo( beamMenu_X ); 1134 action->addTo( beamMenu_X );
1110 connect( action, SIGNAL( activated() ), 1135 connect( action, SIGNAL( activated() ),
1111 mView->viewManager(), SLOT( slotprintWNV() ) ); 1136 mView->viewManager(), SLOT( slotprintWNV() ) );
1112 1137
1113 1138
1114 icon = loadPixmap( pathString + "print" ); 1139 icon = loadPixmap( pathString + "print" );
1115 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1140 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1116 action->addTo( beamMenu_X ); 1141 action->addTo( beamMenu_X );
1117 connect( action, SIGNAL( activated() ), 1142 connect( action, SIGNAL( activated() ),
1118 this, SLOT( printListView() ) ); 1143 this, SLOT( printListView() ) );
1119 1144
1120 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1145 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1121 action->addTo( beamMenu_X ); 1146 action->addTo( beamMenu_X );
1122 connect( action, SIGNAL( activated() ), 1147 connect( action, SIGNAL( activated() ),
1123 mView, SLOT( slotprintSelInc() ) ); 1148 mView, SLOT( slotprintSelInc() ) );
1124 1149
1125 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1150 importMenu->insertItem( i18n("Print"), beamMenu_X );
1126#endif 1151#endif
1127 importMenu->insertSeparator(); 1152
1128 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1129 this );
1130 action->addTo( importMenu );
1131 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1132 importMenu->insertSeparator(); 1153 importMenu->insertSeparator();
1133 action = new QAction( "beam all", i18n("Save"), 0, 1154 action = new QAction( "beam all", i18n("Save"), 0,
1134 this ); 1155 this );
1135 action->addTo( importMenu ); 1156 action->addTo( importMenu );
1136 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1157 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1137 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1158 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1138 this ); 1159 this );
1139 action->addTo( importMenu ); 1160 action->addTo( importMenu );
1140 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1161 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1141 1162
1142 //menuBar->insertItem( "Configure",configureMenu ); 1163 //menuBar->insertItem( "Configure",configureMenu );
1143 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1164 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1144 icon = loadPixmap( "korganizer/korganizer" ); 1165 icon = loadPixmap( "korganizer/korganizer" );
1145 1166
1146 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1167 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1147 action->addTo( helpMenu ); 1168 action->addTo( helpMenu );
1148 connect( action, SIGNAL( activated() ), 1169 connect( action, SIGNAL( activated() ),
1149 SLOT( whatsNew() ) ); 1170 SLOT( whatsNew() ) );
1150 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1171 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1151 action->addTo( helpMenu ); 1172 action->addTo( helpMenu );
1152 connect( action, SIGNAL( activated() ), 1173 connect( action, SIGNAL( activated() ),
1153 SLOT( features() ) ); 1174 SLOT( features() ) );
1154 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1175 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1155 action->addTo( helpMenu ); 1176 action->addTo( helpMenu );
@@ -1693,56 +1714,61 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1693 1714
1694 if ( incidence->typeID() == eventID ) { 1715 if ( incidence->typeID() == eventID ) {
1695 mShowAction->setText( i18n("Show Event...") ); 1716 mShowAction->setText( i18n("Show Event...") );
1696 mEditAction->setText( i18n("Edit Event...") ); 1717 mEditAction->setText( i18n("Edit Event...") );
1697 mDeleteAction->setText( i18n("Delete Event...") ); 1718 mDeleteAction->setText( i18n("Delete Event...") );
1698 1719
1699 mNewSubTodoAction->setEnabled( false ); 1720 mNewSubTodoAction->setEnabled( false );
1700 } else if ( incidence->typeID() == todoID ) { 1721 } else if ( incidence->typeID() == todoID ) {
1701 mShowAction->setText( i18n("Show Todo...") ); 1722 mShowAction->setText( i18n("Show Todo...") );
1702 mEditAction->setText( i18n("Edit Todo...") ); 1723 mEditAction->setText( i18n("Edit Todo...") );
1703 mDeleteAction->setText( i18n("Delete Todo...") ); 1724 mDeleteAction->setText( i18n("Delete Todo...") );
1704 1725
1705 mNewSubTodoAction->setEnabled( true ); 1726 mNewSubTodoAction->setEnabled( true );
1706 } else { 1727 } else {
1707 mShowAction->setText( i18n("Show...") ); 1728 mShowAction->setText( i18n("Show...") );
1708 mShowAction->setText( i18n("Edit...") ); 1729 mShowAction->setText( i18n("Edit...") );
1709 mShowAction->setText( i18n("Delete...") ); 1730 mShowAction->setText( i18n("Delete...") );
1710 1731
1711 mNewSubTodoAction->setEnabled( false ); 1732 mNewSubTodoAction->setEnabled( false );
1712 } 1733 }
1713} 1734}
1714 1735
1715void MainWindow::enableIncidenceActions( bool enabled ) 1736void MainWindow::enableIncidenceActions( bool enabled )
1716{ 1737{
1738
1739#ifndef DESKTOP_VERSION
1740 mCurrentItemMenu->setEnabled( enabled );
1741#else
1717 mShowAction->setEnabled( enabled ); 1742 mShowAction->setEnabled( enabled );
1718 mEditAction->setEnabled( enabled ); 1743 mEditAction->setEnabled( enabled );
1719 mDeleteAction->setEnabled( enabled ); 1744 mDeleteAction->setEnabled( enabled );
1720 1745
1721 mCloneAction->setEnabled( enabled ); 1746 mCloneAction->setEnabled( enabled );
1722 mMoveAction->setEnabled( enabled ); 1747 mMoveAction->setEnabled( enabled );
1723 mBeamAction->setEnabled( enabled ); 1748 mBeamAction->setEnabled( enabled );
1724 mCancelAction->setEnabled( enabled ); 1749 mCancelAction->setEnabled( enabled );
1750#endif
1725} 1751}
1726 1752
1727void MainWindow::importOL() 1753void MainWindow::importOL()
1728{ 1754{
1729#ifdef _OL_IMPORT_ 1755#ifdef _OL_IMPORT_
1730 mView->clearAllViews(); 1756 mView->clearAllViews();
1731 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1757 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1732 id->exec(); 1758 id->exec();
1733 delete id; 1759 delete id;
1734 mView->calendar()->checkAlarmForIncidence( 0, true ); 1760 mView->calendar()->checkAlarmForIncidence( 0, true );
1735 mView->updateView(); 1761 mView->updateView();
1736#endif 1762#endif
1737} 1763}
1738void MainWindow::importBday() 1764void MainWindow::importBday()
1739{ 1765{
1740 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), 1766 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
1741 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1767 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
1742 i18n("Import!"), i18n("Cancel"), 0, 1768 i18n("Import!"), i18n("Cancel"), 0,
1743 0, 1 ); 1769 0, 1 );
1744 if ( result == 0 ) { 1770 if ( result == 0 ) {
1745 mView->importBday(); 1771 mView->importBday();
1746 1772
1747 } 1773 }
1748 1774
@@ -2253,48 +2279,49 @@ void MainWindow::configureToolBar( int item )
2253 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2279 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2254 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); 2280 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2255 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); 2281 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2256 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); 2282 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2257 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); 2283 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2258 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2284 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2259 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2285 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2260 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2286 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2261 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2287 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2262 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2288 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2263 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2289 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2264 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2290 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2265 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2291 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2266 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2292 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2267 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2293 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2268 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2294 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
2269 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2295 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
2270 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2296 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
2271 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2297 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
2272 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2298 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
2273 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2299 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
2274 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2300 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
2275 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2301 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
2276 // initActions(); 2302 // initActions();
2303 setCaption ( i18n("Toolbar changes needs a restart!") );
2277} 2304}
2278void MainWindow::setCaption ( const QString & c ) 2305void MainWindow::setCaption ( const QString & c )
2279{ 2306{
2280 QString cap = c; 2307 QString cap = c;
2281 cap.replace( QRegExp("\n"), " " ); 2308 cap.replace( QRegExp("\n"), " " );
2282 cap = cap.stripWhiteSpace(); 2309 cap = cap.stripWhiteSpace();
2283 if ( cap.isEmpty() ) 2310 if ( cap.isEmpty() )
2284 cap = "KO/Pi"; 2311 cap = "KO/Pi";
2285 QWidget::setCaption( cap ); 2312 QWidget::setCaption( cap );
2286} 2313}
2287void MainWindow::setCaptionToDates() 2314void MainWindow::setCaptionToDates()
2288{ 2315{
2289 QString selDates; 2316 QString selDates;
2290 QDate date = mView->startDate(); 2317 QDate date = mView->startDate();
2291 if ( ! date.isValid() ) { 2318 if ( ! date.isValid() ) {
2292 setCaption(""); 2319 setCaption("");
2293 return; 2320 return;
2294 } 2321 }
2295 selDates = KGlobal::locale()->formatDate( date, true); 2322 selDates = KGlobal::locale()->formatDate( date, true);
2296 if (mView->startDate() < mView->endDate() ) 2323 if (mView->startDate() < mView->endDate() )
2297 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 2324 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
2298 else { 2325 else {
2299 QString addString; 2326 QString addString;
2300 if ( date == QDateTime::currentDateTime().date() ) 2327 if ( date == QDateTime::currentDateTime().date() )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a4d0523..953774f 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -108,48 +108,49 @@ class MainWindow : public QMainWindow
108 108
109 protected: 109 protected:
110 void hideEvent ( QHideEvent * ); 110 void hideEvent ( QHideEvent * );
111 QString sentSyncFile(); 111 QString sentSyncFile();
112 void displayText( QString, QString); 112 void displayText( QString, QString);
113 void enableIncidenceActions( bool ); 113 void enableIncidenceActions( bool );
114 114
115 private: 115 private:
116 bool mBRdisabled; 116 bool mBRdisabled;
117#ifndef DESKTOP_VERSION 117#ifndef DESKTOP_VERSION
118 QCopChannel* infrared; 118 QCopChannel* infrared;
119#endif 119#endif
120 QAction* brAction; 120 QAction* brAction;
121 KSyncManager* mSyncManager; 121 KSyncManager* mSyncManager;
122 bool mClosed; 122 bool mClosed;
123 void saveOnClose(); 123 void saveOnClose();
124 bool mFlagKeyPressed; 124 bool mFlagKeyPressed;
125 bool mBlockAtStartup; 125 bool mBlockAtStartup;
126 QPEToolBar *iconToolBar; 126 QPEToolBar *iconToolBar;
127 QPEToolBar *viewToolBar; 127 QPEToolBar *viewToolBar;
128 QPEToolBar *navigatorToolBar; 128 QPEToolBar *navigatorToolBar;
129 QPEToolBar *filterToolBar; 129 QPEToolBar *filterToolBar;
130 QMenuBar *filterMenubar; 130 QMenuBar *filterMenubar;
131 QPopupMenu * filterPopupMenu; 131 QPopupMenu * filterPopupMenu;
132 QPopupMenu * mCurrentItemMenu;
132 void initActions(); 133 void initActions();
133 void setDefaultPreferences(); 134 void setDefaultPreferences();
134 void resizeEvent( QResizeEvent* e); 135 void resizeEvent( QResizeEvent* e);
135 void keyPressEvent ( QKeyEvent * ) ; 136 void keyPressEvent ( QKeyEvent * ) ;
136 void keyReleaseEvent ( QKeyEvent * ) ; 137 void keyReleaseEvent ( QKeyEvent * ) ;
137 QPopupMenu *configureToolBarMenu; 138 QPopupMenu *configureToolBarMenu;
138 QPopupMenu *selectFilterMenu; 139 QPopupMenu *selectFilterMenu;
139 QPopupMenu *selectFilterMenuTB; 140 QPopupMenu *selectFilterMenuTB;
140 QPopupMenu *configureAgendaMenu, *syncMenu; 141 QPopupMenu *configureAgendaMenu, *syncMenu;
141 CalendarLocal *mCalendar; 142 CalendarLocal *mCalendar;
142 CalendarView *mView; 143 CalendarView *mView;
143 QAction *mNewSubTodoAction; 144 QAction *mNewSubTodoAction;
144 QAction *mWeekAction; 145 QAction *mWeekAction;
145 QFont mWeekFont; 146 QFont mWeekFont;
146 QPixmap mWeekPixmap; 147 QPixmap mWeekPixmap;
147 QColor mWeekBgColor; 148 QColor mWeekBgColor;
148 149
149 QAction *mShowAction; 150 QAction *mShowAction;
150 QAction *mEditAction; 151 QAction *mEditAction;
151 QAction *mDeleteAction; 152 QAction *mDeleteAction;
152 QAction *mCloneAction; 153 QAction *mCloneAction;
153 QAction *mMoveAction; 154 QAction *mMoveAction;
154 QAction *mBeamAction; 155 QAction *mBeamAction;
155 QAction *mCancelAction; 156 QAction *mCancelAction;
diff --git a/version b/version
index 6a9a414..8ab3bd7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "2.1.11"; version = "2.1.12";