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

Compare commits

base: vinzenz:6748649033828071d18710ce045b8151ca801dae
Branches Tags
vinzenz:main
..
compare: vinzenz:25c2ed1021e98184a5c29c8efd98f7e5ea9fd0e9
Branches Tags
vinzenz:main

No commits in common. "6748649033828071d18710ce045b8151ca801dae" and "25c2ed1021e98184a5c29c8efd98f7e5ea9fd0e9" have entirely different histories.
6748649033 ... 25c2ed1021

6 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/Bar.qml
View file

@ -144,7 +144,9 @@ PanelWindow {
M.BarGroup { M.BarGroup {
Layout.minimumWidth: 0 Layout.minimumWidth: 0
clip: true clip: true
M.WindowTitle {} M.WindowTitle {
visible: M.Modules.windowTitle.enable
}
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true

24
modules/BluetoothMenu.qml
View file

@ -73,7 +73,7 @@ M.HoverPanel {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.rightMargin: 4 anchors.rightMargin: 4
color: btHeaderHover.hovered ? M.Theme.base02 : "transparent" color: btHeaderArea.containsMouse ? M.Theme.base02 : "transparent"
radius: M.Theme.radius radius: M.Theme.radius
} }
@ -109,12 +109,12 @@ M.HoverPanel {
font.family: M.Theme.iconFontFamily font.family: M.Theme.iconFontFamily
} }
HoverHandler { MouseArea {
id: btHeaderHover id: btHeaderArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} onClicked: {
TapHandler {
onTapped: {
powerProc._action = menuWindow._btEnabled ? "off" : "on"; powerProc._action = menuWindow._btEnabled ? "off" : "on";
powerProc.running = true; powerProc.running = true;
} }
@ -143,7 +143,7 @@ M.HoverPanel {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.rightMargin: 4 anchors.rightMargin: 4
color: entryHover.hovered ? M.Theme.base02 : "transparent" color: entryArea.containsMouse ? M.Theme.base02 : "transparent"
radius: M.Theme.radius radius: M.Theme.radius
} }
@ -184,12 +184,12 @@ M.HoverPanel {
width: entry.modelData.battery >= 0 ? implicitWidth : 0 width: entry.modelData.battery >= 0 ? implicitWidth : 0
} }
HoverHandler { MouseArea {
id: entryHover id: entryArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} onClicked: {
TapHandler {
onTapped: {
toggleProc.action = entry.modelData.connected ? "disconnect" : "connect"; toggleProc.action = entry.modelData.connected ? "disconnect" : "connect";
toggleProc.mac = entry.modelData.mac; toggleProc.mac = entry.modelData.mac;
toggleProc.running = true; toggleProc.running = true;

15
modules/Modules.qml
View file

@ -33,17 +33,20 @@ QtObject {
enable: true enable: true
}) })
property var bluetooth: ({ property var bluetooth: ({
enable: true enable: true,
interval: 5000
}) })
property var backlight: ({ property var backlight: ({
enable: true, enable: true,
step: 5 step: 5
}) })
property var network: ({ property var network: ({
enable: true enable: true,
interval: 5000
}) })
property var powerProfile: ({ property var powerProfile: ({
enable: true enable: true,
interval: 5000
}) })
property var idleInhibitor: ({ property var idleInhibitor: ({
enable: true enable: true
@ -60,10 +63,12 @@ QtObject {
hot: 90 hot: 90
}) })
property var cpu: ({ property var cpu: ({
enable: true enable: true,
interval: 1000
}) })
property var memory: ({ property var memory: ({
enable: true enable: true,
interval: 2000
}) })
property var disk: ({ property var disk: ({
enable: true, enable: true,

24
modules/NetworkMenu.qml
View file

@ -104,7 +104,7 @@ M.HoverPanel {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.rightMargin: 4 anchors.rightMargin: 4
color: headerHover.hovered ? M.Theme.base02 : "transparent" color: headerArea.containsMouse ? M.Theme.base02 : "transparent"
radius: M.Theme.radius radius: M.Theme.radius
} }
@ -140,12 +140,12 @@ M.HoverPanel {
font.family: M.Theme.iconFontFamily font.family: M.Theme.iconFontFamily
} }
HoverHandler { MouseArea {
id: headerHover id: headerArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} onClicked: {
TapHandler {
onTapped: {
radioProc._state = menuWindow._wifiEnabled ? "off" : "on"; radioProc._state = menuWindow._wifiEnabled ? "off" : "on";
radioProc.running = true; radioProc.running = true;
} }
@ -174,7 +174,7 @@ M.HoverPanel {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.rightMargin: 4 anchors.rightMargin: 4
color: entryHover.hovered ? M.Theme.base02 : "transparent" color: entryArea.containsMouse ? M.Theme.base02 : "transparent"
radius: M.Theme.radius radius: M.Theme.radius
} }
@ -215,12 +215,12 @@ M.HoverPanel {
width: entry.modelData.signal >= 0 ? implicitWidth : 0 width: entry.modelData.signal >= 0 ? implicitWidth : 0
} }
HoverHandler { MouseArea {
id: entryHover id: entryArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} onClicked: {
TapHandler {
onTapped: {
if (entry.modelData.active) { if (entry.modelData.active) {
disconnectProc.uuid = entry.modelData.uuid; disconnectProc.uuid = entry.modelData.uuid;
disconnectProc.running = true; disconnectProc.running = true;

2
modules/WindowTitle.qml
View file

@ -8,7 +8,7 @@ import "." as M
M.BarSection { M.BarSection {
id: root id: root
spacing: M.Theme.moduleSpacing spacing: M.Theme.moduleSpacing
visible: M.Modules.windowTitle.enable && root._title !== "" visible: root._title !== ""
tooltip: root._appId ? root._appId + "\n" + root._title : root._title tooltip: root._appId ? root._appId + "\n" + root._title : root._title

12
nix/hm-module.nix
View file

@ -84,11 +84,6 @@ in
"clock" "clock"
"mpris" "mpris"
"volume" "volume"
"bluetooth"
"network"
"powerProfile"
"cpu"
"memory"
"idleInhibitor" "idleInhibitor"
"power" "power"
"backgroundOverlay" "backgroundOverlay"
@ -119,6 +114,11 @@ in
description = "Maximum notifications kept in history (-1 for unlimited)."; description = "Maximum notifications kept in history (-1 for unlimited).";
}; };
}; };
bluetooth = moduleOpt "bluetooth" (intervalOpt 5000);
network = moduleOpt "network" (intervalOpt 5000);
powerProfile = moduleOpt "powerProfile" (intervalOpt 5000);
cpu = moduleOpt "cpu" (intervalOpt 1000);
memory = moduleOpt "memory" (intervalOpt 2000);
disk = moduleOpt "disk" (intervalOpt 30000); disk = moduleOpt "disk" (intervalOpt 30000);
backlight = moduleOpt "backlight" { backlight = moduleOpt "backlight" {
step = lib.mkOption { step = lib.mkOption {
@ -177,7 +177,7 @@ in
description = '' description = ''
Theme overrides written to `$XDG_CONFIG_HOME/nova-shell/theme.json`. Theme overrides written to `$XDG_CONFIG_HOME/nova-shell/theme.json`.
Keys: colors (base00-base0F), fontFamily, iconFontFamily, fontSize, Keys: colors (base00-base0F), fontFamily, iconFontFamily, fontSize,
barOpacity, barHeight, barPadding, groupSpacing, moduleSpacing, radius, screenRadius. barOpacity, barHeight, barPadding, barSpacing, moduleSpacing, radius.
Automatically populated from stylix when it is available. Automatically populated from stylix when it is available.
''; '';
}; };