author | zautrix <zautrix> | 2005-07-01 20:33:17 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-01 20:33:17 (UTC) |
commit | 541878bcf52030d8597d5e79afb6ae1185b2ac2c (patch) (unidiff) | |
tree | c6aeb2861062f1bfcc6ba10ec6e26b058205a1cd /korganizer | |
parent | c53efbe8f53f468d21d93f5e19b625d1a4beb242 (diff) | |
download | kdepimpi-541878bcf52030d8597d5e79afb6ae1185b2ac2c.zip kdepimpi-541878bcf52030d8597d5e79afb6ae1185b2ac2c.tar.gz kdepimpi-541878bcf52030d8597d5e79afb6ae1185b2ac2c.tar.bz2 |
fixixixis
-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 |
4 files changed, 46 insertions, 112 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e5e3704..4c815d8 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -285,70 +285,67 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
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())); |
@@ -433,47 +430,52 @@ void KOListView::setCalendar( int c ) | |||
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() ) |
@@ -538,101 +540,39 @@ void KOListView::setCategories( bool removeOld ) | |||
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, |
@@ -1101,19 +1041,18 @@ void KOListView::changeEventDisplay(Event *event, int action) | |||
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 | } |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index bcef0f0..a54b550 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -25,21 +25,16 @@ | |||
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; |
@@ -274,26 +269,24 @@ class KOListView : public KOEventView | |||
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 ); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 02d7aae..6337ca5 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -224,17 +224,17 @@ KOPrefs::KOPrefs() : | |||
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); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index bd191d8..792a7b8 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -450,16 +450,18 @@ void KOViewManager::showListView() | |||
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 ); |