author | zautrix <zautrix> | 2005-07-06 19:14:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-06 19:14:52 (UTC) |
commit | c79a8a4950c098fa6f5a7ae8396feb4dd3a91577 (patch) (unidiff) | |
tree | 7c6e03165f85a4bb42c8a20f6090fc533f3133f0 | |
parent | 2038f7363c31e1a0ab139a1184cbed10086e1862 (diff) | |
download | kdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.zip kdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.tar.gz kdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 9 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 3 |
4 files changed, 25 insertions, 4 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index bc5cbb7..a5e2597 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1301,196 +1301,205 @@ | |||
1301 | { "%1 minutes\n","%1 Minuten\n" }, | 1301 | { "%1 minutes\n","%1 Minuten\n" }, |
1302 | { "1 minute\n","1 Minute\n" }, | 1302 | { "1 minute\n","1 Minute\n" }, |
1303 | { "Only one toolbar","Nur eine Toolbar" }, | 1303 | { "Only one toolbar","Nur eine Toolbar" }, |
1304 | { "Print","Drucke" }, | 1304 | { "Print","Drucke" }, |
1305 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, | 1305 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, |
1306 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, | 1306 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, |
1307 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, | 1307 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, |
1308 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, | 1308 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, |
1309 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, | 1309 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, |
1310 | { "KO/Pi Printout","KO/Pi Ausdruck" }, | 1310 | { "KO/Pi Printout","KO/Pi Ausdruck" }, |
1311 | { "Print unscaled","Drucke unskaliert" }, | 1311 | { "Print unscaled","Drucke unskaliert" }, |
1312 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, | 1312 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, |
1313 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, | 1313 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, |
1314 | { "Printout Mode","Druck Modus" }, | 1314 | { "Printout Mode","Druck Modus" }, |
1315 | { "Filter menu icon","Filtermenu Icon" }, | 1315 | { "Filter menu icon","Filtermenu Icon" }, |
1316 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, | 1316 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, |
1317 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, | 1317 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, |
1318 | { "%1d","%1t" }, | 1318 | { "%1d","%1t" }, |
1319 | { "%1h","%1std" }, | 1319 | { "%1h","%1std" }, |
1320 | { "%1min","%1min" }, | 1320 | { "%1min","%1min" }, |
1321 | { "( %1 before )","( %1 vorher )" }, | 1321 | { "( %1 before )","( %1 vorher )" }, |
1322 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, | 1322 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, |
1323 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, | 1323 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, |
1324 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, | 1324 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, |
1325 | { "Show Sync Events","Zeige Sync-Ereignisse" }, | 1325 | { "Show Sync Events","Zeige Sync-Ereignisse" }, |
1326 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, | 1326 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, |
1327 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, | 1327 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, |
1328 | { " on "," am " }, | 1328 | { " on "," am " }, |
1329 | { "On: ","Am: " }, | 1329 | { "On: ","Am: " }, |
1330 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, | 1330 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, |
1331 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, | 1331 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, |
1332 | { "Color for running todos:","Farbe für laufende Todos:" }, | 1332 | { "Color for running todos:","Farbe für laufende Todos:" }, |
1333 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, | 1333 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, |
1334 | { "Todo is started","Todo ist gestartet" }, | 1334 | { "Todo is started","Todo ist gestartet" }, |
1335 | { "Stop todo","Stoppe Todo" }, | 1335 | { "Stop todo","Stoppe Todo" }, |
1336 | { "Todo is stopped","Todo ist gestoppt" }, | 1336 | { "Todo is stopped","Todo ist gestoppt" }, |
1337 | { "Start todo","Starte Todo" }, | 1337 | { "Start todo","Starte Todo" }, |
1338 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, | 1338 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, |
1339 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, | 1339 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, |
1340 | { "Todo has subtodos","Todo hat Untertodos" }, | 1340 | { "Todo has subtodos","Todo hat Untertodos" }, |
1341 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, | 1341 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, |
1342 | { "Colors","Farben" }, | 1342 | { "Colors","Farben" }, |
1343 | { "Click on new parent item","Klicke auf neues Übertodo" }, | 1343 | { "Click on new parent item","Klicke auf neues Übertodo" }, |
1344 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, | 1344 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, |
1345 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, | 1345 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, |
1346 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, | 1346 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, |
1347 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, | 1347 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, |
1348 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | 1348 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
1349 | { "times","Zeiten" }, | 1349 | { "times","Zeiten" }, |
1350 | { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" }, | 1350 | { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" }, |
1351 | { "Backup enabled","Backup angeschaltet" }, | 1351 | { "Backup enabled","Backup angeschaltet" }, |
1352 | { "Use standard backup dir","Standard Backupverzeichnis" }, | 1352 | { "Use standard backup dir","Standard Backupverzeichnis" }, |
1353 | { "Number of Backups:","Anzahl der Backups" }, | 1353 | { "Number of Backups:","Anzahl der Backups" }, |
1354 | { "Make backup every ","Mache ein Backup alle " }, | 1354 | { "Make backup every ","Mache ein Backup alle " }, |
1355 | { " days"," Tage" }, | 1355 | { " days"," Tage" }, |
1356 | { "Creating backup ... please wait ...","Erstelle Backup ... bitte warten ..." }, | 1356 | { "Creating backup ... please wait ...","Erstelle Backup ... bitte warten ..." }, |
1357 | { "Backup Failed!","Backup Problem!" }, | 1357 | { "Backup Failed!","Backup Problem!" }, |
1358 | { "Try again now","Versuche jetzt nochmal" }, | 1358 | { "Try again now","Versuche jetzt nochmal" }, |
1359 | { "Try again later","Versuche später nochmal" }, | 1359 | { "Try again later","Versuche später nochmal" }, |
1360 | { "Try again tomorrow","Versuche morgen nochmal" }, | 1360 | { "Try again tomorrow","Versuche morgen nochmal" }, |
1361 | { "Disable backup","Schalte Backup ab" }, | 1361 | { "Disable backup","Schalte Backup ab" }, |
1362 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 1362 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
1363 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 1363 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
1364 | { "Choose action","Wähle Aktion" }, | 1364 | { "Choose action","Wähle Aktion" }, |
1365 | { "Comment for todo:","Kommentar zum Todo:" }, | 1365 | { "Comment for todo:","Kommentar zum Todo:" }, |
1366 | { "Stop+note","Stop+Notiz" }, | 1366 | { "Stop+note","Stop+Notiz" }, |
1367 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, | 1367 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, |
1368 | { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, | 1368 | { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, |
1369 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, | 1369 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, |
1370 | { "Print complete list...","Drucke komplette Liste..." }, | 1370 | { "Print complete list...","Drucke komplette Liste..." }, |
1371 | { "Hide all selected","Verstecke Ausgewählte" }, | 1371 | { "Hide all selected","Verstecke Ausgewählte" }, |
1372 | { "Add items","hinzufügen" }, | 1372 | { "Add items","hinzufügen" }, |
1373 | { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" }, | 1373 | { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" }, |
1374 | { "Print List View...","Drucke Listenansicht..." }, | 1374 | { "Print List View...","Drucke Listenansicht..." }, |
1375 | { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, | 1375 | { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, |
1376 | { "Configure KO/Pi...","Konfiguriere KO/Pi..." }, | 1376 | { "Configure KO/Pi...","Konfiguriere KO/Pi..." }, |
1377 | { "Global Settings...","Globale Einstellungen..." }, | 1377 | { "Global Settings...","Globale Einstellungen..." }, |
1378 | { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" }, | 1378 | { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" }, |
1379 | { "(disabled)","(abgeschaltet)" }, | 1379 | { "(disabled)","(abgeschaltet)" }, |
1380 | { "New Calendar","Neuer Kalender" }, | 1380 | { "New Calendar","Neuer Kalender" }, |
1381 | { "Calendar","Kalender" }, | 1381 | { "Calendar","Kalender" }, |
1382 | { "Filter selector","Filterauswahl" }, | 1382 | { "Filter selector","Filterauswahl" }, |
1383 | { "Filtermenu","Filtermenu" }, | 1383 | { "Filtermenu","Filtermenu" }, |
1384 | { "Toggle Fullscreen","Vollbild umschalten" }, | 1384 | { "Toggle Fullscreen","Vollbild umschalten" }, |
1385 | { "Toggle Resource View","Resourcenansicht umschalten" }, | 1385 | { "Toggle Resource View","Resourcenansicht umschalten" }, |
1386 | { "Storage HowTo...","Speicherort HowTo..." }, | 1386 | { "Storage HowTo...","Speicherort HowTo..." }, |
1387 | { "Timetracking HowTo...","Timetracking HowTo..." }, | 1387 | { "Timetracking HowTo...","Timetracking HowTo..." }, |
1388 | { "Juni","Juni" }, | 1388 | { "Juni","Juni" }, |
1389 | { "Juli","Juli" }, | 1389 | { "Juli","Juli" }, |
1390 | { "ToDo:","ToDo:" }, | 1390 | { "ToDo:","ToDo:" }, |
1391 | { "Set Calendar","Setze Kalender" }, | 1391 | { "Set Calendar","Setze Kalender" }, |
1392 | { "Todo: %1","Todo: %1" }, | 1392 | { "Todo: %1","Todo: %1" }, |
1393 | { ": (Prio ",": (Prio " }, | 1393 | { ": (Prio ",": (Prio " }, |
1394 | { "Todos","Todos" }, | 1394 | { "Todos","Todos" }, |
1395 | { "Todo Viewer","Todo Anzeige" }, | 1395 | { "Todo Viewer","Todo Anzeige" }, |
1396 | { "Todo ","Todo " }, | 1396 | { "Todo ","Todo " }, |
1397 | { " Calendar \n Resource "," Kalender \n Resource " }, | 1397 | { " Calendar \n Resource "," Kalender \n Resource " }, |
1398 | { " Color "," Farbe " }, | 1398 | { " Color "," Farbe " }, |
1399 | { "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" }, | 1399 | { "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" }, |
1400 | { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" }, | 1400 | { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" }, |
1401 | { "Add new Calendar","Füge Kalender hinzu" }, | 1401 | { "Add new Calendar","Füge Kalender hinzu" }, |
1402 | { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" }, | 1402 | { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" }, |
1403 | { "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" }, | 1403 | { "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" }, |
1404 | { "Sorry, the calendar name is empty!","Sorry, der Kalendername ist leer!" }, | 1404 | { "Sorry, the calendar name is empty!","Sorry, der Kalendername ist leer!" }, |
1405 | { "Sorry, the file name is empty!","Sorry, der Dateiname ist leer!" }, | 1405 | { "Sorry, the file name is empty!","Sorry, der Dateiname ist leer!" }, |
1406 | { "Error loading calendar file\n%1.","Fehler beim Laden der Kalenderdatei\n%1." }, | 1406 | { "Error loading calendar file\n%1.","Fehler beim Laden der Kalenderdatei\n%1." }, |
1407 | { "The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>","Der Kalender <b>%1</b> ist nicht geladen! Das Laden der Datei <b>%2</b> schlug fehl! <b>Soll erneut versucht werden den Kalender zu laden?</b>" }, | 1407 | { "The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>","Der Kalender <b>%1</b> ist nicht geladen! Das Laden der Datei <b>%2</b> schlug fehl! <b>Soll erneut versucht werden den Kalender zu laden?</b>" }, |
1408 | { "Global application font for all apps:","Globale Schriftart:" }, | 1408 | { "Global application font for all apps:","Globale Schriftart:" }, |
1409 | { "Application Font","Applikationsschriftart" }, | 1409 | { "Application Font","Applikationsschriftart" }, |
1410 | { "Kx/Pi","Kx/Pi" }, | 1410 | { "Kx/Pi","Kx/Pi" }, |
1411 | { "Backup","Backup" }, | 1411 | { "Backup","Backup" }, |
1412 | { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" }, | 1412 | { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" }, |
1413 | { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" }, | 1413 | { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" }, |
1414 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, | 1414 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, |
1415 | { "Choose Color","Wähle Farbe" }, | 1415 | { "Choose Color","Wähle Farbe" }, |
1416 | { " OK "," OK " }, | 1416 | { " OK "," OK " }, |
1417 | { " Cancel "," Abbrechen " }, | 1417 | { " Cancel "," Abbrechen " }, |
1418 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, | 1418 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, |
1419 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, | 1419 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, |
1420 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, | 1420 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, |
1421 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, | 1421 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, |
1422 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, | 1422 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, |
1423 | { "%1\nis running!","%1\nist am Laufen!" }, | 1423 | { "%1\nis running!","%1\nist am Laufen!" }, |
1424 | { "Additional Comment:","Zusätzlicher Kommentar:" }, | 1424 | { "Additional Comment:","Zusätzlicher Kommentar:" }, |
1425 | { "Stop and save","Stopp und Speichern" }, | 1425 | { "Stop and save","Stopp und Speichern" }, |
1426 | { "Continue running","Weiter laufen lassen" }, | 1426 | { "Continue running","Weiter laufen lassen" }, |
1427 | { "Stop - do not save","Stopp - nicht Speichern" }, | 1427 | { "Stop - do not save","Stopp - nicht Speichern" }, |
1428 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, | 1428 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, |
1429 | { "Time mismatch!","Zeiten stimmen nicht!" }, | 1429 | { "Time mismatch!","Zeiten stimmen nicht!" }, |
1430 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, | 1430 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, |
1431 | { "Yes, stop todo","Ja, stoppe Todo" }, | 1431 | { "Yes, stop todo","Ja, stoppe Todo" }, |
1432 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, | 1432 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, |
1433 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, | 1433 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, |
1434 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, | 1434 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, |
1435 | { "Spouse","Ehegatte" }, | 1435 | { "Spouse","Ehegatte" }, |
1436 | { "Notes","Notizen" }, | 1436 | { "Notes","Notizen" }, |
1437 | { "Messanger","Messanger" }, | 1437 | { "Messanger","Messanger" }, |
1438 | { "Assistant","Assistent" }, | 1438 | { "Assistant","Assistent" }, |
1439 | { "Manager","Manager" }, | 1439 | { "Manager","Manager" }, |
1440 | { "Secrecy","Sichtbar" }, | 1440 | { "Secrecy","Sichtbar" }, |
1441 | { "male","männlich" }, | 1441 | { "male","männlich" }, |
1442 | { "female","weiblich" }, | 1442 | { "female","weiblich" }, |
1443 | { "Hide!","Verbergen!" }, | 1443 | { "Hide!","Verbergen!" }, |
1444 | { "Show!","Anzeigen!" }, | 1444 | { "Show!","Anzeigen!" }, |
1445 | { "Details","Details" }, | 1445 | { "Details","Details" }, |
1446 | { "Profession","Beruf" }, | 1446 | { "Profession","Beruf" }, |
1447 | { "Children","Kinder" }, | 1447 | { "Children","Kinder" }, |
1448 | { "Department","Abteilung" }, | 1448 | { "Department","Abteilung" }, |
1449 | { "Backup cancelled","Backup abgebrochen" }, | 1449 | { "Backup cancelled","Backup abgebrochen" }, |
1450 | { "Backup globally disabled","Backup global abgeschaltet" }, | 1450 | { "Backup globally disabled","Backup global abgeschaltet" }, |
1451 | { "Backup succesfully finished","Backup erfolgreich beendet" }, | 1451 | { "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!)" }, | 1452 | { "(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" }, | 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" }, |
1454 | { "Birthdays","Geburtstage" }, | 1454 | { "Birthdays","Geburtstage" }, |
1455 | { "KO/Pi import information!","KO/Pi Import Information!" }, | 1455 | { "KO/Pi import information!","KO/Pi Import Information!" }, |
1456 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, | 1456 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, |
1457 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, | 1457 | { "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?"" }, | 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?"" }, |
1459 | { "Reload","Neu laden" }, | 1459 | { "Reload","Neu laden" }, |
1460 | { "Timezone settings","Zeitzoneneinstellung" }, | 1460 | { "Timezone settings","Zeitzoneneinstellung" }, |
1461 | { "Title: ","Titel: " }, | 1461 | { "Title: ","Titel: " }, |
1462 | { "Journal from: ","Journal vom: " }, | 1462 | { "Journal from: ","Journal vom: " }, |
1463 | { "Journal: %1 from ","Journal: %1 vom " }, | 1463 | { "Journal: %1 from ","Journal: %1 vom " }, |
1464 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, | 1464 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, |
1465 | { "Selected Item","Ausgewähltes Item" }, | 1465 | { "Selected Item","Ausgewähltes Item" }, |
1466 | { "Select Date...","Wähle Datum..." }, | 1466 | { "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:" }, | 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:" }, |
1468 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, | 1468 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, |
1469 | { "Edit category list...","Ändere Kategorieliste..." }, | 1469 | { "Edit category list...","Ändere Kategorieliste..." }, |
1470 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, | 1470 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, |
1471 | { "Filepath: ","Dateipfad: " }, | 1471 | { "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!" }, | 1472 | { "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!" }, | 1473 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, |
1474 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, | 1474 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, |
1475 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, | 1475 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, |
1476 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, | 1476 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, |
1477 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, | 1477 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, |
1478 | { "Alarm Options","Alarm Einstellungen" }, | 1478 | { "Alarm Options","Alarm Einstellungen" }, |
1479 | { "Delete selected...","Lösche Ausgewählte..." }, | 1479 | { "Delete selected...","Lösche Ausgewählte..." }, |
1480 | { "None","Nichts" }, | 1480 | { "None","Nichts" }, |
1481 | { "Selection","Auswahl" }, | 1481 | { "Selection","Auswahl" }, |
1482 | { "Set categories","Setze Kategorien" }, | 1482 | { "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!" }, | 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!" }, |
1484 | { "Reset","Neu setzen" }, | 1484 | { "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)?" }, | 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)?" }, |
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?" }, | 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?" }, |
1487 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1487 | { "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" }, | 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" }, |
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" }, | 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" }, |
1490 | { "Edit","Edit" }, | 1490 | { "Edit","Edit" }, |
1491 | { "Last Modified","Zuletzt geändert" }, | 1491 | { "Last Modified","Zuletzt geändert" }, |
1492 | { "Journal viewer","Journal Anzeige" }, | 1492 | { "Journal viewer","Journal Anzeige" }, |
1493 | { "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>." }, | ||
1495 | { "","" }, | ||
1496 | { "","" }, | ||
1497 | { "","" }, | ||
1498 | { "","" }, | ||
1499 | { "","" }, | ||
1500 | { "","" }, | ||
1501 | { "","" }, | ||
1493 | { "","" }, | 1502 | { "","" }, |
1494 | { "","" }, | 1503 | { "","" }, |
1495 | { "","" }, | 1504 | { "","" }, |
1496 | { "","" }, | 1505 | { "","" }, |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ef5c4dd..131a345 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -647,385 +647,388 @@ void KOAgendaView::resizeEvent( QResizeEvent* e ) | |||
647 | int ow = e->oldSize().width(); | 647 | int ow = e->oldSize().width(); |
648 | int oh = e->oldSize().height(); | 648 | int oh = e->oldSize().height(); |
649 | int w = e->size().width(); | 649 | int w = e->size().width(); |
650 | int h = e->size().height(); | 650 | int h = e->size().height(); |
651 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { | 651 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { |
652 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) | 652 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) |
653 | uc = true; | 653 | uc = true; |
654 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); | 654 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); |
655 | } | 655 | } |
656 | mUpcomingWidth = e->size().width() ; | 656 | mUpcomingWidth = e->size().width() ; |
657 | if ( mBlockUpdating || uc ) { | 657 | if ( mBlockUpdating || uc ) { |
658 | mBlockUpdating = false; | 658 | mBlockUpdating = false; |
659 | //mAgenda->setMinimumSize(800 , 600 ); | 659 | //mAgenda->setMinimumSize(800 , 600 ); |
660 | //qDebug("mAgenda->resize+++++++++++++++ "); | 660 | //qDebug("mAgenda->resize+++++++++++++++ "); |
661 | updateConfig(); | 661 | updateConfig(); |
662 | //qDebug("KOAgendaView::Updating now possible "); | 662 | //qDebug("KOAgendaView::Updating now possible "); |
663 | } else | 663 | } else |
664 | createDayLabels(); | 664 | createDayLabels(); |
665 | //qDebug("resizeEvent end "); | 665 | //qDebug("resizeEvent end "); |
666 | 666 | ||
667 | } | 667 | } |
668 | void KOAgendaView::slotDaylabelClicked( int num ) | 668 | void KOAgendaView::slotDaylabelClicked( int num ) |
669 | { | 669 | { |
670 | 670 | ||
671 | QDate firstDate = mSelectedDates.first(); | 671 | QDate firstDate = mSelectedDates.first(); |
672 | if ( num == -1 ) | 672 | if ( num == -1 ) |
673 | emit showDateView( 6, firstDate ); | 673 | emit showDateView( 6, firstDate ); |
674 | else if (num >= 0 ) { | 674 | else if (num >= 0 ) { |
675 | if ( mSelectedDates.count() == 1) | 675 | if ( mSelectedDates.count() == 1) |
676 | emit showDateView( 9, firstDate.addDays( num ) ); | 676 | emit showDateView( 9, firstDate.addDays( num ) ); |
677 | else | 677 | else |
678 | emit showDateView( 3, firstDate.addDays( num ) ); | 678 | emit showDateView( 3, firstDate.addDays( num ) ); |
679 | } | 679 | } |
680 | else | 680 | else |
681 | showDateView( 10, firstDate.addDays(1) ); | 681 | showDateView( 10, firstDate.addDays(1) ); |
682 | } | 682 | } |
683 | 683 | ||
684 | KOAgendaButton* KOAgendaView::getNewDaylabel() | 684 | KOAgendaButton* KOAgendaView::getNewDaylabel() |
685 | { | 685 | { |
686 | 686 | ||
687 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); | 687 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); |
688 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); | 688 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); |
689 | mDayLabelsList.append( dayLabel ); | 689 | mDayLabelsList.append( dayLabel ); |
690 | mLayoutDayLabels->addWidget(dayLabel); | 690 | mLayoutDayLabels->addWidget(dayLabel); |
691 | return dayLabel ; | 691 | return dayLabel ; |
692 | } | 692 | } |
693 | 693 | ||
694 | void KOAgendaView::createDayLabels() | 694 | void KOAgendaView::createDayLabels() |
695 | { | 695 | { |
696 | 696 | ||
697 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 697 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
698 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 698 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
699 | return; | 699 | return; |
700 | 700 | ||
701 | } | 701 | } |
702 | int newHight; | 702 | int newHight; |
703 | if ( !mSelectedDates.count()) | 703 | if ( !mSelectedDates.count()) |
704 | return; | 704 | return; |
705 | 705 | ||
706 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 706 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
707 | // It would remove some flickering and gain speed (since this is called by | 707 | // It would remove some flickering and gain speed (since this is called by |
708 | // each updateView() call) | 708 | // each updateView() call) |
709 | 709 | ||
710 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; | 710 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; |
711 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 711 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
712 | if ( maxWid < 20 ) | 712 | if ( maxWid < 20 ) |
713 | maxWid = 20; | 713 | maxWid = 20; |
714 | 714 | ||
715 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 715 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
716 | QFontMetrics fm ( dlf ); | 716 | QFontMetrics fm ( dlf ); |
717 | dlf.setBold( true ); | 717 | dlf.setBold( true ); |
718 | int selCount = mSelectedDates.count(); | 718 | int selCount = mSelectedDates.count(); |
719 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; | 719 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; |
720 | QString dayTest = "Mon 20"; | 720 | QString dayTest = "Mon 20"; |
721 | //QString dayTest = "Mon 20"; | 721 | //QString dayTest = "Mon 20"; |
722 | int wid = fm.width( dayTest ); | 722 | int wid = fm.width( dayTest ); |
723 | //maxWid -= ( selCount * 3 ); //working for QLabels | 723 | //maxWid -= ( selCount * 3 ); //working for QLabels |
724 | if ( QApplication::desktop()->width() <= 320 ) | 724 | if ( QApplication::desktop()->width() <= 320 ) |
725 | maxWid -= ( selCount * 3 ); //working for QPushButton | 725 | maxWid -= ( selCount * 3 ); //working for QPushButton |
726 | else | 726 | else |
727 | maxWid -= ( selCount * 4 ); //working for QPushButton | 727 | maxWid -= ( selCount * 4 ); //working for QPushButton |
728 | if ( maxWid < 0 ) | 728 | if ( maxWid < 0 ) |
729 | maxWid = 20; | 729 | maxWid = 20; |
730 | int needWid = wid * selCount; | 730 | int needWid = wid * selCount; |
731 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 731 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
732 | //if ( needWid > maxWid ) | 732 | //if ( needWid > maxWid ) |
733 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 733 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
734 | while ( needWid > maxWid ) { | 734 | while ( needWid > maxWid ) { |
735 | dayTest = dayTest.left( dayTest.length() - 1 ); | 735 | dayTest = dayTest.left( dayTest.length() - 1 ); |
736 | wid = fm.width( dayTest ); | 736 | wid = fm.width( dayTest ); |
737 | needWid = wid * selCount; | 737 | needWid = wid * selCount; |
738 | } | 738 | } |
739 | int maxLen = dayTest.length(); | 739 | int maxLen = dayTest.length(); |
740 | int fontPoint = dlf.pointSize(); | 740 | int fontPoint = dlf.pointSize(); |
741 | if ( maxLen < 2 ) { | 741 | if ( maxLen < 2 ) { |
742 | int fontPoint = dlf.pointSize(); | 742 | int fontPoint = dlf.pointSize(); |
743 | while ( fontPoint > 4 ) { | 743 | while ( fontPoint > 4 ) { |
744 | --fontPoint; | 744 | --fontPoint; |
745 | dlf.setPointSize( fontPoint ); | 745 | dlf.setPointSize( fontPoint ); |
746 | QFontMetrics f( dlf ); | 746 | QFontMetrics f( dlf ); |
747 | wid = f.width( "30" ); | 747 | wid = f.width( "30" ); |
748 | needWid = wid * selCount; | 748 | needWid = wid * selCount; |
749 | if ( needWid < maxWid ) | 749 | if ( needWid < maxWid ) |
750 | break; | 750 | break; |
751 | } | 751 | } |
752 | maxLen = 2; | 752 | maxLen = 2; |
753 | } | 753 | } |
754 | //qDebug("Max len %d ", dayTest.length() ); | 754 | //qDebug("Max len %d ", dayTest.length() ); |
755 | if ( !KOPrefs::instance()->mTimeLabelsFont.bold() ) | 755 | if ( !KOPrefs::instance()->mTimeLabelsFont.bold() ) |
756 | dlf.setBold( false ); | 756 | dlf.setBold( false ); |
757 | QFontMetrics tempF( dlf ); | 757 | QFontMetrics tempF( dlf ); |
758 | newHight = tempF.height(); | 758 | newHight = tempF.height(); |
759 | mDayLabels->setFont( dlf ); | 759 | mDayLabels->setFont( dlf ); |
760 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 760 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
761 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 761 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
762 | //mLayoutDayLabels->addSpacing( 2 ); | 762 | //mLayoutDayLabels->addSpacing( 2 ); |
763 | // QFont lFont = dlf; | 763 | // QFont lFont = dlf; |
764 | bool appendLabels = false; | 764 | bool appendLabels = false; |
765 | KOAgendaButton *dayLabel; | 765 | KOAgendaButton *dayLabel; |
766 | dayLabel = mDayLabelsList.first(); | 766 | dayLabel = mDayLabelsList.first(); |
767 | if ( !dayLabel ) { | 767 | if ( !dayLabel ) { |
768 | appendLabels = true; | 768 | appendLabels = true; |
769 | dayLabel = getNewDaylabel(); | 769 | dayLabel = getNewDaylabel(); |
770 | } | 770 | } |
771 | dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); | 771 | dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); |
772 | dayLabel->setFont( dlf ); | 772 | dayLabel->setFont( dlf ); |
773 | dayLabel->setNum( -1 ); | 773 | dayLabel->setNum( -1 ); |
774 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 774 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
775 | 775 | ||
776 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 776 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
777 | dayLabel->show(); | 777 | dayLabel->show(); |
778 | DateList::ConstIterator dit; | 778 | DateList::ConstIterator dit; |
779 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | 779 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); |
780 | int counter = -1; | 780 | int counter = -1; |
781 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 781 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
782 | ++counter; | 782 | ++counter; |
783 | QDate date = *dit; | 783 | QDate date = *dit; |
784 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 784 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
785 | if ( ! appendLabels ) { | 785 | if ( ! appendLabels ) { |
786 | dayLabel = mDayLabelsList.next(); | 786 | dayLabel = mDayLabelsList.next(); |
787 | if ( !dayLabel ) | 787 | if ( !dayLabel ) |
788 | appendLabels = true; | 788 | appendLabels = true; |
789 | } | 789 | } |
790 | if ( appendLabels ) { | 790 | if ( appendLabels ) { |
791 | dayLabel = getNewDaylabel(); | 791 | dayLabel = getNewDaylabel(); |
792 | } | 792 | } |
793 | dayLabel->setMinimumWidth( 1 ); | 793 | dayLabel->setMinimumWidth( 1 ); |
794 | dayLabel->setMaximumWidth( 10240 ); | 794 | dayLabel->setMaximumWidth( 10240 ); |
795 | dayLabel->setFont( dlf ); | 795 | dayLabel->setFont( dlf ); |
796 | dayLabel->show(); | 796 | dayLabel->show(); |
797 | dayLabel->setAutoRepeat( false ); | 797 | dayLabel->setAutoRepeat( false ); |
798 | dayLabel->setNum( counter ); | 798 | dayLabel->setNum( counter ); |
799 | QString str; | 799 | QString str; |
800 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 800 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
801 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 801 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
802 | switch ( maxLen ) { | 802 | switch ( maxLen ) { |
803 | case 2: | 803 | case 2: |
804 | str = QString::number( date.day() ); | 804 | str = QString::number( date.day() ); |
805 | break; | 805 | break; |
806 | 806 | ||
807 | case 3: | 807 | case 3: |
808 | str = dayName.left( 1 ) +QString::number( date.day()); | 808 | str = dayName.left( 1 ) +QString::number( date.day()); |
809 | 809 | ||
810 | break; | 810 | break; |
811 | case 4: | 811 | case 4: |
812 | str = dayName.left( 1 ) + " " +QString::number( date.day()); | 812 | str = dayName.left( 1 ) + " " +QString::number( date.day()); |
813 | 813 | ||
814 | break; | 814 | break; |
815 | case 5: | 815 | case 5: |
816 | str = dayName.left( 2 ) + " " +QString::number( date.day()); | 816 | str = dayName.left( 2 ) + " " +QString::number( date.day()); |
817 | 817 | ||
818 | break; | 818 | break; |
819 | case 6: | 819 | case 6: |
820 | str = dayName.left( 3 ) + " " +QString::number( date.day()); | 820 | str = dayName.left( 3 ) + " " +QString::number( date.day()); |
821 | break; | 821 | break; |
822 | 822 | ||
823 | default: | 823 | default: |
824 | break; | 824 | break; |
825 | } | 825 | } |
826 | if ( oneday ) { | 826 | if ( oneday ) { |
827 | QString addString; | 827 | QString addString; |
828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | 828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) |
829 | addString = i18n("Today"); | 829 | addString = i18n("Today"); |
830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | 830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) |
831 | addString = i18n("Tomorrow"); | 831 | addString = i18n("Tomorrow"); |
832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | 832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) |
833 | addString = i18n("Yesterday"); | 833 | addString = i18n("Yesterday"); |
834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | 834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) |
835 | addString = i18n("Day before yesterday"); | 835 | addString = i18n("Day before yesterday"); |
836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | 836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) |
837 | addString = i18n("Day after tomorrow"); | 837 | addString = i18n("Day after tomorrow"); |
838 | if ( !addString.isEmpty() ) { | 838 | if ( !addString.isEmpty() ) { |
839 | str = addString+", " + str; | 839 | if ( QApplication::desktop()->width() < 640 ) |
840 | str = addString+", " + str; | ||
841 | else | ||
842 | str = addString+", "+ KGlobal::locale()->formatDate( date, false); | ||
840 | } else { | 843 | } else { |
841 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); | 844 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); |
842 | } | 845 | } |
843 | } | 846 | } |
844 | dayLabel->setText(str); | 847 | dayLabel->setText(str); |
845 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 848 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
846 | if (date == QDate::currentDate()) { | 849 | if (date == QDate::currentDate()) { |
847 | QFont bFont = dlf; | 850 | QFont bFont = dlf; |
848 | bFont.setBold( true ); | 851 | bFont.setBold( true ); |
849 | dayLabel->setFont(bFont); | 852 | dayLabel->setFont(bFont); |
850 | } | 853 | } |
851 | //dayLayout->addWidget(dayLabel); | 854 | //dayLayout->addWidget(dayLabel); |
852 | 855 | ||
853 | #ifndef KORG_NOPLUGINS | 856 | #ifndef KORG_NOPLUGINS |
854 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); | 857 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); |
855 | CalendarDecoration *it; | 858 | CalendarDecoration *it; |
856 | for(it = cds.first(); it; it = cds.next()) { | 859 | for(it = cds.first(); it; it = cds.next()) { |
857 | QString text = it->shortText( date ); | 860 | QString text = it->shortText( date ); |
858 | if ( !text.isEmpty() ) { | 861 | if ( !text.isEmpty() ) { |
859 | QLabel *label = new QLabel(text,mDayLabels); | 862 | QLabel *label = new QLabel(text,mDayLabels); |
860 | label->setAlignment(AlignCenter); | 863 | label->setAlignment(AlignCenter); |
861 | dayLayout->addWidget(label); | 864 | dayLayout->addWidget(label); |
862 | } | 865 | } |
863 | } | 866 | } |
864 | 867 | ||
865 | for(it = cds.first(); it; it = cds.next()) { | 868 | for(it = cds.first(); it; it = cds.next()) { |
866 | QWidget *wid = it->smallWidget(mDayLabels,date); | 869 | QWidget *wid = it->smallWidget(mDayLabels,date); |
867 | if ( wid ) { | 870 | if ( wid ) { |
868 | // wid->setHeight(20); | 871 | // wid->setHeight(20); |
869 | dayLayout->addWidget(wid); | 872 | dayLayout->addWidget(wid); |
870 | } | 873 | } |
871 | } | 874 | } |
872 | #endif | 875 | #endif |
873 | } | 876 | } |
874 | if ( ! appendLabels ) { | 877 | if ( ! appendLabels ) { |
875 | dayLabel = mDayLabelsList.next(); | 878 | dayLabel = mDayLabelsList.next(); |
876 | if ( !dayLabel ) | 879 | if ( !dayLabel ) |
877 | appendLabels = true; | 880 | appendLabels = true; |
878 | } | 881 | } |
879 | if ( appendLabels ) { | 882 | if ( appendLabels ) { |
880 | dayLabel = getNewDaylabel(); | 883 | dayLabel = getNewDaylabel(); |
881 | } | 884 | } |
882 | //dayLabel->hide();//test only | 885 | //dayLabel->hide();//test only |
883 | 886 | ||
884 | dayLabel->setText(">"); | 887 | dayLabel->setText(">"); |
885 | dayLabel->setFont( dlf ); | 888 | dayLabel->setFont( dlf ); |
886 | dayLabel->setAutoRepeat( true ); | 889 | dayLabel->setAutoRepeat( true ); |
887 | dayLabel->show(); | 890 | dayLabel->show(); |
888 | dayLabel->setNum( -2 ); | 891 | dayLabel->setNum( -2 ); |
889 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ widModulo ); | 892 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ widModulo ); |
890 | 893 | ||
891 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 894 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
892 | if ( !appendLabels ) { | 895 | if ( !appendLabels ) { |
893 | dayLabel = mDayLabelsList.next(); | 896 | dayLabel = mDayLabelsList.next(); |
894 | while ( dayLabel ) { | 897 | while ( dayLabel ) { |
895 | //qDebug("!dayLabel %d",dayLabel ); | 898 | //qDebug("!dayLabel %d",dayLabel ); |
896 | dayLabel->hide(); | 899 | dayLabel->hide(); |
897 | dayLabel = mDayLabelsList.next(); | 900 | dayLabel = mDayLabelsList.next(); |
898 | } | 901 | } |
899 | } | 902 | } |
900 | 903 | ||
901 | mDayLabelsFrame->setFixedHeight( newHight + 4 ); | 904 | mDayLabelsFrame->setFixedHeight( newHight + 4 ); |
902 | } | 905 | } |
903 | 906 | ||
904 | int KOAgendaView::maxDatesHint() | 907 | int KOAgendaView::maxDatesHint() |
905 | { | 908 | { |
906 | // Not sure about the max number of events, so return 0 for now. | 909 | // Not sure about the max number of events, so return 0 for now. |
907 | return 0; | 910 | return 0; |
908 | } | 911 | } |
909 | 912 | ||
910 | int KOAgendaView::currentDateCount() | 913 | int KOAgendaView::currentDateCount() |
911 | { | 914 | { |
912 | return mSelectedDates.count(); | 915 | return mSelectedDates.count(); |
913 | } | 916 | } |
914 | 917 | ||
915 | QPtrList<Incidence> KOAgendaView::selectedIncidences() | 918 | QPtrList<Incidence> KOAgendaView::selectedIncidences() |
916 | { | 919 | { |
917 | QPtrList<Incidence> selected; | 920 | QPtrList<Incidence> selected; |
918 | Incidence *incidence; | 921 | Incidence *incidence; |
919 | 922 | ||
920 | incidence = mAgenda->selectedIncidence(); | 923 | incidence = mAgenda->selectedIncidence(); |
921 | if (incidence) selected.append(incidence); | 924 | if (incidence) selected.append(incidence); |
922 | 925 | ||
923 | incidence = mAllDayAgenda->selectedIncidence(); | 926 | incidence = mAllDayAgenda->selectedIncidence(); |
924 | if (incidence) selected.append(incidence); | 927 | if (incidence) selected.append(incidence); |
925 | 928 | ||
926 | return selected; | 929 | return selected; |
927 | } | 930 | } |
928 | 931 | ||
929 | DateList KOAgendaView::selectedDates() | 932 | DateList KOAgendaView::selectedDates() |
930 | { | 933 | { |
931 | DateList selected; | 934 | DateList selected; |
932 | QDate qd; | 935 | QDate qd; |
933 | 936 | ||
934 | qd = mAgenda->selectedIncidenceDate(); | 937 | qd = mAgenda->selectedIncidenceDate(); |
935 | if (qd.isValid()) selected.append(qd); | 938 | if (qd.isValid()) selected.append(qd); |
936 | 939 | ||
937 | qd = mAllDayAgenda->selectedIncidenceDate(); | 940 | qd = mAllDayAgenda->selectedIncidenceDate(); |
938 | if (qd.isValid()) selected.append(qd); | 941 | if (qd.isValid()) selected.append(qd); |
939 | 942 | ||
940 | return selected; | 943 | return selected; |
941 | } | 944 | } |
942 | 945 | ||
943 | 946 | ||
944 | void KOAgendaView::updateView() | 947 | void KOAgendaView::updateView() |
945 | { | 948 | { |
946 | if ( mBlockUpdating ) | 949 | if ( mBlockUpdating ) |
947 | return; | 950 | return; |
948 | // kdDebug() << "KOAgendaView::updateView()" << endl; | 951 | // kdDebug() << "KOAgendaView::updateView()" << endl; |
949 | fillAgenda(); | 952 | fillAgenda(); |
950 | 953 | ||
951 | } | 954 | } |
952 | 955 | ||
953 | 956 | ||
954 | /* | 957 | /* |
955 | Update configuration settings for the agenda view. This method is not | 958 | Update configuration settings for the agenda view. This method is not |
956 | complete. | 959 | complete. |
957 | */ | 960 | */ |
958 | void KOAgendaView::updateConfig() | 961 | void KOAgendaView::updateConfig() |
959 | { | 962 | { |
960 | if ( mBlockUpdating ) | 963 | if ( mBlockUpdating ) |
961 | return; | 964 | return; |
962 | if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) { | 965 | if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) { |
963 | int old = KOPrefs::instance()->mHourSize; | 966 | int old = KOPrefs::instance()->mHourSize; |
964 | KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; | 967 | KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; |
965 | //qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize ); | 968 | //qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize ); |
966 | } | 969 | } |
967 | 970 | ||
968 | 971 | ||
969 | // update config for children | 972 | // update config for children |
970 | mTimeLabels->updateConfig(); | 973 | mTimeLabels->updateConfig(); |
971 | mAgenda->storePosition(); | 974 | mAgenda->storePosition(); |
972 | mAgenda->updateConfig(); | 975 | mAgenda->updateConfig(); |
973 | mAllDayAgenda->updateConfig(); | 976 | mAllDayAgenda->updateConfig(); |
974 | // widget synchronization | 977 | // widget synchronization |
975 | //TODO: find a better way, maybe signal/slot | 978 | //TODO: find a better way, maybe signal/slot |
976 | mTimeLabels->positionChanged(); | 979 | mTimeLabels->positionChanged(); |
977 | 980 | ||
978 | // for some reason, this needs to be called explicitly | 981 | // for some reason, this needs to be called explicitly |
979 | mTimeLabels->repaint(); | 982 | mTimeLabels->repaint(); |
980 | 983 | ||
981 | mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); | 984 | mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); |
982 | 985 | ||
983 | // ToolTips displaying summary of events | 986 | // ToolTips displaying summary of events |
984 | KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() | 987 | KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() |
985 | ->mEnableToolTips); | 988 | ->mEnableToolTips); |
986 | 989 | ||
987 | //setHolidayMasks(); | 990 | //setHolidayMasks(); |
988 | 991 | ||
989 | //createDayLabels(); called by via updateView(); | 992 | //createDayLabels(); called by via updateView(); |
990 | mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); | 993 | mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); |
991 | updateView(); | 994 | updateView(); |
992 | mAgenda->restorePosition(); | 995 | mAgenda->restorePosition(); |
993 | } | 996 | } |
994 | 997 | ||
995 | 998 | ||
996 | void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) | 999 | void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) |
997 | { | 1000 | { |
998 | 1001 | ||
999 | 1002 | ||
1000 | int xxx = item->cellX(); | 1003 | int xxx = item->cellX(); |
1001 | //qDebug("KOAgendaView::updateEventDates %d %d %d %d %d", xxx, mMinY.at(xxx),mMaxY.at(xxx),item->cellYTop(),item->cellYBottom() ); | 1004 | //qDebug("KOAgendaView::updateEventDates %d %d %d %d %d", xxx, mMinY.at(xxx),mMaxY.at(xxx),item->cellYTop(),item->cellYBottom() ); |
1002 | if ( mMinY.at(xxx) > item->cellYTop() ) | 1005 | if ( mMinY.at(xxx) > item->cellYTop() ) |
1003 | mMinY.at(xxx) = item->cellYTop(); | 1006 | mMinY.at(xxx) = item->cellYTop(); |
1004 | if ( mMaxY.at(xxx) < item->cellYBottom() ) | 1007 | if ( mMaxY.at(xxx) < item->cellYBottom() ) |
1005 | mMaxY.at(xxx) = item->cellYBottom(); | 1008 | mMaxY.at(xxx) = item->cellYBottom(); |
1006 | 1009 | ||
1007 | QDateTime startDt,endDt; | 1010 | QDateTime startDt,endDt; |
1008 | QDate startDate; | 1011 | QDate startDate; |
1009 | int lenInSecs; | 1012 | int lenInSecs; |
1010 | // if ( type == KOAgenda::RESIZETOP ) | 1013 | // if ( type == KOAgenda::RESIZETOP ) |
1011 | // qDebug("RESIZETOP "); | 1014 | // qDebug("RESIZETOP "); |
1012 | // if ( type == KOAgenda::RESIZEBOTTOM ) | 1015 | // if ( type == KOAgenda::RESIZEBOTTOM ) |
1013 | // qDebug("RESIZEBOTTOM "); | 1016 | // qDebug("RESIZEBOTTOM "); |
1014 | // if ( type == KOAgenda::MOVE ) | 1017 | // if ( type == KOAgenda::MOVE ) |
1015 | // qDebug("MOVE "); | 1018 | // qDebug("MOVE "); |
1016 | if ( item->incidence()->typeID() == eventID ) { | 1019 | if ( item->incidence()->typeID() == eventID ) { |
1017 | startDt =item->incidence()->dtStart(); | 1020 | startDt =item->incidence()->dtStart(); |
1018 | endDt = item->incidence()->dtEnd(); | 1021 | endDt = item->incidence()->dtEnd(); |
1019 | lenInSecs = startDt.secsTo( endDt ); | 1022 | lenInSecs = startDt.secsTo( endDt ); |
1020 | } | 1023 | } |
1021 | 1024 | ||
1022 | // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); | 1025 | // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); |
1023 | 1026 | ||
1024 | if ( item->incidence()->typeID()== todoID && item->mLastMoveXPos > 0 ) { | 1027 | if ( item->incidence()->typeID()== todoID && item->mLastMoveXPos > 0 ) { |
1025 | startDate = mSelectedDates[item->mLastMoveXPos]; | 1028 | startDate = mSelectedDates[item->mLastMoveXPos]; |
1026 | } else { | 1029 | } else { |
1027 | if (item->cellX() < 0) { | 1030 | if (item->cellX() < 0) { |
1028 | startDate = (mSelectedDates.first()).addDays(item->cellX()); | 1031 | startDate = (mSelectedDates.first()).addDays(item->cellX()); |
1029 | } else { | 1032 | } else { |
1030 | startDate = mSelectedDates[item->cellX()]; | 1033 | startDate = mSelectedDates[item->cellX()]; |
1031 | } | 1034 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index cbf6096..e960424 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -830,726 +830,734 @@ void MainWindow::initActions() | |||
830 | #endif | 830 | #endif |
831 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | 831 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); |
832 | mCancelAction->addTo( mCurrentItemMenu ); | 832 | mCancelAction->addTo( mCurrentItemMenu ); |
833 | connect( mCancelAction, SIGNAL( activated() ), | 833 | connect( mCancelAction, SIGNAL( activated() ), |
834 | mView, SLOT( toggleCancelIncidence() ) ); | 834 | mView, SLOT( toggleCancelIncidence() ) ); |
835 | 835 | ||
836 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 836 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
837 | ne_action->addTo( actionMenu ); | 837 | ne_action->addTo( actionMenu ); |
838 | connect( ne_action, SIGNAL( activated() ), | 838 | connect( ne_action, SIGNAL( activated() ), |
839 | mView, SLOT( newEvent() ) ); | 839 | mView, SLOT( newEvent() ) ); |
840 | icon = loadPixmap( pathString + "newtodo" ); | 840 | icon = loadPixmap( pathString + "newtodo" ); |
841 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 841 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
842 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 842 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
843 | nt_action->addTo( actionMenu ); | 843 | nt_action->addTo( actionMenu ); |
844 | connect( nt_action, SIGNAL( activated() ), | 844 | connect( nt_action, SIGNAL( activated() ), |
845 | mView, SLOT( newTodo() ) ); | 845 | mView, SLOT( newTodo() ) ); |
846 | 846 | ||
847 | 847 | ||
848 | 848 | ||
849 | // *********************** | 849 | // *********************** |
850 | if ( KOPrefs::instance()->mVerticalScreen ) { | 850 | if ( KOPrefs::instance()->mVerticalScreen ) { |
851 | icon = SmallIcon( "1updownarrow" ); | 851 | icon = SmallIcon( "1updownarrow" ); |
852 | } else { | 852 | } else { |
853 | icon = SmallIcon("1leftrightarrow" ); | 853 | icon = SmallIcon("1leftrightarrow" ); |
854 | } | 854 | } |
855 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 855 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
856 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); | 856 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); |
857 | FSaction->addTo( viewMenu ); | 857 | FSaction->addTo( viewMenu ); |
858 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); | 858 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); |
859 | 859 | ||
860 | 860 | ||
861 | icon = loadPixmap( pathString + "filter" ); | 861 | icon = loadPixmap( pathString + "filter" ); |
862 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); | 862 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); |
863 | icon = loadPixmap( pathString + "configure" ); | 863 | icon = loadPixmap( pathString + "configure" ); |
864 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); | 864 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); |
865 | action->addTo( viewMenu ); | 865 | action->addTo( viewMenu ); |
866 | connect( action, SIGNAL( activated() ), | 866 | connect( action, SIGNAL( activated() ), |
867 | mView, SLOT( toggleFilter() ) ); | 867 | mView, SLOT( toggleFilter() ) ); |
868 | mToggleFilter = action; | 868 | mToggleFilter = action; |
869 | icon = loadPixmap( pathString + "navi" ); | 869 | icon = loadPixmap( pathString + "navi" ); |
870 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); | 870 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); |
871 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 871 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
872 | action->addTo( viewMenu ); | 872 | action->addTo( viewMenu ); |
873 | connect( action, SIGNAL( activated() ), | 873 | connect( action, SIGNAL( activated() ), |
874 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 874 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
875 | mToggleNav = action ; | 875 | mToggleNav = action ; |
876 | icon = loadPixmap( pathString + "allday" ); | 876 | icon = loadPixmap( pathString + "allday" ); |
877 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); | 877 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); |
878 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 878 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
879 | action->addTo( viewMenu ); | 879 | action->addTo( viewMenu ); |
880 | connect( action, SIGNAL( activated() ), | 880 | connect( action, SIGNAL( activated() ), |
881 | mView, SLOT( toggleAllDaySize() ) ); | 881 | mView, SLOT( toggleAllDaySize() ) ); |
882 | mToggleAllday = action; | 882 | mToggleAllday = action; |
883 | 883 | ||
884 | 884 | ||
885 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 885 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
886 | mToggleNav, SLOT( setEnabled ( bool ) ) ); | 886 | mToggleNav, SLOT( setEnabled ( bool ) ) ); |
887 | //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 887 | //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
888 | // mToggleFilter, SLOT( setEnabled ( bool ) ) ); | 888 | // mToggleFilter, SLOT( setEnabled ( bool ) ) ); |
889 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 889 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
890 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); | 890 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); |
891 | // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 891 | // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
892 | // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); | 892 | // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); |
893 | 893 | ||
894 | 894 | ||
895 | dPickerAction->addTo( iconToolBar ); | 895 | dPickerAction->addTo( iconToolBar ); |
896 | viewMenu->insertSeparator(); | 896 | viewMenu->insertSeparator(); |
897 | 897 | ||
898 | if ( p-> mShowIconToggleFull ) | 898 | if ( p-> mShowIconToggleFull ) |
899 | FSaction->addTo( iconToolBar ); | 899 | FSaction->addTo( iconToolBar ); |
900 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); | 900 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); |
901 | 901 | ||
902 | //******************** | 902 | //******************** |
903 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); | 903 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); |
904 | 904 | ||
905 | 905 | ||
906 | icon = loadPixmap( pathString + "whatsnext" ); | 906 | icon = loadPixmap( pathString + "whatsnext" ); |
907 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); | 907 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); |
908 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | 908 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
909 | whatsnext_action->addTo( viewMenu ); | 909 | whatsnext_action->addTo( viewMenu ); |
910 | connect( whatsnext_action, SIGNAL( activated() ), | 910 | connect( whatsnext_action, SIGNAL( activated() ), |
911 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | 911 | mView->viewManager(), SLOT( showWhatsNextView() ) ); |
912 | 912 | ||
913 | icon = loadPixmap( pathString + "xdays" ); | 913 | icon = loadPixmap( pathString + "xdays" ); |
914 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); | 914 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); |
915 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | 915 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); |
916 | xdays_action->addTo( viewMenu ); | 916 | xdays_action->addTo( viewMenu ); |
917 | connect( xdays_action, SIGNAL( activated() ), | 917 | connect( xdays_action, SIGNAL( activated() ), |
918 | mView->viewManager(), SLOT( showNextXView() ) ); | 918 | mView->viewManager(), SLOT( showNextXView() ) ); |
919 | 919 | ||
920 | 920 | ||
921 | icon = loadPixmap( pathString + "journal" ); | 921 | icon = loadPixmap( pathString + "journal" ); |
922 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 922 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
923 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 923 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
924 | viewjournal_action->addTo( viewMenu ); | 924 | viewjournal_action->addTo( viewMenu ); |
925 | connect( viewjournal_action, SIGNAL( activated() ), | 925 | connect( viewjournal_action, SIGNAL( activated() ), |
926 | mView->viewManager(), SLOT( showJournalView() ) ); | 926 | mView->viewManager(), SLOT( showJournalView() ) ); |
927 | 927 | ||
928 | 928 | ||
929 | icon = loadPixmap( pathString + "day" ); | 929 | icon = loadPixmap( pathString + "day" ); |
930 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 930 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
931 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); | 931 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); |
932 | day1_action->addTo( viewMenu ); | 932 | day1_action->addTo( viewMenu ); |
933 | // action->addTo( toolBar ); | 933 | // action->addTo( toolBar ); |
934 | connect( day1_action, SIGNAL( activated() ), | 934 | connect( day1_action, SIGNAL( activated() ), |
935 | mView->viewManager(), SLOT( showDayView() ) ); | 935 | mView->viewManager(), SLOT( showDayView() ) ); |
936 | 936 | ||
937 | icon = loadPixmap( pathString + "workweek" ); | 937 | icon = loadPixmap( pathString + "workweek" ); |
938 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); | 938 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); |
939 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); | 939 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); |
940 | day5_action->addTo( viewMenu ); | 940 | day5_action->addTo( viewMenu ); |
941 | connect( day5_action, SIGNAL( activated() ), | 941 | connect( day5_action, SIGNAL( activated() ), |
942 | mView->viewManager(), SLOT( showWorkWeekView() ) ); | 942 | mView->viewManager(), SLOT( showWorkWeekView() ) ); |
943 | 943 | ||
944 | icon = loadPixmap( pathString + "week" ); | 944 | icon = loadPixmap( pathString + "week" ); |
945 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); | 945 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); |
946 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); | 946 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); |
947 | day7_action->addTo( viewMenu ); | 947 | day7_action->addTo( viewMenu ); |
948 | connect( day7_action, SIGNAL( activated() ), | 948 | connect( day7_action, SIGNAL( activated() ), |
949 | mView->viewManager(), SLOT( showWeekView() ) ); | 949 | mView->viewManager(), SLOT( showWeekView() ) ); |
950 | 950 | ||
951 | icon = loadPixmap( pathString + "workweek2" ); | 951 | icon = loadPixmap( pathString + "workweek2" ); |
952 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); | 952 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); |
953 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); | 953 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); |
954 | day6_action->addTo( viewMenu ); | 954 | day6_action->addTo( viewMenu ); |
955 | connect( day6_action, SIGNAL( activated() ), | 955 | connect( day6_action, SIGNAL( activated() ), |
956 | mView->viewManager(), SLOT( showMonthViewWeek() ) ); | 956 | mView->viewManager(), SLOT( showMonthViewWeek() ) ); |
957 | 957 | ||
958 | icon = loadPixmap( pathString + "month" ); | 958 | icon = loadPixmap( pathString + "month" ); |
959 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); | 959 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); |
960 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); | 960 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); |
961 | month_action->addTo( viewMenu ); | 961 | month_action->addTo( viewMenu ); |
962 | connect( month_action, SIGNAL( activated() ), | 962 | connect( month_action, SIGNAL( activated() ), |
963 | mView->viewManager(), SLOT( showMonthView() ) ); | 963 | mView->viewManager(), SLOT( showMonthView() ) ); |
964 | 964 | ||
965 | icon = loadPixmap( pathString + "list" ); | 965 | icon = loadPixmap( pathString + "list" ); |
966 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); | 966 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); |
967 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); | 967 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); |
968 | showlist_action->addTo( viewMenu ); | 968 | showlist_action->addTo( viewMenu ); |
969 | connect( showlist_action, SIGNAL( activated() ), | 969 | connect( showlist_action, SIGNAL( activated() ), |
970 | mView->viewManager(), SLOT( showListView() ) ); | 970 | mView->viewManager(), SLOT( showListView() ) ); |
971 | 971 | ||
972 | icon = loadPixmap( pathString + "todo" ); | 972 | icon = loadPixmap( pathString + "todo" ); |
973 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); | 973 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); |
974 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); | 974 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); |
975 | todoview_action->addTo( viewMenu ); | 975 | todoview_action->addTo( viewMenu ); |
976 | connect( todoview_action, SIGNAL( activated() ), | 976 | connect( todoview_action, SIGNAL( activated() ), |
977 | mView->viewManager(), SLOT( showTodoView() ) ); | 977 | mView->viewManager(), SLOT( showTodoView() ) ); |
978 | 978 | ||
979 | 979 | ||
980 | 980 | ||
981 | #if 0 | 981 | #if 0 |
982 | action = new QAction( "view_timespan", "Time Span", 0, this ); | 982 | action = new QAction( "view_timespan", "Time Span", 0, this ); |
983 | action->addTo( viewMenu ); | 983 | action->addTo( viewMenu ); |
984 | connect( action, SIGNAL( activated() ), | 984 | connect( action, SIGNAL( activated() ), |
985 | mView->viewManager(), SLOT( showTimeSpanView() ) ); | 985 | mView->viewManager(), SLOT( showTimeSpanView() ) ); |
986 | #endif | 986 | #endif |
987 | 987 | ||
988 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, | 988 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, |
989 | this ); | 989 | this ); |
990 | mNewSubTodoAction->addTo( actionMenu ); | 990 | mNewSubTodoAction->addTo( actionMenu ); |
991 | connect( mNewSubTodoAction, SIGNAL( activated() ), | 991 | connect( mNewSubTodoAction, SIGNAL( activated() ), |
992 | mView, SLOT( newSubTodo() ) ); | 992 | mView, SLOT( newSubTodo() ) ); |
993 | 993 | ||
994 | action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, | 994 | action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, |
995 | this ); | 995 | this ); |
996 | action->addTo( actionMenu ); | 996 | action->addTo( actionMenu ); |
997 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); | 997 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); |
998 | 998 | ||
999 | 999 | ||
1000 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); | 1000 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); |
1001 | 1001 | ||
1002 | 1002 | ||
1003 | 1003 | ||
1004 | actionMenu->insertSeparator(); | 1004 | actionMenu->insertSeparator(); |
1005 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, | 1005 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, |
1006 | this ); | 1006 | this ); |
1007 | action->addTo( actionMenu ); | 1007 | action->addTo( actionMenu ); |
1008 | connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); | 1008 | connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); |
1009 | 1009 | ||
1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1011 | this ); | 1011 | this ); |
1012 | action->addTo( actionMenu ); | 1012 | action->addTo( actionMenu ); |
1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1014 | 1014 | ||
1015 | 1015 | ||
1016 | actionMenu->insertSeparator(); | 1016 | actionMenu->insertSeparator(); |
1017 | icon = loadPixmap( pathString + "configure" ); | 1017 | icon = loadPixmap( pathString + "configure" ); |
1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | 1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); |
1019 | action->addTo( actionMenu ); | 1019 | action->addTo( actionMenu ); |
1020 | connect( action, SIGNAL( activated() ), | 1020 | connect( action, SIGNAL( activated() ), |
1021 | mView, SLOT( edit_options() ) ); | 1021 | mView, SLOT( edit_options() ) ); |
1022 | icon = loadPixmap( pathString + "configure" ); | 1022 | action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); |
1023 | action->addTo( actionMenu ); | ||
1024 | connect( action, SIGNAL( activated() ), | ||
1025 | this, SLOT( calHint() ) ); | ||
1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1026 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1024 | action->addTo( actionMenu ); | 1027 | action->addTo( actionMenu ); |
1025 | connect( action, SIGNAL( activated() ), | 1028 | connect( action, SIGNAL( activated() ), |
1026 | mView, SLOT( edit_global_options() ) ); | 1029 | mView, SLOT( edit_global_options() ) ); |
1027 | if ( KOPrefs::instance()->mShowFullMenu ) { | 1030 | if ( KOPrefs::instance()->mShowFullMenu ) { |
1028 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 1031 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
1029 | 1032 | ||
1030 | } | 1033 | } |
1031 | // actionMenu->insertSeparator(); | 1034 | // actionMenu->insertSeparator(); |
1032 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1035 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1033 | this ); | 1036 | this ); |
1034 | action->addTo( importMenu_X ); | 1037 | action->addTo( importMenu_X ); |
1035 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 1038 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
1036 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 1039 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
1037 | this ); | 1040 | this ); |
1038 | action->addTo( importMenu_X ); | 1041 | action->addTo( importMenu_X ); |
1039 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 1042 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
1040 | importMenu_X->insertSeparator(); | 1043 | importMenu_X->insertSeparator(); |
1041 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 1044 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
1042 | this ); | 1045 | this ); |
1043 | action->addTo( importMenu_X ); | 1046 | action->addTo( importMenu_X ); |
1044 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 1047 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
1045 | //#ifndef DESKTOP_VERSION | 1048 | //#ifndef DESKTOP_VERSION |
1046 | importMenu_X->insertSeparator(); | 1049 | importMenu_X->insertSeparator(); |
1047 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 1050 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
1048 | this ); | 1051 | this ); |
1049 | action->addTo( importMenu_X ); | 1052 | action->addTo( importMenu_X ); |
1050 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 1053 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
1051 | //#else | 1054 | //#else |
1052 | #ifdef _OL_IMPORT_ | 1055 | #ifdef _OL_IMPORT_ |
1053 | importMenu_X->insertSeparator(); | 1056 | importMenu_X->insertSeparator(); |
1054 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 1057 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
1055 | this ); | 1058 | this ); |
1056 | action->addTo( importMenu_X ); | 1059 | action->addTo( importMenu_X ); |
1057 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 1060 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
1058 | #endif | 1061 | #endif |
1059 | //#endif | 1062 | //#endif |
1060 | 1063 | ||
1061 | //importMenu->insertSeparator(); | 1064 | //importMenu->insertSeparator(); |
1062 | #if 0 | 1065 | #if 0 |
1063 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 1066 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
1064 | this ); | 1067 | this ); |
1065 | action->addTo( importMenu ); | 1068 | action->addTo( importMenu ); |
1066 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); | 1069 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); |
1067 | #endif | 1070 | #endif |
1068 | action = new QAction( "save_cal", i18n("Save Backup..."), 0, | 1071 | action = new QAction( "save_cal", i18n("Save Backup..."), 0, |
1069 | this ); | 1072 | this ); |
1070 | action->addTo( importMenu ); | 1073 | action->addTo( importMenu ); |
1071 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 1074 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
1072 | importMenu->insertSeparator(); | 1075 | importMenu->insertSeparator(); |
1073 | importMenu->insertItem( i18n("Import"), importMenu_X ); | 1076 | importMenu->insertItem( i18n("Import"), importMenu_X ); |
1074 | //importMenu->insertSeparator(); | 1077 | //importMenu->insertSeparator(); |
1075 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 1078 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
1076 | this ); | 1079 | this ); |
1077 | action->addTo( exportMenu_X ); | 1080 | action->addTo( exportMenu_X ); |
1078 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 1081 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); |
1079 | 1082 | ||
1080 | 1083 | ||
1081 | //LR | 1084 | //LR |
1082 | QPopupMenu *ex2phone = new QPopupMenu( this ); | 1085 | QPopupMenu *ex2phone = new QPopupMenu( this ); |
1083 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1086 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1084 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1087 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1085 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 1088 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
1086 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); | 1089 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); |
1087 | 1090 | ||
1088 | importMenu->insertItem( i18n("Export"), exportMenu_X ); | 1091 | importMenu->insertItem( i18n("Export"), exportMenu_X ); |
1089 | #ifndef DESKTOP_VERSION | 1092 | #ifndef DESKTOP_VERSION |
1090 | //importMenu->insertSeparator(); | 1093 | //importMenu->insertSeparator(); |
1091 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 1094 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
1092 | this ); | 1095 | this ); |
1093 | brAction->addTo( beamMenu_X ); | 1096 | brAction->addTo( beamMenu_X ); |
1094 | brAction->setToggleAction (true ) ; | 1097 | brAction->setToggleAction (true ) ; |
1095 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 1098 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
1096 | 1099 | ||
1097 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 1100 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
1098 | this ); | 1101 | this ); |
1099 | action->addTo( beamMenu_X ); | 1102 | action->addTo( beamMenu_X ); |
1100 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 1103 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
1101 | 1104 | ||
1102 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 1105 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
1103 | this ); | 1106 | this ); |
1104 | action->addTo( beamMenu_X ); | 1107 | action->addTo( beamMenu_X ); |
1105 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 1108 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
1106 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); | 1109 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); |
1107 | #else | 1110 | #else |
1108 | //importMenu->insertSeparator(); | 1111 | //importMenu->insertSeparator(); |
1109 | icon = loadPixmap( pathString + "print" ); | 1112 | icon = loadPixmap( pathString + "print" ); |
1110 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 1113 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
1111 | action->addTo( beamMenu_X ); | 1114 | action->addTo( beamMenu_X ); |
1112 | connect( action, SIGNAL( activated() ), | 1115 | connect( action, SIGNAL( activated() ), |
1113 | this, SLOT( printCal() ) ); | 1116 | this, SLOT( printCal() ) ); |
1114 | 1117 | ||
1115 | icon = loadPixmap( pathString + "print" ); | 1118 | icon = loadPixmap( pathString + "print" ); |
1116 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 1119 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
1117 | action->addTo( beamMenu_X ); | 1120 | action->addTo( beamMenu_X ); |
1118 | connect( action, SIGNAL( activated() ), | 1121 | connect( action, SIGNAL( activated() ), |
1119 | this, SLOT( printSel() ) ); | 1122 | this, SLOT( printSel() ) ); |
1120 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 1123 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
1121 | action->addTo( beamMenu_X ); | 1124 | action->addTo( beamMenu_X ); |
1122 | connect( action, SIGNAL( activated() ), | 1125 | connect( action, SIGNAL( activated() ), |
1123 | mView->viewManager(), SLOT( slotprintWNV() ) ); | 1126 | mView->viewManager(), SLOT( slotprintWNV() ) ); |
1124 | 1127 | ||
1125 | 1128 | ||
1126 | icon = loadPixmap( pathString + "print" ); | 1129 | icon = loadPixmap( pathString + "print" ); |
1127 | action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); | 1130 | action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); |
1128 | action->addTo( beamMenu_X ); | 1131 | action->addTo( beamMenu_X ); |
1129 | connect( action, SIGNAL( activated() ), | 1132 | connect( action, SIGNAL( activated() ), |
1130 | this, SLOT( printListView() ) ); | 1133 | this, SLOT( printListView() ) ); |
1131 | 1134 | ||
1132 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); | 1135 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); |
1133 | action->addTo( beamMenu_X ); | 1136 | action->addTo( beamMenu_X ); |
1134 | connect( action, SIGNAL( activated() ), | 1137 | connect( action, SIGNAL( activated() ), |
1135 | mView, SLOT( slotprintSelInc() ) ); | 1138 | mView, SLOT( slotprintSelInc() ) ); |
1136 | 1139 | ||
1137 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | 1140 | importMenu->insertItem( i18n("Print"), beamMenu_X ); |
1138 | #endif | 1141 | #endif |
1139 | 1142 | ||
1140 | importMenu->insertSeparator(); | 1143 | importMenu->insertSeparator(); |
1141 | action = new QAction( "beam all", i18n("Save"), 0, | 1144 | action = new QAction( "beam all", i18n("Save"), 0, |
1142 | this ); | 1145 | this ); |
1143 | action->addTo( importMenu ); | 1146 | action->addTo( importMenu ); |
1144 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1147 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1145 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1148 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1146 | this ); | 1149 | this ); |
1147 | action->addTo( importMenu ); | 1150 | action->addTo( importMenu ); |
1148 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 1151 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
1149 | 1152 | ||
1150 | //menuBar->insertItem( "Configure",configureMenu ); | 1153 | //menuBar->insertItem( "Configure",configureMenu ); |
1151 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 1154 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
1152 | icon = loadPixmap( "korganizer/korganizer" ); | 1155 | icon = loadPixmap( "korganizer/korganizer" ); |
1153 | 1156 | ||
1154 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 1157 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
1155 | action->addTo( helpMenu ); | 1158 | action->addTo( helpMenu ); |
1156 | connect( action, SIGNAL( activated() ), | 1159 | connect( action, SIGNAL( activated() ), |
1157 | SLOT( whatsNew() ) ); | 1160 | SLOT( whatsNew() ) ); |
1158 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 1161 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
1159 | action->addTo( helpMenu ); | 1162 | action->addTo( helpMenu ); |
1160 | connect( action, SIGNAL( activated() ), | 1163 | connect( action, SIGNAL( activated() ), |
1161 | SLOT( features() ) ); | 1164 | SLOT( features() ) ); |
1162 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 1165 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
1163 | action->addTo( helpMenu ); | 1166 | action->addTo( helpMenu ); |
1164 | connect( action, SIGNAL( activated() ), | 1167 | connect( action, SIGNAL( activated() ), |
1165 | SLOT( keyBindings() ) ); | 1168 | SLOT( keyBindings() ) ); |
1166 | action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); | 1169 | action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); |
1167 | action->addTo( helpMenu ); | 1170 | action->addTo( helpMenu ); |
1168 | connect( action, SIGNAL( activated() ), | 1171 | connect( action, SIGNAL( activated() ), |
1169 | SLOT( storagehowto() ) ); | 1172 | SLOT( storagehowto() ) ); |
1170 | action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); | 1173 | action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); |
1171 | action->addTo( helpMenu ); | 1174 | action->addTo( helpMenu ); |
1172 | connect( action, SIGNAL( activated() ), | 1175 | connect( action, SIGNAL( activated() ), |
1173 | SLOT( timetrackinghowto() ) ); | 1176 | SLOT( timetrackinghowto() ) ); |
1174 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 1177 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
1175 | action->addTo( helpMenu ); | 1178 | action->addTo( helpMenu ); |
1176 | connect( action, SIGNAL( activated() ), | 1179 | connect( action, SIGNAL( activated() ), |
1177 | SLOT( synchowto() ) ); | 1180 | SLOT( synchowto() ) ); |
1178 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 1181 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
1179 | action->addTo( helpMenu ); | 1182 | action->addTo( helpMenu ); |
1180 | connect( action, SIGNAL( activated() ), | 1183 | connect( action, SIGNAL( activated() ), |
1181 | SLOT( kdesynchowto() ) ); | 1184 | SLOT( kdesynchowto() ) ); |
1182 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 1185 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
1183 | action->addTo( helpMenu ); | 1186 | action->addTo( helpMenu ); |
1184 | connect( action, SIGNAL( activated() ), | 1187 | connect( action, SIGNAL( activated() ), |
1185 | SLOT( multisynchowto() ) ); | 1188 | SLOT( multisynchowto() ) ); |
1186 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 1189 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
1187 | action->addTo( helpMenu ); | 1190 | action->addTo( helpMenu ); |
1188 | connect( action, SIGNAL( activated() ), | 1191 | connect( action, SIGNAL( activated() ), |
1189 | SLOT( aboutAutoSaving() ) ); | 1192 | SLOT( aboutAutoSaving() ) ); |
1190 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 1193 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
1191 | action->addTo( helpMenu ); | 1194 | action->addTo( helpMenu ); |
1192 | connect( action, SIGNAL( activated() ), | 1195 | connect( action, SIGNAL( activated() ), |
1193 | SLOT( aboutKnownBugs() ) ); | 1196 | SLOT( aboutKnownBugs() ) ); |
1194 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 1197 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
1195 | action->addTo( helpMenu ); | 1198 | action->addTo( helpMenu ); |
1196 | connect( action, SIGNAL( activated() ), | 1199 | connect( action, SIGNAL( activated() ), |
1197 | SLOT( usertrans() ) ); | 1200 | SLOT( usertrans() ) ); |
1198 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 1201 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
1199 | action->addTo( helpMenu ); | 1202 | action->addTo( helpMenu ); |
1200 | connect( action, SIGNAL( activated() ), | 1203 | connect( action, SIGNAL( activated() ), |
1201 | SLOT( faq() ) ); | 1204 | SLOT( faq() ) ); |
1202 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 1205 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
1203 | action->addTo( helpMenu ); | 1206 | action->addTo( helpMenu ); |
1204 | connect( action, SIGNAL( activated() ), | 1207 | connect( action, SIGNAL( activated() ), |
1205 | SLOT( licence() ) ); | 1208 | SLOT( licence() ) ); |
1206 | action = new QAction( "about", i18n("About..."), 0, this ); | 1209 | action = new QAction( "about", i18n("About..."), 0, this ); |
1207 | action->addTo( helpMenu ); | 1210 | action->addTo( helpMenu ); |
1208 | connect( action, SIGNAL( activated() ), | 1211 | connect( action, SIGNAL( activated() ), |
1209 | SLOT( about() ) ); | 1212 | SLOT( about() ) ); |
1210 | //menuBar->insertSeparator(); | 1213 | //menuBar->insertSeparator(); |
1211 | 1214 | ||
1212 | // ****************************************************** | 1215 | // ****************************************************** |
1213 | // menubar icons | 1216 | // menubar icons |
1214 | 1217 | ||
1215 | 1218 | ||
1216 | 1219 | ||
1217 | //menuBar->insertItem( iconToolBar ); | 1220 | //menuBar->insertItem( iconToolBar ); |
1218 | //xdays_action | 1221 | //xdays_action |
1219 | if (p-> mShowIconNewEvent) | 1222 | if (p-> mShowIconNewEvent) |
1220 | ne_action->addTo( iconToolBar ); | 1223 | ne_action->addTo( iconToolBar ); |
1221 | if (p->mShowIconNewTodo ) | 1224 | if (p->mShowIconNewTodo ) |
1222 | nt_action->addTo( iconToolBar ); | 1225 | nt_action->addTo( iconToolBar ); |
1223 | if (p-> mShowIconSearch) | 1226 | if (p-> mShowIconSearch) |
1224 | search_action->addTo( iconToolBar ); | 1227 | search_action->addTo( iconToolBar ); |
1225 | if (p-> mShowIconWhatsThis) | 1228 | if (p-> mShowIconWhatsThis) |
1226 | QWhatsThis::whatsThisButton ( iconToolBar ); | 1229 | QWhatsThis::whatsThisButton ( iconToolBar ); |
1227 | if (p-> mShowIconNext) | 1230 | if (p-> mShowIconNext) |
1228 | whatsnext_action->addTo( viewToolBar ); | 1231 | whatsnext_action->addTo( viewToolBar ); |
1229 | if (p-> mShowIconNextDays) | 1232 | if (p-> mShowIconNextDays) |
1230 | xdays_action->addTo( viewToolBar ); | 1233 | xdays_action->addTo( viewToolBar ); |
1231 | if (p-> mShowIconJournal) | 1234 | if (p-> mShowIconJournal) |
1232 | viewjournal_action->addTo( viewToolBar ); | 1235 | viewjournal_action->addTo( viewToolBar ); |
1233 | if (p-> mShowIconDay1) | 1236 | if (p-> mShowIconDay1) |
1234 | day1_action->addTo( viewToolBar ); | 1237 | day1_action->addTo( viewToolBar ); |
1235 | if (p-> mShowIconDay5) | 1238 | if (p-> mShowIconDay5) |
1236 | day5_action->addTo( viewToolBar ); | 1239 | day5_action->addTo( viewToolBar ); |
1237 | if (p-> mShowIconDay7) | 1240 | if (p-> mShowIconDay7) |
1238 | day7_action->addTo( viewToolBar ); | 1241 | day7_action->addTo( viewToolBar ); |
1239 | if (p-> mShowIconDay6) | 1242 | if (p-> mShowIconDay6) |
1240 | day6_action->addTo( viewToolBar ); | 1243 | day6_action->addTo( viewToolBar ); |
1241 | if (p-> mShowIconMonth) | 1244 | if (p-> mShowIconMonth) |
1242 | month_action->addTo( viewToolBar ); | 1245 | month_action->addTo( viewToolBar ); |
1243 | if (p-> mShowIconList) | 1246 | if (p-> mShowIconList) |
1244 | showlist_action->addTo( viewToolBar ); | 1247 | showlist_action->addTo( viewToolBar ); |
1245 | if (p-> mShowIconTodoview) | 1248 | if (p-> mShowIconTodoview) |
1246 | todoview_action->addTo( viewToolBar ); | 1249 | todoview_action->addTo( viewToolBar ); |
1247 | 1250 | ||
1248 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1251 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1249 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); | 1252 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); |
1250 | if (p-> mShowIconBackFast) { | 1253 | if (p-> mShowIconBackFast) { |
1251 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1254 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1252 | connect( action, SIGNAL( activated() ), | 1255 | connect( action, SIGNAL( activated() ), |
1253 | mView, SLOT( goPreviousMonth() ) ); | 1256 | mView, SLOT( goPreviousMonth() ) ); |
1254 | action->addTo( navigatorToolBar ); | 1257 | action->addTo( navigatorToolBar ); |
1255 | } | 1258 | } |
1256 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1259 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1257 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); | 1260 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); |
1258 | if (p-> mShowIconBack) { | 1261 | if (p-> mShowIconBack) { |
1259 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1262 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1260 | connect( action, SIGNAL( activated() ), | 1263 | connect( action, SIGNAL( activated() ), |
1261 | mView, SLOT( goPrevious() ) ); | 1264 | mView, SLOT( goPrevious() ) ); |
1262 | action->addTo( navigatorToolBar ); | 1265 | action->addTo( navigatorToolBar ); |
1263 | } | 1266 | } |
1264 | icon = loadPixmap( pathString + "today" ); | 1267 | icon = loadPixmap( pathString + "today" ); |
1265 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 1268 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
1266 | if (p-> mShowIconToday) | 1269 | if (p-> mShowIconToday) |
1267 | today_action->addTo( navigatorToolBar ); | 1270 | today_action->addTo( navigatorToolBar ); |
1268 | icon = loadPixmap( pathString + "1rightarrowB" ); | 1271 | icon = loadPixmap( pathString + "1rightarrowB" ); |
1269 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); | 1272 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); |
1270 | if (p-> mShowIconForward) { | 1273 | if (p-> mShowIconForward) { |
1271 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1274 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |
1272 | connect( action, SIGNAL( activated() ), | 1275 | connect( action, SIGNAL( activated() ), |
1273 | mView, SLOT( goNext() ) ); | 1276 | mView, SLOT( goNext() ) ); |
1274 | action->addTo( navigatorToolBar ); | 1277 | action->addTo( navigatorToolBar ); |
1275 | } | 1278 | } |
1276 | icon = loadPixmap( pathString + "2rightarrowB" ); | 1279 | icon = loadPixmap( pathString + "2rightarrowB" ); |
1277 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); | 1280 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); |
1278 | if (p-> mShowIconForwardFast) { | 1281 | if (p-> mShowIconForwardFast) { |
1279 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); | 1282 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); |
1280 | connect( action, SIGNAL( activated() ), | 1283 | connect( action, SIGNAL( activated() ), |
1281 | mView, SLOT( goNextMonth() ) ); | 1284 | mView, SLOT( goNextMonth() ) ); |
1282 | action->addTo( navigatorToolBar ); | 1285 | action->addTo( navigatorToolBar ); |
1283 | } | 1286 | } |
1284 | 1287 | ||
1285 | 1288 | ||
1286 | configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); | 1289 | configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); |
1287 | 1290 | ||
1288 | 1291 | ||
1289 | if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true); | 1292 | if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true); |
1290 | if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true); | 1293 | if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true); |
1291 | if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true); | 1294 | if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true); |
1292 | if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true); | 1295 | if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true); |
1293 | 1296 | ||
1294 | if (p-> mShowIconNewEvent) | 1297 | if (p-> mShowIconNewEvent) |
1295 | configureToolBarMenu->setItemChecked( 10, true ); | 1298 | configureToolBarMenu->setItemChecked( 10, true ); |
1296 | if (p->mShowIconNewTodo ) | 1299 | if (p->mShowIconNewTodo ) |
1297 | configureToolBarMenu->setItemChecked( 20, true ); | 1300 | configureToolBarMenu->setItemChecked( 20, true ); |
1298 | if (p-> mShowIconSearch) | 1301 | if (p-> mShowIconSearch) |
1299 | configureToolBarMenu->setItemChecked( 120, true ); | 1302 | configureToolBarMenu->setItemChecked( 120, true ); |
1300 | if (p-> mShowIconList) | 1303 | if (p-> mShowIconList) |
1301 | configureToolBarMenu->setItemChecked( 30, true ); | 1304 | configureToolBarMenu->setItemChecked( 30, true ); |
1302 | if (p-> mShowIconDay1) | 1305 | if (p-> mShowIconDay1) |
1303 | configureToolBarMenu->setItemChecked( 40, true ); | 1306 | configureToolBarMenu->setItemChecked( 40, true ); |
1304 | if (p-> mShowIconDay5) | 1307 | if (p-> mShowIconDay5) |
1305 | configureToolBarMenu->setItemChecked( 50, true ); | 1308 | configureToolBarMenu->setItemChecked( 50, true ); |
1306 | if (p-> mShowIconDay6) | 1309 | if (p-> mShowIconDay6) |
1307 | configureToolBarMenu->setItemChecked( 75, true ); | 1310 | configureToolBarMenu->setItemChecked( 75, true ); |
1308 | if (p-> mShowIconDay7) | 1311 | if (p-> mShowIconDay7) |
1309 | configureToolBarMenu->setItemChecked( 60, true ); | 1312 | configureToolBarMenu->setItemChecked( 60, true ); |
1310 | if (p-> mShowIconMonth) | 1313 | if (p-> mShowIconMonth) |
1311 | configureToolBarMenu->setItemChecked( 70, true ); | 1314 | configureToolBarMenu->setItemChecked( 70, true ); |
1312 | if (p-> mShowIconTodoview) | 1315 | if (p-> mShowIconTodoview) |
1313 | configureToolBarMenu->setItemChecked( 80, true ); | 1316 | configureToolBarMenu->setItemChecked( 80, true ); |
1314 | if (p-> mShowIconBackFast) | 1317 | if (p-> mShowIconBackFast) |
1315 | configureToolBarMenu->setItemChecked( 200, true ); | 1318 | configureToolBarMenu->setItemChecked( 200, true ); |
1316 | if (p-> mShowIconBack) | 1319 | if (p-> mShowIconBack) |
1317 | configureToolBarMenu->setItemChecked( 210, true ); | 1320 | configureToolBarMenu->setItemChecked( 210, true ); |
1318 | if (p-> mShowIconToday) | 1321 | if (p-> mShowIconToday) |
1319 | configureToolBarMenu->setItemChecked( 130, true ); | 1322 | configureToolBarMenu->setItemChecked( 130, true ); |
1320 | if (p-> mShowIconForward) | 1323 | if (p-> mShowIconForward) |
1321 | configureToolBarMenu->setItemChecked( 220, true ); | 1324 | configureToolBarMenu->setItemChecked( 220, true ); |
1322 | if (p-> mShowIconForwardFast) | 1325 | if (p-> mShowIconForwardFast) |
1323 | configureToolBarMenu->setItemChecked( 230, true ); | 1326 | configureToolBarMenu->setItemChecked( 230, true ); |
1324 | if (p-> mShowIconNextDays) | 1327 | if (p-> mShowIconNextDays) |
1325 | configureToolBarMenu->setItemChecked( 100, true ); | 1328 | configureToolBarMenu->setItemChecked( 100, true ); |
1326 | if (p-> mShowIconNext) | 1329 | if (p-> mShowIconNext) |
1327 | configureToolBarMenu->setItemChecked( 110, true ); | 1330 | configureToolBarMenu->setItemChecked( 110, true ); |
1328 | if (p-> mShowIconJournal) | 1331 | if (p-> mShowIconJournal) |
1329 | configureToolBarMenu->setItemChecked( 90, true ); | 1332 | configureToolBarMenu->setItemChecked( 90, true ); |
1330 | if (p-> mShowIconWhatsThis) | 1333 | if (p-> mShowIconWhatsThis) |
1331 | configureToolBarMenu->setItemChecked( 300, true ); | 1334 | configureToolBarMenu->setItemChecked( 300, true ); |
1332 | if (p-> mShowIconWeekNum) | 1335 | if (p-> mShowIconWeekNum) |
1333 | configureToolBarMenu->setItemChecked( 400, true ); | 1336 | configureToolBarMenu->setItemChecked( 400, true ); |
1334 | if (!p-> mShowIconStretch) { | 1337 | if (!p-> mShowIconStretch) { |
1335 | QLabel* dummy = new QLabel( iconToolBar ); | 1338 | QLabel* dummy = new QLabel( iconToolBar ); |
1336 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 1339 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
1337 | dummy->setMinimumWidth( 0 ); | 1340 | dummy->setMinimumWidth( 0 ); |
1338 | iconToolBar->setStretchableWidget ( dummy ) ; | 1341 | iconToolBar->setStretchableWidget ( dummy ) ; |
1339 | } | 1342 | } |
1340 | else { | 1343 | else { |
1341 | iconToolBar->setHorizontalStretchable (true ); | 1344 | iconToolBar->setHorizontalStretchable (true ); |
1342 | viewToolBar->setHorizontalStretchable (true ); | 1345 | viewToolBar->setHorizontalStretchable (true ); |
1343 | navigatorToolBar->setHorizontalStretchable (true ); | 1346 | navigatorToolBar->setHorizontalStretchable (true ); |
1344 | iconToolBar->setVerticalStretchable (true ); | 1347 | iconToolBar->setVerticalStretchable (true ); |
1345 | viewToolBar->setVerticalStretchable (true ); | 1348 | viewToolBar->setVerticalStretchable (true ); |
1346 | navigatorToolBar->setVerticalStretchable (true ); | 1349 | navigatorToolBar->setVerticalStretchable (true ); |
1347 | configureToolBarMenu->setItemChecked( 5, true ); | 1350 | configureToolBarMenu->setItemChecked( 5, true ); |
1348 | } | 1351 | } |
1349 | if (p-> mShowIconFilter) | 1352 | if (p-> mShowIconFilter) |
1350 | configureToolBarMenu->setItemChecked( 7, true ); | 1353 | configureToolBarMenu->setItemChecked( 7, true ); |
1351 | if (p-> mShowIconOnetoolbar) | 1354 | if (p-> mShowIconOnetoolbar) |
1352 | configureToolBarMenu->setItemChecked( 6, true ); | 1355 | configureToolBarMenu->setItemChecked( 6, true ); |
1353 | 1356 | ||
1354 | 1357 | ||
1355 | if ( filterMenubar ) { | 1358 | if ( filterMenubar ) { |
1356 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | 1359 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); |
1357 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); | 1360 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); |
1358 | } | 1361 | } |
1359 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1362 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1360 | configureAgenda( p->mHourSize ); | 1363 | configureAgenda( p->mHourSize ); |
1361 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1364 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1362 | } | 1365 | } |
1363 | 1366 | void MainWindow::calHint() | |
1367 | { | ||
1368 | QString message = i18n("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>."); | ||
1369 | |||
1370 | KMessageBox::information( this, message); | ||
1371 | } | ||
1364 | void MainWindow::exportToPhone( int mode ) | 1372 | void MainWindow::exportToPhone( int mode ) |
1365 | { | 1373 | { |
1366 | 1374 | ||
1367 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1375 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1368 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1376 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1369 | KOex2phonePrefs ex2phone; | 1377 | KOex2phonePrefs ex2phone; |
1370 | 1378 | ||
1371 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 1379 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
1372 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 1380 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
1373 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1381 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
1374 | if ( mode == 1 ) | 1382 | if ( mode == 1 ) |
1375 | ex2phone.setCaption(i18n("Export complete calendar")); | 1383 | ex2phone.setCaption(i18n("Export complete calendar")); |
1376 | if ( mode == 2 ) | 1384 | if ( mode == 2 ) |
1377 | ex2phone.setCaption(i18n("Export filtered calendar")); | 1385 | ex2phone.setCaption(i18n("Export filtered calendar")); |
1378 | 1386 | ||
1379 | if ( !ex2phone.exec() ) { | 1387 | if ( !ex2phone.exec() ) { |
1380 | return; | 1388 | return; |
1381 | } | 1389 | } |
1382 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 1390 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
1383 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 1391 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
1384 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 1392 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
1385 | 1393 | ||
1386 | int inFuture = 0; | 1394 | int inFuture = 0; |
1387 | if ( ex2phone.mWriteBackFuture->isChecked() ) | 1395 | if ( ex2phone.mWriteBackFuture->isChecked() ) |
1388 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); | 1396 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); |
1389 | QPtrList<Incidence> delSel; | 1397 | QPtrList<Incidence> delSel; |
1390 | if ( mode == 1 ) | 1398 | if ( mode == 1 ) |
1391 | delSel = mCalendar->rawIncidences(); | 1399 | delSel = mCalendar->rawIncidences(); |
1392 | if ( mode == 2 ) | 1400 | if ( mode == 2 ) |
1393 | delSel = mCalendar->incidences(); | 1401 | delSel = mCalendar->incidences(); |
1394 | CalendarLocal* cal = new CalendarLocal(); | 1402 | CalendarLocal* cal = new CalendarLocal(); |
1395 | cal->setLocalTime(); | 1403 | cal->setLocalTime(); |
1396 | Incidence *incidence = delSel.first(); | 1404 | Incidence *incidence = delSel.first(); |
1397 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | 1405 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); |
1398 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); | 1406 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); |
1399 | while ( incidence ) { | 1407 | while ( incidence ) { |
1400 | if ( incidence->typeID() != journalID ) { | 1408 | if ( incidence->typeID() != journalID ) { |
1401 | bool add = true; | 1409 | bool add = true; |
1402 | if ( inFuture ) { | 1410 | if ( inFuture ) { |
1403 | QDateTime dt; | 1411 | QDateTime dt; |
1404 | if ( incidence->typeID() == todoID ) { | 1412 | if ( incidence->typeID() == todoID ) { |
1405 | Todo * t = (Todo*)incidence; | 1413 | Todo * t = (Todo*)incidence; |
1406 | if ( t->hasDueDate() ) | 1414 | if ( t->hasDueDate() ) |
1407 | dt = t->dtDue(); | 1415 | dt = t->dtDue(); |
1408 | else | 1416 | else |
1409 | dt = cur.addSecs( 62 ); | 1417 | dt = cur.addSecs( 62 ); |
1410 | } | 1418 | } |
1411 | else { | 1419 | else { |
1412 | bool ok; | 1420 | bool ok; |
1413 | dt = incidence->getNextOccurence( cur, &ok ); | 1421 | dt = incidence->getNextOccurence( cur, &ok ); |
1414 | if ( !ok ) | 1422 | if ( !ok ) |
1415 | dt = cur.addSecs( -62 ); | 1423 | dt = cur.addSecs( -62 ); |
1416 | } | 1424 | } |
1417 | if ( dt < cur || dt > end ) { | 1425 | if ( dt < cur || dt > end ) { |
1418 | add = false; | 1426 | add = false; |
1419 | } | 1427 | } |
1420 | } | 1428 | } |
1421 | if ( add ) { | 1429 | if ( add ) { |
1422 | Incidence *in = incidence->clone(); | 1430 | Incidence *in = incidence->clone(); |
1423 | cal->addIncidence( in ); | 1431 | cal->addIncidence( in ); |
1424 | } | 1432 | } |
1425 | } | 1433 | } |
1426 | incidence = delSel.next(); | 1434 | incidence = delSel.next(); |
1427 | } | 1435 | } |
1428 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, | 1436 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, |
1429 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, | 1437 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, |
1430 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1438 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
1431 | 1439 | ||
1432 | setCaption( i18n("Writing to phone...")); | 1440 | setCaption( i18n("Writing to phone...")); |
1433 | if ( PhoneFormat::writeToPhone( cal ) ) | 1441 | if ( PhoneFormat::writeToPhone( cal ) ) |
1434 | setCaption( i18n("Export to phone successful!")); | 1442 | setCaption( i18n("Export to phone successful!")); |
1435 | else | 1443 | else |
1436 | setCaption( i18n("Error exporting to phone!")); | 1444 | setCaption( i18n("Error exporting to phone!")); |
1437 | delete cal; | 1445 | delete cal; |
1438 | } | 1446 | } |
1439 | 1447 | ||
1440 | 1448 | ||
1441 | void MainWindow::setDefaultPreferences() | 1449 | void MainWindow::setDefaultPreferences() |
1442 | { | 1450 | { |
1443 | KOPrefs *p = KOPrefs::instance(); | 1451 | KOPrefs *p = KOPrefs::instance(); |
1444 | 1452 | ||
1445 | p->mCompactDialogs = true; | 1453 | p->mCompactDialogs = true; |
1446 | p->mConfirm = true; | 1454 | p->mConfirm = true; |
1447 | // p->mEnableQuickTodo = false; | 1455 | // p->mEnableQuickTodo = false; |
1448 | 1456 | ||
1449 | } | 1457 | } |
1450 | 1458 | ||
1451 | QString MainWindow::resourcePath() | 1459 | QString MainWindow::resourcePath() |
1452 | { | 1460 | { |
1453 | return KGlobal::iconLoader()->iconPath(); | 1461 | return KGlobal::iconLoader()->iconPath(); |
1454 | } | 1462 | } |
1455 | 1463 | ||
1456 | void MainWindow::displayText( QString text ,QString cap ) | 1464 | void MainWindow::displayText( QString text ,QString cap ) |
1457 | { | 1465 | { |
1458 | QDialog dia( this, "name", true ); ; | 1466 | QDialog dia( this, "name", true ); ; |
1459 | dia.setCaption( cap ); | 1467 | dia.setCaption( cap ); |
1460 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 1468 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
1461 | lay->setSpacing( 3 ); | 1469 | lay->setSpacing( 3 ); |
1462 | lay->setMargin( 3 ); | 1470 | lay->setMargin( 3 ); |
1463 | QTextBrowser tb ( &dia ); | 1471 | QTextBrowser tb ( &dia ); |
1464 | lay->addWidget( &tb ); | 1472 | lay->addWidget( &tb ); |
1465 | tb.setText( text ); | 1473 | tb.setText( text ); |
1466 | #ifdef DESKTOP_VERSION | 1474 | #ifdef DESKTOP_VERSION |
1467 | dia.resize( 640, 480); | 1475 | dia.resize( 640, 480); |
1468 | #else | 1476 | #else |
1469 | dia.showMaximized(); | 1477 | dia.showMaximized(); |
1470 | #endif | 1478 | #endif |
1471 | dia.exec(); | 1479 | dia.exec(); |
1472 | } | 1480 | } |
1473 | 1481 | ||
1474 | void MainWindow::features() | 1482 | void MainWindow::features() |
1475 | { | 1483 | { |
1476 | 1484 | ||
1477 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); | 1485 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); |
1478 | } | 1486 | } |
1479 | 1487 | ||
1480 | void MainWindow::usertrans() | 1488 | void MainWindow::usertrans() |
1481 | { | 1489 | { |
1482 | 1490 | ||
1483 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); | 1491 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); |
1484 | } | 1492 | } |
1485 | 1493 | ||
1486 | void MainWindow::storagehowto() | 1494 | void MainWindow::storagehowto() |
1487 | { | 1495 | { |
1488 | KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); | 1496 | KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); |
1489 | } | 1497 | } |
1490 | void MainWindow::timetrackinghowto() | 1498 | void MainWindow::timetrackinghowto() |
1491 | { | 1499 | { |
1492 | KApplication::showFile( "KO/Pi Timetracking HowTo", "kdepim/timetrackerhowto.txt" ); | 1500 | KApplication::showFile( "KO/Pi Timetracking HowTo", "kdepim/timetrackerhowto.txt" ); |
1493 | } | 1501 | } |
1494 | void MainWindow::kdesynchowto() | 1502 | void MainWindow::kdesynchowto() |
1495 | { | 1503 | { |
1496 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 1504 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
1497 | } | 1505 | } |
1498 | void MainWindow::multisynchowto() | 1506 | void MainWindow::multisynchowto() |
1499 | { | 1507 | { |
1500 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 1508 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
1501 | } | 1509 | } |
1502 | void MainWindow::synchowto() | 1510 | void MainWindow::synchowto() |
1503 | { | 1511 | { |
1504 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1512 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1505 | } | 1513 | } |
1506 | void MainWindow::faq() | 1514 | void MainWindow::faq() |
1507 | { | 1515 | { |
1508 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); | 1516 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); |
1509 | 1517 | ||
1510 | } | 1518 | } |
1511 | void MainWindow::whatsNew() | 1519 | void MainWindow::whatsNew() |
1512 | { | 1520 | { |
1513 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1521 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1514 | 1522 | ||
1515 | } | 1523 | } |
1516 | void MainWindow::licence() | 1524 | void MainWindow::licence() |
1517 | { | 1525 | { |
1518 | KApplication::showLicence(); | 1526 | KApplication::showLicence(); |
1519 | 1527 | ||
1520 | } | 1528 | } |
1521 | void MainWindow::about() | 1529 | void MainWindow::about() |
1522 | { | 1530 | { |
1523 | QString version; | 1531 | QString version; |
1524 | #include <../version> | 1532 | #include <../version> |
1525 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1533 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1526 | i18n("KOrganizer/Platform-independent\n") + | 1534 | i18n("KOrganizer/Platform-independent\n") + |
1527 | "(KO/Pi) " + version + " - " + | 1535 | "(KO/Pi) " + version + " - " + |
1528 | 1536 | ||
1529 | #ifdef DESKTOP_VERSION | 1537 | #ifdef DESKTOP_VERSION |
1530 | i18n("Desktop Edition\n") + | 1538 | i18n("Desktop Edition\n") + |
1531 | #else | 1539 | #else |
1532 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + | 1540 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + |
1533 | #endif | 1541 | #endif |
1534 | i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); | 1542 | i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); |
1535 | } | 1543 | } |
1536 | void MainWindow::keyBindings() | 1544 | void MainWindow::keyBindings() |
1537 | { | 1545 | { |
1538 | QString cap = i18n("KO/Pi Keys + Colors"); | 1546 | QString cap = i18n("KO/Pi Keys + Colors"); |
1539 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + | 1547 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + |
1540 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ | 1548 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ |
1541 | i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") + | 1549 | i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") + |
1542 | i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + | 1550 | i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + |
1543 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1551 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1544 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1552 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1545 | i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+ | 1553 | i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+ |
1546 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1554 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1547 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1555 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1548 | i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ | 1556 | i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ |
1549 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ | 1557 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ |
1550 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ | 1558 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ |
1551 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ | 1559 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ |
1552 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ | 1560 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ |
1553 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ | 1561 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ |
1554 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ | 1562 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ |
1555 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+ | 1563 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+ |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index a948a52..adab95d 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -1,172 +1,173 @@ | |||
1 | #ifndef KORGE_MAINWINDOW_H | 1 | #ifndef KORGE_MAINWINDOW_H |
2 | #define KORGE_MAINWINDOW_H | 2 | #define KORGE_MAINWINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include <qtimer.h> | 5 | #include <qtimer.h> |
6 | #include <qdict.h> | 6 | #include <qdict.h> |
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | #include <qmenubar.h> | 8 | #include <qmenubar.h> |
9 | #include <qtextstream.h> | 9 | #include <qtextstream.h> |
10 | #include <qregexp.h> | 10 | #include <qregexp.h> |
11 | 11 | ||
12 | #include <libkcal/incidence.h> | 12 | #include <libkcal/incidence.h> |
13 | #include <ksyncmanager.h> | 13 | #include <ksyncmanager.h> |
14 | #ifndef DESKTOP_VERSION | 14 | #ifndef DESKTOP_VERSION |
15 | #include <qcopchannel_qws.h> | 15 | #include <qcopchannel_qws.h> |
16 | #endif | 16 | #endif |
17 | class QAction; | 17 | class QAction; |
18 | class CalendarView; | 18 | class CalendarView; |
19 | class KSyncProfile; | 19 | class KSyncProfile; |
20 | #ifdef DESKTOP_VERSION | 20 | #ifdef DESKTOP_VERSION |
21 | 21 | ||
22 | #define QPEToolBar QToolBar | 22 | #define QPEToolBar QToolBar |
23 | #define QPEMenuBar QMenuBar | 23 | #define QPEMenuBar QMenuBar |
24 | #endif | 24 | #endif |
25 | class QPEToolBar; | 25 | class QPEToolBar; |
26 | class QPEMenuBar; | 26 | class QPEMenuBar; |
27 | 27 | ||
28 | 28 | ||
29 | namespace KCal { | 29 | namespace KCal { |
30 | class CalendarLocal; | 30 | class CalendarLocal; |
31 | } | 31 | } |
32 | 32 | ||
33 | using namespace KCal; | 33 | using namespace KCal; |
34 | 34 | ||
35 | class MainWindow : public QMainWindow | 35 | class MainWindow : public QMainWindow |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); | 39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); |
40 | ~MainWindow(); | 40 | ~MainWindow(); |
41 | bool beamReceiveEnabled(); | 41 | bool beamReceiveEnabled(); |
42 | static QString defaultFileName(); | 42 | static QString defaultFileName(); |
43 | static QString syncFileName(); | 43 | static QString syncFileName(); |
44 | static QString resourcePath(); | 44 | static QString resourcePath(); |
45 | public slots: | 45 | public slots: |
46 | void setUsesBigPixmaps ( bool ); | 46 | void setUsesBigPixmaps ( bool ); |
47 | void setCaption ( const QString & ); | 47 | void setCaption ( const QString & ); |
48 | void updateWeekNum(const KCal::DateList &); | 48 | void updateWeekNum(const KCal::DateList &); |
49 | void updateWeek(QDate); | 49 | void updateWeek(QDate); |
50 | void updateFilterToolbar(); | 50 | void updateFilterToolbar(); |
51 | virtual void showMaximized (); | 51 | virtual void showMaximized (); |
52 | void configureAgenda( int ); | 52 | void configureAgenda( int ); |
53 | void recieve( const QCString& msg, const QByteArray& data ); | 53 | void recieve( const QCString& msg, const QByteArray& data ); |
54 | protected slots: | 54 | protected slots: |
55 | void calHint(); | ||
55 | void startMultiSync(); | 56 | void startMultiSync(); |
56 | void setCaptionToDates(); | 57 | void setCaptionToDates(); |
57 | void weekAction(); | 58 | void weekAction(); |
58 | void about(); | 59 | void about(); |
59 | void licence(); | 60 | void licence(); |
60 | void faq(); | 61 | void faq(); |
61 | void usertrans(); | 62 | void usertrans(); |
62 | void features(); | 63 | void features(); |
63 | void synchowto(); | 64 | void synchowto(); |
64 | void storagehowto(); | 65 | void storagehowto(); |
65 | void timetrackinghowto(); | 66 | void timetrackinghowto(); |
66 | void kdesynchowto(); | 67 | void kdesynchowto(); |
67 | void multisynchowto(); | 68 | void multisynchowto(); |
68 | void whatsNew(); | 69 | void whatsNew(); |
69 | void keyBindings(); | 70 | void keyBindings(); |
70 | void aboutAutoSaving();; | 71 | void aboutAutoSaving();; |
71 | void aboutKnownBugs(); | 72 | void aboutKnownBugs(); |
72 | 73 | ||
73 | void processIncidenceSelection( Incidence * ); | 74 | void processIncidenceSelection( Incidence * ); |
74 | 75 | ||
75 | void importQtopia(); | 76 | void importQtopia(); |
76 | void importBday(); | 77 | void importBday(); |
77 | void importOL(); | 78 | void importOL(); |
78 | void importIcal(); | 79 | void importIcal(); |
79 | void importFile( QString, bool ); | 80 | void importFile( QString, bool ); |
80 | void quickImportIcal(); | 81 | void quickImportIcal(); |
81 | 82 | ||
82 | void slotModifiedChanged( bool ); | 83 | void slotModifiedChanged( bool ); |
83 | 84 | ||
84 | void save(); | 85 | void save(); |
85 | void backupAllFiles(); | 86 | void backupAllFiles(); |
86 | void saveStopTimer(); | 87 | void saveStopTimer(); |
87 | void configureToolBar( int ); | 88 | void configureToolBar( int ); |
88 | void printSel(); | 89 | void printSel(); |
89 | void printCal(); | 90 | void printCal(); |
90 | void printListView(); | 91 | void printListView(); |
91 | void saveCalendar(); | 92 | void saveCalendar(); |
92 | void loadCalendar(); | 93 | void loadCalendar(); |
93 | void exportVCalendar(); | 94 | void exportVCalendar(); |
94 | void fillFilterMenu(); | 95 | void fillFilterMenu(); |
95 | void fillFilterMenuTB(); | 96 | void fillFilterMenuTB(); |
96 | void selectFilter( int ); | 97 | void selectFilter( int ); |
97 | void fillFilterMenuPopup(); | 98 | void fillFilterMenuPopup(); |
98 | void selectFilterPopup( int ); | 99 | void selectFilterPopup( int ); |
99 | void exportToPhone( int ); | 100 | void exportToPhone( int ); |
100 | void toggleBeamReceive(); | 101 | void toggleBeamReceive(); |
101 | void disableBR(bool); | 102 | void disableBR(bool); |
102 | signals: | 103 | signals: |
103 | void selectWeek ( int ); | 104 | void selectWeek ( int ); |
104 | private slots: | 105 | private slots: |
105 | void showConfigureAgenda(); | 106 | void showConfigureAgenda(); |
106 | void getFile( bool ); | 107 | void getFile( bool ); |
107 | void syncFileRequest(); | 108 | void syncFileRequest(); |
108 | 109 | ||
109 | protected: | 110 | protected: |
110 | void hideEvent ( QHideEvent * ); | 111 | void hideEvent ( QHideEvent * ); |
111 | QString sentSyncFile(); | 112 | QString sentSyncFile(); |
112 | void displayText( QString, QString); | 113 | void displayText( QString, QString); |
113 | void enableIncidenceActions( bool ); | 114 | void enableIncidenceActions( bool ); |
114 | 115 | ||
115 | private: | 116 | private: |
116 | bool mBRdisabled; | 117 | bool mBRdisabled; |
117 | #ifndef DESKTOP_VERSION | 118 | #ifndef DESKTOP_VERSION |
118 | QCopChannel* infrared; | 119 | QCopChannel* infrared; |
119 | #endif | 120 | #endif |
120 | QAction* brAction; | 121 | QAction* brAction; |
121 | KSyncManager* mSyncManager; | 122 | KSyncManager* mSyncManager; |
122 | bool mClosed; | 123 | bool mClosed; |
123 | void saveOnClose(); | 124 | void saveOnClose(); |
124 | bool mFlagKeyPressed; | 125 | bool mFlagKeyPressed; |
125 | bool mBlockAtStartup; | 126 | bool mBlockAtStartup; |
126 | QPEToolBar *iconToolBar; | 127 | QPEToolBar *iconToolBar; |
127 | QPEToolBar *viewToolBar; | 128 | QPEToolBar *viewToolBar; |
128 | QPEToolBar *navigatorToolBar; | 129 | QPEToolBar *navigatorToolBar; |
129 | QPEToolBar *filterToolBar; | 130 | QPEToolBar *filterToolBar; |
130 | QMenuBar *filterMenubar; | 131 | QMenuBar *filterMenubar; |
131 | QPopupMenu * filterPopupMenu; | 132 | QPopupMenu * filterPopupMenu; |
132 | QPopupMenu * mCurrentItemMenu; | 133 | QPopupMenu * mCurrentItemMenu; |
133 | void initActions(); | 134 | void initActions(); |
134 | void setDefaultPreferences(); | 135 | void setDefaultPreferences(); |
135 | void resizeEvent( QResizeEvent* e); | 136 | void resizeEvent( QResizeEvent* e); |
136 | void keyPressEvent ( QKeyEvent * ) ; | 137 | void keyPressEvent ( QKeyEvent * ) ; |
137 | void keyReleaseEvent ( QKeyEvent * ) ; | 138 | void keyReleaseEvent ( QKeyEvent * ) ; |
138 | QPopupMenu *configureToolBarMenu; | 139 | QPopupMenu *configureToolBarMenu; |
139 | QPopupMenu *selectFilterMenu; | 140 | QPopupMenu *selectFilterMenu; |
140 | QPopupMenu *selectFilterMenuTB; | 141 | QPopupMenu *selectFilterMenuTB; |
141 | QPopupMenu *configureAgendaMenu, *syncMenu; | 142 | QPopupMenu *configureAgendaMenu, *syncMenu; |
142 | CalendarLocal *mCalendar; | 143 | CalendarLocal *mCalendar; |
143 | CalendarView *mView; | 144 | CalendarView *mView; |
144 | QAction *mNewSubTodoAction; | 145 | QAction *mNewSubTodoAction; |
145 | QAction *mWeekAction; | 146 | QAction *mWeekAction; |
146 | QFont mWeekFont; | 147 | QFont mWeekFont; |
147 | QPixmap mWeekPixmap; | 148 | QPixmap mWeekPixmap; |
148 | QColor mWeekBgColor; | 149 | QColor mWeekBgColor; |
149 | 150 | ||
150 | QAction *mShowAction; | 151 | QAction *mShowAction; |
151 | QAction *mEditAction; | 152 | QAction *mEditAction; |
152 | QAction *mDeleteAction; | 153 | QAction *mDeleteAction; |
153 | QAction *mCloneAction; | 154 | QAction *mCloneAction; |
154 | QAction *mMoveAction; | 155 | QAction *mMoveAction; |
155 | QAction *mBeamAction; | 156 | QAction *mBeamAction; |
156 | QAction *mCancelAction; | 157 | QAction *mCancelAction; |
157 | 158 | ||
158 | QAction *mToggleNav; | 159 | QAction *mToggleNav; |
159 | QAction *mToggleFilter; | 160 | QAction *mToggleFilter; |
160 | QAction *mToggleAllday; | 161 | QAction *mToggleAllday; |
161 | QAction *actionFilterMenuTB; | 162 | QAction *actionFilterMenuTB; |
162 | 163 | ||
163 | void closeEvent( QCloseEvent* ce ); | 164 | void closeEvent( QCloseEvent* ce ); |
164 | QTimer mSaveTimer; | 165 | QTimer mSaveTimer; |
165 | //bool mBlockSaveFlag; | 166 | //bool mBlockSaveFlag; |
166 | bool mCalendarModifiedFlag; | 167 | bool mCalendarModifiedFlag; |
167 | QPixmap loadPixmap( QString ); | 168 | QPixmap loadPixmap( QString ); |
168 | QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80; | 169 | QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80; |
169 | }; | 170 | }; |
170 | 171 | ||
171 | 172 | ||
172 | #endif | 173 | #endif |