Merge remote-tracking branch 'g1o/qml_app_ui_aesthetic' into qml_app_ui_aesthetic

retroshare-qml-app/src/ContactDetails.qml

@@ -69,9 +69,10 @@ Item
 			Image
 			{
 				source: cntDt.is_contact ?
-							"qrc:/icons/rating.png" :
+							"qrc:/icons/rating.svg" :
-							"qrc:/icons/rating-unrated.png"
+							"qrc:/icons/rating-unrated.svg"
 				height: parent.height - 4
+				sourceSize.height: height
 				fillMode: Image.PreserveAspectFit
 				anchors.verticalCenter: parent.verticalCenter
 

retroshare-qml-app/src/GxsIdentityDelegate.qml

@@ -185,9 +185,10 @@ Item
 				Image
 				{
 					source: model.is_contact ?
-								"qrc:/icons/rating.png" :
+								"qrc:/icons/rating.svg" :
-								"qrc:/icons/rating-unrated.png"
+								"qrc:/icons/rating-unrated.svg"
 					height: parent.height - 4
+					sourceSize.height: height
 					fillMode: Image.PreserveAspectFit
 					anchors.verticalCenter: parent.verticalCenter
 

retroshare-qml-app/src/Locations.qml

@@ -47,7 +47,7 @@ Item
 				target: loginView
 				visible: true
 				buttonText: qsTr("Save")
-				iconUrl: "qrc:/icons/edit-image-face-detect.png"
+				iconUrl: "qrc:/icons/edit-image-face-detect.svg"
 				suggestionText: qsTr("Create your profile")
 				onSubmit:
 				{

retroshare-qml-app/src/RsLoginPassView.qml

@@ -24,7 +24,7 @@ Item
 {
 	id: loginView
 	property string buttonText: qsTr("Unlock")
-	property string iconUrl: "qrc:/icons/emblem-locked.png"
+	property string iconUrl: "qrc:/icons/emblem-locked.svg"
 	property string login
 	property bool loginPreset: false
 	property bool advancedMode: false
@@ -53,6 +53,8 @@ Item
 		{
 			source: loginView.iconUrl
 			Layout.alignment: Qt.AlignHCenter
+			height: 128
+			sourceSize.height: height
 		}
 
 		Text

retroshare-qml-app/src/TrustedNodeDetails.qml

@@ -37,9 +37,11 @@ Item
 	{
 		id: nodeStatusImage
 		source: isOnline?
-					"icons/state-ok.png" :
+					"icons/state-ok.svg" :
-					"icons/state-offline.png"
+					"icons/state-offline.svg"
 
+		height: 128
+		sourceSize.height: height
 		fillMode: Image.PreserveAspectFit
 
 		anchors.top: parent.top
@@ -125,10 +127,11 @@ Item
 				{
 					id: statusImage
 					source: model.is_online ?
-								"icons/state-ok.png" :
+								"icons/network-connect.svg" :
-								"icons/state-offline.png"
+								"icons/network-disconnect.svg"
 
 					height: parent.height - 4
+					sourceSize.height: height
 					fillMode: Image.PreserveAspectFit
 					anchors.verticalCenter: parent.verticalCenter
 				}

retroshare-qml-app/src/TrustedNodesView.qml

@@ -75,10 +75,11 @@ Item
 			{
 				id: statusImage
 				source:  isOnline?
-							"icons/state-ok.png" :
+							"icons/state-ok.svg" :
-							"icons/state-offline.png"
+							"icons/state-offline.svg"
 
 				height: parent.height - 4
+				sourceSize.height: height
 				fillMode: Image.PreserveAspectFit
 				anchors.left: parent.left
 				anchors.leftMargin: 3

retroshare-qml-app/src/components/ColorHash.qml

@@ -28,8 +28,13 @@ Rectangle
 
 	Image
 	{
-		source: "qrc:/icons/edit-image-face-detect.png"
+		source: "qrc:/icons/edit-image-face-detect.svg"
-		anchors.fill: parent
+		anchors.centerIn: parent
+		height: parent.height
+		width: parent.width
+		sourceSize.height: height
+		sourceSize.width: width
+		fillMode: Image.PreserveAspectFit
 	}
 
 	Rectangle

retroshare-qml-app/src/icons/application-menu.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 3 L 2 5 L 14 5 L 14 3 L 2 3 z M 2 7 L 2 9 L 14 9 L 14 7 L 2 7 z M 2 11 L 2 13 L 14 13 L 14 11 L 2 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>

retroshare-qml-app/src/icons/edit-image-face-detect.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 2 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 2 2 z M 6 2 L 6 3 L 10 3 L 10 2 L 6 2 z M 11 2 L 11 3 L 13 3 L 13 5 L 14 5 L 14 2 L 11 2 z M 6 5 A 1 1 0 0 0 5 6 A 1 1 0 0 0 6 7 A 1 1 0 0 0 7 6 A 1 1 0 0 0 6 5 z M 10 5 A 1 1 0 0 0 9 6 A 1 1 0 0 0 10 7 A 1 1 0 0 0 11 6 A 1 1 0 0 0 10 5 z M 2 6 L 2 10 L 3 10 L 3 6 L 2 6 z M 13 6 L 13 10 L 14 10 L 14 6 L 13 6 z M 4 9 A 4 3 0 0 0 8 12 A 4 3 0 0 0 12 9 L 11 9 A 3 2 0 0 1 8 11 A 3 2 0 0 1 5 9 L 4 9 z M 2 11 L 2 14 L 5 14 L 5 13 L 3 13 L 3 11 L 2 11 z M 13 11 L 13 13 L 11 13 L 11 14 L 14 14 L 14 11 L 13 11 z M 6 13 L 6 14 L 10 14 L 10 13 L 6 13 z "
+     class="ColorScheme-Text"
+     />
+</svg>

retroshare-qml-app/src/icons/emblem-locked.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NeutralText"
+    d="M 1 0 C 0.4459807 0 0 0.446 0 1 L 0 7 C 0 7.5541 0.4459807 8 1 8 L 7 8 C 7.554019 8 8 7.5541 8 7 L 8 1 C 8 0.446 7.554019 0 7 0 L 1 0 z "
+      />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 4 1 C 2.8954237 1 1.9999904 1.8954 2 3 L 2.0019531 4 L 1 4 L 1 7 L 7 7 L 7 4 L 6 4 L 6 3 C 6.00001 1.8954 5.104576 1 4 1 z M 4 2 C 4.552285 2 5 2.4477 5 3 L 5 4 L 3 4 L 3 3 C 3 2.4477 3.447715 2 4 2 z "
+        />
+</svg>

retroshare-qml-app/src/icons/network-connect.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 19.292969 4 L 15.792969 7.5 L 14.292969 6 L 12.292969 8 L 9 11.292969 L 7 13.292969 L 8.5 14.792969 L 4 19.292969 L 4.7070312 20 L 9.2070312 15.5 L 10.707031 17 L 12.707031 15 L 16 11.707031 L 18 9.7070312 L 16.5 8.2070312 L 20 4.7070312 L 19.292969 4 z "
+     class="ColorScheme-Text"
+     />
+</svg>

retroshare-qml-app/src/icons/network-disconnect.svg

@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 19.292969 4 L 15.792969 7.5 L 14.292969 6 L 12.292969 8 L 10.5 9.7929688 L 12 11.292969 L 12.707031 12 L 14.207031 13.5 L 16 11.707031 L 18 9.7070312 L 16.5 8.2070312 L 20 4.7070312 L 19.292969 4 z M 9.7929688 10.5 L 9 11.292969 L 7 13.292969 L 8.5 14.792969 L 4 19.292969 L 4.7070312 20 L 9.2070312 15.5 L 10.707031 17 L 12.707031 15 L 13.5 14.207031 L 12 12.707031 L 11.292969 12 L 9.7929688 10.5 z "
+     class="ColorScheme-Text"/>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14.990234 14 L 14 14.990234 L 16.009766 17 L 14 19.009766 L 14.990234 20 L 17 17.990234 L 19.009766 20 L 20 19.009766 L 17.990234 17 L 20 14.990234 L 19.009766 14 L 17 16.009766 L 14.990234 14 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>

retroshare-qml-app/src/icons/rating-unrated.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+    <path
+       style="fill:currentColor;fill-opacity:0.6;stroke:none" 
+       d="m8.03 2l-1.875 3.939-4.15.621 2.982 3.08-.732 4.336 3.719-2.037 3.697 2.061-.684-4.34 3.02-3.062-4.143-.645zm-.008 2l1.221 2.635 2.762.432-2.01 2.041.455 2.893-2.463-1.373-2.48 1.357.488-2.891-1.988-2.055 2.766-.412z"
+       class="ColorScheme-Text" />
+</svg>

retroshare-qml-app/src/icons/rating.svg

@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-421.71429,-531.79074)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="m 429.74391,532.79074 -2.1875,4.59602 -4.84212,0.72462 3.47949,3.59343 -0.85449,5.05858 4.33854,-2.37663 4.31348,2.40398 -0.79753,-5.06315 3.52051,-3.57291 -4.83301,-0.75196 z"
+       id="path4277"
+       class="ColorScheme-Highlight" />
+  </g>
+</svg>

retroshare-qml-app/src/icons/state-offline.svg

@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-421.71429,-525.79074)">
+    <path
+       style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
+       d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z "
+       transform="translate(421.71429,525.79074)"
+       class="ColorScheme-Text"
+       id="path4196" />
+    <path
+       style="opacity:1;fill:#bdc3c7;fill-opacity:1;stroke:none"
+       d="m 442.71429,540.29071 a 4.5,4.5 0 0 1 -4.5,4.5 4.5,4.5 0 0 1 -4.5,-4.5 4.5,4.5 0 0 1 4.5,-4.5 4.5,4.5 0 0 1 4.5,4.5 z"
+       id="path4306" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-linecap:round"
+       d="M 14 14 L 14 15 L 15 15 L 15 14 L 14 14 z M 16 14 L 16 15 L 17 15 L 17 14 L 16 14 z M 18 14 L 18 15 L 19 15 L 19 14 L 18 14 z "
+       transform="translate(421.71429,525.79074)"
+       id="rect4521" />
+  </g>
+</svg>

retroshare-qml-app/src/icons/state-ok.svg

@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z "
+     class="ColorScheme-Text"
+     />
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText"
+    d="M 16 11 C 13.784 11 12 12.784 12 15 C 12 17.216 13.784 19 16 19 C 18.216 19 20 17.216 20 15 C 20 12.784 18.216 11 16 11 z "
+      />
+  <path
+     style="opacity:1;fill:#ffffff"
+     d="M 18 13 L 15 16 L 14 15 L 13 16 L 14 17 L 15 18 L 19 14 L 18 13 z " />
+</svg>

retroshare-qml-app/src/main-app.qml

@@ -197,9 +197,11 @@ ApplicationWindow
 
 			Image
 			{
-				source: "qrc:/icons/application-menu.png"
+				source: "qrc:/icons/application-menu.svg"
 				height: parent.height - 10
-				width: parent.height - 10
+				width: height
+				sourceSize.height: height
+				sourceSize.width: height
 				anchors.centerIn: parent
 			}
 

retroshare-qml-app/src/qml.qrc

@@ -10,13 +10,13 @@
         <file>TrustedNodesView.qml</file>
         <file>ChatView.qml</file>
         <file>icons/retroshare06.png</file>
-        <file>icons/state-offline.png</file>
+        <file>icons/state-offline.svg</file>
-        <file>icons/state-ok.png</file>
+        <file>icons/state-ok.svg</file>
         <file>GxsIdentityDelegate.qml</file>
-        <file>icons/edit-image-face-detect.png</file>
+        <file>icons/edit-image-face-detect.svg</file>
-        <file>icons/application-menu.png</file>
+        <file>icons/application-menu.svg</file>
         <file>ContactSort.js</file>
-        <file>icons/emblem-locked.png</file>
+        <file>icons/emblem-locked.svg</file>
         <file>BusyOverlay.qml</file>
         <file>URI.js</file>
         <file>TokensManager.qml</file>
@@ -24,8 +24,8 @@
         <file>TrustedNodeDetails.qml</file>
         <file>ClipboardWrapper.qml</file>
         <file>ContactDetails.qml</file>
-        <file>icons/rating-unrated.png</file>
+        <file>icons/rating-unrated.svg</file>
-        <file>icons/rating.png</file>
+        <file>icons/rating.svg</file>
         <file>TimedPopup.qml</file>
         <file>ChatCache.qml</file>
         <file>ChatBubbleDelegate.qml</file>
@@ -51,5 +51,7 @@
         <file>components/emoji/EmojiCategoryButton.qml</file>
         <file>components/emoji/EmojiButton.qml</file>
         <file>components/emoji/emoji.js</file>
+        <file>icons/network-connect.svg</file>
+        <file>icons/network-disconnect.svg</file>
     </qresource>
 </RCC>