added icons

src/imports/imports.pro

@@ -2,8 +2,8 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
-	mvvmquick \
+	mvvmcore \
-	mvvmcore
+	mvvmquick
 
 qtHaveModule(datasync) {
 	SUBDIRS += mvvmdatasynccore \

src/imports/mvvmdatasyncquick/DataSyncView.qml

@@ -36,21 +36,21 @@ Page {
 
 			ActionButton {
 				id: _syncButton
-				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_search"
+				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_sync"
 				toolTip: qsTr("Synchronize")
 				onClicked: viewModel.syncOrConnect()
 			}
 
 			ActionButton {
 				id: _idButton
-				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_settings_backup_restore"
+				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_fingerprint"
 				toolTip: qsTr("Edit Identity")
 				onClicked: viewModel.showDeviceInfo()
 			}
 
 			ActionButton {
 				id: _moreButton
-				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_search"//"image://svg/de/skycoder42/quickextras/icons/ic_more_vert"
+				source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_more_vert"
 				toolTip: qsTr("More…")
 				checkable: true
 				checked: _moreMenu.visible
@@ -237,7 +237,7 @@ Page {
 
 						ActionButton {
 							anchors.fill: parent
-							source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_close"
+							source: "image://svg/de/skycoder42/qtmvvm/quick/icons/ic_delete_forever"
 							toolTip: qsTr("Remove Device")
 
 							Material.foreground: "white"

src/imports/mvvmdatasyncquick/icons/ic_delete_forever_white_24px.svg

@@ -0,0 +1,5 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0V0z" fill="none"/>
+    <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zm2.46-7.12l1.41-1.41L12 12.59l2.12-2.12 1.41 1.41L13.41 14l2.12 2.12-1.41 1.41L12 15.41l-2.12 2.12-1.41-1.41L10.59 14l-2.13-2.12zM15.5 4l-1-1h-5l-1 1H5v2h14V4z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>

src/imports/mvvmdatasyncquick/icons/ic_fingerprint_white_24px.svg

@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86.47-5.57 1.41-.24.13-.54.04-.68-.2-.13-.24-.04-.55.2-.68C7.82 2.52 9.86 2 12.01 2c2.13 0 3.99.47 6.03 1.52.25.13.34.43.21.67-.09.18-.26.28-.44.28zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7.99-1.4 2.25-2.5 3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5.77 2.76 1.86 3.75 3.25.16.22.11.54-.12.7-.23.16-.54.11-.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4.01-1.36.7-2.5 1.7-3.4 2.96-.08.14-.23.21-.39.21zm6.25 12.07c-.13 0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34 0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22.5-.5.5s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44.32 2.77.93 3.85.64 1.15 1.08 1.64 1.85 2.42.19.2.19.51 0 .71-.11.1-.24.15-.37.15zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28.22-.5.5-.5s.5.22.5.5c0 1.41.72 2.74 1.94 3.56.71.48 1.54.71 2.54.71.24 0 .64-.03 1.04-.1.27-.05.53.13.58.41.05.27-.13.53-.41.58-.57.11-1.07.12-1.21.12zM14.91 22c-.04 0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22 0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07.93 1.94 2.08 1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61 4.03-.39.81-.59 1.76-.59 2.8 0 .78.07 2.01.67 3.61.1.26-.03.55-.29.64-.26.1-.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2.23-2.29.68-3.24 1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08 2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08.87-2.08 1.94c0 1.71.66 3.31 1.87 4.51.95.94 1.86 1.46 3.27 1.85.27.07.42.35.35.61-.05.23-.26.38-.47.38z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>

src/imports/mvvmdatasyncquick/icons/ic_more_vert_white_24px.svg

@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
+</svg>

src/imports/mvvmdatasyncquick/icons/ic_sync_white_24px.svg

@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>

src/imports/mvvmdatasyncquick/mvvmdatasyncquick.pro

@@ -38,3 +38,6 @@ generate_qmltypes {
 	mfirst.depends += qmltypes
 	QMAKE_EXTRA_TARGETS += mfirst
 }
+
+RESOURCES += \
+    qtmvvmdatasyncquick_plugin.qrc

src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp

@@ -4,9 +4,18 @@
 
 #include "testdummy.h"
 
+static void initResources()
+{
+#ifdef QT_STATIC
+	Q_INIT_RESOURCE(qtmvvmdatasyncquick_plugin);
+#endif
+}
+
 QtMvvmDataSyncQuickDeclarativeModule::QtMvvmDataSyncQuickDeclarativeModule(QObject *parent) :
 	QQmlExtensionPlugin(parent)
-{}
+{
+	initResources();
+}
 
 void QtMvvmDataSyncQuickDeclarativeModule::registerTypes(const char *uri)
 {

src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.qrc

@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/de/skycoder42/qtmvvm/quick/icons">
+        <file alias="ic_sync.svg">icons/ic_sync_white_24px.svg</file>
+        <file alias="ic_fingerprint.svg">icons/ic_fingerprint_white_24px.svg</file>
+        <file alias="ic_more_vert.svg">icons/ic_more_vert_white_24px.svg</file>
+        <file alias="ic_delete_forever.svg">icons/ic_delete_forever_white_24px.svg</file>
+    </qresource>
+</RCC>

src/mvvmdatasyncwidgets/changeremotedialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Change Remote</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
@@ -202,8 +202,8 @@
   </layout>
   <action name="actionA_dd_Header">
    <property name="icon">
-    <iconset theme="list-add">
+    <iconset theme="list-add" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/add.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/add.ico</iconset>
    </property>
    <property name="text">
     <string>A&amp;dd Header</string>
@@ -214,8 +214,8 @@
   </action>
   <action name="action_Remove_Header">
    <property name="icon">
-    <iconset theme="list-remove">
+    <iconset theme="list-remove" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Remove Selected Header</string>
@@ -225,7 +225,9 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="qtmvvmdatasyncwidgets_module.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/mvvmdatasyncwidgets/datasyncwindow.ui

@@ -226,8 +226,8 @@
         <string>Account &amp;actions</string>
        </property>
        <property name="icon">
-        <iconset theme="user-identity">
+        <iconset theme="user-identity" resource="qtmvvmdatasyncwidgets_module.qrc">
-         <normaloff>.</normaloff>.</iconset>
+         <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/user.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/user.ico</iconset>
        </property>
        <property name="popupMode">
         <enum>QToolButton::InstantPopup</enum>
@@ -242,8 +242,8 @@
   </layout>
   <action name="action_Import_from_file">
    <property name="icon">
-    <iconset theme="document-import">
+    <iconset theme="document-import" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/import.ico</normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/import.ico</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/import.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/import.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Import from file</string>
@@ -254,8 +254,8 @@
   </action>
   <action name="action_Export_to_file">
    <property name="icon">
-    <iconset theme="document-export">
+    <iconset theme="document-export" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/export.ico</normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/export.ico</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/export.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/export.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Export to file</string>
@@ -266,8 +266,8 @@
   </action>
   <action name="action_Network_exchange">
    <property name="icon">
-    <iconset theme="network-connect">
+    <iconset theme="network-connect" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/exchange.ico</normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/exchange.ico</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/exchange.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/exchange.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Network exchange</string>
@@ -278,8 +278,8 @@
   </action>
   <action name="action_Reset_Identity">
    <property name="icon">
-    <iconset theme="user-group-delete">
+    <iconset theme="user-group-delete" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/idreset.ico</normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/idreset.ico</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/reset.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/reset.ico</iconset>
    </property>
    <property name="text">
     <string>Rese&amp;t identity</string>
@@ -287,8 +287,8 @@
   </action>
   <action name="action_Change_Remote_Server">
    <property name="icon">
-    <iconset theme="network-server">
+    <iconset theme="network-server" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/changeRemote.ico</normaloff>:/de/skycoder42/qtmvvm/datasync/widgets/icons/changeRemote.ico</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/editServer.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/editServer.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Change remote server</string>
@@ -296,8 +296,8 @@
   </action>
   <action name="action_Remove_Device">
    <property name="icon">
-    <iconset theme="list-remove">
+    <iconset theme="list-remove" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Remove selected device</string>
@@ -308,8 +308,8 @@
   </action>
   <action name="actionEdit_Identity">
    <property name="icon">
-    <iconset theme="fingerprint-gui">
+    <iconset theme="fingerprint-gui" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/identity.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/identity.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Identity</string>
@@ -320,8 +320,8 @@
   </action>
   <action name="actionUpdate_Exchange_Key">
    <property name="icon">
-    <iconset theme="application-pgp-keys">
+    <iconset theme="application-pgp-keys" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/changeKey.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/changeKey.ico</iconset>
    </property>
    <property name="text">
     <string>Update exchange &amp;key</string>
@@ -329,8 +329,8 @@
   </action>
   <action name="actionRe_load_Device_List">
    <property name="icon">
-    <iconset theme="view-refresh">
+    <iconset theme="view-refresh" resource="qtmvvmdatasyncwidgets_module.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/reload.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/reload.ico</iconset>
    </property>
    <property name="text">
     <string>Re&amp;load device list</string>
@@ -340,6 +340,8 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="qtmvvmdatasyncwidgets_module.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/mvvmdatasyncwidgets/exportsetupdialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Configure Export</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>

src/mvvmdatasyncwidgets/identityeditdialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Edit Identity</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>

src/mvvmdatasyncwidgets/mvvmdatasyncwidgets.pro

@@ -52,3 +52,6 @@ else: include($$OUT_PWD/qpmx_generated.pri)
 qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasyncwidgets_template.qm
 qpmx_ts_target.files += translations/qtmvvmdatasyncwidgets_template.ts
 
+RESOURCES += \
+    qtmvvmdatasyncwidgets_module.qrc
+

src/mvvmdatasyncwidgets/networkexchangewindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Network Exchange</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">

src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.cpp

@@ -7,8 +7,16 @@
 #include "changeremotedialog_p.h"
 #include "identityeditdialog_p.h"
 
+static void initResources()
+{
+#ifdef QT_STATIC
+	Q_INIT_RESOURCE(qtmvvmdatasyncwidgets_module);
+#endif
+}
+
 void QtMvvm::registerDataSyncWidgets()
 {
+	initResources();
 	QtMvvm::WidgetsPresenter::registerView<DataSyncWindow>();
 	QtMvvm::WidgetsPresenter::registerView<NetworkExchangeWindow>();
 	QtMvvm::WidgetsPresenter::registerView<ExportSetupDialog>();

src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_module.qrc

@@ -0,0 +1,15 @@
+<RCC>
+    <qresource prefix="/de/skycoder42/qtmvvm/widgets/icons">
+        <file alias="add.ico">icons/add.ico</file>
+        <file alias="reload.ico">icons/arrow_refresh.ico</file>
+        <file alias="export.ico">icons/card_export.ico</file>
+        <file alias="import.ico">icons/card_import.ico</file>
+        <file alias="remove.ico">icons/delete.ico</file>
+        <file alias="identity.ico">icons/fingerprint.ico</file>
+        <file alias="changeKey.ico">icons/key_go.ico</file>
+        <file alias="editServer.ico">icons/server_edit.ico</file>
+        <file alias="reset.ico">icons/user_delete.ico</file>
+        <file alias="user.ico">icons/user.ico</file>
+        <file alias="exchange.ico">icons/world_go.ico</file>
+    </qresource>
+</RCC>