Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Fix] Fixed Paste&Go shortcut, it works now.

Browse Source 
- for some reason, QKeySequence("Ctrl+Shift+V") doesn't work
  so we catch it in keyPressEvent
This commit is contained in:
nowrep 2012-01-21 23:51:24 +01:00
parent 6c8f9c07b8
commit dfc667e785
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/navigation/locationbar.cpp
View File

@ -124,7 +124,9 @@ QUrl LocationBar::createUrl()
void LocationBar::urlEnter() void LocationBar::urlEnter()
{ {
m_locationCompleter->popup()->hide();
m_webView->setFocus(); m_webView->setFocus();
emit loadUrl(createUrl()); emit loadUrl(createUrl());
} }
@ -255,7 +257,6 @@ void LocationBar::contextMenuEvent(QContextMenuEvent* event)
if (!m_pasteAndGoAction) { if (!m_pasteAndGoAction) {
m_pasteAndGoAction = new QAction(QIcon::fromTheme("edit-paste"), tr("Paste And &Go"), this); m_pasteAndGoAction = new QAction(QIcon::fromTheme("edit-paste"), tr("Paste And &Go"), this);
m_pasteAndGoAction->setShortcut(QKeySequence("Ctrl+Shift+V")); m_pasteAndGoAction->setShortcut(QKeySequence("Ctrl+Shift+V"));
connect(m_pasteAndGoAction, SIGNAL(triggered()), this, SLOT(pasteAndGo()));
} }
if (!m_clearAction) { if (!m_clearAction) {
@ -374,6 +375,14 @@ void LocationBar::mousePressEvent(QMouseEvent* event)
void LocationBar::keyPressEvent(QKeyEvent* event) void LocationBar::keyPressEvent(QKeyEvent* event)
{ {
switch (event->key()) { switch (event->key()) {
case Qt::Key_V:
if (event->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) {
pasteAndGo();
event->accept();
return;
}
break;
case Qt::Key_Escape: case Qt::Key_Escape:
m_webView->setFocus(); m_webView->setFocus();
showUrl(m_webView->url()); showUrl(m_webView->url());
@ -401,8 +410,9 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
} }
default: default:
m_holdingAlt = false; m_holdingAlt = false;
LineEdit::keyPressEvent(event);
} }
LineEdit::keyPressEvent(event);
} }
void LocationBar::keyReleaseEvent(QKeyEvent* event) void LocationBar::keyReleaseEvent(QKeyEvent* event)