feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Replace Qt::MidButton by Qt::MiddleButton

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I46e06ec1402be345ebd1e4543ed67a726caa42a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-08-27 18:19:46 +02:00
parent a79b0c6558
commit 4314795992
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/searchwidget.cpp
View File

@@ -216,7 +216,7 @@ bool SearchWidget::eventFilter(QObject *o, QEvent *e)
if (!link.isEmpty() || link.isValid()) { if (!link.isEmpty() || link.isValid()) {
bool controlPressed = me->modifiers() & Qt::ControlModifier; bool controlPressed = me->modifiers() & Qt::ControlModifier;
if ((me->button() == Qt::LeftButton && controlPressed) if ((me->button() == Qt::LeftButton && controlPressed)
|| (me->button() == Qt::MidButton)) { || (me->button() == Qt::MiddleButton)) {
emit linkActivated(link, currentSearchTerms(), true/*newPage*/); emit linkActivated(link, currentSearchTerms(), true/*newPage*/);
} }
} }

2
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -443,7 +443,7 @@ void TextBrowserHelpWidget::mouseReleaseEvent(QMouseEvent *e)
bool controlPressed = e->modifiers() & Qt::ControlModifier; bool controlPressed = e->modifiers() & Qt::ControlModifier;
const QString link = linkAt(e->pos()); const QString link = linkAt(e->pos());
if (m_parent->isActionVisible(HelpViewer::Action::NewPage) if (m_parent->isActionVisible(HelpViewer::Action::NewPage)
&& (controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) { && (controlPressed || e->button() == Qt::MiddleButton) && !link.isEmpty()) {
emit m_parent->newPageRequested(QUrl(link)); emit m_parent->newPageRequested(QUrl(link));
return; return;
} }

2
src/shared/help/bookmarkmanager.cpp
View File

@@ -513,7 +513,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
QMouseEvent *me = static_cast<QMouseEvent*>(e); QMouseEvent *me = static_cast<QMouseEvent*>(e);
bool controlPressed = me->modifiers() & Qt::ControlModifier; bool controlPressed = me->modifiers() & Qt::ControlModifier;
if (((me->button() == Qt::LeftButton) && controlPressed) if (((me->button() == Qt::LeftButton) && controlPressed)
|| (me->button() == Qt::MidButton)) { || (me->button() == Qt::MiddleButton)) {
QString data = index.data(Qt::UserRole + 10).toString(); QString data = index.data(Qt::UserRole + 10).toString();
if (!data.isEmpty() && data != QLatin1String("Folder")) if (!data.isEmpty() && data != QLatin1String("Folder"))
emit createPage(QUrl(data), false); emit createPage(QUrl(data), false);

2
src/shared/help/contentwindow.cpp
View File

@@ -107,7 +107,7 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
if (index.isValid() && sm->isSelected(index)) { if (index.isValid() && sm->isSelected(index)) {
if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier)) if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier))
|| (button == Qt::MidButton)) { || (button == Qt::MiddleButton)) {
QHelpContentItem *itm = m_contentModel->contentItemAt(index); QHelpContentItem *itm = m_contentModel->contentItemAt(index);
if (itm) if (itm)
emit linkActivated(itm->url(), true/*newPage*/); emit linkActivated(itm->url(), true/*newPage*/);

2
src/shared/help/indexwindow.cpp
View File

@@ -178,7 +178,7 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
if (idx.isValid()) { if (idx.isValid()) {
Qt::MouseButtons button = mouseEvent->button(); Qt::MouseButtons button = mouseEvent->button();
if (((button == Qt::LeftButton) && (mouseEvent->modifiers() & Qt::ControlModifier)) if (((button == Qt::LeftButton) && (mouseEvent->modifiers() & Qt::ControlModifier))
|| (button == Qt::MidButton)) { || (button == Qt::MiddleButton)) {
open(idx); open(idx);
} }
} }