diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 98aaec4bdf39cc727ddedd8e7e08635668ace258..317b1da0207045a3385756bc0c22704a7c0c9a41 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -174,14 +174,18 @@
<file>screen/desktop/Certificates/parts/TitleTextView.qml</file>
<file>screen/desktop/Certificates/parts/Utils.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksPanel.qml</file>
- <file>resources/icons/networks_next_icon.png</file>
- <file>resources/icons/networks_next_icon_hover.png</file>
- <file>resources/icons/networks_previous_icon.png</file>
- <file>resources/icons/networks_previous_icon_hover.png</file>
<file>screen/desktop/NetworksPanel/DapNetworkPanelButton.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksList.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworkPopup.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworkName.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworkPopupButton.qml</file>
+ <file>resources/icons/ic_copy.svg</file>
+ <file>resources/icons/ic_copy_hover.svg</file>
+ <file>resources/icons/icon_on_off_net.svg</file>
+ <file>resources/icons/icon_on_off_net_hover.svg</file>
+ <file>resources/icons/Icon_sync_net.svg</file>
+ <file>resources/icons/Icon_sync_net_hover.svg</file>
+ <file>resources/icons/next-page.svg</file>
+ <file>resources/icons/next-page_hover.svg</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/resources/icons/Icon_sync_net.svg b/CellFrameDashboardGUI/resources/icons/Icon_sync_net.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5455f9b1707db00afaf56c5903e4c91216332504
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/Icon_sync_net.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><rect width="24" height="24" fill="none"/><g transform="translate(2.428 -2.7)"><path d="M3.475,13.654l-.885-2.92a.491.491,0,0,1,.339-.61h0a.5.5,0,0,1,.619.334l.516,1.7a6.115,6.115,0,0,1,11.205.436.5.5,0,0,1-.457.668.512.512,0,0,1-.472-.32,5.126,5.126,0,0,0-9.465-.218l1.887-.567a.5.5,0,0,1,.619.334h0a.491.491,0,0,1-.339.61l-2.963.872A.5.5,0,0,1,3.475,13.654Z" transform="translate(0 0)" fill="#453f5a"/><path d="M22.858,58.42l-.516-1.7a6.132,6.132,0,0,1-11.22-.45.5.5,0,0,1,.457-.668.512.512,0,0,1,.472.32,5.126,5.126,0,0,0,9.465.218l-1.887.567a.5.5,0,0,1-.619-.334.491.491,0,0,1,.339-.61l2.963-.872a.5.5,0,0,1,.619.334l.885,2.92a.491.491,0,0,1-.339.61h0A.5.5,0,0,1,22.858,58.42Z" transform="translate(-7.264 -39.464)" fill="#453f5a"/></g></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/resources/icons/Icon_sync_net_hover.svg b/CellFrameDashboardGUI/resources/icons/Icon_sync_net_hover.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d91167f3385c91e0ece24d04b6744ba46ad11663
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/Icon_sync_net_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><rect width="24" height="24" fill="none"/><g transform="translate(2.428 -2.7)"><path d="M3.475,13.654l-.885-2.92a.491.491,0,0,1,.339-.61h0a.5.5,0,0,1,.619.334l.516,1.7a6.115,6.115,0,0,1,11.205.436.5.5,0,0,1-.457.668.512.512,0,0,1-.472-.32,5.126,5.126,0,0,0-9.465-.218l1.887-.567a.5.5,0,0,1,.619.334h0a.491.491,0,0,1-.339.61l-2.963.872A.5.5,0,0,1,3.475,13.654Z" transform="translate(0 0)" fill="#fff"/><path d="M22.858,58.42l-.516-1.7a6.132,6.132,0,0,1-11.22-.45.5.5,0,0,1,.457-.668.512.512,0,0,1,.472.32,5.126,5.126,0,0,0,9.465.218l-1.887.567a.5.5,0,0,1-.619-.334.491.491,0,0,1,.339-.61l2.963-.872a.5.5,0,0,1,.619.334l.885,2.92a.491.491,0,0,1-.339.61h0A.5.5,0,0,1,22.858,58.42Z" transform="translate(-7.264 -39.464)" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/resources/icons/ic_copy.svg b/CellFrameDashboardGUI/resources/icons/ic_copy.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1ff98a1dc65f5e900c8f9e69b77a83ea0a9443e6
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/ic_copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect width="16" height="16" fill="none"/><g transform="translate(-3 -956.362)"><path d="M9.722,958.362a.268.268,0,0,0-.243.268v1.606H6.243A.268.268,0,0,0,6,960.5v9.367a.268.268,0,0,0,.268.268h7.493a.268.268,0,0,0,.268-.268v-2.409h2.409a.268.268,0,0,0,.268-.268V958.63a.268.268,0,0,0-.268-.268H9.722Zm.293.535H16.17v8.028H14.029V960.5a.268.268,0,0,0-.268-.268H10.014Zm-3.479,1.873h6.958V969.6H6.535Z" transform="translate(0 0)" fill="#757184"/></g></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/resources/icons/ic_copy_hover.svg b/CellFrameDashboardGUI/resources/icons/ic_copy_hover.svg
new file mode 100644
index 0000000000000000000000000000000000000000..eaa41c099b56dd845e8cae46045575727639ddc9
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/ic_copy_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect width="16" height="16" fill="none"/><g transform="translate(-3 -956.362)"><path d="M9.722,958.362a.268.268,0,0,0-.243.268v1.606H6.243A.268.268,0,0,0,6,960.5v9.367a.268.268,0,0,0,.268.268h7.493a.268.268,0,0,0,.268-.268v-2.409h2.409a.268.268,0,0,0,.268-.268V958.63a.268.268,0,0,0-.268-.268H9.722Zm.293.535H16.17v8.028H14.029V960.5a.268.268,0,0,0-.268-.268H10.014Zm-3.479,1.873h6.958V969.6H6.535Z" transform="translate(0 0)" fill="#d51f5d"/></g></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/resources/icons/icon_on_off_net.svg b/CellFrameDashboardGUI/resources/icons/icon_on_off_net.svg
new file mode 100644
index 0000000000000000000000000000000000000000..eaa52d544fc72640d25669bedc37944a3bbce8aa
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/icon_on_off_net.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g transform="translate(6 5)"><g transform="translate(-6 -5)" fill="rgba(255,255,255,0)" stroke="rgba(0,0,0,0)" stroke-width="1"></g><g transform="translate(0.796 2)"><path d="M13.665,12.913a.54.54,0,1,0-.65.862,4.827,4.827,0,1,1-5.8-.009.54.54,0,1,0-.65-.862,5.914,5.914,0,1,0,9.463,4.732,5.867,5.867,0,0,0-2.365-4.723Z" transform="translate(-5 -12.549)" fill="#453f5a"/><path d="M44.9,8.965a.54.54,0,0,0,.54-.54V4.1a.54.54,0,1,0-1.08,0V8.425A.54.54,0,0,0,44.9,8.965Z" transform="translate(-39.734 -4.564)" fill="#453f5a"/></g></g></svg>
diff --git a/CellFrameDashboardGUI/resources/icons/icon_on_off_net_hover.svg b/CellFrameDashboardGUI/resources/icons/icon_on_off_net_hover.svg
new file mode 100644
index 0000000000000000000000000000000000000000..481f66be60ba7f55390ea63fcd14bdffac3c7a92
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/icon_on_off_net_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g transform="translate(6 5)"><g transform="translate(-6 -5)" fill="rgba(255,255,255,0)" stroke="rgba(0,0,0,0)" stroke-width="1"></g><g transform="translate(0.796 2)"><path d="M13.665,12.913a.54.54,0,1,0-.65.862,4.827,4.827,0,1,1-5.8-.009.54.54,0,1,0-.65-.862,5.914,5.914,0,1,0,9.463,4.732,5.867,5.867,0,0,0-2.365-4.723Z" transform="translate(-5 -12.549)" fill="#fff"/><path d="M44.9,8.965a.54.54,0,0,0,.54-.54V4.1a.54.54,0,1,0-1.08,0V8.425A.54.54,0,0,0,44.9,8.965Z" transform="translate(-39.734 -4.564)" fill="#fff"/></g></g></svg>
diff --git a/CellFrameDashboardGUI/resources/icons/networks_next_icon.png b/CellFrameDashboardGUI/resources/icons/networks_next_icon.png
deleted file mode 100644
index 4c062690c145ae4ff694861f755f49df5ba5247c..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/resources/icons/networks_next_icon.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/resources/icons/networks_next_icon_hover.png b/CellFrameDashboardGUI/resources/icons/networks_next_icon_hover.png
deleted file mode 100644
index 3af36cffe9f631f06229d04093f1b16a9272fa21..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/resources/icons/networks_next_icon_hover.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/resources/icons/networks_previous_icon.png b/CellFrameDashboardGUI/resources/icons/networks_previous_icon.png
deleted file mode 100644
index d7dd180573e65ca308a69f268df39c55ffa44d33..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/resources/icons/networks_previous_icon.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/resources/icons/networks_previous_icon_hover.png b/CellFrameDashboardGUI/resources/icons/networks_previous_icon_hover.png
deleted file mode 100644
index d2a245cfcf580446cb43627615c762bd055109d5..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/resources/icons/networks_previous_icon_hover.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/resources/icons/next-page.svg b/CellFrameDashboardGUI/resources/icons/next-page.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6d7a523026ebe017845bc0f47b3a853621c23353
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/next-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40"><rect width="40" height="40" fill="none"/><path d="M9.04-5.9v.5L2.112-1.648l-.528-.9L7.248-5.632,1.536-8.544l.592-.9Zm9.6,0v.5l-6.928,3.76-.528-.9,5.664-3.088L11.136-8.544l.592-.9Z" transform="translate(9.464 25.44)" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/resources/icons/next-page_hover.svg b/CellFrameDashboardGUI/resources/icons/next-page_hover.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5b9360ffb9e29f9aa8cdb7921a16d5048ba50f49
--- /dev/null
+++ b/CellFrameDashboardGUI/resources/icons/next-page_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40"><rect width="40" height="40" fill="none"/><path d="M9.04-5.9v.5L2.112-1.648l-.528-.9L7.248-5.632,1.536-8.544l.592-.9Zm9.6,0v.5l-6.928,3.76-.528-.9,5.664-3.088L11.136-8.544l.592-.9Z" transform="translate(9.464 25.44)" fill="#d51f5d"/></svg>
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkName.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkName.qml
index f0a379ac6eb98e6e051cbbd229c6940680a94e1c..e1fefa001d72f935e82bde197c120519a3be2e12 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkName.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkName.qml
@@ -4,7 +4,7 @@ Item {
id: control
property string name
- property string state
+ property string networkState
property color textColor
Row {
@@ -37,14 +37,14 @@ Item {
radius: width * 0.5
color: {
- switch (control.state) {
+ switch (control.networkState) {
case "NET_STATE_ONLINE":
return "#9DD51F";
case "NET_STATE_OFFLINE":
return "#FFC527";
default:
if (control.state.length > 0)
- console.warn("Unknown network state: " + control.state);
+ console.warn("Unknown network state: " + control.networkState);
return "#000000";
}
}
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPanelButton.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPanelButton.qml
index b03c547559d9b212ec36192cc300cd60f427727c..02f8c1f75cce26d4cd66cf41cfc215f0a15dd45f 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPanelButton.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPanelButton.qml
@@ -5,6 +5,7 @@ Item {
property string normalIcon
property string hoverIcon
+ property alias mirror: img.mirror
signal clicked
@@ -12,6 +13,8 @@ Item {
implicitHeight: 40 * pt
Image {
+ id: img
+
anchors.fill: parent
source: mouseArea.containsMouse ? control.hoverIcon : control.normalIcon
}
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopup.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopup.qml
index 72cf8e4f08faafb56cd7c8b90c0ac871c138a49f..b5f01fec4a4b3e31d738d50315b8bfc771557aae 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopup.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopup.qml
@@ -11,8 +11,8 @@ Popup {
property int networkDelegateItemHeight
property string name
- property string state
- property string targetState
+ property string networkState
+ property string networkTargetState
property int activeLinksCount
property int linksCount
property string nodeAddress
@@ -24,8 +24,8 @@ Popup {
networkDelegateItemHeight = Qt.binding(function() { return networkDelegateItem.height });
name = Qt.binding(function() { return networkDelegateItem.name });
- state = Qt.binding(function() { return networkDelegateItem.state });
- targetState = Qt.binding(function() { return networkDelegateItem.targetState });
+ networkState = Qt.binding(function() { return networkDelegateItem.networkState });
+ networkTargetState = Qt.binding(function() { return networkDelegateItem.networkTargetState });
activeLinksCount = Qt.binding(function() { return networkDelegateItem.activeLinksCount });
linksCount = Qt.binding(function() { return networkDelegateItem.linksCount });
nodeAddress = Qt.binding(function() { return networkDelegateItem.nodeAddress });
@@ -40,8 +40,8 @@ Popup {
networkDelegateItemHeight = 0;
name = "";
- state = "";
- targetState = "";
+ networkState = "";
+ networkTargetState = "";
activeLinksCount = 0;
linksCount = 0;
nodeAddress = 0;
@@ -66,16 +66,16 @@ Popup {
contentItem: Item {
id: contentItem
- function networkStateToString(state)
+ function networkStateToString(networkState)
{
- switch (state) {
+ switch (networkState) {
case "NET_STATE_ONLINE":
return qsTr("ONLINE");
case "NET_STATE_OFFLINE":
return qsTr("OFFLINE");
default:
if (state.length > 0)
- console.warn("Unknown network state: " + state);
+ console.warn("Unknown network state: " + networkState);
return "";
}
}
@@ -92,17 +92,28 @@ Popup {
DapNetworkPopupButton {
width: contentItem.width / 2
height: 24 * pt
- enabled: control.state == "NET_STATE_ONLINE" && control.targetState == "NET_STATE_ONLINE"
text: qsTr("Sync network")
+ iconNormal: "qrc:/resources/icons/Icon_sync_net.svg"
+ iconHover: "qrc:/resources/icons/Icon_sync_net_hover.svg"
onClicked: console.log("SYNC NETWORK CLICKED", control.name)
}
DapNetworkPopupButton {
width: contentItem.width / 2
height: 24 * pt
- text: control.state == "NET_STATE_OFFLINE" ? qsTr("On network") : qsTr("Off network")
-
- onClicked: console.log("ON/OFF NETWORK CLICKED", control.name)
+ text: control.networkState == "NET_STATE_ONLINE" ? qsTr("Off network") : qsTr("On network")
+ iconNormal: "qrc:/resources/icons/icon_on_off_net.svg"
+ iconHover: "qrc:/resources/icons/icon_on_off_net_hover.svg"
+
+ onClicked: {
+ if (control.networkState == "NET_STATE_ONLINE") {
+ dapServiceController.changeNetworkStateToOffline(control.name);
+ } else if (control.networkState == "NET_STATE_OFFLINE") {
+ dapServiceController.changeNetworkStateToOnline(control.name);
+ } else {
+ console.warn("Unknown network state: " + control.networkState);
+ }
+ }
}
}
@@ -119,7 +130,7 @@ Popup {
font: quicksandFonts.regular12
color: "#070023"
elide: Text.ElideRight
- text: contentItem.networkStateToString(control.state)
+ text: contentItem.networkStateToString(control.networkState)
Layout.fillWidth: true
Layout.maximumWidth: Math.ceil(implicitWidth)
}
@@ -137,7 +148,7 @@ Popup {
font: quicksandFonts.regular12
color: "#070023"
elide: Text.ElideRight
- text: contentItem.networkStateToString(control.targetState)
+ text: contentItem.networkStateToString(control.networkTargetState)
Layout.fillWidth: true
Layout.maximumWidth: Math.ceil(implicitWidth)
}
@@ -179,7 +190,7 @@ Popup {
Layout.maximumWidth: Math.ceil(implicitWidth)
}
Image {
- source: btnCopyAddressMouseArea.containsMouse ? "qrc:/resources/icons/ic_copy_hover.png" : "qrc:/resources/icons/ic_copy.png"
+ source: btnCopyAddressMouseArea.containsMouse ? "qrc:/resources/icons/ic_copy_hover.svg" : "qrc:/resources/icons/ic_copy.svg"
Layout.maximumWidth: Math.floor(textAddress.height * 1.1)
Layout.maximumHeight: Layout.maximumWidth
@@ -204,7 +215,7 @@ Popup {
height: control.networkDelegateItemHeight
textColor: "#070023"
name: control.name
- state: control.state
+ networkState: control.networkState
}
}
}
@@ -220,7 +231,7 @@ Popup {
DropShadow {
anchors.fill: r1
- opacity: control.opacity === 1.0 ? 1.0 : control.opacity / 4
+ opacity: control.opacity === 1.0 ? 1.0 : control.opacity / 5
source: r1
radius: 5
samples: 11
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopupButton.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopupButton.qml
index bb5a220d6c3f6a6e44982407835ee0677216fc87..2d3480da191bff98fb3ad7b7729d2a17edcafecd 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopupButton.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworkPopupButton.qml
@@ -4,22 +4,24 @@ Rectangle {
id: control
property alias text: _text.text
+ property string iconNormal
+ property string iconHover
- property bool highlight: enabled && (mouseArea.containsMouse || mouseArea.pressed)
+ property bool highlight: mouseArea.containsMouse
property int spacing: 6 * pt
signal clicked
color: highlight ? "#D51F5D" : "#FFFFFF"
- Rectangle {
+ Image {
id: icon
anchors.verticalCenter: control.verticalCenter
anchors.right: _text.left
anchors.rightMargin: control.spacing
- width: 10
- height: 10
- color: control.enabled ? control.highlight ? "#FFFFFF" : "#453F5A" : "gray"
+ width: 24 * pt
+ height: 24 * pt
+ source: control.highlight ? control.iconHover : control.iconNormal
}
Text {
@@ -29,7 +31,7 @@ Rectangle {
x: Math.floor(icon.width + control.spacing + (control.width - (width + icon.width + control.spacing)) * 0.5)
width: Math.min(implicitWidth, control.width - icon.width - control.spacing)
font: quicksandFonts.medium12
- color: control.enabled ? control.highlight ? "#FFFFFF" : "#453F5A" : "gray"
+ color: control.highlight ? "#FFFFFF" : "#453F5A"
elide: Text.ElideRight
}
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksList.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksList.qml
index 7b9500d29792a19669703bb2e99998a1c6de11ae..c7b74db22cfd265b761c0992aa688c0cdee75df0 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksList.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksList.qml
@@ -76,8 +76,8 @@ Item {
// properties duplicated for DapNetworkPopup
property string name: modelData.name
- property string state: modelData.state
- property string targetState: modelData.targetState
+ property string networkState: modelData.state
+ property string networkTargetState: modelData.targetState
property int activeLinksCount: modelData.activeLinksCount
property int linksCount: modelData.linksCount
property string nodeAddress: modelData.nodeAddress
@@ -91,7 +91,7 @@ Item {
height: parent.height
textColor: "#FFFFFF"
name: delegateItem.name
- state: delegateItem.state
+ networkState: delegateItem.networkState
}
MouseArea {
diff --git a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksPanel.qml b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksPanel.qml
index e9965e88ce01b6b53ad734ad9eb161b0cec03b89..24efc370c8e2649e2879a66faae2446406ff0815 100644
--- a/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/NetworksPanel/DapNetworksPanel.qml
@@ -13,8 +13,9 @@ Rectangle {
visible: networksListView.hasLeft
height: parent.height
- normalIcon: "qrc:/resources/icons/networks_previous_icon.png"
- hoverIcon: "qrc:/resources/icons/networks_previous_icon_hover.png"
+ mirror: true
+ normalIcon: "qrc:/resources/icons/next-page.svg"
+ hoverIcon: "qrc:/resources/icons/next-page_hover.svg"
onClicked: networksListView.scrollToLeft()
}
@@ -32,8 +33,8 @@ Rectangle {
visible: networksListView.hasRight
anchors.right: parent.right
height: parent.height
- normalIcon: "qrc:/resources/icons/networks_next_icon.png"
- hoverIcon: "qrc:/resources/icons/networks_next_icon_hover.png"
+ normalIcon: "qrc:/resources/icons/next-page.svg"
+ hoverIcon: "qrc:/resources/icons/next-page_hover.svg"
onClicked: networksListView.scrollToRight()
}
}
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index a2797c1d597aa6e79ad71e9db1c856f03a33d937..738fbd54ea3842a8c5d8e518ff9a9bac944e9a95 100755
--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -42,6 +42,8 @@ else {
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES += DAP_VERSION=\\\"$$VERSION\\\"
+
# You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.