Differential D10954 Diff 28531 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Context not available.
471 471​
472bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev) 472​bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev)
473{ 473​{
474​ if (ev->type() == QEvent::Show && obj->inherits("QMenu")) {
475​ QMenu *menu = static_cast<QMenu *>(obj);
476​ QList<QAction *> acts = menu->actions();
477​ _menuSearch = "";
478​ resetShortcuts();
479​ }
480​
481​ // Having it occur on keypress is consistent with other shortcuts,
nmelAuthorUnsubmitted
Done

space: // Ha...

nmel: space: // Ha...
482​ // such as ctrl+w and the '&' bookmark shortcut standard
483​ // (&movies makes m a shortcut for said bookmark)
484​ if (ev->type() == QEvent::KeyPress && obj->inherits("QMenu")) {
nmelAuthorUnsubmitted
Done

Please use the following style for all ifs:

if (cond) {
    body;
}

i.e. fix spaces.

nmel: Please use the following style for all ifs: ``` if (cond) { body; } ``` i.e. fix spaces.
485​ QKeyEvent *kev = static_cast<QKeyEvent *>(ev);
nmelAuthorUnsubmitted
Done

style: QKeyEvent *kev

nmel: style: QKeyEvent *kev
486​ QMenu *menu = static_cast<QMenu *>(obj);
487​ QList<QAction *> acts = menu->actions();
488​
489​ if (kev->modifiers() != Qt::NoModifier ||
490​ kev->text().isEmpty() ||
491​ kev->key() == Qt::Key_Delete) {
492​ return QObject::eventFilter(obj, ev);
493​ }
494​
495​ if (kev->key() == Qt::Key_Backspace) {
496​ _menuSearch.chop(1);
497​ if(_menuSearch.length() == 0) {
martinkostolnyUnsubmitted
Done

one space behind if :)

martinkostolny: one space behind `if` :)
498​ resetShortcuts();
499​ return QObject::eventFilter(obj, ev);
nmelAuthorUnsubmitted
Done

style: QList<QAction *>

nmel: style: QList<QAction *>
500​ }
501​ } else {
502​ _menuSearch.append(kev->text());
nmelAuthorUnsubmitted
Done

auto act

since act is a pointer

nmel: > auto act since act is a pointer
503​ }
nmelAuthorUnsubmitted
Done

remove double space

nmel: remove double space
504​
505​ QAction* found = nullptr;
506​ const int menuSearchLength = _menuSearch.length();
507​ bool solematch;
508​ for (auto act : acts) {
509​ if (act->isSeparator() || act->text() == "") {
510​ continue;
511​ }
512​
513​ if (menuSearchLength == 1 && kev->key() != Qt::Key_Backspace && !kev->text().isEmpty()) {
514​ if (act->text().contains('&' + kev->text(), Qt::CaseInsensitive)) {
515​ _menuSearch = "";
516​ resetShortcuts();
517​ break;
518​ }
519​
520​ _msNamesWithAccelerators.insert(act, act->text());
521​ }
522​
523​ act->setText(KLocalizedString::removeAcceleratorMarker(act->text()));
524​ if (act->text().left(menuSearchLength).compare(_menuSearch, Qt::CaseInsensitive) == 0) {
525​ act->setText(createShortcutUnderline(act->text(), menuSearchLength));
526​ if (!found) {
527​ found = act;
528​ solematch = true;
529​ } else {
530​ solematch = false;
531​ }
532​ }
533​ }
534​
535​ if (found && solematch) {
536​ found->activate(QAction::Trigger);
martinkostolnyUnsubmitted
Done

I'm suggesting this instead of line 536:

if ((bool) found->menu()) {
    menu->setActiveAction(found);
} else {
    found->activate(QAction::Trigger);
}

It will open a folder menu when such menu entry is "activated".

martinkostolny: I'm suggesting this instead of line 536: ``` if ((bool) found->menu()) { menu…
537​ _menuSearch = "";
538​ resetShortcuts();
539​ } else if (found && menuSearchLength > 1) {
540​ // & bookmark code will give focus as long as there is only one
541​ // & character
542​ menu->setActiveAction(found);
543​ } else if (!found) {
544​ _menuSearch = "";
545​ resetShortcuts();
546​ }
547​ }
548​
474 if (ev->type() == QEvent::MouseButtonRelease) { 549​ if (ev->type() == QEvent::MouseButtonRelease) {
475 switch (static_cast<QMouseEvent *>(ev)->button()) { 550​ switch (static_cast<QMouseEvent *>(ev)->button()) {
476 case Qt::RightButton: 551​ case Qt::RightButton:
Context not available.
507 return QObject::eventFilter(obj, ev); 582​ return QObject::eventFilter(obj, ev);
508} 583​}
509 584​
585​void KrBookmarkHandler::resetShortcuts()
586​{
587​ QHash<QAction *, QString>::const_iterator i = _msNamesWithAccelerators.begin();
588​ while (i != _msNamesWithAccelerators.end()) {
nmelAuthorUnsubmitted
Done

join 'i=', 'while', '++i' into a single 'for'

nmel: join 'i=', 'while', '++i' into a single 'for'
589​ i.key()->setText(i.value());
590​ ++i;
591​ }
592​ _msNamesWithAccelerators.clear();
593​}
594​
595​QString KrBookmarkHandler::createShortcutUnderline(const QString &text, int underlineEnd)
596​{
597​ if (underlineEnd <= 0) {
598​ return text;
599​ }
600​ if (underlineEnd > text.length()) {
601​ underlineEnd = text.length();
602​ }
603​
604​ QString underlinedtext = text;
605​ for (int i = 0; i < underlineEnd; i++) {
606​ if (underlinedtext[2 * i] != '&') {
607​ underlinedtext.insert(2 * i, '&');
608​ }
609​ }
610​ return underlinedtext;
611​}
612​
510#define POPULAR_URLS_ID 100100 613​#define POPULAR_URLS_ID 100100
511#define TRASH_ID 100101 614​#define TRASH_ID 100101
512#define LAN_ID 100103 615​#define LAN_ID 100103
Context not available.