vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: vinzenz:6f80224d6c3b187665d445da83057b8dabfcfa57
Branches Tags
vinzenz:main
..
compare: vinzenz:e7abfebe4977a63402e7d1ca3838b0e3dded3367
Branches Tags
vinzenz:main

No commits in common. "6f80224d6c3b187665d445da83057b8dabfcfa57" and "e7abfebe4977a63402e7d1ca3838b0e3dded3367" have entirely different histories.
6f80224d6c ... e7abfebe49

16 changed files with 36 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/Backlight.qml
View file

@ -45,12 +45,10 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: "\uF185" icon: "\uF185"
color: M.Theme.base0A
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { M.BarLabel {
label: root.percent + "%" label: root.percent + "%"
color: M.Theme.base0A
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

2
modules/Battery.qml
View file

@ -20,7 +20,7 @@ M.BarSection {
readonly property color _stateColor: charging ? M.Theme.base0B readonly property color _stateColor: charging ? M.Theme.base0B
: pct < 15 ? M.Theme.base08 : pct < 15 ? M.Theme.base08
: pct < 30 ? M.Theme.base09 : pct < 30 ? M.Theme.base09
: M.Theme.base0B : M.Theme.base05
M.BarIcon { M.BarIcon {
icon: { icon: {

2
modules/Bluetooth.qml
View file

@ -54,7 +54,7 @@ M.BarSection {
icon: "\uF294" icon: "\uF294"
color: root.state === "connected" ? M.Theme.base0D color: root.state === "connected" ? M.Theme.base0D
: root.state === "off" ? M.Theme.base04 : root.state === "off" ? M.Theme.base04
: M.Theme.base0D : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { M.BarLabel {

1
modules/Clock.qml
View file

@ -8,7 +8,6 @@ M.BarLabel {
precision: SystemClock.Seconds precision: SystemClock.Seconds
} }
color: M.Theme.base0D
font.pixelSize: M.Theme.fontSize + 1 font.pixelSize: M.Theme.fontSize + 1
label: Qt.formatDateTime(clock.date, "ddd, dd. MMM HH:mm") label: Qt.formatDateTime(clock.date, "ddd, dd. MMM HH:mm")
tooltip: Qt.formatDateTime(clock.date, "dddd, dd. MMMM yyyy\nHH:mm:ss") tooltip: Qt.formatDateTime(clock.date, "dddd, dd. MMMM yyyy\nHH:mm:ss")

11
modules/Cpu.qml
View file

@ -54,12 +54,13 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: "\uF2DB" icon: "\uF2DB"
color: M.Theme.base08
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { Text {
label: root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2) text: root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2)
color: M.Theme.base08 color: M.Theme.base05
anchors.verticalCenter: parent.verticalCenter font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily
verticalAlignment: Text.AlignVCenter
} }
} }

11
modules/Disk.qml
View file

@ -34,12 +34,13 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: "\uF0C9" icon: "\uF0C9"
color: M.Theme.base09
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { Text {
label: root.freePct + "% " + root.totalTb.toFixed(1) text: root.freePct + "% " + root.totalTb.toFixed(1)
color: M.Theme.base09 color: M.Theme.base05
anchors.verticalCenter: parent.verticalCenter font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily
verticalAlignment: Text.AlignVCenter
} }
} }

1
modules/IdleInhibitor.qml
View file

@ -4,7 +4,6 @@ import "." as M
M.BarIcon { M.BarIcon {
id: root id: root
color: root.active ? M.Theme.base0A : M.Theme.base04
tooltip: "Idle inhibition: " + (root.active ? "active" : "inactive") tooltip: "Idle inhibition: " + (root.active ? "active" : "inactive")
property bool active: false property bool active: false

11
modules/Memory.qml
View file

@ -34,12 +34,13 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: "\uEFC5" icon: "\uEFC5"
color: M.Theme.base0B
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { Text {
label: root.percent + "%" text: root.percent + "%"
color: M.Theme.base0B color: M.Theme.base05
anchors.verticalCenter: parent.verticalCenter font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily
verticalAlignment: Text.AlignVCenter
} }
} }

2
modules/Mpris.qml
View file

@ -25,12 +25,10 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: root.playing ? "\uF04B" : (root.player?.playbackState === MprisPlaybackState.Paused ? "\uDB80\uDFE4" : "\uDB81\uDCDB") icon: root.playing ? "\uF04B" : (root.player?.playbackState === MprisPlaybackState.Paused ? "\uDB80\uDFE4" : "\uDB81\uDCDB")
color: M.Theme.base0E
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { M.BarLabel {
label: root.player?.trackTitle || root.player?.identity || "" label: root.player?.trackTitle || root.player?.identity || ""
color: M.Theme.base0E
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

10
modules/Network.qml
View file

@ -61,13 +61,15 @@ M.BarSection {
return "\uDB85\uDE16"; return "\uDB85\uDE16";
return "\uDB82\uDCFD"; return "\uDB82\uDCFD";
} }
color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { Text {
visible: root.state === "wifi" visible: root.state === "wifi"
label: root.essid text: root.essid
color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base05
font.pixelSize: M.Theme.fontSize + 1
font.family: M.Theme.fontFamily
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }

2
modules/Notifications.qml
View file

@ -44,12 +44,10 @@ M.BarSection {
return root.count > 0 ? "\uDB80\uDCA0" : "\uDB82\uDE93"; return root.count > 0 ? "\uDB80\uDCA0" : "\uDB82\uDE93";
return root.count > 0 ? "\uDB84\uDD6B" : "\uDB80\uDC9C"; return root.count > 0 ? "\uDB84\uDD6B" : "\uDB80\uDC9C";
} }
color: root.count > 0 ? M.Theme.base09 : (root.dnd ? M.Theme.base04 : M.Theme.base09)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { M.BarLabel {
label: root.count > 0 ? String(root.count) : "" label: root.count > 0 ? String(root.count) : ""
color: M.Theme.base09
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

4
modules/PowerProfile.qml
View file

@ -8,10 +8,6 @@ M.BarIcon {
property string profile: "" property string profile: ""
color: root.profile === "performance" ? M.Theme.base09
: root.profile === "power-saver" ? M.Theme.base0B
: M.Theme.base05
icon: { icon: {
if (root.profile === "performance") if (root.profile === "performance")
return "\uF0E7"; return "\uF0E7";

15
modules/Temperature.qml
View file

@ -8,9 +8,6 @@ M.BarSection {
tooltip: "Temperature: " + root.celsius + "\u00B0C" tooltip: "Temperature: " + root.celsius + "\u00B0C"
property int celsius: 0 property int celsius: 0
readonly property color _stateColor: celsius > 80 ? M.Theme.base08
: celsius > 60 ? M.Theme.base09
: M.Theme.base0C
FileView { FileView {
id: thermal id: thermal
@ -26,12 +23,14 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: "\uF2C9" icon: "\uF2C9"
color: root._stateColor color: root.celsius > 80 ? M.Theme.base08 : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { Text {
label: root.celsius + "\u00B0C" text: root.celsius + "\u00B0C"
color: root._stateColor color: root.celsius > 80 ? M.Theme.base08 : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily
verticalAlignment: Text.AlignVCenter
} }
} }

9
modules/Tray.qml
View file

@ -9,7 +9,6 @@ RowLayout {
spacing: M.Theme.moduleSpacing + 2 spacing: M.Theme.moduleSpacing + 2
required property var bar required property var bar
property var _activeMenu: null
Repeater { Repeater {
model: SystemTray.items model: SystemTray.items
@ -49,10 +48,7 @@ RowLayout {
iconItem.modelData.activate(); iconItem.modelData.activate();
} else if (mouse.button === Qt.RightButton) { } else if (mouse.button === Qt.RightButton) {
if (iconItem.modelData.menu) { if (iconItem.modelData.menu) {
if (root._activeMenu && root._activeMenu !== menuLoader)
root._activeMenu.active = false;
menuLoader.active = true; menuLoader.active = true;
root._activeMenu = menuLoader;
} else { } else {
iconItem.modelData.secondaryActivate(); iconItem.modelData.secondaryActivate();
} }
@ -68,10 +64,7 @@ RowLayout {
handle: iconItem.modelData.menu handle: iconItem.modelData.menu
screen: root.bar.screen screen: root.bar.screen
anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x
onMenuClosed: { onMenuClosed: menuLoader.active = false
menuLoader.active = false;
root._activeMenu = null;
}
} }
} }
} }

4
modules/Volume.qml
View file

@ -17,12 +17,12 @@ M.BarSection {
M.BarIcon { M.BarIcon {
icon: root.muted ? "\uF026" : (root.volume > 0.5 ? "\uF028" : (root.volume > 0 ? "\uF027" : "\uF026")) icon: root.muted ? "\uF026" : (root.volume > 0.5 ? "\uF028" : (root.volume > 0 ? "\uF027" : "\uF026"))
color: root.muted ? M.Theme.base04 : M.Theme.base0E color: root.muted ? M.Theme.base04 : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
M.BarLabel { M.BarLabel {
label: Math.round(root.volume * 100) + "%" label: Math.round(root.volume * 100) + "%"
color: root.muted ? M.Theme.base04 : M.Theme.base0E color: root.muted ? M.Theme.base04 : M.Theme.base05
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

1
modules/Wlogout.qml
View file

@ -4,7 +4,6 @@ import "." as M
M.BarIcon { M.BarIcon {
icon: "\uF011" icon: "\uF011"
color: M.Theme.base08
tooltip: "Open logout menu" tooltip: "Open logout menu"
Process { Process {