marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

statusbar: Cleanup and fix audio indicator not showing

Browse source
This commit is contained in:
Devin Lin 2023-03-18 19:52:35 -07:00
parent 1449ea7b4e
commit b0d45d8409
6 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/mobileshell/qml/dataproviders/AudioInfo.qml
View file

@ -9,7 +9,7 @@ QtObject {
property SinkModel paSinkModel: SinkModel {} property SinkModel paSinkModel: SinkModel {}
// whether the audio icon should be visible in the status bar // whether the audio icon should be visible in the status bar
readonly property bool isVisible: paSinkModel.preferredSink && paSinkModel.preferredSink.muted readonly property bool isVisible: paSinkModel.preferredSink
// the icon that should be displayed in the status bar // the icon that should be displayed in the status bar
readonly property string icon: paSinkModel.preferredSink && !isDummyOutput(paSinkModel.preferredSink) readonly property string icon: paSinkModel.preferredSink && !isDummyOutput(paSinkModel.preferredSink)

1
components/mobileshell/qml/homescreen/HomeScreen.qml
View file

@ -176,7 +176,6 @@ Item {
function evaluateAnimChange() { function evaluateAnimChange() {
// only animate if homescreen is visible // only animate if homescreen is visible
console.log('EVAL');
if (!WindowPlugin.WindowMaximizedTracker.showingWindow || WindowPlugin.WindowUtil.activeWindowIsShell) { if (!WindowPlugin.WindowMaximizedTracker.showingWindow || WindowPlugin.WindowUtil.activeWindowIsShell) {
itemContainer.zoomIn(); itemContainer.zoomIn();
} else { } else {

17
components/mobileshell/qml/statusbar/StatusBar.qml
View file

@ -54,7 +54,6 @@ Item {
property bool disableSystemTray: false property bool disableSystemTray: false
property alias colorScopeColor: icons.backgroundColor property alias colorScopeColor: icons.backgroundColor
property alias applets: appletIconsRow
readonly property real textPixelSize: 11 readonly property real textPixelSize: 11
readonly property real smallerTextPixelSize: 9 readonly property real smallerTextPixelSize: 9
@ -162,15 +161,6 @@ Item {
} }
} }
// applet indicators
RowLayout {
id: appletIconsRow
Layout.leftMargin: root.elementSpacing
Layout.fillHeight: true
spacing: root.elementSpacing
visible: children.length > 0
}
// system indicators // system indicators
RowLayout { RowLayout {
id: indicators id: indicators
@ -179,25 +169,30 @@ Item {
spacing: root.elementSpacing spacing: root.elementSpacing
Indicators.SignalStrengthIndicator { Indicators.SignalStrengthIndicator {
Layout.fillHeight: true
showLabel: false showLabel: false
visible: root.showTime visible: root.showTime
internetIndicator: internetIndicatorItem internetIndicator: internetIndicatorItem
Layout.fillHeight: true
Layout.preferredWidth: height
} }
Indicators.BluetoothIndicator { Indicators.BluetoothIndicator {
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: height
} }
Indicators.InternetIndicator { Indicators.InternetIndicator {
id: internetIndicatorItem id: internetIndicatorItem
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: height
} }
Indicators.VolumeIndicator { Indicators.VolumeIndicator {
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: height
} }
Indicators.BatteryIndicator { Indicators.BatteryIndicator {
spacing: root.elementSpacing spacing: root.elementSpacing
textPixelSize: root.textPixelSize textPixelSize: root.textPixelSize
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: height
} }
} }
} }

5
components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml
View file

@ -19,11 +19,8 @@ PlasmaCore.IconItem {
readonly property var provider: DataProviders.BluetoothInfo {} readonly property var provider: DataProviders.BluetoothInfo {}
source: provider.icon source: "network-bluetooth" // provider.icon
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup
visible: provider.isVisible visible: provider.isVisible
Layout.fillHeight: true
Layout.preferredWidth: height
} }

3
components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml
View file

@ -41,9 +41,6 @@ PlasmaCore.IconItem {
source: icon source: icon
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup
Layout.fillHeight: true
Layout.preferredWidth: height
PlasmaComponents.BusyIndicator { PlasmaComponents.BusyIndicator {
id: connectingIndicator id: connectingIndicator

2
components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml
View file

@ -18,8 +18,6 @@ PlasmaCore.IconItem {
id: paIcon id: paIcon
readonly property var provider: DataProviders.AudioInfo {} readonly property var provider: DataProviders.AudioInfo {}
Layout.fillHeight: true
Layout.preferredWidth: height
source: provider.icon source: provider.icon
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup