From 2a51875f1e5601f813dd9e9866dd581d3b1eac26 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Wed, 3 Jul 2013 12:21:34 +0200
Subject: [PATCH] Move the icons into common.
Use the same icons for the widgets and qtquick example.
Remove the styling as it does not work on all platforms anyway.
Change-Id: Iff59455689619ae45823eb835768d7c4fc75bd93
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
examples/common.pri | 2 ++
examples/common/common_resources.qrc | 8 ++++++++
examples/{qtquick => common}/icons/go-next.png | Bin
.../{qtquick => common}/icons/go-previous.png | Bin
.../{qtquick => common}/icons/process-stop.png | Bin
.../{qtquick => common}/icons/view-refresh.png | Bin
examples/qtquick/quickwindow.qml | 9 +++------
examples/qtquick/resources.qrc | 6 ------
examples/widgets/widgetwindow.cpp | 14 +++++---------
9 files changed, 18 insertions(+), 21 deletions(-)
create mode 100644 examples/common/common_resources.qrc
rename examples/{qtquick => common}/icons/go-next.png (100%)
rename examples/{qtquick => common}/icons/go-previous.png (100%)
rename examples/{qtquick => common}/icons/process-stop.png (100%)
rename examples/{qtquick => common}/icons/view-refresh.png (100%)
diff --git a/examples/common.pri b/examples/common.pri
index 0724ea3f8..b5fe6b5a0 100644
--- a/examples/common.pri
+++ b/examples/common.pri
@@ -6,6 +6,8 @@ else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
HEADERS += common/util.h
+RESOURCES += $$absolute_path(common/common_resources.qrc)
+
LIBS += -L$$LIBPATH -lQt5WebEngine
QMAKE_RPATHDIR += $$LIBPATH
diff --git a/examples/common/common_resources.qrc b/examples/common/common_resources.qrc
new file mode 100644
index 000000000..45e766179
--- /dev/null
+++ b/examples/common/common_resources.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="icons">
+ <file alias="go-next.png">icons/go-next.png</file>
+ <file alias="go-previous.png">icons/go-previous.png</file>
+ <file alias="process-stop.png">icons/process-stop.png</file>
+ <file alias="view-refresh.png">icons/view-refresh.png</file>
+</qresource>
+</RCC>
diff --git a/examples/qtquick/icons/go-next.png b/examples/common/icons/go-next.png
similarity index 100%
rename from examples/qtquick/icons/go-next.png
rename to examples/common/icons/go-next.png
diff --git a/examples/qtquick/icons/go-previous.png b/examples/common/icons/go-previous.png
similarity index 100%
rename from examples/qtquick/icons/go-previous.png
rename to examples/common/icons/go-previous.png
diff --git a/examples/qtquick/icons/process-stop.png b/examples/common/icons/process-stop.png
similarity index 100%
rename from examples/qtquick/icons/process-stop.png
rename to examples/common/icons/process-stop.png
diff --git a/examples/qtquick/icons/view-refresh.png b/examples/common/icons/view-refresh.png
similarity index 100%
rename from examples/qtquick/icons/view-refresh.png
rename to examples/common/icons/view-refresh.png
diff --git a/examples/qtquick/quickwindow.qml b/examples/qtquick/quickwindow.qml
index 13e3ec6d0..cd005940d 100644
--- a/examples/qtquick/quickwindow.qml
+++ b/examples/qtquick/quickwindow.qml
@@ -57,22 +57,19 @@ ApplicationWindow {
ToolButton {
id: backButton
- iconName: "go-previous"
- iconSource: ":/icons/go-previous.png"
+ iconSource: "icons/go-previous.png"
onClicked: webContentsView.goBack()
enabled: webContentsView.canGoBack
}
ToolButton {
id: forwardButton
- iconName: "go-next"
- iconSource: ":/icons/go-next.png"
+ iconSource: "icons/go-next.png"
onClicked: webContentsView.goForward()
enabled: webContentsView.canGoForward
}
ToolButton {
id: reloadButton
- iconName: webContentsView.loading ? "process-stop" : "view-refresh"
- iconSource: webContentsView.loading ? ":/icons/process-stop.png" : ":/icons/view-refresh.png"
+ iconSource: webContentsView.loading ? "icons/process-stop.png" : "icons/view-refresh.png"
onClicked: webContentsView.reload()
}
TextField {
diff --git a/examples/qtquick/resources.qrc b/examples/qtquick/resources.qrc
index a91907a60..de8232440 100644
--- a/examples/qtquick/resources.qrc
+++ b/examples/qtquick/resources.qrc
@@ -2,10 +2,4 @@
<qresource>
<file>quickwindow.qml</file>
</qresource>
-<qresource prefix="/icons">
- <file alias="go-next.png">icons/go-next.png</file>
- <file alias="go-previous.png">icons/go-previous.png</file>
- <file alias="process-stop.png">icons/process-stop.png</file>
- <file alias="view-refresh.png">icons/view-refresh.png</file>
-</qresource>
</RCC>
diff --git a/examples/widgets/widgetwindow.cpp b/examples/widgets/widgetwindow.cpp
index a28a6f130..7f54add09 100644
--- a/examples/widgets/widgetwindow.cpp
+++ b/examples/widgets/widgetwindow.cpp
@@ -50,10 +50,6 @@ WidgetWindow::WidgetWindow()
: m_webView(new QWebContentsView)
, addressLineEdit(0)
{
- // Use oxygen as a fallback.
- if (QIcon::themeName().isEmpty())
- QIcon::setThemeName("oxygen");
-
setGeometry(0, 0, 800, 600);
QVBoxLayout* layout = new QVBoxLayout;
@@ -64,15 +60,15 @@ WidgetWindow::WidgetWindow()
addressBar->setSpacing(margin); // Bigger buttons, less space between them
backButton = new QToolButton;
- backButton->setIcon(QIcon::fromTheme("go-previous"));
+ backButton->setIcon(QIcon(":/icons/go-previous.png"));
addressBar->addWidget(backButton);
forwardButton = new QToolButton;
- forwardButton->setIcon(QIcon::fromTheme("go-next"));
+ forwardButton->setIcon(QIcon(":/icons/go-next.png"));
addressBar->addWidget(forwardButton);
reloadButton = new QToolButton;
- reloadButton->setIcon(QIcon::fromTheme("view-refresh"));
+ reloadButton->setIcon(QIcon::fromTheme(":/icons/view-refresh.png"));
addressBar->addWidget(reloadButton);
addressLineEdit = new QLineEdit;
@@ -111,7 +107,7 @@ void WidgetWindow::setAddressBarUrl(const QUrl& url)
void WidgetWindow::loadStarted()
{
- reloadButton->setIcon(QIcon::fromTheme("process-stop"));
+ reloadButton->setIcon(QIcon(":/icons/process-stop.png"));
}
void WidgetWindow::loadFinished(bool success)
@@ -119,5 +115,5 @@ void WidgetWindow::loadFinished(bool success)
Q_UNUSED(success);
forwardButton->setEnabled(m_webView->canGoForward());
backButton->setEnabled(m_webView->canGoBack());
- reloadButton->setIcon(QIcon::fromTheme("view-refresh"));
+ reloadButton->setIcon(QIcon(":/icons/view-refresh.png"));
}
--
GitLab