diff --git a/src/images/sidebar/dark/about.svg b/src/images/sidebar/dark/about.svg
new file mode 100644
index 0000000..de4d4c7
--- /dev/null
+++ b/src/images/sidebar/dark/about.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/src/images/sidebar/dark/accounts.svg b/src/images/sidebar/dark/accounts.svg
new file mode 100644
index 0000000..1c46222
--- /dev/null
+++ b/src/images/sidebar/dark/accounts.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/src/images/sidebar/dark/appearance.svg b/src/images/sidebar/dark/appearance.svg
new file mode 100644
index 0000000..042b4f0
--- /dev/null
+++ b/src/images/sidebar/dark/appearance.svg
@@ -0,0 +1,78 @@
+
+
diff --git a/src/images/sidebar/dark/battery.svg b/src/images/sidebar/dark/battery.svg
new file mode 100644
index 0000000..89498ae
--- /dev/null
+++ b/src/images/sidebar/dark/battery.svg
@@ -0,0 +1,74 @@
+
+
diff --git a/src/images/sidebar/dark/bluetooth.svg b/src/images/sidebar/dark/bluetooth.svg
new file mode 100644
index 0000000..e1c5e72
--- /dev/null
+++ b/src/images/sidebar/dark/bluetooth.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/src/images/sidebar/dark/display.svg b/src/images/sidebar/dark/display.svg
new file mode 100644
index 0000000..d77178a
--- /dev/null
+++ b/src/images/sidebar/dark/display.svg
@@ -0,0 +1,53 @@
+
+
diff --git a/src/images/sidebar/dark/dock.svg b/src/images/sidebar/dark/dock.svg
new file mode 100644
index 0000000..012024a
--- /dev/null
+++ b/src/images/sidebar/dark/dock.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/src/images/sidebar/dark/language.svg b/src/images/sidebar/dark/language.svg
new file mode 100644
index 0000000..6124e72
--- /dev/null
+++ b/src/images/sidebar/dark/language.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/src/images/sidebar/dark/network.svg b/src/images/sidebar/dark/network.svg
new file mode 100644
index 0000000..0c48009
--- /dev/null
+++ b/src/images/sidebar/dark/network.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/src/images/sidebar/dark/wallpaper.svg b/src/images/sidebar/dark/wallpaper.svg
new file mode 100644
index 0000000..a86ce14
--- /dev/null
+++ b/src/images/sidebar/dark/wallpaper.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/src/images/sidebar/about.svg b/src/images/sidebar/light/about.svg
similarity index 100%
rename from src/images/sidebar/about.svg
rename to src/images/sidebar/light/about.svg
diff --git a/src/images/sidebar/accounts.svg b/src/images/sidebar/light/accounts.svg
similarity index 100%
rename from src/images/sidebar/accounts.svg
rename to src/images/sidebar/light/accounts.svg
diff --git a/src/images/sidebar/appearance.svg b/src/images/sidebar/light/appearance.svg
similarity index 100%
rename from src/images/sidebar/appearance.svg
rename to src/images/sidebar/light/appearance.svg
diff --git a/src/images/sidebar/battery.svg b/src/images/sidebar/light/battery.svg
similarity index 100%
rename from src/images/sidebar/battery.svg
rename to src/images/sidebar/light/battery.svg
diff --git a/src/images/sidebar/bluetooth.svg b/src/images/sidebar/light/bluetooth.svg
similarity index 100%
rename from src/images/sidebar/bluetooth.svg
rename to src/images/sidebar/light/bluetooth.svg
diff --git a/src/images/sidebar/display.svg b/src/images/sidebar/light/display.svg
similarity index 100%
rename from src/images/sidebar/display.svg
rename to src/images/sidebar/light/display.svg
diff --git a/src/images/sidebar/dock.svg b/src/images/sidebar/light/dock.svg
similarity index 100%
rename from src/images/sidebar/dock.svg
rename to src/images/sidebar/light/dock.svg
diff --git a/src/images/sidebar/language.svg b/src/images/sidebar/light/language.svg
similarity index 100%
rename from src/images/sidebar/language.svg
rename to src/images/sidebar/light/language.svg
diff --git a/src/images/sidebar/network.svg b/src/images/sidebar/light/network.svg
similarity index 100%
rename from src/images/sidebar/network.svg
rename to src/images/sidebar/light/network.svg
diff --git a/src/images/sidebar/wallpaper.svg b/src/images/sidebar/light/wallpaper.svg
similarity index 100%
rename from src/images/sidebar/wallpaper.svg
rename to src/images/sidebar/light/wallpaper.svg
diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml
index 049e417..cccdba1 100644
--- a/src/qml/SideBar.qml
+++ b/src/qml/SideBar.qml
@@ -32,70 +32,70 @@ Item {
title: qsTr("User")
name: "accounts"
page: "qrc:/qml/AccountsPage.qml"
- iconSource: "qrc:/images/sidebar/accounts.svg"
+ iconSource: "accounts.svg"
}
ListElement {
title: qsTr("Display")
name: "display"
page: "qrc:/qml/DisplayPage.qml"
- iconSource: "qrc:/images/sidebar/display.svg"
+ iconSource: "display.svg"
}
ListElement {
title: qsTr("Network")
name: "network"
page: "qrc:/qml/NetworkPage.qml"
- iconSource: "qrc:/images/sidebar/network.svg"
+ iconSource: "network.svg"
}
// ListElement {
// title: qsTr("Bluetooth")
// name: "bluetooth"
// page: "qrc:/qml/BluetoothPage.qml"
-// iconSource: "qrc:/images/sidebar/bluetooth.svg"
+// iconSource: "bluetooth.svg"
// }
ListElement {
title: qsTr("Appearance")
name: "appearance"
page: "qrc:/qml/AppearancePage.qml"
- iconSource: "qrc:/images/sidebar/appearance.svg"
+ iconSource: "appearance.svg"
}
ListElement {
title: qsTr("Background")
name: "background"
page: "qrc:/qml/Wallpaper/BackgroundPage.qml"
- iconSource: "qrc:/images/sidebar/wallpaper.svg"
+ iconSource: "wallpaper.svg"
}
ListElement {
title: qsTr("Dock")
name: "dock"
page: "qrc:/qml/DockPage.qml"
- iconSource: "qrc:/images/sidebar/dock.svg"
+ iconSource: "dock.svg"
}
ListElement {
title: qsTr("Language")
name: "language"
page: "qrc:/qml/LanguagePage.qml"
- iconSource: "qrc:/images/sidebar/language.svg"
+ iconSource: "language.svg"
}
ListElement {
title: qsTr("Battery")
name: "battery"
page: "qrc:/qml/BatteryPage.qml"
- iconSource: "qrc:/images/sidebar/battery.svg"
+ iconSource: "battery.svg"
}
ListElement {
title: qsTr("About")
name: "about"
page: "qrc:/qml/AboutPage.qml"
- iconSource: "qrc:/images/sidebar/about.svg"
+ iconSource: "about.svg"
}
}
@@ -160,19 +160,10 @@ Item {
id: icon
width: 16
height: width
- source: model.iconSource
+ source: FishUI.Theme.darkMode || isCurrent ? "qrc:/images/sidebar/dark/" + model.iconSource
+ : "qrc:/images/sidebar/light/" + model.iconSource
sourceSize: Qt.size(width, height)
-
Layout.alignment: Qt.AlignVCenter
-
- ColorOverlay {
- id: colorOverlay
- anchors.fill: icon
- source: icon
- color: isCurrent ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor
- opacity: 1
- visible: FishUI.Theme.darkMode || isCurrent
- }
}
Label {
diff --git a/src/resources.qrc b/src/resources.qrc
index ee48570..9f4e8d3 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -23,16 +23,8 @@
qml/IconCheckBox.qml
qml/HorizontalDivider.qml
qml/DockPage.qml
- images/sidebar/about.svg
- images/sidebar/battery.svg
- images/sidebar/display.svg
- images/sidebar/wallpaper.svg
- images/sidebar/dock.svg
- images/sidebar/appearance.svg
qml/LanguagePage.qml
- images/sidebar/network.svg
qml/NetworkPage.qml
- images/sidebar/language.svg
images/locked.svg
images/checked.svg
images/light/network-wired.svg
@@ -55,14 +47,12 @@
qml/WirelessDetailsDialog.qml
qml/WiredItem.qml
qml/AccountsPage.qml
- images/sidebar/accounts.svg
qml/Hideable.qml
qml/AddUserDialog.qml
qml/BluetoothPage.qml
images/dock_top.svg
images/dock_right.svg
qml/HistoryGraph.qml
- images/sidebar/bluetooth.svg
images/rot90.svg
images/rot180.svg
images/rot270.svg
@@ -75,5 +65,25 @@
images/dark/up.svg
qml/Wallpaper/BackgroundPage.qml
qml/Wallpaper/DesktopPreview.qml
+ images/sidebar/dark/about.svg
+ images/sidebar/dark/accounts.svg
+ images/sidebar/dark/appearance.svg
+ images/sidebar/dark/battery.svg
+ images/sidebar/dark/bluetooth.svg
+ images/sidebar/dark/display.svg
+ images/sidebar/dark/dock.svg
+ images/sidebar/dark/language.svg
+ images/sidebar/dark/network.svg
+ images/sidebar/dark/wallpaper.svg
+ images/sidebar/light/about.svg
+ images/sidebar/light/accounts.svg
+ images/sidebar/light/appearance.svg
+ images/sidebar/light/battery.svg
+ images/sidebar/light/bluetooth.svg
+ images/sidebar/light/display.svg
+ images/sidebar/light/dock.svg
+ images/sidebar/light/language.svg
+ images/sidebar/light/network.svg
+ images/sidebar/light/wallpaper.svg