diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
| commit | b045cf0ab9756a67a5a1037c231199ee9bf2d074 (patch) | |
| tree | 43831df602905b64552cf31a233127bed9904fc8 /examples/webenginewidgets/simplebrowser/browserwindow.cpp | |
| parent | 0bbaf0d5d7b2d406eda57d40370b00fb79cc0aeb (diff) | |
| parent | 7f7af6290a63bdab76855da5866881c8a53f045c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/3rdparty
Change-Id: Ie6b1922db2269e0e0561022162228a7c8609c9ba
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/browserwindow.cpp')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/browserwindow.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp index e114ae0f3..016d58afe 100644 --- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp +++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp @@ -67,9 +67,10 @@ #include <QVBoxLayout> #include <QWebEngineProfile> -BrowserWindow::BrowserWindow(Browser *browser) +BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile) : m_browser(browser) - , m_tabWidget(new TabWidget(this)) + , m_profile(profile) + , m_tabWidget(new TabWidget(profile, this)) , m_progressBar(new QProgressBar(this)) , m_historyBackAction(nullptr) , m_historyForwardAction(nullptr) @@ -141,6 +142,7 @@ QMenu *BrowserWindow::createFileMenu(TabWidget *tabWidget) { QMenu *fileMenu = new QMenu(tr("&File")); fileMenu->addAction(tr("&New Window"), this, &BrowserWindow::handleNewWindowTriggered, QKeySequence::New); + fileMenu->addAction(tr("New &Incognito Window"), this, &BrowserWindow::handleNewIncognitoWindowTriggered); QAction *newTabAction = new QAction(tr("New &Tab"), this); newTabAction->setShortcuts(QKeySequence::AddTab); @@ -403,10 +405,14 @@ void BrowserWindow::handleWebActionEnabledChanged(QWebEnginePage::WebAction acti void BrowserWindow::handleWebViewTitleChanged(const QString &title) { + QString suffix = m_profile->isOffTheRecord() + ? tr("Qt Simple Browser (Incognito)") + : tr("Qt Simple Browser"); + if (title.isEmpty()) - setWindowTitle(tr("Qt Simple Browser")); + setWindowTitle(suffix); else - setWindowTitle(tr("%1 - Qt Simple Browser").arg(title)); + setWindowTitle(title + " - " + suffix); } void BrowserWindow::handleNewWindowTriggered() @@ -414,6 +420,11 @@ void BrowserWindow::handleNewWindowTriggered() m_browser->createWindow(); } +void BrowserWindow::handleNewIncognitoWindowTriggered() +{ + m_browser->createWindow(/* offTheRecord: */ true); +} + void BrowserWindow::handleFileOpenTriggered() { QUrl url = QFileDialog::getOpenFileUrl(this, tr("Open Web Resource"), QString(), |