Differential D10954 Diff 28878 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 (obj->inherits("QMenu") && (ev->type() == QEvent::Show ||
475​ ev->type() == QEvent::Close)) {
476​ _menuSearch = "";
477​ resetShortcuts();
478​ }
479​
480​ // Having it occur on keypress is consistent with other shortcuts,
481​ // such as ctrl+w and the '&' bookmark shortcut standard
nmelAuthorUnsubmitted
Done

space: // Ha...

nmel: space: // Ha...
482​ // (&movies makes m a shortcut for said bookmark)
483​ if (ev->type() == QEvent::KeyPress && obj->inherits("QMenu")) {
484​ QKeyEvent *kev = static_cast<QKeyEvent *>(ev);
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​ QMenu *menu = static_cast<QMenu *>(obj);
nmelAuthorUnsubmitted
Done

style: QKeyEvent *kev

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

one space behind if :)

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

style: QList<QAction *>

nmel: style: QList<QAction *>
500​ } else {
501​ _menuSearch.append(kev->text());
502​ }
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​ QAction* found = nullptr;
505​ const int menuSearchLength = _menuSearch.length();
506​ bool solematch;
507​ for (auto act : acts) {
508​ if (act->isSeparator() || act->text() == "") {
509​ continue;
510​ }
511​
512​ if (menuSearchLength == 1 && kev->key() != Qt::Key_Backspace && !kev->text().isEmpty()) {
513​ if (act->text().contains('&' + kev->text(), Qt::CaseInsensitive)) {
514​ _menuSearch = "";
515​ resetShortcuts();
516​ break;
517​ }
518​
519​ _msNamesWithAccelerators.insert(act, act->text());
520​ }
521​
522​ act->setText(KLocalizedString::removeAcceleratorMarker(act->text()));
523​ if (act->text().left(menuSearchLength).compare(_menuSearch, Qt::CaseInsensitive) == 0) {
524​ act->setText(createShortcutUnderline(act->text(), menuSearchLength));
525​ if (!found) {
526​ found = act;
527​ solematch = true;
528​ } else {
529​ solematch = false;
530​ }
531​ }
532​ }
533​
534​ if (found && solematch) {
535​ if ((bool) found->menu()) {
536​ menu->setActiveAction(found);
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​ } else {
538​ found->activate(QAction::Trigger);
539​ }
540​ _menuSearch = "";
541​ resetShortcuts();
542​ } else if (found && menuSearchLength > 1) {
543​ // & bookmark code will give focus as long as there is only one
544​ // & character
545​ menu->setActiveAction(found);
546​ } else if (!found) {
547​ _menuSearch = "";
548​ resetShortcuts();
549​ }
550​ }
551​
474 if (ev->type() == QEvent::MouseButtonRelease) { 552​ if (ev->type() == QEvent::MouseButtonRelease) {
475 switch (static_cast<QMouseEvent *>(ev)->button()) { 553​ switch (static_cast<QMouseEvent *>(ev)->button()) {
476 case Qt::RightButton: 554​ case Qt::RightButton:
Context not available.
507 return QObject::eventFilter(obj, ev); 585​ return QObject::eventFilter(obj, ev);
508} 586​}
509 587​
588​void KrBookmarkHandler::resetShortcuts()
589​{
590​ QHash<QAction *, QString>::const_iterator i = _msNamesWithAccelerators.begin();
591​ for (; i != _msNamesWithAccelerators.end(); ++i) {
nmelAuthorUnsubmitted
Done

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

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