[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
benjamin.poulain at nokia.com
benjamin.poulain at nokia.com
Wed Dec 22 15:51:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b89680c118a9e6712de3ddf312688aafdf35390b
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 15 16:56:00 2010 +0000
2010-11-15 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Andreas Kling.
[Qt] [WK2] Add Ctrl+L shortcut to Qt Minibrowser
https://bugs.webkit.org/show_bug.cgi?id=49544
Add the shortcut to BrowserWindow.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::openLocation):
* MiniBrowser/qt/BrowserWindow.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72008 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1ef619e..d1d057e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-15 Benjamin Poulain <benjamin.poulain at nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] [WK2] Add Ctrl+L shortcut to Qt Minibrowser
+ https://bugs.webkit.org/show_bug.cgi?id=49544
+
+ Add the shortcut to BrowserWindow.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::openLocation):
+ * MiniBrowser/qt/BrowserWindow.h:
+
2010-11-14 David Levin <levin at chromium.org>
Reviewed by Daniel Bates.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index a703788..985d88b 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -60,6 +60,9 @@ BrowserWindow::BrowserWindow()
m_browser->setFocus(Qt::OtherFocusReason);
+ QShortcut* selectAddressBar = new QShortcut(Qt::CTRL | Qt::Key_L, this);
+ connect(selectAddressBar, SIGNAL(activated()), this, SLOT(openLocation()));
+
resize(960, 640);
show();
}
@@ -77,6 +80,12 @@ BrowserWindow* BrowserWindow::newWindow(const QString& url)
return window;
}
+void BrowserWindow::openLocation()
+{
+ m_addressBar->selectAll();
+ m_addressBar->setFocus();
+}
+
void BrowserWindow::changeLocation()
{
QString string = m_addressBar->text();
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.h b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
index 47e55b5..79ba291 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
@@ -44,6 +44,7 @@ public:
public slots:
BrowserWindow* newWindow(const QString& url = "about:blank");
+ void openLocation();
protected slots:
void changeLocation();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list