-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 16 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 147 | ||||
-rw-r--r-- | korganizer/kolistview.h | 7 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 2 |
5 files changed, 57 insertions, 117 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 708ac19..ed6a1c1 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -472,33 +472,33 @@ | |||
472 | { "ViewChange","Ansichtswechsel" }, | 472 | { "ViewChange","Ansichtswechsel" }, |
473 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, | 473 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, |
474 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, | 474 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, |
475 | { "File","Datei" }, | 475 | { "File","Datei" }, |
476 | { "Clone...","Dupliziere..." }, | 476 | { "Clone...","Dupliziere..." }, |
477 | { "Move...","Bewege..." }, | 477 | { "Move...","Bewege..." }, |
478 | { "Beam...","Sende via IR..." }, | 478 | { "Beam...","Sende via IR..." }, |
479 | { "&Clone...","Dupliziere.." }, | 479 | { "&Clone...","Dupliziere.." }, |
480 | { "&Move...","Bewege..." }, | 480 | { "&Move...","Bewege..." }, |
481 | { "&Beam...","Sende via IR..." }, | 481 | { "&Beam...","Sende via IR..." }, |
482 | { "Show Completed","Zeige erledigte Todos" }, | 482 | { "Show Completed","Zeige erledigte Todos" }, |
483 | { "Show Quick Todo","Zeige Quick Todo" }, | 483 | { "Show Quick Todo","Zeige Quick Todo" }, |
484 | { "Unparent Todo","Un-sub Todo" }, | 484 | { "Unparent Todo","Un-sub Todo" }, |
485 | { "Save selected to file...","Speichere Selektierte..." }, | 485 | { "Save selected to file...","Speichere Selektierte..." }, |
486 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, | 486 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, |
487 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, | 487 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, |
488 | { "Beam selected via IR","Sende Selekt. via IR..." }, | 488 | { "Beam via IR","Sende via IR" }, |
489 | { "Search","Suchen" }, | 489 | { "Search","Suchen" }, |
490 | { "Date Picker","Datum auswählen" }, | 490 | { "Date Picker","Datum auswählen" }, |
491 | { "Day View","Tagesansicht" }, | 491 | { "Day View","Tagesansicht" }, |
492 | { "Work Week","Arbeitswoche" }, | 492 | { "Work Week","Arbeitswoche" }, |
493 | { "Week","Wochenansicht" }, | 493 | { "Week","Wochenansicht" }, |
494 | { "Month","Monatsansicht" }, | 494 | { "Month","Monatsansicht" }, |
495 | { "Todo View","Todo Liste" }, | 495 | { "Todo View","Todo Liste" }, |
496 | { "Journal","Journal" }, | 496 | { "Journal","Journal" }, |
497 | { "Next days","Nächste Tage" }, | 497 | { "Next days","Nächste Tage" }, |
498 | { "Print agenda selection...","Drucke Agendaselektion..." }, | 498 | { "Print agenda selection...","Drucke Agendaselektion..." }, |
499 | { "Toggle DateNavigator","Navigator umschalten" }, | 499 | { "Toggle DateNavigator","Navigator umschalten" }, |
500 | { "Toggle FilterView","Filteransicht umschalten" }, | 500 | { "Toggle FilterView","Filteransicht umschalten" }, |
501 | { "Prev. month","Vorheriger Monat" }, | 501 | { "Prev. month","Vorheriger Monat" }, |
502 | { "Go backward","Gehe zurück" }, | 502 | { "Go backward","Gehe zurück" }, |
503 | { "Go forward","Gehe weiter" }, | 503 | { "Go forward","Gehe weiter" }, |
504 | { "Synchronize","Synchronisieren" }, | 504 | { "Synchronize","Synchronisieren" }, |
@@ -1183,33 +1183,33 @@ | |||
1183 | { " (%1 y.)"," (%1 J.)" }, | 1183 | { " (%1 y.)"," (%1 J.)" }, |
1184 | { "Allday:","Ganztägig:" }, | 1184 | { "Allday:","Ganztägig:" }, |
1185 | { "compl.todos","erled.Todos" }, | 1185 | { "compl.todos","erled.Todos" }, |
1186 | { "Day view","Tagesansicht" }, | 1186 | { "Day view","Tagesansicht" }, |
1187 | { "Next days","Nächste Tage" }, | 1187 | { "Next days","Nächste Tage" }, |
1188 | { "Next week","Nächste Woche" }, | 1188 | { "Next week","Nächste Woche" }, |
1189 | { "Next two weeks","Nächste zwei Wochen" }, | 1189 | { "Next two weeks","Nächste zwei Wochen" }, |
1190 | { "This month","Dieser Monat" }, | 1190 | { "This month","Dieser Monat" }, |
1191 | { "Journal view","Journal" }, | 1191 | { "Journal view","Journal" }, |
1192 | { "Display all opened","Zeige alle geöffnet" }, | 1192 | { "Display all opened","Zeige alle geöffnet" }, |
1193 | { "Display all closed","Zeige alle geschlossen" }, | 1193 | { "Display all closed","Zeige alle geschlossen" }, |
1194 | { "Display all flat","Zeige alle flach" }, | 1194 | { "Display all flat","Zeige alle flach" }, |
1195 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, | 1195 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, |
1196 | { "Default todo done color:","Standard Todo erledigt Farbe" }, | 1196 | { "Default todo done color:","Standard Todo erledigt Farbe" }, |
1197 | { "Select week %1-%2","Wähle Woche %1-%2" }, | 1197 | { "Select week %1-%2","Wähle Woche %1-%2" }, |
1198 | { "Select Week","Wähle Woche" }, | 1198 | { "Select Week","Wähle Woche" }, |
1199 | { "Set alarm for selected...","Setze Alarm für Selekt..." }, | 1199 | { "Set alarm...","Setze Alarm..." }, |
1200 | { "Set Alarm!","Setze Alarm!" }, | 1200 | { "Set Alarm!","Setze Alarm!" }, |
1201 | { "Changed alarm for %1 items","Alarm für %1 Items geändert" }, | 1201 | { "Changed alarm for %1 items","Alarm für %1 Items geändert" }, |
1202 | { " and "," und " }, | 1202 | { " and "," und " }, |
1203 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, | 1203 | { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, |
1204 | { "Mail to selected","Mail an Ausgewählte" }, | 1204 | { "Mail to selected","Mail an Ausgewählte" }, |
1205 | { "Mail to all","Mail an Alle" }, | 1205 | { "Mail to all","Mail an Alle" }, |
1206 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, | 1206 | { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, |
1207 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, | 1207 | { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, |
1208 | { " on"," am" }, | 1208 | { " on"," am" }, |
1209 | { " completed on "," erledigt am " }, | 1209 | { " completed on "," erledigt am " }, |
1210 | { "Save as Event template","Speichere als Vorlage" }, | 1210 | { "Save as Event template","Speichere als Vorlage" }, |
1211 | { "Load Event template","Lade Termin Vorlage" }, | 1211 | { "Load Event template","Lade Termin Vorlage" }, |
1212 | { "Save as Journal template","Speichere als Journal Vorlage" }, | 1212 | { "Save as Journal template","Speichere als Journal Vorlage" }, |
1213 | { "Insert Journal template","Füge Journal Vorlage ein" }, | 1213 | { "Insert Journal template","Füge Journal Vorlage ein" }, |
1214 | { "Sub todos:<br>","Unter Todos:<br>" }, | 1214 | { "Sub todos:<br>","Unter Todos:<br>" }, |
1215 | { "Parent todo:<br>","Über Todo:<br>" }, | 1215 | { "Parent todo:<br>","Über Todo:<br>" }, |
@@ -1273,33 +1273,33 @@ | |||
1273 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, | 1273 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, |
1274 | { "View Options","Anzeige Optionen" }, | 1274 | { "View Options","Anzeige Optionen" }, |
1275 | { "<b>Created: ","<b>Erstellt am: " }, | 1275 | { "<b>Created: ","<b>Erstellt am: " }, |
1276 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, | 1276 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, |
1277 | { "Journal: ","Journal: " }, | 1277 | { "Journal: ","Journal: " }, |
1278 | { "yearly","jährlich" }, | 1278 | { "yearly","jährlich" }, |
1279 | { "(%1) ","%1-" }, | 1279 | { "(%1) ","%1-" }, |
1280 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, | 1280 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, |
1281 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, | 1281 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, |
1282 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, | 1282 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, |
1283 | { "Summary/Loc.","Titel/Ort" }, | 1283 | { "Summary/Loc.","Titel/Ort" }, |
1284 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, | 1284 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, |
1285 | { "Week Number","Wochennummer" }, | 1285 | { "Week Number","Wochennummer" }, |
1286 | { "Import","Importiere" }, | 1286 | { "Import","Importiere" }, |
1287 | { "Export","Exportiere" }, | 1287 | { "Export","Exportiere" }, |
1288 | { "Beam","Beame" }, | 1288 | { "Beam","Beame" }, |
1289 | { "Export selected","Exportiere Selektierte" }, | 1289 | { "Export","Exportiere" }, |
1290 | { "As iCal (ics) file...","Als iCal (ics) Datei..." }, | 1290 | { "As iCal (ics) file...","Als iCal (ics) Datei..." }, |
1291 | { "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, | 1291 | { "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, |
1292 | { "Journal/Details...","Journale/Details..." }, | 1292 | { "Journal/Details...","Journale/Details..." }, |
1293 | { "Agenda View","Agenda Ansicht" }, | 1293 | { "Agenda View","Agenda Ansicht" }, |
1294 | { "Show current time","Zeige aktuelle Zeit" }, | 1294 | { "Show current time","Zeige aktuelle Zeit" }, |
1295 | { "Edit new item","Bearbeite neuen Eintrag" }, | 1295 | { "Edit new item","Bearbeite neuen Eintrag" }, |
1296 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, | 1296 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, |
1297 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, | 1297 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, |
1298 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, | 1298 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, |
1299 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, | 1299 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, |
1300 | { "%1 days\n","%1 Tagen\n" }, | 1300 | { "%1 days\n","%1 Tagen\n" }, |
1301 | { "1 day\n","1 Tag\n" }, | 1301 | { "1 day\n","1 Tag\n" }, |
1302 | { "%1 hours\n","%1 Stunden\n" }, | 1302 | { "%1 hours\n","%1 Stunden\n" }, |
1303 | { "1 hour\n","1 Stunde\n" }, | 1303 | { "1 hour\n","1 Stunde\n" }, |
1304 | { "%1 minutes\n","%1 Minuten\n" }, | 1304 | { "%1 minutes\n","%1 Minuten\n" }, |
1305 | { "1 minute\n","1 Minute\n" }, | 1305 | { "1 minute\n","1 Minute\n" }, |
@@ -1465,28 +1465,34 @@ | |||
1465 | { "Journal from: ","Journal vom: " }, | 1465 | { "Journal from: ","Journal vom: " }, |
1466 | { "Journal: %1 from ","Journal: %1 vom " }, | 1466 | { "Journal: %1 from ","Journal: %1 vom " }, |
1467 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, | 1467 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, |
1468 | { "Selected Item","Ausgewähltes Item" }, | 1468 | { "Selected Item","Ausgewähltes Item" }, |
1469 | { "Select Date...","Wähle Datum..." }, | 1469 | { "Select Date...","Wähle Datum..." }, |
1470 | { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" }, | 1470 | { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" }, |
1471 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, | 1471 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, |
1472 | { "Edit category list...","Ändere Kategorieliste..." }, | 1472 | { "Edit category list...","Ändere Kategorieliste..." }, |
1473 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, | 1473 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, |
1474 | { "Filepath: ","Dateipfad: " }, | 1474 | { "Filepath: ","Dateipfad: " }, |
1475 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, | 1475 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, |
1476 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, | 1476 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, |
1477 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, | 1477 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, |
1478 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, | 1478 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, |
1479 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, | 1479 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, |
1480 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, | 1480 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, |
1481 | { "","" }, | 1481 | { "Alarm Options","Alarm Einstellungen" }, |
1482 | { "","" }, | 1482 | { "Delete selected...","Lösche Ausgewählte..." }, |
1483 | { "None","Nichts" }, | ||
1484 | { "Selection","Auswahl" }, | ||
1485 | { "Set categories","Setze Kategorien" }, | ||
1486 | { "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!" }, | ||
1487 | { "Reset","Neu setzen" }, | ||
1488 | { "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)?" }, | ||
1483 | { "","" }, | 1489 | { "","" }, |
1484 | { "","" }, | 1490 | { "","" }, |
1485 | { "","" }, | 1491 | { "","" }, |
1486 | { "","" }, | 1492 | { "","" }, |
1487 | { "","" }, | 1493 | { "","" }, |
1488 | { "","" }, | 1494 | { "","" }, |
1489 | { "","" }, | 1495 | { "","" }, |
1490 | { "","" }, | 1496 | { "","" }, |
1491 | { "","" }, | 1497 | { "","" }, |
1492 | { "","" }, \ No newline at end of file | 1498 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e5e3704..4c815d8 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -277,86 +277,83 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
277 | mListView->setColumnAlignment(6,AlignLeft); | 277 | mListView->setColumnAlignment(6,AlignLeft); |
278 | mListView->setColumnAlignment(7,AlignLeft); | 278 | mListView->setColumnAlignment(7,AlignLeft); |
279 | mListView->setColumnAlignment(8,AlignLeft); | 279 | mListView->setColumnAlignment(8,AlignLeft); |
280 | mListView->setColumnAlignment(9,AlignLeft); | 280 | mListView->setColumnAlignment(9,AlignLeft); |
281 | mListView->setColumnAlignment(10,AlignLeft); | 281 | mListView->setColumnAlignment(10,AlignLeft); |
282 | mListView->setColumnAlignment(11,AlignLeft); | 282 | mListView->setColumnAlignment(11,AlignLeft); |
283 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); | 283 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); |
284 | 284 | ||
285 | int iii = 0; | 285 | int iii = 0; |
286 | for ( iii = 0; iii< 12 ; ++iii ) | 286 | for ( iii = 0; iii< 12 ; ++iii ) |
287 | mListView->setColumnWidthMode( iii, QListView::Manual ); | 287 | mListView->setColumnWidthMode( iii, QListView::Manual ); |
288 | 288 | ||
289 | QBoxLayout *layoutTop = new QVBoxLayout(this); | 289 | QBoxLayout *layoutTop = new QVBoxLayout(this); |
290 | layoutTop->addWidget(mListView); | 290 | layoutTop->addWidget(mListView); |
291 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); | 291 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); |
292 | mPopupMenu = eventPopup(); | 292 | mPopupMenu = eventPopup(); |
293 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 293 | QPopupMenu* selPopup = new QPopupMenu ( this ); |
294 | i18n("Select all"),this, | 294 | mPopupMenu->insertSeparator(); |
295 | SLOT(allSelection()),true); | ||
296 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
297 | i18n("Deselect all"),this, | ||
298 | SLOT(clearSelection()),true); | ||
299 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
300 | i18n("Delete all selected"),this, | ||
301 | SLOT(deleteAll()),true); | ||
302 | 295 | ||
296 | selPopup->insertItem(i18n("All"),this, | ||
297 | SLOT(allSelection())); | ||
298 | selPopup->insertItem(i18n("None"),this, | ||
299 | SLOT(clearSelection())); | ||
300 | selPopup->insertItem(i18n("Delete selected..."),this, | ||
301 | SLOT(deleteAll())); | ||
302 | mPopupMenu->insertItem(i18n("Selection"), selPopup ); | ||
303 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 303 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
304 | i18n("Hide all selected"),this, | 304 | i18n("Hide all selected"),this, |
305 | SLOT(hideAll()),true); | 305 | SLOT(hideAll()),true); |
306 | 306 | ||
307 | mPopupMenu->insertSeparator(); | 307 | mPopupMenu->insertSeparator(); |
308 | #ifdef DESKTOP_VERSION | 308 | #ifdef DESKTOP_VERSION |
309 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 309 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
310 | i18n("Print complete list"),this, | 310 | i18n("Print complete list"),this, |
311 | SLOT(printList()),true); | 311 | SLOT(printList()),true); |
312 | mPopupMenu->insertSeparator(); | 312 | mPopupMenu->insertSeparator(); |
313 | #endif | 313 | #endif |
314 | mCalPopup = new QPopupMenu ( this ); | 314 | mCalPopup = new QPopupMenu ( this ); |
315 | mPopupMenu->insertItem( i18n("Set Calendar"), mCalPopup ); | 315 | mPopupMenu->insertItem( i18n("Set Calendar"), mCalPopup ); |
316 | 316 | ||
317 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
318 | i18n("Set categories")+"...",this, | ||
319 | SLOT(setCat()),true); | ||
320 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
321 | i18n("Set alarm..."),this, | ||
322 | SLOT(setAlarm()),true); | ||
317 | QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this, | 323 | QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this, |
318 | SLOT( populateCalPopup() )); | 324 | SLOT( populateCalPopup() )); |
319 | QObject::connect(mCalPopup,SIGNAL(activated( int )),this, | 325 | QObject::connect(mCalPopup,SIGNAL(activated( int )),this, |
320 | SLOT( setCalendar( int ) )); | 326 | SLOT( setCalendar( int ) )); |
321 | QPopupMenu * exportPO = new QPopupMenu ( this ); | 327 | QPopupMenu * exportPO = new QPopupMenu ( this ); |
322 | mPopupMenu->insertItem( i18n("Export selected"), exportPO ); | 328 | mPopupMenu->insertItem( i18n("Export"), exportPO ); |
323 | exportPO->insertItem( i18n("As iCal (ics) file..."),this, | 329 | exportPO->insertItem( i18n("As iCal (ics) file..."),this, |
324 | SLOT(saveToFile())); | 330 | SLOT(saveToFile())); |
325 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, | 331 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, |
326 | SLOT(saveToFileVCS())); | 332 | SLOT(saveToFileVCS())); |
327 | exportPO->insertItem( i18n("Journal/Details..."),this, | 333 | exportPO->insertItem( i18n("Journal/Details..."),this, |
328 | SLOT(saveDescriptionToFile())); | 334 | SLOT(saveDescriptionToFile())); |
329 | // mPopupMenu->insertSeparator(); | 335 | // mPopupMenu->insertSeparator(); |
330 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 336 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
331 | i18n("Add Categ. to selected..."),this, | 337 | // i18n("Add Categ. to selected..."),this, |
332 | SLOT(addCat()),true); | 338 | // SLOT(addCat()),true); |
333 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
334 | i18n("Set Categ. for selected..."),this, | ||
335 | SLOT(setCat()),true); | ||
336 | //mPopupMenu->insertSeparator(); | 339 | //mPopupMenu->insertSeparator(); |
337 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
338 | i18n("Set alarm for selected..."),this, | ||
339 | SLOT(setAlarm()),true); | ||
340 | |||
341 | |||
342 | |||
343 | #ifndef DESKTOP_VERSION | 340 | #ifndef DESKTOP_VERSION |
344 | mPopupMenu->insertSeparator(); | 341 | mPopupMenu->insertSeparator(); |
345 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 342 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
346 | i18n("Beam selected via IR"),this, | 343 | i18n("Beam via IR"),this, |
347 | SLOT(beamSelected()),true); | 344 | SLOT(beamSelected()),true); |
348 | #endif | 345 | #endif |
349 | /* | 346 | /* |
350 | mPopupMenu = new QPopupMenu; | 347 | mPopupMenu = new QPopupMenu; |
351 | mPopupMenu->insertItem(i18n("Edit Event"), this, | 348 | mPopupMenu->insertItem(i18n("Edit Event"), this, |
352 | SLOT (editEvent())); | 349 | SLOT (editEvent())); |
353 | mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this, | 350 | mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this, |
354 | SLOT (deleteEvent())); | 351 | SLOT (deleteEvent())); |
355 | mPopupMenu->insertSeparator(); | 352 | mPopupMenu->insertSeparator(); |
356 | mPopupMenu->insertItem(i18n("Show Dates"), this, | 353 | mPopupMenu->insertItem(i18n("Show Dates"), this, |
357 | SLOT(showDates())); | 354 | SLOT(showDates())); |
358 | mPopupMenu->insertItem(i18n("Hide Dates"), this, | 355 | mPopupMenu->insertItem(i18n("Hide Dates"), this, |
359 | SLOT(hideDates())); | 356 | SLOT(hideDates())); |
360 | */ | 357 | */ |
361 | QObject::connect(mListView,SIGNAL( newEvent()), | 358 | QObject::connect(mListView,SIGNAL( newEvent()), |
362 | this,SIGNAL(signalNewEvent())); | 359 | this,SIGNAL(signalNewEvent())); |
@@ -425,63 +422,68 @@ void KOListView::setCalendar( int c ) | |||
425 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); | 422 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); |
426 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); | 423 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); |
427 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); | 424 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); |
428 | if ( cal->isStandard ) | 425 | if ( cal->isStandard ) |
429 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 426 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
430 | cal = calendars.next(); | 427 | cal = calendars.next(); |
431 | } | 428 | } |
432 | mCalendar->setSyncEventsReadOnly(); | 429 | mCalendar->setSyncEventsReadOnly(); |
433 | mCalendar->reInitAlarmSettings(); | 430 | mCalendar->reInitAlarmSettings(); |
434 | 431 | ||
435 | } | 432 | } |
436 | void KOListView::populateCalPopup() | 433 | void KOListView::populateCalPopup() |
437 | { | 434 | { |
438 | mCalPopup->clear(); | 435 | mCalPopup->clear(); |
439 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 436 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
440 | while ( kkf ) { | 437 | while ( kkf ) { |
441 | int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); | 438 | int index = mCalPopup->insertItem( kkf->mName+"...", kkf->mCalNumber); |
442 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 439 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
443 | mCalPopup->setItemEnabled( index, false ); | 440 | mCalPopup->setItemEnabled( index, false ); |
444 | kkf = KOPrefs::instance()->mCalendars.next(); | 441 | kkf = KOPrefs::instance()->mCalendars.next(); |
445 | } | 442 | } |
446 | } | 443 | } |
447 | void KOListView::updateList() | 444 | void KOListView::updateList() |
448 | { | 445 | { |
449 | // qDebug(" KOListView::updateList() "); | 446 | // qDebug(" KOListView::updateList() "); |
450 | 447 | ||
451 | } | 448 | } |
452 | 449 | ||
453 | void KOListView::clearList() | 450 | void KOListView::clearList() |
454 | { | 451 | { |
455 | clear (); | 452 | clear (); |
456 | } | 453 | } |
457 | void KOListView::addCat( ) | 454 | |
458 | { | ||
459 | setCategories( false ); | ||
460 | } | ||
461 | void KOListView::setCat() | 455 | void KOListView::setCat() |
462 | { | 456 | { |
463 | setCategories( true ); | 457 | |
458 | bool set = true; | ||
459 | int result = KMessageBox::warningYesNoCancel(this, | ||
460 | i18n("Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?"), | ||
461 | i18n("Set categories"), | ||
462 | i18n("Add"), | ||
463 | i18n("Reset")); | ||
464 | if (result == KMessageBox::Cancel) return; | ||
465 | if (result == KMessageBox::Yes) set = false; | ||
466 | setCategories( set ); | ||
464 | } | 467 | } |
465 | 468 | ||
466 | void KOListView::setAlarm() | 469 | void KOListView::setAlarm() |
467 | { | 470 | { |
468 | KOAlarmPrefs kap( this); | 471 | KOAlarmPrefs kap( this); |
469 | if ( !kap.exec() ) | 472 | if ( !kap.exec() ) |
470 | return; | 473 | return; |
471 | QStringList itemList; | ||
472 | QPtrList<KOListViewItem> sel ; | 474 | QPtrList<KOListViewItem> sel ; |
473 | QListViewItem *qitem = mListView->firstChild (); | 475 | QListViewItem *qitem = mListView->firstChild (); |
474 | while ( qitem ) { | 476 | while ( qitem ) { |
475 | if ( qitem->isSelected() ) { | 477 | if ( qitem->isSelected() ) { |
476 | Incidence* inc = ((KOListViewItem *) qitem)->data(); | 478 | Incidence* inc = ((KOListViewItem *) qitem)->data(); |
477 | if ( inc->typeID() != journalID ) { | 479 | if ( inc->typeID() != journalID ) { |
478 | if ( inc->typeID() == todoID ) { | 480 | if ( inc->typeID() == todoID ) { |
479 | if ( ((Todo*)inc)->hasDueDate() ) | 481 | if ( ((Todo*)inc)->hasDueDate() ) |
480 | sel.append(((KOListViewItem *)qitem)); | 482 | sel.append(((KOListViewItem *)qitem)); |
481 | } else | 483 | } else |
482 | sel.append(((KOListViewItem *)qitem)); | 484 | sel.append(((KOListViewItem *)qitem)); |
483 | } | 485 | } |
484 | } | 486 | } |
485 | qitem = qitem->nextSibling(); | 487 | qitem = qitem->nextSibling(); |
486 | } | 488 | } |
487 | int count = 0; | 489 | int count = 0; |
@@ -530,117 +532,55 @@ void KOListView::setAlarm() | |||
530 | topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count ) ); | 532 | topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count ) ); |
531 | qDebug("KO: Set alarm for %d items", count); | 533 | qDebug("KO: Set alarm for %d items", count); |
532 | calendar()->reInitAlarmSettings(); | 534 | calendar()->reInitAlarmSettings(); |
533 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | 535 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); |
534 | } | 536 | } |
535 | void KOListView::setCategories( bool removeOld ) | 537 | void KOListView::setCategories( bool removeOld ) |
536 | { | 538 | { |
537 | 539 | ||
538 | KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 ); | 540 | KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 ); |
539 | csd->setColorEnabled(); | 541 | csd->setColorEnabled(); |
540 | if (! csd->exec()) { | 542 | if (! csd->exec()) { |
541 | delete csd; | 543 | delete csd; |
542 | return; | 544 | return; |
543 | } | 545 | } |
544 | QStringList catList = csd->selectedCategories(); | 546 | QStringList catList = csd->selectedCategories(); |
545 | delete csd; | 547 | delete csd; |
546 | // if ( catList.count() == 0 ) | 548 | QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed; |
547 | // return; | 549 | Incidence* inc = delSel.first(); |
548 | //catList.sort(); | 550 | while ( inc ) { |
549 | QString categoriesStr = catList.join(","); | ||
550 | int i; | ||
551 | QStringList itemList; | ||
552 | QPtrList<KOListViewItem> sel ; | ||
553 | QListViewItem *qitem = mListView->firstChild (); | ||
554 | while ( qitem ) { | ||
555 | if ( qitem->isSelected() ) { | ||
556 | sel.append(((KOListViewItem *)qitem)); | ||
557 | } | ||
558 | qitem = qitem->nextSibling(); | ||
559 | } | ||
560 | KOListViewItem * item, *temp; | ||
561 | item = sel.first(); | ||
562 | if( item ) { | ||
563 | Incidence* inc = item->data() ; | ||
564 | bool setSub = false; | ||
565 | if( inc->typeID() == todoID && sel.count() == 1 && inc->relations().count() > 0 ) { | ||
566 | int result = KMessageBox::warningYesNoCancel(this, | ||
567 | i18n("The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?").arg( inc->summary().left ( 25 ) ), | ||
568 | i18n("Todo has subtodos"), | ||
569 | i18n("Yes"), | ||
570 | i18n("No")); | ||
571 | if (result == KMessageBox::Cancel) item = 0; | ||
572 | if (result == KMessageBox::Yes) setSub = true; | ||
573 | } | ||
574 | while ( item ) { | ||
575 | inc = item->data(); | ||
576 | if ( removeOld ) { | 551 | if ( removeOld ) { |
577 | inc->setCategories( catList, setSub ); | 552 | inc->setCategories( catList, false ); |
578 | } else { | 553 | } else { |
579 | inc->addCategories( catList, setSub ); | 554 | inc->addCategories( catList, false ); |
580 | } | 555 | } |
556 | KOListViewItem* item = getItemForEvent(inc); | ||
557 | if (item) { | ||
581 | ListItemVisitor v(item, mStartDate ); | 558 | ListItemVisitor v(item, mStartDate ); |
582 | inc->accept(v); | 559 | inc->accept(v); |
583 | item = sel.next(); | ||
584 | } | 560 | } |
561 | inc = delSel.next(); | ||
585 | } | 562 | } |
586 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | 563 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); |
587 | } | 564 | } |
588 | 565 | ||
589 | void KOListView::beamSelected() | 566 | void KOListView::beamSelected() |
590 | { | 567 | { |
591 | QPtrList<Incidence> delSel = getSelectedIncidences() ; | 568 | QPtrList<Incidence> delSel = getSelectedIncidences() ; |
592 | int icount = delSel.count(); | 569 | if ( delSel.count() ) |
593 | if ( icount ) { | ||
594 | emit beamIncidenceList( delSel ); | 570 | emit beamIncidenceList( delSel ); |
595 | return; | ||
596 | QString fn ; | ||
597 | fn = QDir::homeDirPath()+"/kopitempbeamfile.vcs"; | ||
598 | QString mes; | ||
599 | bool createbup = true; | ||
600 | if ( createbup ) { | ||
601 | QString description = "\n"; | ||
602 | CalendarLocal* cal = new CalendarLocal(); | ||
603 | cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | ||
604 | Incidence *incidence = delSel.first(); | ||
605 | while ( incidence ) { | ||
606 | Incidence *in = incidence->clone(); | ||
607 | description += in->summary() + "\n"; | ||
608 | cal->addIncidence( in ); | ||
609 | incidence = delSel.next(); | ||
610 | } | ||
611 | FileStorage storage( cal, fn, new VCalFormat ); | ||
612 | storage.save(); | ||
613 | delete cal; | ||
614 | mes = i18n("KO/Pi: Ready for beaming"); | ||
615 | topLevelWidget()->setCaption(mes); | ||
616 | |||
617 | #ifndef DESKTOP_VERSION | ||
618 | Ir *ir = new Ir( this ); | ||
619 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); | ||
620 | ir->send( fn, description, "text/x-vCalendar" ); | ||
621 | #endif | ||
622 | } | ||
623 | } | ||
624 | } | ||
625 | void KOListView::beamDone( Ir *ir ) | ||
626 | { | ||
627 | #ifndef DESKTOP_VERSION | ||
628 | delete ir; | ||
629 | #endif | ||
630 | topLevelWidget()->setCaption(i18n("KO/Pi:Beaming done")); | ||
631 | } | 571 | } |
632 | 572 | ||
633 | void KOListView::saveDescriptionToFile() | 573 | void KOListView::saveDescriptionToFile() |
634 | { | 574 | { |
635 | 575 | ||
636 | int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"), | 576 | int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"), |
637 | i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."), | 577 | i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."), |
638 | i18n("Continue"), i18n("Cancel"), 0, | 578 | i18n("Continue"), i18n("Cancel"), 0, |
639 | 0, 1 ); | 579 | 0, 1 ); |
640 | if ( result != 0 ) { | 580 | if ( result != 0 ) { |
641 | return; | 581 | return; |
642 | } | 582 | } |
643 | QPtrList<Incidence> delSel = getSelectedIncidences() ; | 583 | QPtrList<Incidence> delSel = getSelectedIncidences() ; |
644 | int icount = delSel.count(); | 584 | int icount = delSel.count(); |
645 | if ( icount ) { | 585 | if ( icount ) { |
646 | QString fn = KOPrefs::instance()->mLastSaveFile; | 586 | QString fn = KOPrefs::instance()->mLastSaveFile; |
@@ -1093,35 +1033,34 @@ void KOListView::showEvents(QPtrList<Event> eventList) | |||
1093 | int KOListView::count() | 1033 | int KOListView::count() |
1094 | { | 1034 | { |
1095 | return mListView->childCount(); | 1035 | return mListView->childCount(); |
1096 | } | 1036 | } |
1097 | 1037 | ||
1098 | void KOListView::changeEventDisplay(Event *event, int action) | 1038 | void KOListView::changeEventDisplay(Event *event, int action) |
1099 | { | 1039 | { |
1100 | KOListViewItem *item; | 1040 | KOListViewItem *item; |
1101 | 1041 | ||
1102 | switch(action) { | 1042 | switch(action) { |
1103 | case KOGlobals::EVENTADDED: | 1043 | case KOGlobals::EVENTADDED: |
1104 | addIncidence( event ); | 1044 | addIncidence( event ); |
1105 | break; | 1045 | break; |
1106 | case KOGlobals::EVENTEDITED: | 1046 | case KOGlobals::EVENTEDITED: |
1107 | item = getItemForEvent(event); | 1047 | item = getItemForEvent(event); |
1108 | if (item) { | 1048 | if (item) { |
1109 | mUidDict.remove( event->uid() ); | 1049 | ListItemVisitor v(item, mStartDate ); |
1110 | delete item; | 1050 | ((Incidence*)event)->accept(v); |
1111 | addIncidence( event ); | ||
1112 | } | 1051 | } |
1113 | break; | 1052 | break; |
1114 | case KOGlobals::EVENTDELETED: | 1053 | case KOGlobals::EVENTDELETED: |
1115 | item = getItemForEvent(event); | 1054 | item = getItemForEvent(event); |
1116 | if (item) { | 1055 | if (item) { |
1117 | mUidDict.remove( event->uid() ); | 1056 | mUidDict.remove( event->uid() ); |
1118 | delete item; | 1057 | delete item; |
1119 | } | 1058 | } |
1120 | break; | 1059 | break; |
1121 | default: | 1060 | default: |
1122 | ; | 1061 | ; |
1123 | } | 1062 | } |
1124 | } | 1063 | } |
1125 | 1064 | ||
1126 | KOListViewItem *KOListView::getItemForEvent(Incidence *event) | 1065 | KOListViewItem *KOListView::getItemForEvent(Incidence *event) |
1127 | { | 1066 | { |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index bcef0f0..a54b550 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -17,37 +17,32 @@ | |||
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | #ifndef _KOLISTVIEW_H | 24 | #ifndef _KOLISTVIEW_H |
25 | #define _KOLISTVIEW_H | 25 | #define _KOLISTVIEW_H |
26 | 26 | ||
27 | #include <qlistview.h> | 27 | #include <qlistview.h> |
28 | #include <qmap.h> | 28 | #include <qmap.h> |
29 | #include <qdict.h> | 29 | #include <qdict.h> |
30 | 30 | ||
31 | #include <klistview.h> | 31 | #include <klistview.h> |
32 | 32 | ||
33 | #ifndef DESKTOP_VERSION | ||
34 | #include <qtopia/ir.h> | ||
35 | #else | ||
36 | #define Ir char | ||
37 | #endif | ||
38 | #include <libkcal/incidence.h> | 33 | #include <libkcal/incidence.h> |
39 | 34 | ||
40 | #include "koeventview.h" | 35 | #include "koeventview.h" |
41 | #include "customlistviewitem.h" | 36 | #include "customlistviewitem.h" |
42 | 37 | ||
43 | using namespace KCal; | 38 | using namespace KCal; |
44 | 39 | ||
45 | class KOListViewWhatsThis; | 40 | class KOListViewWhatsThis; |
46 | 41 | ||
47 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
48 | #include <qlayout.h> | 43 | #include <qlayout.h> |
49 | #include <qdialog.h> | 44 | #include <qdialog.h> |
50 | #include <qtimer.h> | 45 | #include <qtimer.h> |
51 | #include <qcombobox.h> | 46 | #include <qcombobox.h> |
52 | #include <qspinbox.h> | 47 | #include <qspinbox.h> |
53 | #include <qtooltip.h> | 48 | #include <qtooltip.h> |
@@ -266,42 +261,40 @@ class KOListView : public KOEventView | |||
266 | void showCompletedTodos(); | 261 | void showCompletedTodos(); |
267 | signals: | 262 | signals: |
268 | void signalNewEvent(); | 263 | void signalNewEvent(); |
269 | void beamIncidenceList(QPtrList<Incidence>); | 264 | void beamIncidenceList(QPtrList<Incidence>); |
270 | 265 | ||
271 | public slots: | 266 | public slots: |
272 | void hideAll(); | 267 | void hideAll(); |
273 | void printList(); | 268 | void printList(); |
274 | void resetFocus(); | 269 | void resetFocus(); |
275 | virtual void updateView(); | 270 | virtual void updateView(); |
276 | virtual void showDates(const QDate &start, const QDate &end); | 271 | virtual void showDates(const QDate &start, const QDate &end); |
277 | virtual void showEvents(QPtrList<Event> eventList); | 272 | virtual void showEvents(QPtrList<Event> eventList); |
278 | void clearSelection(); | 273 | void clearSelection(); |
279 | void allSelection(); | 274 | void allSelection(); |
280 | 275 | ||
281 | void clear(); | 276 | void clear(); |
282 | void beamDone( Ir *ir ); | ||
283 | void showDates(); | 277 | void showDates(); |
284 | void hideDates(); | 278 | void hideDates(); |
285 | void deleteAll(); | 279 | void deleteAll(); |
286 | void saveToFile(); | 280 | void saveToFile(); |
287 | void saveToFileVCS(); | 281 | void saveToFileVCS(); |
288 | void saveDescriptionToFile(); | 282 | void saveDescriptionToFile(); |
289 | void beamSelected(); | 283 | void beamSelected(); |
290 | void updateConfig(); | 284 | void updateConfig(); |
291 | void addCat(); | ||
292 | void setCat(); | 285 | void setCat(); |
293 | void setAlarm(); | 286 | void setAlarm(); |
294 | void setCategories( bool removeOld ); | 287 | void setCategories( bool removeOld ); |
295 | void changeEventDisplay(Event *, int); | 288 | void changeEventDisplay(Event *, int); |
296 | 289 | ||
297 | void defaultItemAction(QListViewItem *item); | 290 | void defaultItemAction(QListViewItem *item); |
298 | void popupMenu(QListViewItem *item,const QPoint &,int); | 291 | void popupMenu(QListViewItem *item,const QPoint &,int); |
299 | void setCalendar( int c ); | 292 | void setCalendar( int c ); |
300 | void populateCalPopup(); | 293 | void populateCalPopup(); |
301 | 294 | ||
302 | protected slots: | 295 | protected slots: |
303 | void processSelectionChange(QListViewItem *); | 296 | void processSelectionChange(QListViewItem *); |
304 | 297 | ||
305 | protected: | 298 | protected: |
306 | void writeToFile( bool iCal ); | 299 | void writeToFile( bool iCal ); |
307 | void addEvents(QPtrList<Event> eventList); | 300 | void addEvents(QPtrList<Event> eventList); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 02d7aae..6337ca5 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -216,33 +216,33 @@ KOPrefs::KOPrefs() : | |||
216 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); | 216 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); |
217 | addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor); | 217 | addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor); |
218 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); | 218 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); |
219 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); | 219 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); |
220 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); | 220 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); |
221 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); | 221 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); |
222 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); | 222 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); |
223 | addItemBool("MonthViewWeek",&mMonthViewWeek,false); | 223 | addItemBool("MonthViewWeek",&mMonthViewWeek,false); |
224 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); | 224 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); |
225 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); | 225 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); |
226 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); | 226 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); |
227 | addItemBool("UseAppColors",&mUseAppColors,false); | 227 | addItemBool("UseAppColors",&mUseAppColors,false); |
228 | 228 | ||
229 | 229 | ||
230 | 230 | ||
231 | KPrefs::setCurrentGroup("Views"); | 231 | KPrefs::setCurrentGroup("Views"); |
232 | addItemBool("Block Popup Menu",&mBlockPopupMenu,true); | 232 | addItemBool("Block Popup Menu",&mBlockPopupMenu,false); |
233 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); | 233 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); |
234 | addItemInt("Hour Size",&mHourSize,8); | 234 | addItemInt("Hour Size",&mHourSize,8); |
235 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 235 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
236 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); | 236 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); |
237 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); | 237 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); |
238 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); | 238 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); |
239 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); | 239 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); |
240 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); | 240 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); |
241 | addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true); | 241 | addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true); |
242 | #ifdef DESKTOP_VERION | 242 | #ifdef DESKTOP_VERION |
243 | addItemBool("Enable ToolTips",&mEnableToolTips,true); | 243 | addItemBool("Enable ToolTips",&mEnableToolTips,true); |
244 | #else | 244 | #else |
245 | addItemBool("Enable ToolTips",&mEnableToolTips,false); | 245 | addItemBool("Enable ToolTips",&mEnableToolTips,false); |
246 | #endif | 246 | #endif |
247 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); | 247 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); |
248 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); | 248 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index bd191d8..792a7b8 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -442,32 +442,34 @@ void KOViewManager::showListView() | |||
442 | mMainView, SLOT(editIncidence(Incidence *))); | 442 | mMainView, SLOT(editIncidence(Incidence *))); |
443 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 443 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
444 | mMainView, SLOT(deleteIncidence(Incidence *))); | 444 | mMainView, SLOT(deleteIncidence(Incidence *))); |
445 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), | 445 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), |
446 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 446 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
447 | connect( mListView, SIGNAL( signalNewEvent() ), | 447 | connect( mListView, SIGNAL( signalNewEvent() ), |
448 | mMainView, SLOT( newEvent() ) ); | 448 | mMainView, SLOT( newEvent() ) ); |
449 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); | 449 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); |
450 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 450 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
451 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 451 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
452 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 452 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
453 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 453 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
454 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 454 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
455 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 455 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
456 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 456 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
457 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 457 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
458 | connect( mListView, SIGNAL( beamIncidenceList( QPtrList<Incidence> ) ), | ||
459 | mMainView, SLOT ( beamIncidenceList( QPtrList<Incidence> ) ) ); | ||
458 | } | 460 | } |
459 | // bool temp = mFlagShowNextxDays; | 461 | // bool temp = mFlagShowNextxDays; |
460 | //globalFlagBlockPainting = true; | 462 | //globalFlagBlockPainting = true; |
461 | globalFlagBlockAgenda = 1; | 463 | globalFlagBlockAgenda = 1; |
462 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { | 464 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { |
463 | mMainView->setBlockShowDates( true ); | 465 | mMainView->setBlockShowDates( true ); |
464 | mMainView->dateNavigator()->selectMonth(); | 466 | mMainView->dateNavigator()->selectMonth(); |
465 | mMainView->setBlockShowDates( false ); | 467 | mMainView->setBlockShowDates( false ); |
466 | } | 468 | } |
467 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 469 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
468 | showView(mListView, KOPrefs::instance()->mFullViewTodo); | 470 | showView(mListView, KOPrefs::instance()->mFullViewTodo); |
469 | //mFlagShowNextxDays = temp; | 471 | //mFlagShowNextxDays = temp; |
470 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 472 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
471 | mMainView->setScrollBarStep( 7 ); | 473 | mMainView->setScrollBarStep( 7 ); |
472 | } | 474 | } |
473 | 475 | ||