kossLAN/dots
1
0
Fork 0
mirror of https://github.com/kossLAN/dots.git synced 2025-11-04 22:49:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: file permissions that got messed up

Browse source
This commit is contained in:
kossLAN 2025-09-04 13:23:59 -04:00
parent c48aca3d0c
commit f59fe534cf
Signed by: kossLAN
SSH key fingerprint: SHA256:bdV0x+wdQHGJ6LgmstH3KV8OpWY+OOFmJcPcB0wQPV8
10 changed files with 190 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/bar/Bar.qml
View file

@ -73,14 +73,11 @@ Variants {
Layout.fillHeight: true
}
// VolumeIndicator {
// id: volumeIndicator
// popup: root.popup
// Layout.preferredWidth: this.height
// Layout.fillHeight: true
// Layout.topMargin: 2
// Layout.bottomMargin: 2
// }
VolumeIndicator {
bar: root
Layout.preferredWidth: this.height
Layout.fillHeight: true
}
PowerMenu {
bar: root

4
shell/bar/systray/SysTray.qml
View file

@ -5,8 +5,8 @@ import QtQuick.Layouts
import Quickshell
import Quickshell.Widgets
import Quickshell.Services.SystemTray
import "../../widgets"
import ".."
import qs.bar
import qs.widgets
// TODO:
// 1. Get rid of leftItem/rightItem properties on menu

29
shell/bar/volume/DeviceMixer.qml
View file

@ -3,8 +3,9 @@ pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import Quickshell.Services.Pipewire
import "../../widgets/" as Widgets
import "../.."
import Quickshell.Widgets
import qs
import qs.widgets
ColumnLayout {
id: root
@ -13,7 +14,7 @@ ColumnLayout {
// don't load until the node is not null
Loader {
id: sinkLoader
active: sink !== null
active: sink !== null
Layout.preferredWidth: 350
Layout.preferredHeight: 45
@ -22,11 +23,11 @@ ColumnLayout {
sourceComponent: VolumeCard {
id: sinkCard
node: sinkLoader.sink
button: Widgets.FontIconButton {
hoverEnabled: false
iconName: sinkCard.node.audio.muted ? "volume_off" : "volume_up"
checked: !sinkCard.node.audio.muted
inactiveColor: ShellSettings.colors["surface_container_highest"]
button: StyledMouseArea {
property bool checked: !sinkCard.node.audio.muted
// IconImage {}
onClicked: {
sinkCard.node.audio.muted = !sinkCard.node.audio.muted;
}
@ -39,7 +40,7 @@ ColumnLayout {
// microphone, same as above
Loader {
id: sourceLoader
active: source !== null
active: source !== null
Layout.preferredWidth: 350
Layout.preferredHeight: 45
@ -48,11 +49,11 @@ ColumnLayout {
sourceComponent: VolumeCard {
id: sourceCard
node: sourceLoader.source
button: Widgets.FontIconButton {
hoverEnabled: false
iconName: sourceCard.node.audio.muted ? "mic_off" : "mic"
checked: !sourceCard.node.audio.muted
inactiveColor: ShellSettings.colors["surface_container_highest"]
button: StyledMouseArea {
property bool checked: !sourceCard.node.audio.muted
// IconImage {}
onClicked: {
sourceCard.node.audio.muted = !sourceCard.node.audio.muted;
}

96
shell/bar/volume/VolumeCard.qml
View file

@ -1,50 +1,80 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Quickshell.Widgets
import Quickshell.Services.Pipewire
import "../../widgets/" as Widgets
import "../.."
import qs
import qs.widgets
WrapperRectangle {
Loader {
id: root
color: ShellSettings.colors["surface_container"]
radius: width / 2
margin: 6
active: node !== null
required property PwNode node
property string text
property Component button
property Component icon
PwObjectTracker {
id: tracker
objects: [root.node]
}
sourceComponent: WrapperRectangle {
id: comp
color: ShellSettings.colors.surface_container_translucent
radius: 12
margin: 6
RowLayout {
Widgets.MaterialSlider {
value: root.node.audio.volume ?? 0
text: root.text
icon: root.icon
border {
width: 1
color: ShellSettings.colors.active_translucent
}
onValueChanged: {
// only allow changes when the node is ready other wise you will combust
if (!root.node.ready)
return;
// property string text
// property Component button
// property Component icon
root.node.audio.volume = value;
PwObjectTracker {
id: tracker
objects: [root.node]
}
RowLayout {
Slider {
value: root.node.audio.volume ?? 0
// text: root.text
// icon: root.icon
onValueChanged: {
// only allow changes when the node is ready other wise you will combust
if (!root.node.ready)
return;
root.node.audio.volume = value;
}
Layout.fillWidth: true
Layout.fillHeight: true
}
Layout.fillWidth: true
Layout.fillHeight: true
}
Loader {
id: buttonLoader
sourceComponent: root.button
Layout.preferredWidth: this.height
Layout.fillHeight: true
// Loader {
// id: buttonLoader
// sourceComponent: root.button
//
// Layout.preferredWidth: this.height
// Layout.fillHeight: true
// }
}
}
// sourceComponent: VolumeCard {
// id: sinkCard
// node: sinkLoader.sink
// button: StyledMouseArea {
// property bool checked: !sinkCard.node.audio.muted
//
// // IconImage {}
//
// onClicked: {
// sinkCard.node.audio.muted = !sinkCard.node.audio.muted;
// }
// }
//
// anchors.fill: parent
// }
}

56
shell/bar/volume/VolumeControl.qml
View file

@ -3,32 +3,34 @@ pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import Quickshell.Widgets
import "../../widgets/" as Widgets
import qs.widgets
WrapperItem {
id: root
visible: false
DeviceMixer {}
ColumnLayout {
spacing: 10
Widgets.TabBar {
id: tabBar
model: ["headphones", "tune"]
Layout.fillWidth: true
Layout.preferredHeight: 35
}
StackLayout {
id: page
currentIndex: tabBar.currentIndex
Layout.fillWidth: true
Layout.preferredHeight: currentItem ? currentItem.implicitHeight : 0
readonly property Item currentItem: children[currentIndex]
DeviceMixer {}
ApplicationMixer {}
}
}
}
// WrapperItem {
// id: root
//
// ColumnLayout {
// spacing: 10
//
// // TabBar {
// // id: tabBar
// // model: ["headphones", "tune"]
// // Layout.fillWidth: true
// // Layout.preferredHeight: 35
// // }
//
//
// // StackLayout {
// // id: page
// // currentIndex: tabBar.currentIndex
// // Layout.fillWidth: true
// // Layout.preferredHeight: currentItem ? currentItem.implicitHeight : 0
// //
// // readonly property Item currentItem: children[currentIndex]
// //
// // DeviceMixer {}
// // ApplicationMixer {}
// // }
// }
// }

70
shell/bar/volume/VolumeIndicator.qml
View file

@ -1,27 +1,65 @@
pragma ComponentBehavior: Bound
import QtQuick
import "../../widgets/" as Widgets
import QtQuick.Layouts
import Quickshell.Widgets
import Quickshell.Services.Pipewire
import qs.widgets
import qs.bar
Item {
StyledMouseArea {
id: root
onClicked: showMenu = !showMenu
required property var popup
required property var bar
property bool showMenu: false
Widgets.FontIconButton {
id: button
iconName: "volume_up"
anchors.fill: parent
onClicked: {
if (root.popup.content == volumeMenu) {
root.popup.hide();
return;
}
IconImage {
id: icon
source: "root:resources/volume/volume-full.svg"
root.popup.set(this, volumeMenu);
root.popup.show();
anchors {
fill: parent
margins: 2
}
}
VolumeControl {
id: volumeMenu
property PopupItem menu: PopupItem {
id: menu
owner: root
popup: root.bar.popup
show: root.showMenu
onClosed: root.showMenu = false
implicitWidth: 300
implicitHeight: container.implicitHeight + (2 * 8)
// implicitWidth: volumeMenu.implicitWidth
// implicitHeight: volumeMenu.implicitHeight
// VolumeControl {
// id: volumeMenu
// }
ColumnLayout {
id: container
anchors {
fill: parent
margins: 8
}
VolumeCard {
node: Pipewire.defaultAudioSink
Layout.fillWidth: true
Layout.preferredHeight: 45
}
VolumeCard {
node: Pipewire.defaultAudioSource
Layout.fillWidth: true
Layout.preferredHeight: 45
}
}
}
}