aboutsummaryrefslogtreecommitdiff
path: root/lib/addressbar/addressbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/addressbar/addressbar.cpp')
-rw-r--r--lib/addressbar/addressbar.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/addressbar/addressbar.cpp b/lib/addressbar/addressbar.cpp
index e8dcc6a..a923e72 100644
--- a/lib/addressbar/addressbar.cpp
+++ b/lib/addressbar/addressbar.cpp
@@ -21,6 +21,7 @@ AddressBar::AddressBar(const QHash<QString, QString> &config, QWidget *parent)
layout()->setSpacing(0);
urlBar = new UrlLineEdit(this);
+ urlBar->menuAction->setShortcut(QKeySequence(config.value("addressbar.shortcuts.menu")));
layout()->addWidget(urlBar);
auto *focusShortcut = new QShortcut(QKeySequence(config.value("addressbar.shortcuts.focus")), parent);
@@ -29,11 +30,6 @@ AddressBar::AddressBar(const QHash<QString, QString> &config, QWidget *parent)
urlBar->selectAll();
});
- urlBar->pageMenu_action->setShortcut(QKeySequence(config.value("addressbar.shortcuts.pageMenu")));
- urlBar->pageMenu_action->setToolTip(tr("Page Actions (%1)").arg(urlBar->pageMenu_action->shortcut().toString()));
-
- urlBar->toolsMenu_action->setShortcut(QKeySequence(config.value("addressbar.shortcuts.toolsMenu")));
- urlBar->toolsMenu_action->setToolTip(tr("Tools (%1)").arg(urlBar->toolsMenu_action->shortcut().toString()));
connect(urlBar, &UrlLineEdit::textEdited, [=](const QString &text) {
std::function<void(QStringList &)> callback = std::bind(&UrlLineEdit::updateCompleter, urlBar, std::placeholders::_1);
@@ -63,8 +59,8 @@ void AddressBar::setView(QWebEngineView *view)
if(view == nullptr) {
urlBar->clear();
- urlBar->pageMenu_action->setMenu(nullptr);
- urlBar->toolsMenu_action->setMenu(nullptr);
+ urlBar->pageMenu = nullptr;
+ urlBar->toolsMenu = nullptr;
return;
}
@@ -85,10 +81,10 @@ void AddressBar::setView(QWebEngineView *view)
void AddressBar::setPageMenu(QMenu *menu)
{
- urlBar->pageMenu_action->setMenu(menu);
+ urlBar->pageMenu = menu;
}
void AddressBar::setToolsMenu(QMenu *menu)
{
- urlBar->toolsMenu_action->setMenu(menu);
+ urlBar->toolsMenu = menu;
}