-rw-r--r-- | korganizer/kolistview.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 341f473..e1b393d 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -326,16 +326,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
326 | 326 | ||
327 | readSettings(KOGlobals::config(),"KOListView Layout"); | 327 | readSettings(KOGlobals::config(),"KOListView Layout"); |
328 | } | 328 | } |
329 | 329 | ||
330 | KOListView::~KOListView() | 330 | KOListView::~KOListView() |
331 | { | 331 | { |
332 | delete mPopupMenu; | 332 | delete mPopupMenu; |
333 | } | 333 | } |
334 | |||
334 | QString KOListView::getWhatsThisText(QPoint p) | 335 | QString KOListView::getWhatsThisText(QPoint p) |
335 | { | 336 | { |
336 | KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p ); | 337 | KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p ); |
337 | if ( item ) | 338 | if ( item ) |
338 | return KIncidenceFormatter::instance()->getFormattedText( item->data(), | 339 | return KIncidenceFormatter::instance()->getFormattedText( item->data(), |
339 | KOPrefs::instance()->mWTshowDetails, | 340 | KOPrefs::instance()->mWTshowDetails, |
340 | KOPrefs::instance()->mWTshowCreated, | 341 | KOPrefs::instance()->mWTshowCreated, |
341 | KOPrefs::instance()->mWTshowChanged); | 342 | KOPrefs::instance()->mWTshowChanged); |
@@ -423,16 +424,17 @@ void KOListView::setAlarm() | |||
423 | item = sel.next(); | 424 | item = sel.next(); |
424 | mUidDict.remove( inc->uid() ); | 425 | mUidDict.remove( inc->uid() ); |
425 | delete temp;; | 426 | delete temp;; |
426 | addIncidence( inc ); | 427 | addIncidence( inc ); |
427 | } | 428 | } |
428 | topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count ) ); | 429 | topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count ) ); |
429 | qDebug("KO: Set alarm for %d items", count); | 430 | qDebug("KO: Set alarm for %d items", count); |
430 | calendar()->reInitAlarmSettings(); | 431 | calendar()->reInitAlarmSettings(); |
432 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
431 | } | 433 | } |
432 | void KOListView::setCategories( bool removeOld ) | 434 | void KOListView::setCategories( bool removeOld ) |
433 | { | 435 | { |
434 | 436 | ||
435 | KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 ); | 437 | KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 ); |
436 | if (! csd->exec()) { | 438 | if (! csd->exec()) { |
437 | delete csd; | 439 | delete csd; |
438 | return; | 440 | return; |
@@ -470,16 +472,17 @@ void KOListView::setCategories( bool removeOld ) | |||
470 | inc->setCategories( itemList.join(",") ); | 472 | inc->setCategories( itemList.join(",") ); |
471 | } | 473 | } |
472 | temp = item; | 474 | temp = item; |
473 | item = sel.next(); | 475 | item = sel.next(); |
474 | mUidDict.remove( inc->uid() ); | 476 | mUidDict.remove( inc->uid() ); |
475 | delete temp;; | 477 | delete temp;; |
476 | addIncidence( inc ); | 478 | addIncidence( inc ); |
477 | } | 479 | } |
480 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
478 | } | 481 | } |
479 | 482 | ||
480 | void KOListView::beamSelected() | 483 | void KOListView::beamSelected() |
481 | { | 484 | { |
482 | int icount = 0; | 485 | int icount = 0; |
483 | QPtrList<Incidence> delSel ; | 486 | QPtrList<Incidence> delSel ; |
484 | QListViewItem *item = mListView->firstChild (); | 487 | QListViewItem *item = mListView->firstChild (); |
485 | while ( item ) { | 488 | while ( item ) { |
@@ -694,16 +697,17 @@ void KOListView::writeToFile( bool iCal ) | |||
694 | VCalFormat format; | 697 | VCalFormat format; |
695 | format.save( &cal, fn ); | 698 | format.save( &cal, fn ); |
696 | } | 699 | } |
697 | mes = i18n("KO/Pi:Saved %1").arg(fn ); | 700 | mes = i18n("KO/Pi:Saved %1").arg(fn ); |
698 | KOPrefs::instance()->mLastSaveFile = fn; | 701 | KOPrefs::instance()->mLastSaveFile = fn; |
699 | topLevelWidget()->setCaption(mes); | 702 | topLevelWidget()->setCaption(mes); |
700 | } | 703 | } |
701 | } | 704 | } |
705 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
702 | } | 706 | } |
703 | void KOListView::deleteAll() | 707 | void KOListView::deleteAll() |
704 | { | 708 | { |
705 | int icount = 0; | 709 | int icount = 0; |
706 | QPtrList<Incidence> delSel ; | 710 | QPtrList<Incidence> delSel ; |
707 | QListViewItem *item = mListView->firstChild (); | 711 | QListViewItem *item = mListView->firstChild (); |
708 | while ( item ) { | 712 | while ( item ) { |
709 | if ( item->isSelected() ) { | 713 | if ( item->isSelected() ) { |
@@ -824,18 +828,21 @@ void KOListView::showDates() | |||
824 | { | 828 | { |
825 | showDates(true); | 829 | showDates(true); |
826 | } | 830 | } |
827 | 831 | ||
828 | void KOListView::hideDates() | 832 | void KOListView::hideDates() |
829 | { | 833 | { |
830 | showDates(false); | 834 | showDates(false); |
831 | } | 835 | } |
836 | |||
832 | void KOListView::resetFocus() | 837 | void KOListView::resetFocus() |
833 | { | 838 | { |
839 | topLevelWidget()->setActiveWindow(); | ||
840 | topLevelWidget()->raise(); | ||
834 | mListView->setFocus(); | 841 | mListView->setFocus(); |
835 | } | 842 | } |
836 | void KOListView::updateView() | 843 | void KOListView::updateView() |
837 | { | 844 | { |
838 | mListView->setFocus(); | 845 | mListView->setFocus(); |
839 | if ( mListView->firstChild () ) | 846 | if ( mListView->firstChild () ) |
840 | mListView->setCurrentItem( mListView->firstChild () ); | 847 | mListView->setCurrentItem( mListView->firstChild () ); |
841 | } | 848 | } |