From 2bb95ad564a8befa09ab6188341b4928166517ed Mon Sep 17 00:00:00 2001 From: megabigbug Date: Sat, 11 Sep 2010 13:27:11 +0200 Subject: properly handle modifiers+return key when the completion list is displayed TODO: fix when the completion list is not displayed --- src/urlbar/completionwidget.cpp | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'src/urlbar') diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index be189001..f8bf6ee2 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -273,12 +273,39 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev) case Qt::Key_Enter: case Qt::Key_Return: - - // let urlbar handle Return + Modifiers - if(!(kev->modifiers() & Qt::NoModifier)) - return false; - w = qobject_cast(parent()); + + if (!w->text().startsWith(QL1S("http://"), Qt::CaseInsensitive)) + { + QString append; + if (kev->modifiers() == Qt::ControlModifier) + { + append = QL1S(".com"); + } + else if (kev->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) + { + append = QL1S(".org"); + } + else if (kev->modifiers() == Qt::ShiftModifier) + { + append = QL1S(".net"); + } + + if (!append.isEmpty()) + { + QUrl url(QL1S("http://www.") + w->text()); + QString host = url.host(); + if (!host.endsWith(append, Qt::CaseInsensitive)) + { + host += append; + url.setHost(host); + } + + emit chosenUrl(url, Rekonq::CurrentTab); + } + } + + if( _currentIndex == -1) _currentIndex = 0; child = findChild(QString::number(_currentIndex)); -- cgit v1.2.1