zach/z-bar-qt
1
1
Fork 0
Code Issues 24 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

config moved to c++ plugin, removed old qml + fileview implementation

Browse Source
This commit is contained in:
zach
2026-08-13 02:25:26 +02:00
parent c29b91cd26
commit 3cd3209b28
341 changed files with 4851 additions and 3502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/DesktopIcons/BackgroundContextMenu.qml
+15 -14
View File
@@ -4,9 +4,10 @@ import Quickshell
import Quickshell.Widgets
import Quickshell.Hyprland
import qs.Components
import qs.Config
import ZShell.Config
import qs.Paths
import qs.Helpers
import qs.Services
Item {
id: root
@@ -30,8 +31,8 @@ Item {
x: root.menuX
y: root.menuY
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.normal
color: Colors.tPalette.m3surface
radius: Tokens.rounding.normal
implicitWidth: menuLayout.implicitWidth + padding * 2
implicitHeight: menuLayout.implicitHeight + padding * 2
@@ -47,13 +48,13 @@ Item {
CustomRect {
Layout.preferredWidth: 200
radius: popupBackground.radius - popupBackground.padding
implicitHeight: openTerminalRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: openTerminalRow.implicitHeight + Tokens.padding.small * 2
RowLayout {
id: openTerminalRow
spacing: 8
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
MaterialIcon { text: "terminal"; font.pointSize: 20 }
CustomText { text: "Open terminal"; Layout.fillWidth: true }
@@ -72,7 +73,7 @@ Item {
CustomRect {
Layout.fillWidth: true
implicitHeight: 1
color: DynamicColors.palette.m3outlineVariant
color: Colors.palette.m3outlineVariant
Layout.topMargin: 4
Layout.bottomMargin: 4
}
@@ -80,13 +81,13 @@ Item {
CustomRect {
Layout.fillWidth: true
radius: popupBackground.radius - popupBackground.padding
implicitHeight: settingsRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: settingsRow.implicitHeight + Tokens.padding.small * 2
RowLayout {
id: settingsRow
spacing: 8
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
MaterialIcon { text: "settings"; font.pointSize: 20 }
CustomText { text: "ZShell settings"; Layout.fillWidth: true }
@@ -106,7 +107,7 @@ Item {
CustomRect {
Layout.fillWidth: true
implicitHeight: 1
color: DynamicColors.palette.m3outlineVariant
color: Colors.palette.m3outlineVariant
Layout.topMargin: 4
Layout.bottomMargin: 4
}
@@ -114,13 +115,13 @@ Item {
CustomRect {
Layout.fillWidth: true
radius: popupBackground.radius - popupBackground.padding
implicitHeight: logoutRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: logoutRow.implicitHeight + Tokens.padding.small * 2
RowLayout {
id: logoutRow
spacing: 8
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
MaterialIcon { text: "logout"; font.pointSize: 20 }
CustomText { text: "Logout"; Layout.fillWidth: true }
@@ -139,7 +140,7 @@ Item {
// CustomRect {
// Layout.fillWidth: true
// implicitHeight: 1
// color: DynamicColors.palette.m3outlineVariant
// color: Colors.palette.m3outlineVariant
// Layout.topMargin: 4
// Layout.bottomMargin: 4
// }
@@ -147,13 +148,13 @@ Item {
// CustomRect {
// Layout.fillWidth: true
// radius: popupBackground.radius - popupBackground.padding
// implicitHeight: desktopIconsRow.implicitHeight + Appearance.padding.small * 2
// implicitHeight: desktopIconsRow.implicitHeight + Tokens.padding.small * 2
//
// RowLayout {
// id: desktopIconsRow
// spacing: 8
// anchors.fill: parent
// anchors.leftMargin: Appearance.padding.smaller
// anchors.leftMargin: Tokens.padding.smaller
//
// MaterialIcon { text: Config.options.background.showDesktopIcons ? "visibility_off" : "visibility"; font.pointSize: 20 }
// CustomText { text: Config.options.background.showDesktopIcons ? "Hide icons" : "Show icons"; Layout.fillWidth: true }
Modules/DesktopIcons/DesktopIconContextMenu.qml
+20 -19
View File
@@ -3,7 +3,8 @@ import QtQuick.Layouts
import Quickshell
import Quickshell.Widgets
import qs.Components
import qs.Config
import ZShell.Config
import qs.Services
Item {
id: contextMenu
@@ -42,13 +43,13 @@ Item {
CustomClippingRect {
id: popupBackground
readonly property real padding: Appearance.padding.small
readonly property real padding: Tokens.padding.small
color: DynamicColors.tPalette.m3surface
color: Colors.tPalette.m3surface
implicitHeight: menuLayout.implicitHeight + padding * 2
implicitWidth: menuLayout.implicitWidth + padding * 2
opacity: contextMenu.visible ? 1 : 0
radius: Appearance.rounding.normal
radius: Tokens.rounding.normal
x: contextMenu.menuX
y: contextMenu.menuY
@@ -65,14 +66,14 @@ Item {
CustomRect {
Layout.preferredWidth: 160
implicitHeight: openRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: openRow.implicitHeight + Tokens.padding.small * 2
radius: popupBackground.radius - popupBackground.padding
RowLayout {
id: openRow
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
spacing: 8
MaterialIcon {
@@ -108,14 +109,14 @@ Item {
CustomRect {
Layout.fillWidth: true
implicitHeight: openWithRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: openWithRow.implicitHeight + Tokens.padding.small * 2
radius: popupBackground.radius - popupBackground.padding
RowLayout {
id: openWithRow
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
spacing: 8
MaterialIcon {
@@ -147,20 +148,20 @@ Item {
Layout.bottomMargin: 4
Layout.fillWidth: true
Layout.topMargin: 4
color: DynamicColors.palette.m3outlineVariant
color: Colors.palette.m3outlineVariant
implicitHeight: 1
}
CustomRect {
Layout.fillWidth: true
implicitHeight: copyPathRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: copyPathRow.implicitHeight + Tokens.padding.small * 2
radius: popupBackground.radius - popupBackground.padding
RowLayout {
id: copyPathRow
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
spacing: 8
MaterialIcon {
@@ -186,7 +187,7 @@ Item {
CustomRect {
Layout.fillWidth: true
implicitHeight: renameRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: renameRow.implicitHeight + Tokens.padding.small * 2
radius: popupBackground.radius - popupBackground.padding
visible: contextMenu.targetPaths.length === 1
@@ -194,7 +195,7 @@ Item {
id: renameRow
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
spacing: 8
MaterialIcon {
@@ -222,31 +223,31 @@ Item {
Layout.bottomMargin: 4
Layout.fillWidth: true
Layout.topMargin: 4
color: DynamicColors.palette.m3outlineVariant
color: Colors.palette.m3outlineVariant
implicitHeight: 1
}
CustomRect {
Layout.fillWidth: true
implicitHeight: deleteRow.implicitHeight + Appearance.padding.small * 2
implicitHeight: deleteRow.implicitHeight + Tokens.padding.small * 2
radius: popupBackground.radius - popupBackground.padding
RowLayout {
id: deleteRow
anchors.fill: parent
anchors.leftMargin: Appearance.padding.smaller
anchors.leftMargin: Tokens.padding.smaller
spacing: 8
MaterialIcon {
color: deleteButton.hovered ? DynamicColors.palette.m3onError : DynamicColors.palette.m3error
color: deleteButton.hovered ? Colors.palette.m3onError : Colors.palette.m3error
font.pointSize: 20
text: "delete"
}
CustomText {
Layout.fillWidth: true
color: deleteButton.hovered ? DynamicColors.palette.m3onError : DynamicColors.palette.m3error
color: deleteButton.hovered ? Colors.palette.m3onError : Colors.palette.m3error
text: "Move to trash"
}
}
@@ -255,7 +256,7 @@ Item {
id: deleteButton
anchors.fill: parent
color: DynamicColors.tPalette.m3error
color: Colors.tPalette.m3error
onClicked: {
let cmd = ["gio", "trash"].concat(contextMenu.targetPaths);
Modules/DesktopIcons/DesktopIconDelegate.qml
+3 -3
View File
@@ -1,7 +1,7 @@
import QtQuick
import Quickshell
import Quickshell.Widgets
import qs.Config
import ZShell.Config
import qs.Components
import qs.Helpers
@@ -205,7 +205,7 @@ Item {
anchors.margins: 4
color: "white"
opacity: root.iconsRoot.selectedIcons.includes(root.filePath) ? 0.2 : 0.0
radius: Appearance.rounding.smallest
radius: Tokens.rounding.smallest
Behavior on opacity {
Anim {
@@ -265,7 +265,7 @@ Item {
anchors.margins: 4
color: "white"
opacity: parent.containsMouse ? 0.1 : 0.0
radius: Appearance.rounding.smallest
radius: Tokens.rounding.smallest
Behavior on opacity {
Anim {
Modules/DesktopIcons/DesktopIcons.qml
+5 -4
View File
@@ -4,7 +4,8 @@ import QtQuick
import Quickshell
import ZShell.Services
import qs.Helpers
import qs.Config
import ZShell.Config
import qs.Services
import qs.Components
import qs.Paths
@@ -116,12 +117,12 @@ Item {
fadeIn.start();
}
border.color: DynamicColors.palette.m3primary
border.color: Colors.palette.m3primary
border.pixelAligned: true
border.width: 1
color: DynamicColors.tPalette.m3primary
color: Colors.tPalette.m3primary
opacity: 0
radius: Appearance.rounding.small
radius: Tokens.rounding.small
visible: false
z: 99