Compare commits
2 commits
f8369a340b
...
76d680a95b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76d680a95b | ||
|
|
56cd758dd5 |
8 changed files with 231 additions and 42 deletions
|
|
@ -11,6 +11,7 @@ Singleton {
|
|||
property Bar bar: Bar {}
|
||||
property Mpris mpris: Mpris {}
|
||||
property Clock clock: Clock {}
|
||||
property Pipewire pipewire: Pipewire {}
|
||||
property Caffeine caffeine: Caffeine {}
|
||||
property Workspace workspace: Workspace {}
|
||||
property Tray tray: Tray {}
|
||||
|
|
@ -46,10 +47,19 @@ Singleton {
|
|||
property int verticalPadding: 6
|
||||
}
|
||||
|
||||
component Pipewire: QtObject {
|
||||
id: clock
|
||||
|
||||
property int fontSize: 14
|
||||
property int height: 30
|
||||
property int horizontalPadding: 8
|
||||
property int verticalPadding: 6
|
||||
}
|
||||
|
||||
component Caffeine: QtObject {
|
||||
id: clock
|
||||
|
||||
property int iconSize: 14
|
||||
property int fontSize: 16
|
||||
property int height: 30
|
||||
property int horizontalPadding: 8
|
||||
property int verticalPadding: 6
|
||||
|
|
|
|||
|
|
@ -92,6 +92,10 @@ Scope {
|
|||
|
||||
spacing: Dimensions.bar.spacing
|
||||
|
||||
Pipewire {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
Caffeine {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,17 +26,17 @@ Clickable {
|
|||
id: text
|
||||
|
||||
font.family: Theme.lucide.font.family
|
||||
font.pixelSize: Dimensions.workspace.iconSize
|
||||
font.pixelSize: Dimensions.caffeine.fontSize
|
||||
font.bold: true
|
||||
text: Icons.coffee
|
||||
|
||||
color: clickable.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent
|
||||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
topPadding: Dimensions.mpris.verticalPadding
|
||||
bottomPadding: Dimensions.mpris.verticalPadding
|
||||
leftPadding: Dimensions.mpris.horizontalPadding
|
||||
rightPadding: Dimensions.mpris.horizontalPadding
|
||||
topPadding: Dimensions.caffeine.verticalPadding
|
||||
bottomPadding: Dimensions.caffeine.verticalPadding
|
||||
leftPadding: Dimensions.caffeine.horizontalPadding
|
||||
rightPadding: Dimensions.caffeine.horizontalPadding
|
||||
}
|
||||
|
||||
Process {
|
||||
|
|
|
|||
72
modules/bar/components/Pipewire.qml
Normal file
72
modules/bar/components/Pipewire.qml
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
import QtQuick
|
||||
import Quickshell.Services.Pipewire
|
||||
import "../../../config/"
|
||||
import "../../../styled/"
|
||||
|
||||
Clickable {
|
||||
id: clickable
|
||||
|
||||
property var sink: Pipewire.defaultAudioSink
|
||||
|
||||
implicitWidth: text.width
|
||||
implicitHeight: Dimensions.pipewire.height
|
||||
|
||||
PwObjectTracker {
|
||||
id: bound
|
||||
objects: [clickable.sink]
|
||||
}
|
||||
|
||||
onClicked: mouse => {
|
||||
if (mouse.button == Qt.LeftButton) {
|
||||
sink.audio.muted = !sink.audio.muted;
|
||||
} else if (mouse.button == Qt.RightButton) {
|
||||
// show menu
|
||||
}
|
||||
}
|
||||
|
||||
onWheel: event => {
|
||||
if (event.angleDelta.y > 0) {
|
||||
sink.audio.volume = Math.min(sink.audio.volume + 0.02, 1.0);
|
||||
} else if (event.angleDelta.y < 0) {
|
||||
sink.audio.volume -= 0.02;
|
||||
}
|
||||
}
|
||||
|
||||
states: [
|
||||
State {
|
||||
name: "muted"
|
||||
when: clickable.sink.audio.muted
|
||||
PropertyChanges {
|
||||
text {
|
||||
icon: " "
|
||||
}
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "off"
|
||||
when: clickable.sink.audio.volume <= 0
|
||||
PropertyChanges {
|
||||
text {
|
||||
icon: " "
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
StyledText {
|
||||
id: text
|
||||
|
||||
property string icon: " "
|
||||
|
||||
text: `${icon} ${(Pipewire.defaultAudioSink.audio.volume * 100).toFixed()}%`
|
||||
font.pixelSize: Dimensions.pipewire.fontSize
|
||||
|
||||
color: clickable.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent
|
||||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
topPadding: Dimensions.pipewire.verticalPadding
|
||||
bottomPadding: Dimensions.pipewire.verticalPadding
|
||||
leftPadding: Dimensions.pipewire.horizontalPadding
|
||||
rightPadding: Dimensions.pipewire.horizontalPadding
|
||||
}
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@ Row {
|
|||
|
||||
sourceComponent: item
|
||||
property Component item: TrayItem {
|
||||
trayItem: modelData
|
||||
trayItem: modelData
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,32 +38,17 @@ Clickable {
|
|||
anchors.centerIn: parent
|
||||
}
|
||||
|
||||
PopupWindow {
|
||||
id: popup
|
||||
Menu {
|
||||
id: menu
|
||||
|
||||
visible: root.menuOpened
|
||||
|
||||
color: 'transparent'
|
||||
opened: root.menuOpened
|
||||
|
||||
anchor.item: root
|
||||
anchor.rect.x: root.width / 2 - width / 2
|
||||
anchor.rect.y: root.height + 8
|
||||
|
||||
implicitWidth: menu.width
|
||||
implicitHeight: menu.height
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: Theme.palette.base300
|
||||
radius: 8
|
||||
}
|
||||
|
||||
Menu {
|
||||
id: menu
|
||||
|
||||
menuOpener: QsMenuOpener {
|
||||
menu: trayItem.menu
|
||||
}
|
||||
menuOpener: QsMenuOpener {
|
||||
menu: trayItem.menu
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,145 @@
|
|||
pragma ComponentBehavior: Bound
|
||||
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import Quickshell
|
||||
import "../../../../../config/"
|
||||
import "../../../../../styled/"
|
||||
|
||||
ColumnLayout {
|
||||
id: menu
|
||||
PopupWindow {
|
||||
id: window
|
||||
|
||||
property QsMenuOpener menuOpener
|
||||
property bool opened: false
|
||||
|
||||
anchors.margins: 8
|
||||
color: 'transparent'
|
||||
|
||||
Repeater {
|
||||
model: menuOpener.children
|
||||
delegate: Loader {
|
||||
required property QsMenuEntry modelData
|
||||
active: true
|
||||
implicitWidth: menu.width
|
||||
implicitHeight: menu.height
|
||||
|
||||
sourceComponent: modelData.isSeparator ? menuSeperator : menuItem
|
||||
property Component menuSeperator: Rectangle {
|
||||
implicitHeight: 1
|
||||
implicitWidth: menu.width
|
||||
color: Theme.palette.basecontent
|
||||
Rectangle {
|
||||
id: background
|
||||
|
||||
anchors.fill: menu
|
||||
color: Theme.palette.base300
|
||||
border.color: Theme.palette.base200
|
||||
border.width: 2
|
||||
radius: 8
|
||||
|
||||
opacity: 0
|
||||
|
||||
states: State {
|
||||
name: "opened"
|
||||
when: window.opened
|
||||
PropertyChanges {
|
||||
background {
|
||||
opacity: 1
|
||||
}
|
||||
}
|
||||
property Component menuItem: MenuItem {
|
||||
menuEntry: modelData
|
||||
}
|
||||
|
||||
transitions: [
|
||||
Transition {
|
||||
from: ""
|
||||
to: "opened"
|
||||
SequentialAnimation {
|
||||
ScriptAction {
|
||||
script: window.visible = true
|
||||
}
|
||||
NumberAnimation {
|
||||
property: "background.opacity"
|
||||
duration: 200
|
||||
}
|
||||
}
|
||||
},
|
||||
Transition {
|
||||
from: "opened"
|
||||
to: ""
|
||||
SequentialAnimation {
|
||||
PauseAnimation {
|
||||
duration: repeater.count * 15
|
||||
}
|
||||
NumberAnimation {
|
||||
property: "background.opacity"
|
||||
duration: 200
|
||||
}
|
||||
ScriptAction {
|
||||
script: window.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
id: menu
|
||||
|
||||
anchors.margins: 30
|
||||
|
||||
Repeater {
|
||||
id: repeater
|
||||
model: window.menuOpener.children
|
||||
delegate: Loader {
|
||||
id: loader
|
||||
|
||||
required property QsMenuEntry modelData
|
||||
required property int index
|
||||
|
||||
active: true
|
||||
|
||||
opacity: 0
|
||||
|
||||
Layout.minimumWidth: 120
|
||||
|
||||
sourceComponent: modelData.isSeparator ? menuSeperator : menuItem
|
||||
property Component menuSeperator: Rectangle {
|
||||
implicitWidth: menu.width
|
||||
implicitHeight: 2
|
||||
|
||||
color: Theme.palette.base100
|
||||
}
|
||||
property Component menuItem: MenuItem {
|
||||
menuEntry: modelData
|
||||
}
|
||||
|
||||
states: State {
|
||||
name: "opened"
|
||||
when: window.opened
|
||||
PropertyChanges {
|
||||
loader {
|
||||
opacity: 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
transitions: [
|
||||
Transition {
|
||||
from: ""
|
||||
to: "opened"
|
||||
SequentialAnimation {
|
||||
PauseAnimation {
|
||||
duration: 15 * loader.index
|
||||
}
|
||||
NumberAnimation {
|
||||
property: "opacity"
|
||||
duration: 100
|
||||
}
|
||||
}
|
||||
},
|
||||
Transition {
|
||||
from: "opened"
|
||||
to: ""
|
||||
SequentialAnimation {
|
||||
PauseAnimation {
|
||||
duration: 15 * (repeater.count - loader.index)
|
||||
}
|
||||
NumberAnimation {
|
||||
property: "opacity"
|
||||
duration: 200
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ Clickable {
|
|||
StyledText {
|
||||
id: text
|
||||
|
||||
opacity: item.opacity
|
||||
|
||||
font.pixelSize: Dimensions.clock.fontSize
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
topPadding: Dimensions.clock.verticalPadding
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue