diff --git a/images/drive-harddisk-root.svg b/images/drive-harddisk-root.svg new file mode 100755 index 0000000..de7840d --- /dev/null +++ b/images/drive-harddisk-root.svg @@ -0,0 +1,21 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/images/drive-harddisk.svg b/images/drive-harddisk.svg new file mode 100755 index 0000000..de7840d --- /dev/null +++ b/images/drive-harddisk.svg @@ -0,0 +1,21 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/images/drive-optical.svg b/images/drive-optical.svg new file mode 100755 index 0000000..650781b --- /dev/null +++ b/images/drive-optical.svg @@ -0,0 +1,20 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/images/drive-removable-media-usb.svg b/images/drive-removable-media-usb.svg new file mode 100755 index 0000000..70af504 --- /dev/null +++ b/images/drive-removable-media-usb.svg @@ -0,0 +1,21 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/images/folder-desktop.svg b/images/folder-desktop.svg new file mode 100755 index 0000000..7eb3329 --- /dev/null +++ b/images/folder-desktop.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/folder-document.svg b/images/folder-document.svg new file mode 100755 index 0000000..768b0a3 --- /dev/null +++ b/images/folder-document.svg @@ -0,0 +1,21 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/images/folder-download.svg b/images/folder-download.svg new file mode 100755 index 0000000..3244bd1 --- /dev/null +++ b/images/folder-download.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/folder-home.svg b/images/folder-home.svg new file mode 100755 index 0000000..36b7b8a --- /dev/null +++ b/images/folder-home.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/folder-music.svg b/images/folder-music.svg new file mode 100755 index 0000000..37de584 --- /dev/null +++ b/images/folder-music.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/folder-picture.svg b/images/folder-picture.svg new file mode 100755 index 0000000..a77bf34 --- /dev/null +++ b/images/folder-picture.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/folder-video.svg b/images/folder-video.svg new file mode 100755 index 0000000..ff6046f --- /dev/null +++ b/images/folder-video.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/user-trash.svg b/images/user-trash.svg new file mode 100755 index 0000000..0ca84a8 --- /dev/null +++ b/images/user-trash.svg @@ -0,0 +1,16 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/qml.qrc b/qml.qrc index 67469ff..1c76bec 100644 --- a/qml.qrc +++ b/qml.qrc @@ -60,5 +60,17 @@ qml/Dialogs/OpenWithDialog.qml qml/Dialogs/DeleteDialog.qml qml/Desktop/Wallpaper.qml + images/folder-document.svg + images/folder-desktop.svg + images/folder-download.svg + images/folder-home.svg + images/folder-music.svg + images/folder-picture.svg + images/folder-video.svg + images/user-trash.svg + images/drive-harddisk-root.svg + images/drive-harddisk.svg + images/drive-optical.svg + images/drive-removable-media-usb.svg diff --git a/qml/PathBar.qml b/qml/PathBar.qml index cddc02e..4ad68a2 100644 --- a/qml/PathBar.qml +++ b/qml/PathBar.qml @@ -67,10 +67,10 @@ Item { } highlight: Rectangle { - radius: FishUI.Theme.mediumRadius - color: Qt.rgba(FishUI.Theme.textColor.r, - FishUI.Theme.textColor.g, - FishUI.Theme.textColor.b, 0.1) + radius: FishUI.Theme.smallRadius + color: Qt.rgba(FishUI.Theme.highlightColor.r, + FishUI.Theme.highlightColor.g, + FishUI.Theme.highlightColor.b, FishUI.Theme.darkMode ? 0.3 : 0.1) smooth: true } @@ -87,7 +87,7 @@ Item { Rectangle { anchors.fill: parent - radius: FishUI.Theme.mediumRadius + radius: FishUI.Theme.smallRadius color: _item.pressed ? Qt.rgba(FishUI.Theme.textColor.r, FishUI.Theme.textColor.g, FishUI.Theme.textColor.b, FishUI.Theme.darkMode ? 0.05 : 0.1) : @@ -102,8 +102,8 @@ Item { Label { id: _name text: model.name - color: FishUI.Theme.textColor anchors.centerIn: parent + color: selected ? FishUI.Theme.highlightColor : FishUI.Theme.textColor } } } diff --git a/qml/SideBar.qml b/qml/SideBar.qml index 8d8b879..0461ea6 100644 --- a/qml/SideBar.qml +++ b/qml/SideBar.qml @@ -21,6 +21,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 import QtQuick.Controls 2.12 import QtQuick.Window 2.12 +import QtGraphicalEffects 1.0 import FishUI 1.0 as FishUI import Cutefish.FileManager 1.0 @@ -58,10 +59,16 @@ ListView { highlight: Rectangle { radius: FishUI.Theme.mediumRadius - color: Qt.rgba(FishUI.Theme.textColor.r, - FishUI.Theme.textColor.g, - FishUI.Theme.textColor.b, 0.1) + color: FishUI.Theme.secondBackgroundColor smooth: true + + Rectangle { + anchors.fill: parent + radius: FishUI.Theme.mediumRadius + color: Qt.rgba(FishUI.Theme.highlightColor.r, + FishUI.Theme.highlightColor.g, + FishUI.Theme.highlightColor.b, FishUI.Theme.darkMode ? 0.3 : 0.2) + } } section.property: "category" @@ -166,7 +173,7 @@ ListView { color: _mouseArea.pressed ? Qt.rgba(FishUI.Theme.textColor.r, FishUI.Theme.textColor.g, FishUI.Theme.textColor.b, FishUI.Theme.darkMode ? 0.05 : 0.1) : - _mouseArea.containsMouse || checked ? Qt.rgba(FishUI.Theme.textColor.r, + _mouseArea.containsMouse && !checked ? Qt.rgba(FishUI.Theme.textColor.r, FishUI.Theme.textColor.g, FishUI.Theme.textColor.b, FishUI.Theme.darkMode ? 0.1 : 0.05) : "transparent" @@ -184,17 +191,24 @@ ListView { height: 22 width: height sourceSize: Qt.size(22, 22) - // source: "image://icontheme/" + model.iconName - source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + model.iconPath + // source: "qrc:/images/dark/" + model.iconPath +// source: "qrc:/images/" + (FishUI.Theme.darkMode || checked ? "dark/" : "light/") + model.iconPath + source: "qrc:/images/" + model.iconPath Layout.alignment: Qt.AlignVCenter smooth: false antialiasing: true + + ColorOverlay { + anchors.fill: parent + source: parent + color: checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor + } } Label { id: _label text: model.name - color: FishUI.Theme.textColor + color: checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor elide: Text.ElideRight Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter