Title: [99527] trunk/Tools
- Revision
- 99527
- Author
- [email protected]
- Date
- 2011-11-07 23:49:53 -0800 (Mon, 07 Nov 2011)
Log Message
[Qt][WK2] MiniBrowser should use urlFromUserInput()
https://bugs.webkit.org/show_bug.cgi?id=71680
Use urlFromUserInput() / QUrl::fromUserInput() to automatically
complete urls in MiniBrowser.
Patch by Zeno Albisser <[email protected]> on 2011-11-07
Reviewed by Tor Arne Vestbø.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::load):
* MiniBrowser/qt/qml/BrowserWindow.qml:
* MiniBrowser/qt/utils.cpp:
(Utils::urlFromUserInput):
* MiniBrowser/qt/utils.h:
(Utils::Utils):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99526 => 99527)
--- trunk/Tools/ChangeLog 2011-11-08 07:32:44 UTC (rev 99526)
+++ trunk/Tools/ChangeLog 2011-11-08 07:49:53 UTC (rev 99527)
@@ -1,3 +1,22 @@
+2011-11-07 Zeno Albisser <[email protected]>
+
+ [Qt][WK2] MiniBrowser should use urlFromUserInput()
+ https://bugs.webkit.org/show_bug.cgi?id=71680
+
+ Use urlFromUserInput() / QUrl::fromUserInput() to automatically
+ complete urls in MiniBrowser.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::load):
+ * MiniBrowser/qt/qml/BrowserWindow.qml:
+ * MiniBrowser/qt/utils.cpp:
+ (Utils::urlFromUserInput):
+ * MiniBrowser/qt/utils.h:
+ (Utils::Utils):
+
2011-11-07 Yuqiang Xian <[email protected]>
Added myself as a committer.
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (99526 => 99527)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-11-08 07:32:44 UTC (rev 99526)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-11-08 07:49:53 UTC (rev 99527)
@@ -47,6 +47,8 @@
qmlImportDir.cd("../imports");
engine()->addImportPath(qmlImportDir.canonicalPath());
+ Utils* utils = new Utils(this);
+ engine()->rootContext()->setContextProperty("utils", utils);
engine()->rootContext()->setContextProperty("options", options);
setSource(QUrl("qrc:/qml/BrowserWindow.qml"));
connect(rootObject(), SIGNAL(pageTitleChanged(QString)), this, SLOT(setWindowTitle(QString)));
@@ -68,7 +70,7 @@
void BrowserWindow::load(const QString& url)
{
- QUrl completedUrl = urlFromUserInput(url);
+ QUrl completedUrl = Utils::urlFromUserInput(url);
QMetaObject::invokeMethod(rootObject(), "load", Qt::DirectConnection, Q_ARG(QVariant, completedUrl));
}
Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (99526 => 99527)
--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2011-11-08 07:32:44 UTC (rev 99526)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2011-11-08 07:49:53 UTC (rev 99527)
@@ -178,7 +178,7 @@
Keys.onReturnPressed:{
console.log("going to: ", addressLine.text)
- webView.load(addressLine.text)
+ webView.load(utils.urlFromUserInput(addressLine.text))
}
Keys.onPressed: {
Modified: trunk/Tools/MiniBrowser/qt/utils.cpp (99526 => 99527)
--- trunk/Tools/MiniBrowser/qt/utils.cpp 2011-11-08 07:32:44 UTC (rev 99526)
+++ trunk/Tools/MiniBrowser/qt/utils.cpp 2011-11-08 07:49:53 UTC (rev 99527)
@@ -87,7 +87,7 @@
exit(exitCode);
}
-QUrl urlFromUserInput(const QString& string)
+QUrl Utils::urlFromUserInput(const QString& string)
{
QString input(string);
QFileInfo fi(input);
Modified: trunk/Tools/MiniBrowser/qt/utils.h (99526 => 99527)
--- trunk/Tools/MiniBrowser/qt/utils.h 2011-11-08 07:32:44 UTC (rev 99526)
+++ trunk/Tools/MiniBrowser/qt/utils.h 2011-11-08 07:49:53 UTC (rev 99527)
@@ -42,6 +42,15 @@
#endif
// options handling
+class Utils : public QObject {
+ Q_OBJECT
+public:
+ Utils(QObject* parent = 0)
+ : QObject(parent) { }
+
+ Q_INVOKABLE static QUrl urlFromUserInput(const QString& input);
+};
+
bool takeOptionFlag(QStringList* arguments, const QString& name);
QString takeOptionValue(QStringList* arguments, const QString& name);
QString formatKeys(QList<QString> keys);
@@ -49,6 +58,4 @@
NO_RETURN void appQuit(int status, const QString& msg = QString());
-QUrl urlFromUserInput(const QString& input);
-
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
