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/urllineedit.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/urllineedit.cpp')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/urllineedit.cpp | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/examples/webenginewidgets/simplebrowser/urllineedit.cpp b/examples/webenginewidgets/simplebrowser/urllineedit.cpp deleted file mode 100644 index 7e67b635a..000000000 --- a/examples/webenginewidgets/simplebrowser/urllineedit.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "urllineedit.h" -#include <QToolButton> -#include <QUrl> - -UrlLineEdit::UrlLineEdit(QWidget *parent) - : QLineEdit(parent) - , m_favButton(new QToolButton(this)) - , m_clearButton(new QToolButton(this)) -{ - m_clearButton->setIcon(QIcon(QStringLiteral(":closetab.png"))); - m_clearButton->setVisible(false); - m_clearButton->setCursor(Qt::ArrowCursor); - QString style(QStringLiteral("QToolButton { border: none; padding: 1px; }")); - m_clearButton->setStyleSheet(style); - m_favButton->setStyleSheet(style); - setStyleSheet(QStringLiteral("QLineEdit { padding-left: %1px; padding-right: %2px; } ") - .arg(m_clearButton->sizeHint().width()) - .arg(m_favButton->sizeHint().width())); - int minIconHeight = qMax(m_favButton->sizeHint().height(), m_clearButton->sizeHint().height()); - setMinimumSize(minimumSizeHint().width() + - m_favButton->sizeHint().width() + - m_clearButton->sizeHint().width(), - qMax(minimumSizeHint().height(), minIconHeight)); - - connect(m_clearButton, &QToolButton::clicked, this, &QLineEdit::clear); - connect(this, &QLineEdit::textChanged, [this](const QString &text) { - m_clearButton->setVisible(!text.isEmpty() && !isReadOnly()); - }); -} - -QUrl UrlLineEdit::url() const -{ - return QUrl::fromUserInput(text()); -} - -void UrlLineEdit::setUrl(const QUrl &url) -{ - setText(url.toString()); - setCursorPosition(0); -} - -void UrlLineEdit::setFavIcon(const QIcon &icon) -{ - QPixmap pixmap = icon.pixmap(16, 16); - m_favButton->setIcon(pixmap); -} - -void UrlLineEdit::resizeEvent(QResizeEvent *event) -{ - QLineEdit::resizeEvent(event); - QSize clearButtonSize = m_clearButton->sizeHint(); - m_clearButton->move(rect().right() - clearButtonSize.width(), - (rect().bottom() - clearButtonSize.height()) / 2); - m_favButton->move(rect().left(), (rect().bottom() - m_favButton->sizeHint().height()) / 2); -} |