-rw-r--r-- | microkde/kdeui/klistview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp index 32483bb..6859d36 100644 --- a/microkde/kdeui/klistview.cpp +++ b/microkde/kdeui/klistview.cpp | |||
@@ -478,97 +478,97 @@ bool KListView::isExecuteArea( const QPoint& point ) | |||
478 | } | 478 | } |
479 | 479 | ||
480 | bool KListView::isExecuteArea( int x ) | 480 | bool KListView::isExecuteArea( int x ) |
481 | { | 481 | { |
482 | if( allColumnsShowFocus() ) | 482 | if( allColumnsShowFocus() ) |
483 | return true; | 483 | return true; |
484 | else { | 484 | else { |
485 | int offset = 0; | 485 | int offset = 0; |
486 | int width = columnWidth( 0 ); | 486 | int width = columnWidth( 0 ); |
487 | int pos = header()->mapToIndex( 0 ); | 487 | int pos = header()->mapToIndex( 0 ); |
488 | 488 | ||
489 | for ( int index = 0; index < pos; index++ ) | 489 | for ( int index = 0; index < pos; index++ ) |
490 | offset += columnWidth( header()->mapToSection( index ) ); | 490 | offset += columnWidth( header()->mapToSection( index ) ); |
491 | 491 | ||
492 | x += contentsX(); // in case of a horizontal scrollbar | 492 | x += contentsX(); // in case of a horizontal scrollbar |
493 | return ( x > offset && x < ( offset + width ) ); | 493 | return ( x > offset && x < ( offset + width ) ); |
494 | } | 494 | } |
495 | } | 495 | } |
496 | 496 | ||
497 | void KListView::slotOnItem( QListViewItem *item ) | 497 | void KListView::slotOnItem( QListViewItem *item ) |
498 | { | 498 | { |
499 | QPoint vp = viewport()->mapFromGlobal( QCursor::pos() ); | 499 | QPoint vp = viewport()->mapFromGlobal( QCursor::pos() ); |
500 | if ( item && isExecuteArea( vp.x() ) && (d->autoSelectDelay > -1) && d->bUseSingle ) { | 500 | if ( item && isExecuteArea( vp.x() ) && (d->autoSelectDelay > -1) && d->bUseSingle ) { |
501 | d->autoSelect.start( d->autoSelectDelay, true ); | 501 | d->autoSelect.start( d->autoSelectDelay, true ); |
502 | d->pCurrentItem = item; | 502 | d->pCurrentItem = item; |
503 | } | 503 | } |
504 | } | 504 | } |
505 | 505 | ||
506 | void KListView::slotOnViewport() | 506 | void KListView::slotOnViewport() |
507 | { | 507 | { |
508 | if ( d->bChangeCursorOverItem ) | 508 | if ( d->bChangeCursorOverItem ) |
509 | viewport()->unsetCursor(); | 509 | viewport()->unsetCursor(); |
510 | 510 | ||
511 | d->autoSelect.stop(); | 511 | d->autoSelect.stop(); |
512 | d->pCurrentItem = 0L; | 512 | d->pCurrentItem = 0L; |
513 | } | 513 | } |
514 | 514 | ||
515 | void KListView::slotSettingsChanged(int category) | 515 | void KListView::slotSettingsChanged(int category) |
516 | { | 516 | { |
517 | //qDebug("KListView::slotSettingsChanged has to be verified"); | 517 | //qDebug("KListView::slotSettingsChanged has to be verified"); |
518 | 518 | ||
519 | 519 | ||
520 | switch (category) | 520 | switch (category) |
521 | { | 521 | { |
522 | //US I create my private category (=1) to set the settings | 522 | //US I create my private category (=1) to set the settings |
523 | case 1: | 523 | case 1: |
524 | d->dragDelay = 2; | 524 | d->dragDelay = 2; |
525 | //US set explicitly d->bUseSingle = KGlobalSettings::singleClick(); | 525 | //US set explicitly d->bUseSingle = KGlobalSettings::singleClick(); |
526 | qDebug("KListView::slotSettingsChanged: single%i", d->bUseSingle); | 526 | // qDebug("KListView::slotSettingsChanged: single%i", d->bUseSingle); |
527 | 527 | ||
528 | disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), | 528 | disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), |
529 | this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); | 529 | this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); |
530 | 530 | ||
531 | if( d->bUseSingle ) | 531 | if( d->bUseSingle ) |
532 | connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), | 532 | connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), |
533 | this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); | 533 | this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); |
534 | 534 | ||
535 | //US d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); | 535 | //US d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); |
536 | //US d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); | 536 | //US d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); |
537 | 537 | ||
538 | if( !d->bUseSingle || !d->bChangeCursorOverItem ) | 538 | if( !d->bUseSingle || !d->bChangeCursorOverItem ) |
539 | viewport()->unsetCursor(); | 539 | viewport()->unsetCursor(); |
540 | 540 | ||
541 | break; | 541 | break; |
542 | 542 | ||
543 | /*US | 543 | /*US |
544 | case KApplication::SETTINGS_MOUSE: | 544 | case KApplication::SETTINGS_MOUSE: |
545 | d->dragDelay = KGlobalSettings::dndEventDelay(); | 545 | d->dragDelay = KGlobalSettings::dndEventDelay(); |
546 | d->bUseSingle = KGlobalSettings::singleClick(); | 546 | d->bUseSingle = KGlobalSettings::singleClick(); |
547 | 547 | ||
548 | disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), | 548 | disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), |
549 | this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); | 549 | this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); |
550 | 550 | ||
551 | if( d->bUseSingle ) | 551 | if( d->bUseSingle ) |
552 | connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), | 552 | connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), |
553 | this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); | 553 | this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); |
554 | 554 | ||
555 | d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); | 555 | d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); |
556 | d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); | 556 | d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); |
557 | 557 | ||
558 | if( !d->bUseSingle || !d->bChangeCursorOverItem ) | 558 | if( !d->bUseSingle || !d->bChangeCursorOverItem ) |
559 | viewport()->unsetCursor(); | 559 | viewport()->unsetCursor(); |
560 | 560 | ||
561 | break; | 561 | break; |
562 | case KApplication::SETTINGS_POPUPMENU: | 562 | case KApplication::SETTINGS_POPUPMENU: |
563 | d->contextMenuKey = KGlobalSettings::contextMenuKey (); | 563 | d->contextMenuKey = KGlobalSettings::contextMenuKey (); |
564 | d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); | 564 | d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); |
565 | 565 | ||
566 | if (d->showContextMenusOnPress) | 566 | if (d->showContextMenusOnPress) |
567 | { | 567 | { |
568 | disconnect (0L, 0L, this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); | 568 | disconnect (0L, 0L, this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); |
569 | 569 | ||
570 | connect(this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)), | 570 | connect(this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)), |
571 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); | 571 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); |
572 | } | 572 | } |
573 | else | 573 | else |
574 | { | 574 | { |