From a71efecbcc6f714d619a922a0eaa665a3c68a3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Mon, 12 Jun 2017 15:57:31 +0200
Subject: 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>
---
 .../webenginewidgets/simplebrowser/browserwindow.h     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'examples/webenginewidgets/simplebrowser/browserwindow.h')

diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.h b/examples/webenginewidgets/simplebrowser/browserwindow.h
index 03c8d385b..745061691 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.h
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.h
@@ -42,14 +42,16 @@
 #define BROWSERWINDOW_H
 
 #include <QMainWindow>
+#include <QTime>
 #include <QWebEnginePage>
 
 QT_BEGIN_NAMESPACE
+class QLineEdit;
 class QProgressBar;
 QT_END_NAMESPACE
 
+class Browser;
 class TabWidget;
-class UrlLineEdit;
 class WebView;
 
 class BrowserWindow : public QMainWindow
@@ -57,15 +59,11 @@ class BrowserWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    BrowserWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = 0);
-    ~BrowserWindow();
+    BrowserWindow(Browser *browser);
     QSize sizeHint() const override;
     TabWidget *tabWidget() const;
     WebView *currentTab() const;
-
-    void loadPage(const QString &url);
-    void loadPage(const QUrl &url);
-    void loadHomePage();
+    Browser *browser() { return m_browser; }
 
 protected:
     void closeEvent(QCloseEvent *event) override;
@@ -77,8 +75,6 @@ private slots:
     void handleShowWindowTriggered();
     void handleWebViewLoadProgress(int);
     void handleWebViewTitleChanged(const QString &title);
-    void handleWebViewUrlChanged(const QUrl &url);
-    void handleWebViewIconChanged(const QIcon &icon);
     void handleWebActionEnabledChanged(QWebEnginePage::WebAction action, bool enabled);
 
 private:
@@ -90,6 +86,7 @@ private:
     QToolBar *createToolBar();
 
 private:
+    Browser *m_browser;
     TabWidget *m_tabWidget;
     QProgressBar *m_progressBar;
     QAction *m_historyBackAction;
@@ -97,7 +94,8 @@ private:
     QAction *m_stopAction;
     QAction *m_reloadAction;
     QAction *m_stopReloadAction;
-    UrlLineEdit *m_urlLineEdit;
+    QLineEdit *m_urlLineEdit;
+    QAction *m_favAction;
     QString m_lastSearch;
 };
 
-- 
cgit v1.2.1