Skip to content

Commit e62c4ce

Browse files
committed
Plugins::WebBrowser: modify shortcuts
1 parent e875a41 commit e62c4ce

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

Plugins/WebBrowser/FrmWebBrowser.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
8484
pWeb->page()->action(QWebEnginePage::Back)->trigger();
8585
});
8686
m_pBack->setEnabled(false);
87+
m_pBack->setShortcuts(QKeySequence::Back);
8788
m_pBack->setStatusTip(m_pBack->text());
8889
m_pForward = m_pToolBar->addAction(
8990
QIcon::fromTheme("go-next"), tr("Forward"),
@@ -93,6 +94,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
9394
pWeb->page()->action(QWebEnginePage::Forward)->trigger();
9495
});
9596
m_pForward->setEnabled(false);
97+
m_pForward->setShortcuts(QKeySequence::Forward);
9698
m_pForward->setStatusTip(m_pForward->text());
9799
m_pRefresh = m_pToolBar->addAction(
98100
QIcon::fromTheme("view-refresh"), tr("Refresh"),
@@ -101,7 +103,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
101103
if(pWeb && pWeb->page())
102104
pWeb->page()->action(QWebEnginePage::Reload)->trigger();
103105
});
104-
m_pRefresh->setShortcut(QKeySequence(QKeySequence::Refresh));
106+
m_pRefresh->setShortcuts(QKeySequence::Refresh);
105107
m_pRefresh->setStatusTip(m_pRefresh->text());
106108

107109
m_pUrlLineEdit = new QLineEdit(this);
@@ -145,11 +147,13 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
145147
}
146148
});
147149
m_pAddPage->setStatusTip(m_pAddPage->text());
150+
m_pAddPage->setShortcuts(QKeySequence::AddTab);
148151
Q_ASSERT(check);
149152
m_pDownload = m_pToolBar->addAction(
150153
QIcon::fromTheme("emblem-downloads"), tr("Download Manager"));
151154
m_pDownload->setCheckable(true);
152155
m_pDownload->setStatusTip(m_pDownload->text());
156+
m_pDownload->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
153157
check = connect(m_pDownload, &QAction::toggled,
154158
this, [&](bool checked){
155159
if(checked)
@@ -507,13 +511,14 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
507511
pMenu->addAction(m_pBack);
508512
pMenu->addAction(m_pForward);
509513
pMenu->addAction(m_pRefresh);
510-
m_pStop = pMenu->addAction(QIcon::fromTheme("media-playback-stop"), tr("Stop"),
511-
this, [&](){
512-
CFrmWebView* pWeb = CurrentView();
513-
if(pWeb && pWeb->page())
514-
pWeb->page()->action(QWebEnginePage::Stop)->trigger();
515-
});
514+
m_pStop = pMenu->addAction(
515+
QIcon::fromTheme("media-playback-stop"), tr("Stop"), this, [&](){
516+
CFrmWebView* pWeb = CurrentView();
517+
if(pWeb && pWeb->page())
518+
pWeb->page()->action(QWebEnginePage::Stop)->trigger();
519+
});
516520
m_pStop->setEnabled(false);
521+
m_pStop->setShortcuts(QKeySequence::Cancel);
517522

518523
pMenu->addSeparator();
519524
pMenu->addAction(m_pAddPage);
@@ -591,7 +596,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
591596
pWeb->findText(m_szFindText);
592597
}
593598
});
594-
m_pFindNext->setShortcut(QKeySequence::FindNext);
599+
m_pFindNext->setShortcuts(QKeySequence::FindNext);
595600
m_pFindNext->setText(m_pFindNext->text());
596601

597602
m_pFindPrevious = pMenu->addAction(
@@ -602,7 +607,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
602607
pWeb->findText(m_szFindText, QWebEnginePage::FindBackward);
603608
}
604609
});
605-
m_pFindPrevious->setShortcut(QKeySequence::FindPrevious);
610+
m_pFindPrevious->setShortcuts(QKeySequence::FindPrevious);
606611
m_pFindPrevious->setStatusTip(m_pFindPrevious->text());
607612

608613
pMenu->addSeparator();
@@ -619,7 +624,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
619624
});
620625
Q_ASSERT(check);
621626
m_pZoomIn = pMenu->addAction(QIcon::fromTheme("zoom-in"), tr("Zoom in"));
622-
m_pZoomIn->setShortcut(QKeySequence::ZoomIn);
627+
m_pZoomIn->setShortcuts(QKeySequence::ZoomIn);
623628
m_pZoomIn->setStatusTip(tr("Zoom in"));
624629
m_pZoomIn->setToolTip(tr("Zoom in"));
625630
check = connect(
@@ -632,7 +637,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
632637
Q_ASSERT(check);
633638
m_pZoomOut = pMenu->addAction(
634639
QIcon::fromTheme("zoom-out"), tr("Zoom out"));
635-
m_pZoomOut->setShortcut(QKeySequence::ZoomOut);
640+
m_pZoomOut->setShortcuts(QKeySequence::ZoomOut);
636641
m_pZoomOut->setStatusTip(tr("Zoom out"));
637642
m_pZoomOut->setToolTip(tr("Zoom out"));
638643
check = connect(
@@ -650,6 +655,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
650655
QIcon::fromTheme("document-print"), tr("Print"),
651656
this, &CFrmWebBrowser::slotPrint);
652657
m_pPrint->setVisible(false);
658+
m_pPrint->setShortcuts(QKeySequence::Print);
653659
m_pPrintToPdf = pMenu->addAction(
654660
QIcon::fromTheme("document-print"), tr("Print to PDF"),
655661
this, &CFrmWebBrowser::slotPrintToPdf);

0 commit comments

Comments
 (0)