remove now unneccessary svg image provider

7 years ago · b3d6ec8f23
15 changed files with 26 additions and 102 deletions
--- a/src/imports/mvvmdatasyncquick/ChangeRemoteView.qml
+++ b/src/imports/mvvmdatasyncquick/ChangeRemoteView.qml
@ -24,7 +24,7 @@ Page {
 			ActionButton {
 				id: _cancelButton
 				icon.name: "gtk-cancel"
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_close"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_close.svg"
 				text: qsTr("Cancel")
 				onClicked: QuickPresenter.popView()
 			}
@ -43,7 +43,7 @@ Page {
 				icon.width: 24
 				icon.height: 24
 				icon.name: "gtk-apply"
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_check"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_check.svg"
 				display: AbstractButton.TextBesideIcon
 				rightPadding: 16

@ -167,7 +167,7 @@ Page {
 						icon.width: 24
 						icon.height: 24
 						icon.name: "user-trash"
-						icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_delete_forever"
+						icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_delete_forever.svg"
 						anchors.right: parent.right
 						implicitHeight: parent.height
 						implicitWidth: implicitHeight
@ -198,7 +198,7 @@ Page {
 						icon.width: 24
 						icon.height: 24
 						icon.name: "list-add"
-						icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_add"
+						icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_add.svg"

 						onClicked: {
 							viewModel.addHeaderConfig(_keyEdit.text, _valueEdit.text);
--- a/src/imports/mvvmdatasyncquick/DataSyncView.qml
+++ b/src/imports/mvvmdatasyncquick/DataSyncView.qml
@ -29,14 +29,15 @@ Page {
 			ActionButton {
 				id: _syncButton
 				icon.name: "view-refresh"
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_sync"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_sync.svg"
 				text: qsTr("Synchronize")
 				onClicked: viewModel.syncOrConnect()
 			}

 			ActionButton {
 				id: _idButton
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_fingerprint"
+				icon.name: "fingerprint-gui"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_fingerprint.svg"
 				text: qsTr("Edit Identity")
 				onClicked: viewModel.showDeviceInfo()
 			}
@ -211,13 +212,16 @@ Page {
 							implicitWidth: parent.width

 							icon.name: "user-trash"
-							icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_delete_forever"
+							icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_delete_forever.svg"
 							text: qsTr("Remove Device")

 							Material.foreground: "white"
 							Universal.foreground: "white"

-							onClicked: viewModel.removeDevice(index)
+							onClicked: {
+								_swipeDelegate.swipe.close();
+								viewModel.removeDevice(index)
+							}
 						}
 					}
 				}
@ -235,8 +239,8 @@ Page {
 		text: qsTr("Add new devices")
 		icon.name: checked ? "tab-close" : "list-add"
 		icon.source: checked ?
-						 "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_close" :
-						 "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_add"
+						 "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_close.svg" :
+						 "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_add.svg"
 	}

 	SubButton {
@ -247,7 +251,7 @@ Page {

 		text: qsTr("Network Exchange")
 		icon.name: "network-connect"
-		icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_exchange"
+		icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_exchange.svg"

 		onClicked: {
 			viewModel.startNetworkExchange();
@ -263,7 +267,7 @@ Page {

 		text: qsTr("Export to file")
 		icon.name: "document-export"
-		icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_export"
+		icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_export.svg"

 		onClicked: {
 			viewModel.startExport();
@ -279,7 +283,7 @@ Page {

 		text: qsTr("Import from file")
 		icon.name: "document-import"
-		icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_import"
+		icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_import.svg"

 		onClicked: {
 			viewModel.startImport();
--- a/src/imports/mvvmdatasyncquick/mvvmdatasyncquick.pro
+++ b/src/imports/mvvmdatasyncquick/mvvmdatasyncquick.pro
@ -1,4 +1,4 @@
-QT += core qml quick mvvmdatasyncquick
+QT += core qml quick svg mvvmdatasyncquick
 CXX_MODULE = mvvmdatasyncquick
 TARGETPATH = de/skycoder42/QtMvvm/DataSync/Quick
 TARGET  = declarative_mvvmdatasyncquick
--- a/src/imports/mvvmquick/MenuButton.qml
+++ b/src/imports/mvvmquick/MenuButton.qml
@ -5,7 +5,7 @@ import de.skycoder42.QtMvvm.Quick 1.0
 ActionButton {
 	id: _menuButton
 	icon.name: "view-more-symbolic"
-	icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_more_vert"
+	icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_more_vert.svg"
 	text: qsTr("More…")
 	checkable: true
 	checked: _moreMenu.visible
--- a/src/imports/mvvmquick/MsgBox.qml
+++ b/src/imports/mvvmquick/MsgBox.qml
@ -6,7 +6,7 @@ MsgBoxBase {

 	iconVisible: msgConfig.subType != "about"
 	iconSource: {
-		var base = "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_%1";
+		var base = "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_%1.svg";
 		switch(String(msgConfig.subType)) {
 		case "information":
 			base = base.arg("info");
--- a/src/imports/mvvmquick/OverviewListView.qml
+++ b/src/imports/mvvmquick/OverviewListView.qml
@ -62,7 +62,7 @@ ListView {

 			TintIcon {
 				id: openIcon
-				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_chevron_right"
+				source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_chevron_right.svg"
 				Layout.row: 0
 				Layout.column: 2
 				Layout.rowSpan: 2
--- a/src/imports/mvvmquick/SettingsView.qml
+++ b/src/imports/mvvmquick/SettingsView.qml
@ -58,7 +58,7 @@ Page {
 			ActionButton {
 				id: _restoreButton
 				visible: _builder.allowRestore
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_settings_backup_restore"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_settings_backup_restore.svg"
 				text: qsTr("Restore settings")
 				onClicked: _builder.restoreDefaults()
 			}
@ -71,7 +71,7 @@ Page {
 			PropertyChanges {
 				target: _searchButton
 				icon.name: "search"
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_search"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_search.svg"
 			}
 			PropertyChanges {
 				target: _titleLabel
@ -92,7 +92,7 @@ Page {
 			PropertyChanges {
 				target: _searchButton
 				icon.name: "gtk-close"
-				icon.source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_close"
+				icon.source: "qrc:/de/skycoder42/qtmvvm/quick/icons/ic_close.svg"
 			}
 			PropertyChanges {
 				target: _titleLabel
--- a/src/imports/mvvmquick/mvvmquick.pro
+++ b/src/imports/mvvmquick/mvvmquick.pro
@ -9,7 +9,6 @@ DEFINES += "VERSION_MINOR=$$MODULE_VERSION_MINOR"
 HEADERS += \
 	qtmvvmquick_plugin.h \
 	qqmlquickpresenter.h \
-	svgimageprovider.h \
 	settingsuibuilder.h \
 	settingssectionmodel.h \
 	multifilterproxymodel.h \
@ -18,7 +17,6 @@ HEADERS += \
 SOURCES += \
 	qtmvvmquick_plugin.cpp \
 	qqmlquickpresenter.cpp \
-	svgimageprovider.cpp \
 	settingsuibuilder.cpp \
 	settingssectionmodel.cpp \
 	multifilterproxymodel.cpp \
--- a/src/imports/mvvmquick/qtmvvmquick_plugin.cpp
+++ b/src/imports/mvvmquick/qtmvvmquick_plugin.cpp
@ -5,7 +5,6 @@
 #include <QtMvvmQuick/InputViewFactory>

 #include "qqmlquickpresenter.h"
-#include "svgimageprovider.h"
 #include "settingsuibuilder.h"
 #ifdef Q_OS_ANDROID
 #include "androidfilechooser.h"
@ -21,7 +20,6 @@ static void initResources()
 static QObject *createQuickPresenterQmlSingleton(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
 {
 	Q_UNUSED(jsEngine)
-	qmlEngine->addImageProvider(QStringLiteral("svg"), new QtMvvm::SvgImageProvider());
 	return new QtMvvm::QQmlQuickPresenter(qmlEngine);
 }

--- a/src/imports/mvvmquick/settingssectionmodel.cpp
+++ b/src/imports/mvvmquick/settingssectionmodel.cpp
@ -100,13 +100,10 @@ SettingsSectionModel::SectionInfo::SectionInfo(SettingsElements::Section section
 	Section(section),
 	category(category)
 {
-	icon = SettingsUiBuilder::svgEscape(icon);
 	category.sections.clear();
 }

 SettingsSectionModel::SectionInfo::SectionInfo(SettingsElements::Category category) :
 	Section{category.title, category.icon, category.tooltip, category.sections.first().groups, {}, {}},
 	category()
-{
-	icon = SettingsUiBuilder::svgEscape(icon);
-}
+{}
--- a/src/imports/mvvmquick/settingsuibuilder.cpp
+++ b/src/imports/mvvmquick/settingsuibuilder.cpp
@ -41,20 +41,6 @@ QString SettingsUiBuilder::filterText() const
 	return _filterText;
 }

-QUrl SettingsUiBuilder::svgEscape(QUrl url)
-{
-	if(url.scheme() == QStringLiteral("qrc")) {
-		auto path = url.path();
-		if(path.endsWith(QStringLiteral(".svg"))) {
-			path.chop(4);
-			path.prepend(QStringLiteral("image://svg"));
-			return path;
-		}
-	}
-
-	return url;
-}
-
 void SettingsUiBuilder::loadSection(const SettingsElements::Section &section)
 {
 	auto inputFactory = QuickPresenterPrivate::currentPresenter()->inputViewFactory();
--- a/src/imports/mvvmquick/settingsuibuilder.h
+++ b/src/imports/mvvmquick/settingsuibuilder.h
@ -29,8 +29,6 @@ public:

 	QString filterText() const;

-	static QUrl svgEscape(QUrl url);
-
 public Q_SLOTS:
 	void loadSection(const QtMvvm::SettingsElements::Section &section);
 	void showDialog(const QString &key, const QString &title, const QString &type, const QVariant &defaultValue, const QVariantMap &properties);
--- a/src/imports/mvvmquick/svgimageprovider.cpp
+++ b/src/imports/mvvmquick/svgimageprovider.cpp
@ -1,39 +0,0 @@
-#include "svgimageprovider.h"
-
-#include <QtGui/QGuiApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QScreen>
-
-#include <QtSvg/QSvgRenderer>
-
-using namespace QtMvvm;
-
-SvgImageProvider::SvgImageProvider() :
-	QQuickImageProvider(Image)
-{}
-
-QImage SvgImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
-{
-	auto path = QStringLiteral(":/%1.svg").arg(id);
-	QScopedPointer<QSvgRenderer, QScopedPointerDeleteLater> renderer(new QSvgRenderer(path));
-	if(renderer->isValid()) {
-		QSize tSize;
-		if(requestedSize.isValid())
-			tSize = requestedSize;
-		else {
-			tSize = renderer->defaultSize();
-			tSize *= QGuiApplication::primaryScreen()->devicePixelRatio();
-		}
-
-		QImage image(tSize, QImage::Format_ARGB32_Premultiplied);
-		image.fill(Qt::transparent);
-		QPainter painter(&image);
-		renderer->render(&painter);
-		*size = image.size();
-
-		return image;
-	} else {
-		*size = QSize();
-		return QImage();
-	}
-}
--- a/src/imports/mvvmquick/svgimageprovider.h
+++ b/src/imports/mvvmquick/svgimageprovider.h
@ -1,18 +0,0 @@
-#ifndef QTMVVM_SVGIMAGEPROVIDER_H
-#define QTMVVM_SVGIMAGEPROVIDER_H
-
-#include <QtQuick/QQuickImageProvider>
-
-namespace QtMvvm {
-
-class SvgImageProvider : public QQuickImageProvider
-{
-public:
-	explicit SvgImageProvider();
-
-	QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
-};
-
-}
-
-#endif // QTMVVM_SVGIMAGEPROVIDER_H
--- a/src/mvvmquick/mvvmquick.pro
+++ b/src/mvvmquick/mvvmquick.pro
@ -1,6 +1,6 @@
 TARGET = QtMvvmQuick

-QT = core gui qml quick mvvmcore mvvmcore-private
+QT = core gui qml quick svg mvvmcore mvvmcore-private

 HEADERS += \
 	qtmvvmquick_global.h \