diff --git a/src/images/balance.svg b/src/images/balance.svg new file mode 100644 index 0000000..607b27b --- /dev/null +++ b/src/images/balance.svg @@ -0,0 +1,101 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/performance.svg b/src/images/performance.svg index eea9a08..0402096 100644 --- a/src/images/performance.svg +++ b/src/images/performance.svg @@ -13,7 +13,7 @@ version="1.1" id="svg26" sodipodi:docname="performance.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> @@ -36,12 +36,12 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2160" - inkscape:window-height="1247" + inkscape:window-height="1258" id="namedview28" showgrid="false" - inkscape:zoom="2.8710938" - inkscape:cx="36.499997" - inkscape:cy="22.712089" + inkscape:zoom="4.0603398" + inkscape:cx="-68.388681" + inkscape:cy="33.943409" inkscape:window-x="0" inkscape:window-y="35" inkscape:window-maximized="1" @@ -51,7 +51,7 @@ id="defs12"> + id="SVGID_1_-6" + gradientUnits="userSpaceOnUse" + x1="256" + x2="256" + y1="512" + y2="0"> + stop-color="#fd3a84" + id="stop2-7" /> + stop-color="#ffa68d" + id="stop4-5" /> + id="g22" + transform="matrix(0.13211508,0,0,0.13211508,-1.8214839,-1.8214768)" + style="fill:#ffffff;fill-opacity:0.8"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g20" + style="fill:#ffffff;fill-opacity:0.8"> + diff --git a/src/images/powersave.svg b/src/images/powersave.svg index a18c805..c4bd63e 100644 --- a/src/images/powersave.svg +++ b/src/images/powersave.svg @@ -13,7 +13,7 @@ version="1.1" id="svg26" sodipodi:docname="powersave.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> @@ -36,12 +36,12 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2160" - inkscape:window-height="1247" + inkscape:window-height="1258" id="namedview28" showgrid="false" inkscape:zoom="5.7421875" - inkscape:cx="53.189968" - inkscape:cy="43.934665" + inkscape:cx="40.32412" + inkscape:cy="20.636656" inkscape:window-x="0" inkscape:window-y="35" inkscape:window-maximized="1" @@ -51,7 +51,7 @@ id="defs12"> + y1="436" + y2="16" + gradientTransform="translate(-715.57057,73.381647)"> + stop-color="#fd5900" + id="stop7-3" /> - - - - + id="stop9-5" /> - - - - - - - + diff --git a/src/images/sidebar/dark/power.svg b/src/images/sidebar/dark/power.svg new file mode 100644 index 0000000..b261c88 --- /dev/null +++ b/src/images/sidebar/dark/power.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/images/sidebar/light/power.svg b/src/images/sidebar/light/power.svg new file mode 100644 index 0000000..c2dcea9 --- /dev/null +++ b/src/images/sidebar/light/power.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/qml/Network/Main.qml b/src/qml/Network/Main.qml index 3c87e9f..fc7ee80 100644 --- a/src/qml/Network/Main.qml +++ b/src/qml/Network/Main.qml @@ -54,11 +54,6 @@ ItemPage { id: connectionModel } - NM.AppletProxyModel { - id: appletProxyModel - sourceModel: connectionModel - } - NM.Configuration { id: configuration } @@ -140,6 +135,7 @@ ItemPage { // Wired connection RoundedItem { visible: enabledConnections.wwanHwEnabled + spacing: FishUI.Units.largeSpacing RowLayout { spacing: FishUI.Units.largeSpacing @@ -178,10 +174,9 @@ ItemPage { interactive: false clip: true - model: NM.TechnologyProxyModel { - type: NM.TechnologyProxyModel.WiredType - showInactiveConnections: true - sourceModel: networkModel + model: NM.AppletProxyModel { + type: NM.AppletProxyModel.WiredType + sourceModel: connectionModel } ScrollBar.vertical: ScrollBar {} diff --git a/src/qml/Network/WifiView.qml b/src/qml/Network/WifiView.qml index cd7ef19..eabd6f2 100644 --- a/src/qml/Network/WifiView.qml +++ b/src/qml/Network/WifiView.qml @@ -21,6 +21,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import FishUI 1.0 as FishUI +import Cutefish.NetworkManagement 1.0 as NM ColumnLayout { id: _contentLayout @@ -74,7 +75,12 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: itemHeight * count + ((count - 1) * spacing) clip: true - model: appletProxyModel + + model: NM.AppletProxyModel { + type: NM.AppletProxyModel.WirelessType + sourceModel: connectionModel + } + spacing: FishUI.Units.smallSpacing * 1.5 interactive: false visible: count > 0 diff --git a/src/qml/Power/Main.qml b/src/qml/Power/Main.qml index 6978424..bf4ac1c 100644 --- a/src/qml/Power/Main.qml +++ b/src/qml/Power/Main.qml @@ -51,13 +51,19 @@ ItemPage { IconCheckBox { source: "qrc:/images/powersave.svg" text: qsTr("Power Save") - checked: true + checked: false + } + + IconCheckBox { + source: "qrc:/images/balance.svg" + text: qsTr("Balance") + checked: false } IconCheckBox { source: "qrc:/images/performance.svg" text: qsTr("Performance") - checked: false + checked: true } } } diff --git a/src/qml/RoundedItem.qml b/src/qml/RoundedItem.qml index 05f78d2..a9ce84d 100644 --- a/src/qml/RoundedItem.qml +++ b/src/qml/RoundedItem.qml @@ -25,6 +25,7 @@ Rectangle { Layout.fillWidth: true default property alias content : _mainLayout.data + property alias spacing: _mainLayout.spacing color: FishUI.Theme.darkMode ? "#363636" : "#FFFFFF" radius: FishUI.Theme.mediumRadius diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml index bb89ab5..ca160bc 100644 --- a/src/qml/SideBar.qml +++ b/src/qml/SideBar.qml @@ -115,7 +115,7 @@ Item { // title: qsTr("Power") // name: "power" // page: "qrc:/qml/Power/Main.qml" -// iconSource: "battery.svg" +// iconSource: "power.svg" // } ListElement { @@ -155,7 +155,7 @@ Item { delegate: Item { id: item width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin - height: 43 + height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing * 2 property bool isCurrent: listView.currentIndex === index diff --git a/src/qml/Wallpaper/Main.qml b/src/qml/Wallpaper/Main.qml index 26d58f5..5db8020 100644 --- a/src/qml/Wallpaper/Main.qml +++ b/src/qml/Wallpaper/Main.qml @@ -118,6 +118,15 @@ ItemPage { } } + // Preload background + Rectangle { + anchors.fill: parent + anchors.margins: FishUI.Units.largeSpacing + radius: FishUI.Theme.bigRadius + FishUI.Units.smallSpacing / 2 + color: FishUI.Theme.backgroundColor + visible: _image.status !== Image.Ready + } + // Preload image Image { anchors.centerIn: parent diff --git a/src/resources.qrc b/src/resources.qrc index 89e5317..25301ef 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -95,5 +95,8 @@ qml/Display/RotationButton.qml images/dark/locked.svg images/light/locked.svg + images/sidebar/light/power.svg + images/sidebar/dark/power.svg + images/balance.svg