From 9b3805dc3c08533c2000dd621320142913bdd8ec Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Fri, 23 Dec 2016 12:06:50 +0000 Subject: [PATCH] WebPage add http:// if no scheme present .. so users can set a url to news.bbc.co.uk without having to type out http:// first. --- src/Train/WebPageWindow.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Train/WebPageWindow.cpp b/src/Train/WebPageWindow.cpp index 2a6cb9770..d44fbdc17 100644 --- a/src/Train/WebPageWindow.cpp +++ b/src/Train/WebPageWindow.cpp @@ -222,10 +222,14 @@ WebPageWindow::forceReplot() void WebPageWindow::userUrl() { + // add http:// if scheme is missing + QRegExp hasscheme("^[^:]*://.*"); + QString url = rCustomUrl->text(); + if (!hasscheme.exactMatch(url)) url = "http://" + url; #ifdef NOWEBKIT - view->setUrl(QUrl(rCustomUrl->text())); + view->setUrl(QUrl(url)); #else - view->page()->mainFrame()->load(QUrl(rCustomUrl->text())); + view->page()->mainFrame()->load(QUrl(url)); //qDebug()<<"load page"<text(); #endif } @@ -278,7 +282,7 @@ WebPageWindow::event(QEvent *event) void WebPageWindow::downloadRequested(QWebEngineDownloadItem *item) { - qDebug()<<"Download Requested:"<url().toString(); + //qDebug()<<"Download Requested:"<url().toString(); } void WebPageWindow::linkHovered(QString link)