summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--bin/kdepim/korganizer/today_small.pngbin797 -> 827 bytes
-rw-r--r--korganizer/kotodoview.cpp12
3 files changed, 9 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index cb92677..bcc23dc 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -45,97 +45,96 @@
45{ "Access:","Zugriff:" }, 45{ "Access:","Zugriff:" },
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{ "Action","Aktion" }, 47{ "Action","Aktion" },
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{ "<b>On:</b> %1","<b>Am:</b> %1" }, 78{ "<b>On:</b> %1","<b>Am:</b> %1" },
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" }, 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" },
80{ "<b>Original event:</b><p>","<b>Original Termin:</b><p>" }, 80{ "<b>Original event:</b><p>","<b>Original Termin:</b><p>" },
81{ " - 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" },
82{ "Busy","Belegt" }, 82{ "Busy","Belegt" },
83{ "&Cancel","Abbre&chen" }, 83{ "&Cancel","Abbre&chen" },
84{ "Cancel","Abbrechen" }, 84{ "Cancel","Abbrechen" },
85{ "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" },
86{ "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." },
87{ "Categories...","Kategorien..." }, 87{ "Categories...","Kategorien..." },
88{ "Categories","Kategorien" }, 88{ "Categories","Kategorien" },
89{ "Category","Kategorie" }, 89{ "Category","Kategorie" },
90{ "Center View","Zentriere Ansicht" }, 90{ "Center View","Zentriere Ansicht" },
91{ "Change","Ändere" }, 91{ "Change","Ändere" },
92{ "Cinema","Kino" }, 92{ "Cinema","Kino" },
93{ "Click to add a new Todo","Hier klicken, um ein neues Todo anzulegen" },
94{ "Clone Item","Klone Eintrag" }, 93{ "Clone Item","Klone Eintrag" },
95{ "&Close","S&chließen" }, 94{ "&Close","S&chließen" },
96{ "Close","Schließen" }, 95{ "Close","Schließen" },
97{ "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" }, 96{ "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" },
98{ "Colors","Farben" }, 97{ "Colors","Farben" },
99{ "completed","erledigt" }, 98{ "completed","erledigt" },
100{ "completed on %1","erledigt am %1" }, 99{ "completed on %1","erledigt am %1" },
101{ "Complete","Erledigt" }, 100{ "Complete","Erledigt" },
102{ "Confidential","Vertraulich" }, 101{ "Confidential","Vertraulich" },
103{ "Configure...","Einstellungen..." }, 102{ "Configure...","Einstellungen..." },
104{ "Confirm &deletes","Löschvogang bestätigen" }, 103{ "Confirm &deletes","Löschvogang bestätigen" },
105{ "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." }, 104{ "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." },
106{ "Counter-event Viewer","Terminzähler Ansicht" }, 105{ "Counter-event Viewer","Terminzähler Ansicht" },
107{ "Daily ending hour:","Feierabend:" }, 106{ "Daily ending hour:","Feierabend:" },
108{ "Daily starting hour:","Anfangszeit:" }, 107{ "Daily starting hour:","Anfangszeit:" },
109{ "Daily","Täglich" }, 108{ "Daily","Täglich" },
110{ "Date Format","Datums Format" }, 109{ "Date Format","Datums Format" },
111{ "Date Format:","Datums Format:" }, 110{ "Date Format:","Datums Format:" },
112{ "DateNavigator:(nr)","Datums Navigator" }, 111{ "DateNavigator:(nr)","Datums Navigator" },
113{ "Dates: ","Datum: " }, 112{ "Dates: ","Datum: " },
114{ "Date && Time","Datum && Zeit" }, 113{ "Date && Time","Datum && Zeit" },
115{ "Day begins at:","Der Tag beginnt um:" }, 114{ "Day begins at:","Der Tag beginnt um:" },
116{ "Days in Next-X-Days:","Tage in Nächste-X-Tage:" }, 115{ "Days in Next-X-Days:","Tage in Nächste-X-Tage:" },
117{ "Days in What's Next:","Tage in What's Next:" }, 116{ "Days in What's Next:","Tage in What's Next:" },
118{ "day(s)","Tag(e)" }, 117{ "day(s)","Tag(e)" },
119{ "Days to show in Next-X-Days view:","Welche Tage in Nächste-X-Tagen anzeigen:" }, 118{ "Days to show in Next-X-Days view:","Welche Tage in Nächste-X-Tagen anzeigen:" },
120{ "day","Tag" }, 119{ "day","Tag" },
121{ "Dec","Dez" }, 120{ "Dec","Dez" },
122{ "December","Dezember" }, 121{ "December","Dezember" },
123{ "Default alarm time:","Standard Alarmzeit:" }, 122{ "Default alarm time:","Standard Alarmzeit:" },
124{ "Default appointment time:","Standard Termin Startzeit:" }, 123{ "Default appointment time:","Standard Termin Startzeit:" },
125{ "Default event color:","Standard Terminfarbe:" }, 124{ "Default event color:","Standard Terminfarbe:" },
126{ "Default","Standard" }, 125{ "Default","Standard" },
127{ "Def. duration of new app.:","Standard Termin Länge:" }, 126{ "Def. duration of new app.:","Standard Termin Länge:" },
128{ "Delete All","Lösche alles" }, 127{ "Delete All","Lösche alles" },
129{ "Delete all selected","Lösche alle Selektierten" }, 128{ "Delete all selected","Lösche alle Selektierten" },
130{ "Delete Current","Aktuellen löschen" }, 129{ "Delete Current","Aktuellen löschen" },
131{ "Delete Event...","Lösche Termin..." }, 130{ "Delete Event...","Lösche Termin..." },
132{ "Delete Event","Lösche Termin" }, 131{ "Delete Event","Lösche Termin" },
133{ "&Delete...","Lösche..." }, 132{ "&Delete...","Lösche..." },
134{ "Delete...","Lösche..." }, 133{ "Delete...","Lösche..." },
135{ "Delete","Lösche" }, 134{ "Delete","Lösche" },
136{ "Delete Todo...","Lösche Todo..." }, 135{ "Delete Todo...","Lösche Todo..." },
137{ "Delete To-Do","Lösche Todo" }, 136{ "Delete To-Do","Lösche Todo" },
138{ "Deleting item %d ...","Lösche Eintrag %d..." }, 137{ "Deleting item %d ...","Lösche Eintrag %d..." },
139{ "Descriptions","Beschreibungen" }, 138{ "Descriptions","Beschreibungen" },
140{ "Deselect all","Deselektiere Alle" }, 139{ "Deselect all","Deselektiere Alle" },
141{ "Details","Details" }, 140{ "Details","Details" },
@@ -1449,58 +1448,59 @@
1449{ "Backup cancelled","Backup abgebrochen" }, 1448{ "Backup cancelled","Backup abgebrochen" },
1450{ "Backup globally disabled","Backup global abgeschaltet" }, 1449{ "Backup globally disabled","Backup global abgeschaltet" },
1451{ "Backup succesfully finished","Backup erfolgreich beendet" }, 1450{ "Backup succesfully finished","Backup erfolgreich beendet" },
1452{ "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, 1451{ "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
1453{ "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" }, 1452{ "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" },
1454{ "Birthdays","Geburtstage" }, 1453{ "Birthdays","Geburtstage" },
1455{ "KO/Pi import information!","KO/Pi Import Information!" }, 1454{ "KO/Pi import information!","KO/Pi Import Information!" },
1456{ "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, 1455{ "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
1457{ "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 1456{ "Cancel - do not start"," Abbrechen - Todo nicht starten" },
1458{ "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?"" }, 1457{ "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?"" },
1459{ "Reload","Neu laden" }, 1458{ "Reload","Neu laden" },
1460{ "Timezone settings","Zeitzoneneinstellung" }, 1459{ "Timezone settings","Zeitzoneneinstellung" },
1461{ "Title: ","Titel: " }, 1460{ "Title: ","Titel: " },
1462{ "Journal from: ","Journal vom: " }, 1461{ "Journal from: ","Journal vom: " },
1463{ "Journal: %1 from ","Journal: %1 vom " }, 1462{ "Journal: %1 from ","Journal: %1 vom " },
1464{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, 1463{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
1465{ "Selected Item","Ausgewähltes Item" }, 1464{ "Selected Item","Ausgewähltes Item" },
1466{ "Select Date...","Wähle Datum..." }, 1465{ "Select Date...","Wähle Datum..." },
1467{ "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:" }, 1466{ "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:" },
1468{ "Change category list now!","Ändere Kategorieliste jetzt!" }, 1467{ "Change category list now!","Ändere Kategorieliste jetzt!" },
1469{ "Edit category list...","Ändere Kategorieliste..." }, 1468{ "Edit category list...","Ändere Kategorieliste..." },
1470{ "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, 1469{ "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
1471{ "Filepath: ","Dateipfad: " }, 1470{ "Filepath: ","Dateipfad: " },
1472{ "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, 1471{ "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
1473{ "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, 1472{ "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
1474{ "Pending Suspend Alarm","Laufender Suspend Alarm" }, 1473{ "Pending Suspend Alarm","Laufender Suspend Alarm" },
1475{ "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, 1474{ "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
1476{ "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, 1475{ "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
1477{ "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, 1476{ "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
1478{ "Alarm Options","Alarm Einstellungen" }, 1477{ "Alarm Options","Alarm Einstellungen" },
1479{ "Delete selected...","Lösche Ausgewählte..." }, 1478{ "Delete selected...","Lösche Ausgewählte..." },
1480{ "None","Nichts" }, 1479{ "None","Nichts" },
1481{ "Selection","Auswahl" }, 1480{ "Selection","Auswahl" },
1482{ "Set categories","Setze Kategorien" }, 1481{ "Set categories","Setze Kategorien" },
1483{ "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, 1482{ "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
1484{ "Reset","Neu setzen" }, 1483{ "Reset","Neu setzen" },
1485{ "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, 1484{ "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
1486{ "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, 1485{ "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, 1486{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
1488{ "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, 1487{ "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
1489{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, 1488{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
1490{ "Edit","Edit" }, 1489{ "Edit","Edit" },
1491{ "Last Modified","Zuletzt geändert" }, 1490{ "Last Modified","Zuletzt geändert" },
1492{ "Journal viewer","Journal Anzeige" }, 1491{ "Journal viewer","Journal Anzeige" },
1493{ "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, 1492{ "Configure Calendar Files...","Konfiguriere Kalenderdateien..." },
1494{ "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, 1493{ "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." },
1495{ "Hide Completed","Verstecke erledigte Todos" }, 1494{ "Hide Completed","Verstecke erledigte Todos" },
1496{ "Show not Running","Zeige nicht Laufende" }, 1495{ "Show not Running","Zeige nicht Laufende" },
1496{ "Click to add new Todo","Klick für neues Todo!" },
1497{ "","" }, 1497{ "","" },
1498{ "","" }, 1498{ "","" },
1499{ "","" }, 1499{ "","" },
1500{ "","" }, 1500{ "","" },
1501{ "","" }, 1501{ "","" },
1502{ "","" }, 1502{ "","" },
1503{ "","" }, 1503{ "","" },
1504 1504
1505 1505
1506 1506
diff --git a/bin/kdepim/korganizer/today_small.png b/bin/kdepim/korganizer/today_small.png
index fcc4ac2..3d2979f 100644
--- a/bin/kdepim/korganizer/today_small.png
+++ b/bin/kdepim/korganizer/today_small.png
Binary files differ
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 06d40b1..2c017e1 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -431,147 +431,151 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
431 return; 431 return;
432 } 432 }
433 433
434 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { 434 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) {
435 switch ( e->key() ) { 435 switch ( e->key() ) {
436 case Qt::Key_Down: 436 case Qt::Key_Down:
437 case Qt::Key_Up: 437 case Qt::Key_Up:
438 QListView::keyPressEvent ( e ); 438 QListView::keyPressEvent ( e );
439 break; 439 break;
440 case Qt::Key_Left: 440 case Qt::Key_Left:
441 case Qt::Key_Right: 441 case Qt::Key_Right:
442 QListView::keyPressEvent ( e ); 442 QListView::keyPressEvent ( e );
443 e->accept(); 443 e->accept();
444 return; 444 return;
445 break; 445 break;
446 default: 446 default:
447 e->ignore(); 447 e->ignore();
448 break; 448 break;
449 } 449 }
450 return; 450 return;
451 } 451 }
452 e->ignore(); 452 e->ignore();
453} 453}
454void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e) 454void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
455{ 455{
456 QListView::contentsMouseReleaseEvent(e); 456 QListView::contentsMouseReleaseEvent(e);
457 mMousePressed = false; 457 mMousePressed = false;
458} 458}
459 459
460void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e) 460void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
461{ 461{
462 if (!e) return; 462 if (!e) return;
463 463
464 QPoint vp = contentsToViewport(e->pos()); 464 QPoint vp = contentsToViewport(e->pos());
465 465
466 QListViewItem *item = itemAt(vp); 466 QListViewItem *item = itemAt(vp);
467 467
468 emit double_Clicked(item); 468 emit double_Clicked(item);
469 if (!item) return; 469 if (!item) return;
470 470
471 emit doubleClicked(item,vp,0); 471 emit doubleClicked(item,vp,0);
472} 472}
473 473
474///////////////////////////////////////////////////////////////////////////// 474/////////////////////////////////////////////////////////////////////////////
475 475
476KOQuickTodo::KOQuickTodo(QWidget *parent) : 476KOQuickTodo::KOQuickTodo(QWidget *parent) :
477 QLineEdit(parent) 477 QLineEdit(parent)
478{ 478{
479 setText(i18n("Click to add a new Todo")); 479 setText(i18n("Click to add new Todo"));
480} 480}
481 481
482void KOQuickTodo::focusInEvent(QFocusEvent *ev) 482void KOQuickTodo::focusInEvent(QFocusEvent *ev)
483{ 483{
484 if ( text()==i18n("Click to add a new Todo") ) 484 if ( text()==i18n("Click to add new Todo") )
485 setText(""); 485 setText("");
486 QLineEdit::focusInEvent(ev); 486 QLineEdit::focusInEvent(ev);
487} 487}
488 488
489void KOQuickTodo::focusOutEvent(QFocusEvent *ev) 489void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
490{ 490{
491 setText(i18n("Click to add a new Todo")); 491 setText(i18n("Click to add new Todo"));
492 QLineEdit::focusOutEvent(ev); 492 QLineEdit::focusOutEvent(ev);
493} 493}
494 494
495///////////////////////////////////////////////////////////////////////////// 495/////////////////////////////////////////////////////////////////////////////
496 496
497KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : 497KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
498 KOrg::BaseView(calendar,parent,name) 498 KOrg::BaseView(calendar,parent,name)
499{ 499{
500 mCategoryPopupMenu = 0; 500 mCategoryPopupMenu = 0;
501 mPendingUpdateBeforeRepaint = false; 501 mPendingUpdateBeforeRepaint = false;
502 isFlatDisplay = false; 502 isFlatDisplay = false;
503 mNavigator = 0; 503 mNavigator = 0;
504 QBoxLayout *topLayout = new QVBoxLayout(this); 504 QBoxLayout *topLayout = new QVBoxLayout(this);
505 mName = QString ( name ); 505 mName = QString ( name );
506 mBlockUpdate = false; 506 mBlockUpdate = false;
507 mQuickBar = new QWidget( this ); 507 mQuickBar = new QWidget( this );
508 topLayout->addWidget(mQuickBar); 508 topLayout->addWidget(mQuickBar);
509 509
510 mQuickAdd = new KOQuickTodo(mQuickBar); 510 mQuickAdd = new KOQuickTodo(mQuickBar);
511 QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); 511 QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
512 quickLayout->addWidget( mQuickAdd ); 512 quickLayout->addWidget( mQuickAdd );
513 QPushButton * flat = new QPushButton( "F",mQuickBar ); 513 QPushButton * flat = new QPushButton( "F",mQuickBar );
514 int fixwid = flat->sizeHint().height(); 514 int fixwid = flat->sizeHint().height();
515 if ( QApplication::desktop()->width() > 320 ) 515 if ( QApplication::desktop()->width() > 320 )
516 fixwid *= 2; 516 fixwid *= 2;
517 flat->setFixedWidth( fixwid ); 517 flat->setFixedWidth( fixwid );
518 connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); 518 connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat()));
519 QPushButton * allopen = new QPushButton( "O",mQuickBar ); 519 QPushButton * allopen = new QPushButton( "O",mQuickBar );
520 allopen->setFixedWidth( fixwid ); 520 allopen->setFixedWidth( fixwid );
521 connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); 521 connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen()));
522 QPushButton * allclose = new QPushButton( "C",mQuickBar ); 522 QPushButton * allclose = new QPushButton( "C",mQuickBar );
523 allclose->setFixedWidth( fixwid ); 523 allclose->setFixedWidth( fixwid );
524 connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); 524 connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose()));
525 QPushButton * s_done = new QPushButton( "D",mQuickBar ); 525 QPushButton * s_done = new QPushButton( "D",mQuickBar );
526 s_done->setPixmap( SmallIcon("greenhook16"));
526 s_done->setFixedWidth( fixwid ); 527 s_done->setFixedWidth( fixwid );
528 s_done->setFixedHeight( flat->sizeHint().height() );
527 connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); 529 connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted()));
528 QPushButton * s_run = new QPushButton( "R",mQuickBar ); 530 QPushButton * s_run = new QPushButton( "R",mQuickBar );
531 s_run->setPixmap( SmallIcon("ko16old"));
529 s_run->setFixedWidth( fixwid ); 532 s_run->setFixedWidth( fixwid );
533 s_run->setFixedHeight( flat->sizeHint().height() );
530 connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); 534 connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning()));
531 535
532 mNewSubBut = new QPushButton( "sub",mQuickBar ); 536 mNewSubBut = new QPushButton( "sub",mQuickBar );
533 mNewSubBut->setFixedWidth( fixwid*3/2 ); 537 mNewSubBut->setFixedWidth( fixwid*3/2 );
534 connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); 538 connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo()));
535 mNewSubBut->setEnabled( false ); 539 mNewSubBut->setEnabled( false );
536 quickLayout->addWidget( mNewSubBut ); 540 quickLayout->addWidget( mNewSubBut );
537 quickLayout->addWidget( s_done ); 541 quickLayout->addWidget( s_done );
538 quickLayout->addWidget( s_run ); 542 quickLayout->addWidget( s_run );
539 543
540 quickLayout->addWidget( allopen ); 544 quickLayout->addWidget( allopen );
541 quickLayout->addWidget( allclose ); 545 quickLayout->addWidget( allclose );
542 quickLayout->addWidget( flat ); 546 quickLayout->addWidget( flat );
543 547
544 if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide(); 548 if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide();
545 549
546 mTodoListView = new KOTodoListView(calendar,this, name ); 550 mTodoListView = new KOTodoListView(calendar,this, name );
547 topLayout->addWidget(mTodoListView); 551 topLayout->addWidget(mTodoListView);
548 //mTodoListView->header()->setMaximumHeight(30); 552 //mTodoListView->header()->setMaximumHeight(30);
549 mTodoListView->setRootIsDecorated(true); 553 mTodoListView->setRootIsDecorated(true);
550 mTodoListView->setAllColumnsShowFocus(true); 554 mTodoListView->setAllColumnsShowFocus(true);
551 555
552 mTodoListView->setShowSortIndicator(true); 556 mTodoListView->setShowSortIndicator(true);
553 557
554 mTodoListView->addColumn(i18n("Todo")); 558 mTodoListView->addColumn(i18n("Todo"));
555 mTodoListView->addColumn(i18n("Prio")); 559 mTodoListView->addColumn(i18n("Prio"));
556 mTodoListView->setColumnAlignment(1,AlignHCenter); 560 mTodoListView->setColumnAlignment(1,AlignHCenter);
557 mTodoListView->addColumn(i18n("Complete")); 561 mTodoListView->addColumn(i18n("Complete"));
558 mTodoListView->setColumnAlignment(2,AlignCenter); 562 mTodoListView->setColumnAlignment(2,AlignCenter);
559 563
560 mTodoListView->addColumn(i18n("Due Date")); 564 mTodoListView->addColumn(i18n("Due Date"));
561 mTodoListView->setColumnAlignment(3,AlignLeft); 565 mTodoListView->setColumnAlignment(3,AlignLeft);
562 mTodoListView->addColumn(i18n("Due Time")); 566 mTodoListView->addColumn(i18n("Due Time"));
563 mTodoListView->setColumnAlignment(4,AlignHCenter); 567 mTodoListView->setColumnAlignment(4,AlignHCenter);
564 568
565 mTodoListView->addColumn(i18n("Start Date")); 569 mTodoListView->addColumn(i18n("Start Date"));
566 mTodoListView->setColumnAlignment(5,AlignLeft); 570 mTodoListView->setColumnAlignment(5,AlignLeft);
567 mTodoListView->addColumn(i18n("Start Time")); 571 mTodoListView->addColumn(i18n("Start Time"));
568 mTodoListView->setColumnAlignment(6,AlignHCenter); 572 mTodoListView->setColumnAlignment(6,AlignHCenter);
569 573
570 mTodoListView->addColumn(i18n("Cancelled")); 574 mTodoListView->addColumn(i18n("Cancelled"));
571 mTodoListView->addColumn(i18n("Categories")); 575 mTodoListView->addColumn(i18n("Categories"));
572 mTodoListView->addColumn(i18n("Calendar")); 576 mTodoListView->addColumn(i18n("Calendar"));
573#if 0 577#if 0
574 mTodoListView->addColumn(i18n("Sort Id")); 578 mTodoListView->addColumn(i18n("Sort Id"));
575 mTodoListView->setColumnAlignment(4,AlignHCenter); 579 mTodoListView->setColumnAlignment(4,AlignHCenter);
576#endif 580#endif
577 581
@@ -1073,97 +1077,97 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1073 const QDate &td) 1077 const QDate &td)
1074{ 1078{
1075#ifndef KORG_NOPRINTER 1079#ifndef KORG_NOPRINTER
1076 calPrinter->preview(CalPrinter::Todolist, fd, td); 1080 calPrinter->preview(CalPrinter::Todolist, fd, td);
1077#endif 1081#endif
1078} 1082}
1079 1083
1080void KOTodoView::editItem(QListViewItem *item ) 1084void KOTodoView::editItem(QListViewItem *item )
1081{ 1085{
1082 emit editTodoSignal(((KOTodoViewItem *)item)->todo()); 1086 emit editTodoSignal(((KOTodoViewItem *)item)->todo());
1083} 1087}
1084 1088
1085void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) 1089void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
1086{ 1090{
1087 emit showTodoSignal(((KOTodoViewItem *)item)->todo()); 1091 emit showTodoSignal(((KOTodoViewItem *)item)->todo());
1088} 1092}
1089 1093
1090void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) 1094void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
1091{ 1095{
1092 pendingSubtodo = 0; 1096 pendingSubtodo = 0;
1093 mActiveItem = (KOTodoViewItem *)item; 1097 mActiveItem = (KOTodoViewItem *)item;
1094 if (item) { 1098 if (item) {
1095 switch (column){ 1099 switch (column){
1096 case 1: 1100 case 1:
1097 mPriorityPopupMenu->popup(QCursor::pos ()); break; 1101 mPriorityPopupMenu->popup(QCursor::pos ()); break;
1098 case 2: 1102 case 2:
1099 mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break; 1103 mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break;
1100 case 3: 1104 case 3:
1101 moveTodo(); 1105 moveTodo();
1102 break; 1106 break;
1103 case 8: 1107 case 8:
1104 mCategoryPopupMenu->popup(QCursor::pos ()); break; 1108 mCategoryPopupMenu->popup(QCursor::pos ()); break;
1105 case 9: 1109 case 9:
1106 mCalPopupMenu->popup(QCursor::pos ()); break; 1110 mCalPopupMenu->popup(QCursor::pos ()); break;
1107 default: 1111 default:
1108 mItemPopupMenu->popup(QCursor::pos()); 1112 mItemPopupMenu->popup(QCursor::pos());
1109 } 1113 }
1110 } else mPopupMenu->popup(QCursor::pos()); 1114 } else mPopupMenu->popup(QCursor::pos());
1111} 1115}
1112void KOTodoView::newTodo() 1116void KOTodoView::newTodo()
1113{ 1117{
1114 emit newTodoSignal(); 1118 emit newTodoSignal();
1115} 1119}
1116 1120
1117void KOTodoView::newSubTodo() 1121void KOTodoView::newSubTodo()
1118{ 1122{
1119 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1123 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
1120 if (mActiveItem) { 1124 if (mActiveItem) {
1121 if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add a new Todo") ) { 1125 if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add new Todo") ) {
1122 addQuickTodoPar( mActiveItem->todo()); 1126 addQuickTodoPar( mActiveItem->todo());
1123 } else 1127 } else
1124 emit newSubTodoSignal(mActiveItem->todo()); 1128 emit newSubTodoSignal(mActiveItem->todo());
1125 } 1129 }
1126} 1130}
1127void KOTodoView::unparentTodo() 1131void KOTodoView::unparentTodo()
1128{ 1132{
1129 if (mActiveItem) { 1133 if (mActiveItem) {
1130 emit unparentTodoSignal(mActiveItem->todo()); 1134 emit unparentTodoSignal(mActiveItem->todo());
1131 } 1135 }
1132} 1136}
1133 1137
1134void KOTodoView::reparentTodo() 1138void KOTodoView::reparentTodo()
1135{ 1139{
1136 if (mActiveItem) { 1140 if (mActiveItem) {
1137 topLevelWidget()->setCaption(i18n("Click on new parent item")); 1141 topLevelWidget()->setCaption(i18n("Click on new parent item"));
1138 pendingSubtodo = mActiveItem; 1142 pendingSubtodo = mActiveItem;
1139 } 1143 }
1140} 1144}
1141void KOTodoView::editTodo() 1145void KOTodoView::editTodo()
1142{ 1146{
1143 if (mActiveItem) { 1147 if (mActiveItem) {
1144 emit editTodoSignal(mActiveItem->todo()); 1148 emit editTodoSignal(mActiveItem->todo());
1145 } 1149 }
1146} 1150}
1147void KOTodoView::cloneTodo() 1151void KOTodoView::cloneTodo()
1148{ 1152{
1149 if (mActiveItem) { 1153 if (mActiveItem) {
1150 emit cloneTodoSignal((Incidence*)mActiveItem->todo()); 1154 emit cloneTodoSignal((Incidence*)mActiveItem->todo());
1151 } 1155 }
1152} 1156}
1153void KOTodoView::cancelTodo() 1157void KOTodoView::cancelTodo()
1154{ 1158{
1155 if (mActiveItem) { 1159 if (mActiveItem) {
1156 emit cancelTodoSignal((Incidence*)mActiveItem->todo()); 1160 emit cancelTodoSignal((Incidence*)mActiveItem->todo());
1157 } 1161 }
1158} 1162}
1159void KOTodoView::moveTodo() 1163void KOTodoView::moveTodo()
1160{ 1164{
1161 if (mActiveItem) { 1165 if (mActiveItem) {
1162 emit moveTodoSignal((Incidence*)mActiveItem->todo()); 1166 emit moveTodoSignal((Incidence*)mActiveItem->todo());
1163 } 1167 }
1164} 1168}
1165void KOTodoView::beamTodo() 1169void KOTodoView::beamTodo()
1166{ 1170{
1167 if (mActiveItem) { 1171 if (mActiveItem) {
1168 emit beamTodoSignal((Incidence*)mActiveItem->todo()); 1172 emit beamTodoSignal((Incidence*)mActiveItem->todo());
1169 } 1173 }