Differential D11443 Diff 29872 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Context not available.
528 QList<QAction *> acts = menu->actions(); 528​ QList<QAction *> acts = menu->actions();
529 bool quickSearchStarted = false; 529​ bool quickSearchStarted = false;
530 530​
531​ if (kev->key() == Qt::Key_Left && kev->modifiers() == Qt::NoModifier) {
532​ menu->close();
533​ return true;
534​ }
535​
531 if (kev->modifiers() != Qt::NoModifier || 536​ if (kev->modifiers() != Qt::NoModifier ||
532 kev->text().isEmpty() || 537​ kev->text().isEmpty() ||
533 kev->key() == Qt::Key_Delete) { 538​ kev->key() == Qt::Key_Delete ||
539​ kev->key() == Qt::Key_Return ||
540​ kev->key() == Qt::Key_Escape) {
534 return QObject::eventFilter(obj, ev); 541​ return QObject::eventFilter(obj, ev);
535 } 542​ }
536 543​
Context not available.
565 if (act->text().contains('&' + kev->text(), Qt::CaseInsensitive)) { 572​ if (act->text().contains('&' + kev->text(), Qt::CaseInsensitive)) {
566 qDebug() << "Bookmark search: hit accelerator key of" << act; 573​ qDebug() << "Bookmark search: hit accelerator key of" << act;
567 _setQuickSearchText(""); 574​ _setQuickSearchText("");
568 break; 575​ return QObject::eventFilter(obj, ev);
569 } 576​ }
570 577​
571 // strip accelerator keys from actions so they don't interfere with the search key press events 578​ // strip accelerator keys from actions so they don't interfere with the search key press events
Context not available.
577 // match prefix of the action text to the query 584​ // match prefix of the action text to the query
578 if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) { 585​ if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) {
579 _highlightAction(act); 586​ _highlightAction(act);
580 if (!firstMatch) { 587​ if (!firstMatch || firstMatch->menu()) {
nmelUnsubmitted
Not Done

firstMatch no longer corresponds to its name. It's the last match of a folder or the first match of a bookmark. Either rename (what's a good name?) or use two vars firstBookmarkMatch and firstFolderMatch.

nmel: firstMatch no longer corresponds to its name. It's the last match of a folder or the first…
588​ //Can't highlight menus (see comment below), hopefully pick something we can
581 firstMatch = act; 589​ firstMatch = act;
582 } 590​ }
583 nMatches++; 591​ nMatches++;
Context not available.
596 if (nMatches == 1) { 604​ if (nMatches == 1) {
597 _setQuickSearchText(""); 605​ _setQuickSearchText("");
598 if ((bool) firstMatch->menu()) { 606​ if ((bool) firstMatch->menu()) {
599 menu->setActiveAction(firstMatch); 607​ menu->setActiveAction(nullptr);
608​ QRect firstMatchGeom = menu->actionGeometry(firstMatch);
609​ QPoint submenuPos = menu->mapToParent(firstMatchGeom.topRight());
610​ firstMatch->menu()->popup(submenuPos);
600 } else { 611​ } else {
601 firstMatch->activate(QAction::Trigger); 612​ firstMatch->activate(QAction::Trigger);
602 } 613​ }
603 } else { 614​ return true;
604 // if no match is found, firstMatch == nullptr 615​ } else if (nMatches > 1) {
605 // this is intended as it will unset active item of the menu 616​ //because of a bug submenus cannot be highlighted
606 menu->setActiveAction(firstMatch); 617​ //https://bugreports.qt.io/browse/QTBUG-939
618​ if (!firstMatch->menu()) {
619​ menu->setActiveAction(firstMatch);
620​ } else {
621​ qDebug() << "We only found submenus, highlighting nothing";
622​ menu->setActiveAction(nullptr);
623​ }
624​ return true;
625​ }
626​ else {
627​ menu->setActiveAction(nullptr);
nmelUnsubmitted
Not Done

Why there is no return true in this case?

nmel: Why there is no return true in this case?
radeAuthorUnsubmitted
Not Done

because we didn't find a match, so we haven't dealt with the button press and are sending it along to others who might be able to handle it.

rade: because we didn't find a match, so we haven't dealt with the button press and are sending it…
607 } 628​ }
608 } 629​ }
609 630​
Context not available.