diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2017-06-12 15:57:31 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2017-07-19 10:16:37 +0000 |
commit | a71efecbcc6f714d619a922a0eaa665a3c68a3b2 (patch) | |
tree | 8d6770e40c83a0b4ef3f6cbff4f7d8a1adf77324 /examples/webenginewidgets/simplebrowser/main.cpp | |
parent | ae71f77d5f680d8b40c9598321a687318a7ff0b2 (diff) |
Update Simple Browser example
- Accept downloads and add a downloads list.
- Fix toolbar icons being pixelated on hidpi screens by
- enabling attribute AA_UseHighDpiPixmaps, and
- replacing the 22x22 icons with 32x32 versions.
- Move favicon selection to WebView to reduce duplication.
- Replace UrlLineEdit with a standard QLineEdit using a QAction for the favicon
and setClearButtonEnabled(true) for the clear button.
- Fix bug where the "File -> New Tab" action would create background tabs
because the QAction::triggered(bool) signal was connected to the
TabWidget::createTab(bool) slot with the bool argument having a completely
different meaning between the two.
- Make the toolbar unmovable. Nobody wants to move the toolbar.
- Add tooltips to toolbar buttons.
- Add tooltips to the tab bar (page titles).
- Stop adding icons to menu items only to disable them right after.
Task-number: QTBUG-60655
Change-Id: I10cc0fa82dbf39281bbdbbf9ef901e1b26402f80
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/main.cpp')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/main.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp index fa9f44c34..93dfc8a8c 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -40,38 +40,35 @@ #include "browser.h" #include "browserwindow.h" +#include "webview.h" #include <QApplication> #include <QWebEngineSettings> -QString getCommandLineUrlArgument() +QUrl getCommandLineUrlArgument() { const QStringList args = QCoreApplication::arguments(); - if (args.count() > 1) { - const QString lastArg = args.last(); - const bool isValidUrl = QUrl::fromUserInput(lastArg).isValid(); - if (isValidUrl) - return lastArg; - } - return QString(); + if (args.count() > 1) + return QUrl::fromUserInput(args.last()); + return QUrl(); } int main(int argc, char **argv) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); - app.setWindowIcon(QIcon(QLatin1String(":simplebrowser.svg"))); + app.setWindowIcon(QIcon(QStringLiteral(":AppLogoColor.png"))); QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::PluginsEnabled, true); - BrowserWindow *window = new BrowserWindow(); - Browser::instance().addWindow(window); + QUrl url = getCommandLineUrlArgument(); + if (!url.isValid()) + url = QStringLiteral("https://www.qt.io"); - const QString url = getCommandLineUrlArgument(); - if (!url.isEmpty()) - window->loadPage(url); - else - window->loadHomePage(); + Browser browser; + BrowserWindow *window = browser.createWindow(); + window->currentTab()->setUrl(url); return app.exec(); } |