diff --git a/retroshare-qml-app/src/ContactDetails.qml b/retroshare-qml-app/src/ContactDetails.qml index c30e4b6a6..836822d24 100644 --- a/retroshare-qml-app/src/ContactDetails.qml +++ b/retroshare-qml-app/src/ContactDetails.qml @@ -69,9 +69,10 @@ Item Image { source: cntDt.is_contact ? - "qrc:/icons/rating.png" : - "qrc:/icons/rating-unrated.png" + "qrc:/icons/rating.svg" : + "qrc:/icons/rating-unrated.svg" height: parent.height - 4 + sourceSize.height: height fillMode: Image.PreserveAspectFit anchors.verticalCenter: parent.verticalCenter diff --git a/retroshare-qml-app/src/GxsIdentityDelegate.qml b/retroshare-qml-app/src/GxsIdentityDelegate.qml index 21ed893c0..92abc5667 100644 --- a/retroshare-qml-app/src/GxsIdentityDelegate.qml +++ b/retroshare-qml-app/src/GxsIdentityDelegate.qml @@ -185,9 +185,10 @@ Item Image { source: model.is_contact ? - "qrc:/icons/rating.png" : - "qrc:/icons/rating-unrated.png" + "qrc:/icons/rating.svg" : + "qrc:/icons/rating-unrated.svg" height: parent.height - 4 + sourceSize.height: height fillMode: Image.PreserveAspectFit anchors.verticalCenter: parent.verticalCenter diff --git a/retroshare-qml-app/src/Locations.qml b/retroshare-qml-app/src/Locations.qml index 5662adaf7..1742ac26a 100644 --- a/retroshare-qml-app/src/Locations.qml +++ b/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: { diff --git a/retroshare-qml-app/src/RsLoginPassView.qml b/retroshare-qml-app/src/RsLoginPassView.qml index 88f92e2ae..7ea4a800d 100644 --- a/retroshare-qml-app/src/RsLoginPassView.qml +++ b/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 diff --git a/retroshare-qml-app/src/TrustedNodeDetails.qml b/retroshare-qml-app/src/TrustedNodeDetails.qml index 252f744d1..5aac8315e 100644 --- a/retroshare-qml-app/src/TrustedNodeDetails.qml +++ b/retroshare-qml-app/src/TrustedNodeDetails.qml @@ -37,9 +37,11 @@ Item { id: nodeStatusImage source: isOnline? - "icons/state-ok.png" : - "icons/state-offline.png" + "icons/state-ok.svg" : + "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/state-offline.png" + "icons/network-connect.svg" : + "icons/network-disconnect.svg" height: parent.height - 4 + sourceSize.height: height fillMode: Image.PreserveAspectFit anchors.verticalCenter: parent.verticalCenter } diff --git a/retroshare-qml-app/src/TrustedNodesView.qml b/retroshare-qml-app/src/TrustedNodesView.qml index f2b0a3843..9bb79317e 100644 --- a/retroshare-qml-app/src/TrustedNodesView.qml +++ b/retroshare-qml-app/src/TrustedNodesView.qml @@ -75,10 +75,11 @@ Item { id: statusImage source: isOnline? - "icons/state-ok.png" : - "icons/state-offline.png" + "icons/state-ok.svg" : + "icons/state-offline.svg" height: parent.height - 4 + sourceSize.height: height fillMode: Image.PreserveAspectFit anchors.left: parent.left anchors.leftMargin: 3 diff --git a/retroshare-qml-app/src/components/ColorHash.qml b/retroshare-qml-app/src/components/ColorHash.qml index 7d9f6ca16..ba4b5be32 100644 --- a/retroshare-qml-app/src/components/ColorHash.qml +++ b/retroshare-qml-app/src/components/ColorHash.qml @@ -28,8 +28,13 @@ Rectangle Image { - source: "qrc:/icons/edit-image-face-detect.png" - anchors.fill: parent + source: "qrc:/icons/edit-image-face-detect.svg" + anchors.centerIn: parent + height: parent.height + width: parent.width + sourceSize.height: height + sourceSize.width: width + fillMode: Image.PreserveAspectFit } Rectangle diff --git a/retroshare-qml-app/src/components/SideBar.qml b/retroshare-qml-app/src/components/SideBar.qml index 36080dcb7..790e1fb54 100644 --- a/retroshare-qml-app/src/components/SideBar.qml +++ b/retroshare-qml-app/src/components/SideBar.qml @@ -16,11 +16,11 @@ Drawer Rectangle { - width: parent.width - height: parent.height + width: parent.width + height: parent.height - ListView + ListView { id: listView currentIndex: -1 diff --git a/retroshare-qml-app/src/icons/application-menu.png b/retroshare-qml-app/src/icons/application-menu.png deleted file mode 100644 index 07efd491f..000000000 Binary files a/retroshare-qml-app/src/icons/application-menu.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/application-menu.svg b/retroshare-qml-app/src/icons/application-menu.svg new file mode 100644 index 000000000..67dd4d951 --- /dev/null +++ b/retroshare-qml-app/src/icons/application-menu.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/retroshare-qml-app/src/icons/edit-image-face-detect.png b/retroshare-qml-app/src/icons/edit-image-face-detect.png deleted file mode 100644 index 3a5324bbd..000000000 Binary files a/retroshare-qml-app/src/icons/edit-image-face-detect.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/edit-image-face-detect.svg b/retroshare-qml-app/src/icons/edit-image-face-detect.svg new file mode 100644 index 000000000..4e2ebb93b --- /dev/null +++ b/retroshare-qml-app/src/icons/edit-image-face-detect.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/retroshare-qml-app/src/icons/emblem-locked.png b/retroshare-qml-app/src/icons/emblem-locked.png deleted file mode 100644 index fb1ec9eb6..000000000 Binary files a/retroshare-qml-app/src/icons/emblem-locked.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/emblem-locked.svg b/retroshare-qml-app/src/icons/emblem-locked.svg new file mode 100644 index 000000000..e8e1ee134 --- /dev/null +++ b/retroshare-qml-app/src/icons/emblem-locked.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/retroshare-qml-app/src/icons/network-connect.svg b/retroshare-qml-app/src/icons/network-connect.svg new file mode 100644 index 000000000..5f0c0b82e --- /dev/null +++ b/retroshare-qml-app/src/icons/network-connect.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/retroshare-qml-app/src/icons/network-disconnect.svg b/retroshare-qml-app/src/icons/network-disconnect.svg new file mode 100644 index 000000000..1a1575cf1 --- /dev/null +++ b/retroshare-qml-app/src/icons/network-disconnect.svg @@ -0,0 +1,21 @@ + + + + + + + diff --git a/retroshare-qml-app/src/icons/rating-unrated.png b/retroshare-qml-app/src/icons/rating-unrated.png deleted file mode 100644 index 98ef79739..000000000 Binary files a/retroshare-qml-app/src/icons/rating-unrated.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/rating-unrated.svg b/retroshare-qml-app/src/icons/rating-unrated.svg new file mode 100644 index 000000000..bcf6e3512 --- /dev/null +++ b/retroshare-qml-app/src/icons/rating-unrated.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/retroshare-qml-app/src/icons/rating.png b/retroshare-qml-app/src/icons/rating.png deleted file mode 100644 index debb3e51a..000000000 Binary files a/retroshare-qml-app/src/icons/rating.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/rating.svg b/retroshare-qml-app/src/icons/rating.svg new file mode 100644 index 000000000..9432f9f21 --- /dev/null +++ b/retroshare-qml-app/src/icons/rating.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/retroshare-qml-app/src/icons/state-offline.png b/retroshare-qml-app/src/icons/state-offline.png deleted file mode 100644 index b8236bd29..000000000 Binary files a/retroshare-qml-app/src/icons/state-offline.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/state-offline.svg b/retroshare-qml-app/src/icons/state-offline.svg new file mode 100644 index 000000000..def7ac155 --- /dev/null +++ b/retroshare-qml-app/src/icons/state-offline.svg @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/retroshare-qml-app/src/icons/state-ok.png b/retroshare-qml-app/src/icons/state-ok.png deleted file mode 100644 index d4e84fdc3..000000000 Binary files a/retroshare-qml-app/src/icons/state-ok.png and /dev/null differ diff --git a/retroshare-qml-app/src/icons/state-ok.svg b/retroshare-qml-app/src/icons/state-ok.svg new file mode 100644 index 000000000..3e105ada0 --- /dev/null +++ b/retroshare-qml-app/src/icons/state-ok.svg @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/retroshare-qml-app/src/main-app.qml b/retroshare-qml-app/src/main-app.qml index 8138d0eab..cec7be699 100644 --- a/retroshare-qml-app/src/main-app.qml +++ b/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 } diff --git a/retroshare-qml-app/src/qml.qrc b/retroshare-qml-app/src/qml.qrc index a27428738..6332dc6da 100644 --- a/retroshare-qml-app/src/qml.qrc +++ b/retroshare-qml-app/src/qml.qrc @@ -10,13 +10,13 @@ TrustedNodesView.qml ChatView.qml icons/retroshare06.png - icons/state-offline.png - icons/state-ok.png + icons/state-offline.svg + icons/state-ok.svg GxsIdentityDelegate.qml - icons/edit-image-face-detect.png - icons/application-menu.png + icons/edit-image-face-detect.svg + icons/application-menu.svg ContactSort.js - icons/emblem-locked.png + icons/emblem-locked.svg BusyOverlay.qml URI.js TokensManager.qml @@ -24,8 +24,8 @@ TrustedNodeDetails.qml ClipboardWrapper.qml ContactDetails.qml - icons/rating-unrated.png - icons/rating.png + icons/rating-unrated.svg + icons/rating.svg TimedPopup.qml ChatCache.qml ChatBubbleDelegate.qml @@ -51,5 +51,7 @@ components/emoji/EmojiCategoryButton.qml components/emoji/EmojiButton.qml components/emoji/emoji.js + icons/network-connect.svg + icons/network-disconnect.svg