Differential D11829 Diff 31012 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Show All 29 Lines
30#include "../Panel/listpanelactions.h" 30​#include "../Panel/listpanelactions.h"
31 31​
32// QtCore 32​// QtCore
33#include <QTextStream> 33​#include <QTextStream>
34#include <QFile> 34​#include <QFile>
35#include <QEvent> 35​#include <QEvent>
36#include <QStandardPaths> 36​#include <QStandardPaths>
37#include <QDebug> 37​#include <QDebug>
38​#include <QTimer>
38// QtGui 39​// QtGui
39#include <QMouseEvent> 40​#include <QMouseEvent>
40#include <QCursor> 41​#include <QCursor>
41 42​
42#include <KConfigCore/KSharedConfig> 43​#include <KConfigCore/KSharedConfig>
43#include <KI18n/KLocalizedString> 44​#include <KI18n/KLocalizedString>
44#include <KIconThemes/KIconLoader> 45​#include <KIconThemes/KIconLoader>
45#include <KWidgetsAddons/KMessageBox> 46​#include <KWidgetsAddons/KMessageBox>
46#include <KXmlGui/KActionCollection> 47​#include <KXmlGui/KActionCollection>
47#include <KBookmarks/KBookmarkManager> 48​#include <KBookmarks/KBookmarkManager>
48 49​
49#define SPECIAL_BOOKMARKS true 50​#define SPECIAL_BOOKMARKS true
50 51​
51// ------------------------ for internal use 52​// ------------------------ for internal use
52#define BOOKMARKS_FILE "krusader/krbookmarks.xml" 53​#define BOOKMARKS_FILE "krusader/krbookmarks.xml"
53#define CONNECT_BM(X) { disconnect(X, SIGNAL(activated(QUrl)), 0, 0); connect(X, SIGNAL(activated(QUrl)), this, SLOT(slotActivated(QUrl))); } 54​#define CONNECT_BM(X) { disconnect(X, SIGNAL(activated(QUrl)), 0, 0); connect(X, SIGNAL(activated(QUrl)), this, SLOT(slotActivated(QUrl))); }
54 55​
55KrBookmarkHandler::KrBookmarkHandler(KrMainWindow *mainWindow) : QObject(mainWindow->widget()), 56​KrBookmarkHandler::KrBookmarkHandler(KrMainWindow *mainWindow) :
56 _mainWindow(mainWindow), _middleClick(false), _mainBookmarkPopup(0), _specialBookmarks(), 57​ QObject(mainWindow->widget()),
57 _quickSearchAction(nullptr), _quickSearchBar(nullptr) 58​ _mainWindow(mainWindow),
59​ _middleClick(false),
60​ _mainBookmarkPopup(0),
61​ _specialBookmarks(),
62​ _quickSearchAction(nullptr),
63​ _quickSearchBar(nullptr),
64​ _quickSearchMenu(nullptr)
58{ 65​{
59 // create our own action collection and make the shortcuts apply only to parent 66​ // create our own action collection and make the shortcuts apply only to parent
60 _privateCollection = new KActionCollection(this); 67​ _privateCollection = new KActionCollection(this);
61 _collection = _mainWindow->actions(); 68​ _collection = _mainWindow->actions();
62 69​
63 // create _root: father of all bookmarks. it is a dummy bookmark and never shown 70​ // create _root: father of all bookmarks. it is a dummy bookmark and never shown
64 _root = new KrBookmark(i18n("Bookmarks")); 71​ _root = new KrBookmark(i18n("Bookmarks"));
65 _root->setParent(this); 72​ _root->setParent(this);
▲ Show 20 Lines • Show All 467 Lines • ▼ Show 20 Line(s)
533 540​
534void KrBookmarkHandler::bookmarksChanged(const QString&, const QString&) 541​void KrBookmarkHandler::bookmarksChanged(const QString&, const QString&)
535{ 542​{
536 importFromFile(); 543​ importFromFile();
537} 544​}
538 545​
539bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev) 546​bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev)
540{ 547​{
541 if (obj->inherits("QMenu") && (ev->type() == QEvent::Show || 548​ auto eventType = ev->type();
542 ev->type() == QEvent::Close)) { 549​ QMenu *menu = dynamic_cast<QMenu *>(obj);
550​
551​ if (eventType == QEvent::Show && menu) {
552​ _setQuickSearchText("");
553​ _quickSearchMenu = menu;
554​ qDebug() << "Bookmark search: menu" << menu << "is shown";
555​ }
556​
557​ if (eventType == QEvent::Close && menu && _quickSearchMenu && _quickSearchMenu != menu) {
558​ qDebug() << "Bookmark search: active action =" << _quickSearchMenu->activeAction();
559​
560​ // fix automatic deactivation of current action due to spurious close event from submenu
561​ auto quickSearchMenu = _quickSearchMenu;
562​ auto activeAction = _quickSearchMenu->activeAction();
563​ QTimer::singleShot(0, this, [=]() {
radeUnsubmitted
Done

Could you explain this? How do we know that this will be scheduled to run after the event that removes focus?

rade: Could you explain this? How do we know that this will be scheduled to run after the event that…
564​ qDebug() << "Bookmark search: active action =" << quickSearchMenu->activeAction();
565​ if (!quickSearchMenu->activeAction() && activeAction) {
566​ quickSearchMenu->setActiveAction(activeAction);
567​ qDebug() << "Bookmark search: restored active action =" << quickSearchMenu->activeAction();
568​ }
569​ });
570​ }
571​
572​ if (eventType == QEvent::Close && menu && _quickSearchMenu == menu) {
573​ qDebug() << "Bookmark search: stopped on menu" << menu;
543 _setQuickSearchText(""); 574​ _setQuickSearchText("");
575​ _quickSearchMenu = nullptr;
544 } 576​ }
martinkostolnyUnsubmitted
Done

Same here - return statement:

return QObject::eventFilter(obj, ev);
martinkostolny: Same here - return statement: ``` return QObject::eventFilter(obj, ev); ```
545 577​
martinkostolnyUnsubmitted
Done

How about placing this line at the end of if statement:

return QObject::eventFilter(obj, ev);

IMO it would improve readability and also it would be a minor optimization in some cases.

martinkostolny: How about placing this line at the end of if statement: ``` return QObject::eventFilter(obj…
546 // Having it occur on keypress is consistent with other shortcuts, 578​ // Having it occur on keypress is consistent with other shortcuts,
547 // such as Ctrl+W and accelerator keys 579​ // such as Ctrl+W and accelerator keys
548 if (ev->type() == QEvent::KeyPress && obj->inherits("QMenu")) { 580​ if (eventType == QEvent::KeyPress && menu) {
549 QKeyEvent *kev = static_cast<QKeyEvent *>(ev); 581​ QKeyEvent *kev = static_cast<QKeyEvent *>(ev);
550 QMenu *menu = static_cast<QMenu *>(obj); ​
551 QList<QAction *> acts = menu->actions(); 582​ QList<QAction *> acts = menu->actions();
552 bool quickSearchStarted = false; 583​ bool quickSearchStarted = false;
553 bool searchInSpecialItems = KConfigGroup(krConfig, "Look&Feel").readEntry("Search in special items", false); 584​ bool searchInSpecialItems = KConfigGroup(krConfig, "Look&Feel").readEntry("Search in special items", false);
554 585​
martinkostolnyUnsubmitted
Done

I'd place else to one line with previous closing bracket

martinkostolny: I'd place `else` to one line with previous closing bracket
555 if (kev->key() == Qt::Key_Left && kev->modifiers() == Qt::NoModifier) { 586​ if (kev->key() == Qt::Key_Left && kev->modifiers() == Qt::NoModifier) {
556 menu->close(); 587​ menu->close();
557 return true; 588​ return true;
558 } 589​ }
559 590​
560 if (kev->modifiers() != Qt::NoModifier || 591​ if (kev->modifiers() != Qt::NoModifier ||
561 kev->text().isEmpty() || 592​ kev->text().isEmpty() ||
562 kev->key() == Qt::Key_Delete || 593​ kev->key() == Qt::Key_Delete ||
563 kev->key() == Qt::Key_Return || 594​ kev->key() == Qt::Key_Return ||
564 kev->key() == Qt::Key_Escape) 595​ kev->key() == Qt::Key_Escape) {
565 596​
566 { ​
567 return QObject::eventFilter(obj, ev); 597​ return QObject::eventFilter(obj, ev);
568 } 598​ }
569 599​
570 // update quick search text 600​ // update quick search text
571 if (kev->key() == Qt::Key_Backspace) { 601​ if (kev->key() == Qt::Key_Backspace) {
572 auto newSearchText = _quickSearchText(); 602​ auto newSearchText = _quickSearchText();
573 newSearchText.chop(1); 603​ newSearchText.chop(1);
574 _setQuickSearchText(newSearchText); 604​ _setQuickSearchText(newSearchText);
575 605​
576 if (_quickSearchText().length() == 0) { 606​ if (_quickSearchText().length() == 0) {
577 return QObject::eventFilter(obj, ev); 607​ return QObject::eventFilter(obj, ev);
578 } 608​ }
579 } else { 609​ } else {
580 quickSearchStarted = _quickSearchText().length() == 0; 610​ quickSearchStarted = _quickSearchText().length() == 0;
581 _setQuickSearchText(_quickSearchText().append(kev->text())); 611​ _setQuickSearchText(_quickSearchText().append(kev->text()));
582 } 612​ }
583 613​
584 if (quickSearchStarted) { 614​ if (quickSearchStarted) {
585 qDebug() << "Bookmark search: started"; 615​ _quickSearchMenu = menu;
616​ qDebug() << "Bookmark search: started on menu" << menu;
586 } 617​ }
587 618​
588 // match actions 619​ // match actions
589 QAction *matchedAction = nullptr; 620​ QAction *matchedAction = nullptr;
590 int nMatches = 0; 621​ int nMatches = 0;
591 for (auto act : acts) { 622​ for (auto act : acts) {
592 if (act->isSeparator() || act->text() == "") { 623​ if (act->isSeparator() || act->text() == "") {
593 continue; 624​ continue;
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)677 } else {
647 menu->setActiveAction(nullptr); 678​ menu->setActiveAction(nullptr);
648 } 679​ }
649 } else { 680​ } else {
650 menu->setActiveAction(nullptr); 681​ menu->setActiveAction(nullptr);
651 } 682​ }
652 return true; 683​ return true;
653 } 684​ }
654 685​
655 if (ev->type() == QEvent::MouseButtonRelease) { 686​ if (eventType == QEvent::MouseButtonRelease) {
656 switch (static_cast<QMouseEvent *>(ev)->button()) { 687​ switch (static_cast<QMouseEvent *>(ev)->button()) {
657 case Qt::RightButton: 688​ case Qt::RightButton:
658 _middleClick = false; 689​ _middleClick = false;
659 if (obj->inherits("QMenu")) { 690​ if (obj->inherits("QMenu")) {
660 QMenu *menu = static_cast<QMenu *>(obj); 691​ QMenu *menu = static_cast<QMenu *>(obj);
661 QAction *act = menu->actionAt(static_cast<QMouseEvent *>(ev)->pos()); 692​ QAction *act = menu->actionAt(static_cast<QMouseEvent *>(ev)->pos());
662 693​
663 if (obj == _mainBookmarkPopup && _specialBookmarks.contains(act)) { 694​ if (obj == _mainBookmarkPopup && _specialBookmarks.contains(act)) {
▲ Show 20 Lines • Show All 175 Lines • Show Last 20 Lines