formatter
This commit is contained in:
Zacharias-Brohn
+104
-111
@@ -8,137 +8,130 @@ import Quickshell.Services.Pipewire
|
||||
import QtQuick
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
id: root
|
||||
|
||||
property string previousSinkName: ""
|
||||
property string previousSourceName: ""
|
||||
readonly property bool muted: !!sink?.audio?.muted
|
||||
readonly property var nodes: Pipewire.nodes.values.reduce((acc, node) => {
|
||||
if (!node.isStream) {
|
||||
if (node.isSink)
|
||||
acc.sinks.push(node);
|
||||
else if (node.audio)
|
||||
acc.sources.push(node);
|
||||
} else if (node.isStream && node.audio) {
|
||||
// Application streams (output streams)
|
||||
acc.streams.push(node);
|
||||
}
|
||||
return acc;
|
||||
}, {
|
||||
sources: [],
|
||||
sinks: [],
|
||||
streams: []
|
||||
})
|
||||
property string previousSinkName: ""
|
||||
property string previousSourceName: ""
|
||||
readonly property PwNode sink: Pipewire.defaultAudioSink
|
||||
readonly property list<PwNode> sinks: nodes.sinks
|
||||
readonly property PwNode source: Pipewire.defaultAudioSource
|
||||
readonly property bool sourceMuted: !!source?.audio?.muted
|
||||
readonly property real sourceVolume: source?.audio?.volume ?? 0
|
||||
readonly property list<PwNode> sources: nodes.sources
|
||||
readonly property list<PwNode> streams: nodes.streams
|
||||
readonly property real volume: sink?.audio?.volume ?? 0
|
||||
|
||||
readonly property var nodes: Pipewire.nodes.values.reduce((acc, node) => {
|
||||
if (!node.isStream) {
|
||||
if (node.isSink)
|
||||
acc.sinks.push(node);
|
||||
else if (node.audio)
|
||||
acc.sources.push(node);
|
||||
} else if (node.isStream && node.audio) {
|
||||
// Application streams (output streams)
|
||||
acc.streams.push(node);
|
||||
}
|
||||
return acc;
|
||||
}, {
|
||||
sources: [],
|
||||
sinks: [],
|
||||
streams: []
|
||||
})
|
||||
function decrementSourceVolume(amount: real): void {
|
||||
setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
|
||||
}
|
||||
|
||||
readonly property list<PwNode> sinks: nodes.sinks
|
||||
readonly property list<PwNode> sources: nodes.sources
|
||||
readonly property list<PwNode> streams: nodes.streams
|
||||
function decrementVolume(amount: real): void {
|
||||
setVolume(volume - (amount || Config.services.audioIncrement));
|
||||
}
|
||||
|
||||
readonly property PwNode sink: Pipewire.defaultAudioSink
|
||||
readonly property PwNode source: Pipewire.defaultAudioSource
|
||||
function getStreamMuted(stream: PwNode): bool {
|
||||
return !!stream?.audio?.muted;
|
||||
}
|
||||
|
||||
readonly property bool muted: !!sink?.audio?.muted
|
||||
readonly property real volume: sink?.audio?.volume ?? 0
|
||||
function getStreamName(stream: PwNode): string {
|
||||
if (!stream)
|
||||
return qsTr("Unknown");
|
||||
// Try application name first, then description, then name
|
||||
return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
|
||||
}
|
||||
|
||||
readonly property bool sourceMuted: !!source?.audio?.muted
|
||||
readonly property real sourceVolume: source?.audio?.volume ?? 0
|
||||
function getStreamVolume(stream: PwNode): real {
|
||||
return stream?.audio?.volume ?? 0;
|
||||
}
|
||||
|
||||
function setVolume(newVolume: real): void {
|
||||
if (sink?.ready && sink?.audio) {
|
||||
sink.audio.muted = false;
|
||||
sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
function incrementSourceVolume(amount: real): void {
|
||||
setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
|
||||
}
|
||||
|
||||
function incrementVolume(amount: real): void {
|
||||
setVolume(volume + (amount || Config.services.audioIncrement));
|
||||
}
|
||||
function incrementVolume(amount: real): void {
|
||||
setVolume(volume + (amount || Config.services.audioIncrement));
|
||||
}
|
||||
|
||||
function decrementVolume(amount: real): void {
|
||||
setVolume(volume - (amount || Config.services.audioIncrement));
|
||||
}
|
||||
function setAudioSink(newSink: PwNode): void {
|
||||
Pipewire.preferredDefaultAudioSink = newSink;
|
||||
}
|
||||
|
||||
function setSourceVolume(newVolume: real): void {
|
||||
if (source?.ready && source?.audio) {
|
||||
source.audio.muted = false;
|
||||
source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
function setAudioSource(newSource: PwNode): void {
|
||||
Pipewire.preferredDefaultAudioSource = newSource;
|
||||
}
|
||||
|
||||
function incrementSourceVolume(amount: real): void {
|
||||
setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
|
||||
}
|
||||
function setSourceVolume(newVolume: real): void {
|
||||
if (source?.ready && source?.audio) {
|
||||
source.audio.muted = false;
|
||||
source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
|
||||
function decrementSourceVolume(amount: real): void {
|
||||
setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
|
||||
}
|
||||
function setStreamMuted(stream: PwNode, muted: bool): void {
|
||||
if (stream?.ready && stream?.audio) {
|
||||
stream.audio.muted = muted;
|
||||
}
|
||||
}
|
||||
|
||||
function setAudioSink(newSink: PwNode): void {
|
||||
Pipewire.preferredDefaultAudioSink = newSink;
|
||||
}
|
||||
function setStreamVolume(stream: PwNode, newVolume: real): void {
|
||||
if (stream?.ready && stream?.audio) {
|
||||
stream.audio.muted = false;
|
||||
stream.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
|
||||
function setAudioSource(newSource: PwNode): void {
|
||||
Pipewire.preferredDefaultAudioSource = newSource;
|
||||
}
|
||||
function setVolume(newVolume: real): void {
|
||||
if (sink?.ready && sink?.audio) {
|
||||
sink.audio.muted = false;
|
||||
sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
|
||||
function setStreamVolume(stream: PwNode, newVolume: real): void {
|
||||
if (stream?.ready && stream?.audio) {
|
||||
stream.audio.muted = false;
|
||||
stream.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
|
||||
}
|
||||
}
|
||||
Component.onCompleted: {
|
||||
previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
|
||||
previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
|
||||
}
|
||||
onSinkChanged: {
|
||||
if (!sink?.ready)
|
||||
return;
|
||||
|
||||
function setStreamMuted(stream: PwNode, muted: bool): void {
|
||||
if (stream?.ready && stream?.audio) {
|
||||
stream.audio.muted = muted;
|
||||
}
|
||||
}
|
||||
const newSinkName = sink.description || sink.name || qsTr("Unknown Device");
|
||||
|
||||
function getStreamVolume(stream: PwNode): real {
|
||||
return stream?.audio?.volume ?? 0;
|
||||
}
|
||||
if (previousSinkName && previousSinkName !== newSinkName && Config.utilities.toasts.audioOutputChanged)
|
||||
Toaster.toast(qsTr("Audio output changed"), qsTr("Now using: %1").arg(newSinkName), "volume_up");
|
||||
|
||||
function getStreamMuted(stream: PwNode): bool {
|
||||
return !!stream?.audio?.muted;
|
||||
}
|
||||
previousSinkName = newSinkName;
|
||||
}
|
||||
onSourceChanged: {
|
||||
if (!source?.ready)
|
||||
return;
|
||||
|
||||
function getStreamName(stream: PwNode): string {
|
||||
if (!stream)
|
||||
return qsTr("Unknown");
|
||||
// Try application name first, then description, then name
|
||||
return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
|
||||
}
|
||||
const newSourceName = source.description || source.name || qsTr("Unknown Device");
|
||||
|
||||
onSinkChanged: {
|
||||
if (!sink?.ready)
|
||||
return;
|
||||
if (previousSourceName && previousSourceName !== newSourceName && Config.utilities.toasts.audioInputChanged)
|
||||
Toaster.toast(qsTr("Audio input changed"), qsTr("Now using: %1").arg(newSourceName), "mic");
|
||||
|
||||
const newSinkName = sink.description || sink.name || qsTr("Unknown Device");
|
||||
previousSourceName = newSourceName;
|
||||
}
|
||||
|
||||
if (previousSinkName && previousSinkName !== newSinkName && Config.utilities.toasts.audioOutputChanged)
|
||||
Toaster.toast(qsTr("Audio output changed"), qsTr("Now using: %1").arg(newSinkName), "volume_up");
|
||||
|
||||
previousSinkName = newSinkName;
|
||||
}
|
||||
|
||||
onSourceChanged: {
|
||||
if (!source?.ready)
|
||||
return;
|
||||
|
||||
const newSourceName = source.description || source.name || qsTr("Unknown Device");
|
||||
|
||||
if (previousSourceName && previousSourceName !== newSourceName && Config.utilities.toasts.audioInputChanged)
|
||||
Toaster.toast(qsTr("Audio input changed"), qsTr("Now using: %1").arg(newSourceName), "mic");
|
||||
|
||||
previousSourceName = newSourceName;
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
|
||||
previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
|
||||
}
|
||||
|
||||
PwObjectTracker {
|
||||
objects: [...root.sinks, ...root.sources, ...root.streams]
|
||||
}
|
||||
PwObjectTracker {
|
||||
objects: [...root.sinks, ...root.sources, ...root.streams]
|
||||
}
|
||||
}
|
||||
|
||||
+285
-282
@@ -5,319 +5,322 @@ import Quickshell.Io
|
||||
import QtQuick
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
id: root
|
||||
|
||||
Component.onCompleted: {
|
||||
// Trigger ethernet device detection after initialization
|
||||
Qt.callLater(() => {
|
||||
getEthernetDevices();
|
||||
});
|
||||
// Load saved connections on startup
|
||||
Nmcli.loadSavedConnections(() => {
|
||||
root.savedConnections = Nmcli.savedConnections;
|
||||
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
||||
});
|
||||
// Get initial WiFi status
|
||||
Nmcli.getWifiStatus(enabled => {
|
||||
root.wifiEnabled = enabled;
|
||||
});
|
||||
// Sync networks from Nmcli on startup
|
||||
Qt.callLater(() => {
|
||||
syncNetworksFromNmcli();
|
||||
}, 100);
|
||||
}
|
||||
readonly property AccessPoint active: networks.find(n => n.active) ?? null
|
||||
readonly property var activeEthernet: ethernetDevices.find(d => d.connected) ?? null
|
||||
property int ethernetDeviceCount: 0
|
||||
property var ethernetDeviceDetails: null
|
||||
property list<var> ethernetDevices: []
|
||||
property bool ethernetProcessRunning: false
|
||||
readonly property list<AccessPoint> networks: []
|
||||
property var pendingConnection: null
|
||||
property list<string> savedConnectionSsids: []
|
||||
property list<string> savedConnections: []
|
||||
readonly property bool scanning: Nmcli.scanning
|
||||
property bool wifiEnabled: true
|
||||
property var wirelessDeviceDetails: null
|
||||
|
||||
readonly property list<AccessPoint> networks: []
|
||||
readonly property AccessPoint active: networks.find(n => n.active) ?? null
|
||||
property bool wifiEnabled: true
|
||||
readonly property bool scanning: Nmcli.scanning
|
||||
signal connectionFailed(string ssid)
|
||||
|
||||
property list<var> ethernetDevices: []
|
||||
readonly property var activeEthernet: ethernetDevices.find(d => d.connected) ?? null
|
||||
property int ethernetDeviceCount: 0
|
||||
property bool ethernetProcessRunning: false
|
||||
property var ethernetDeviceDetails: null
|
||||
property var wirelessDeviceDetails: null
|
||||
function cidrToSubnetMask(cidr: string): string {
|
||||
// Convert CIDR notation (e.g., "24") to subnet mask (e.g., "255.255.255.0")
|
||||
const cidrNum = parseInt(cidr);
|
||||
if (isNaN(cidrNum) || cidrNum < 0 || cidrNum > 32) {
|
||||
return "";
|
||||
}
|
||||
|
||||
function enableWifi(enabled: bool): void {
|
||||
Nmcli.enableWifi(enabled, result => {
|
||||
if (result.success) {
|
||||
root.getWifiStatus();
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
const mask = (0xffffffff << (32 - cidrNum)) >>> 0;
|
||||
const octets = [(mask >>> 24) & 0xff, (mask >>> 16) & 0xff, (mask >>> 8) & 0xff, mask & 0xff];
|
||||
|
||||
function toggleWifi(): void {
|
||||
Nmcli.toggleWifi(result => {
|
||||
if (result.success) {
|
||||
root.getWifiStatus();
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
return octets.join(".");
|
||||
}
|
||||
|
||||
function rescanWifi(): void {
|
||||
Nmcli.rescanWifi();
|
||||
}
|
||||
function connectEthernet(connectionName: string, interfaceName: string): void {
|
||||
Nmcli.connectEthernet(connectionName, interfaceName, result => {
|
||||
if (result.success) {
|
||||
getEthernetDevices();
|
||||
// Refresh device details after connection
|
||||
Qt.callLater(() => {
|
||||
const activeDevice = root.ethernetDevices.find(function (d) {
|
||||
return d.connected;
|
||||
});
|
||||
if (activeDevice && activeDevice.interface) {
|
||||
updateEthernetDeviceDetails(activeDevice.interface);
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
property var pendingConnection: null
|
||||
signal connectionFailed(string ssid)
|
||||
function connectToNetwork(ssid: string, password: string, bssid: string, callback: var): void {
|
||||
// Set up pending connection tracking if callback provided
|
||||
if (callback) {
|
||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||
root.pendingConnection = {
|
||||
ssid: ssid,
|
||||
bssid: hasBssid ? bssid : "",
|
||||
callback: callback
|
||||
};
|
||||
}
|
||||
|
||||
function connectToNetwork(ssid: string, password: string, bssid: string, callback: var): void {
|
||||
// Set up pending connection tracking if callback provided
|
||||
if (callback) {
|
||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||
root.pendingConnection = {
|
||||
ssid: ssid,
|
||||
bssid: hasBssid ? bssid : "",
|
||||
callback: callback
|
||||
};
|
||||
}
|
||||
Nmcli.connectToNetwork(ssid, password, bssid, result => {
|
||||
if (result && result.success) {
|
||||
// Connection successful
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
} else if (result && result.needsPassword) {
|
||||
// Password needed - callback will handle showing dialog
|
||||
if (callback)
|
||||
callback(result);
|
||||
} else {
|
||||
// Connection failed
|
||||
if (result && result.error) {
|
||||
root.connectionFailed(ssid);
|
||||
}
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Nmcli.connectToNetwork(ssid, password, bssid, result => {
|
||||
if (result && result.success) {
|
||||
// Connection successful
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
} else if (result && result.needsPassword) {
|
||||
// Password needed - callback will handle showing dialog
|
||||
if (callback)
|
||||
callback(result);
|
||||
} else {
|
||||
// Connection failed
|
||||
if (result && result.error) {
|
||||
root.connectionFailed(ssid);
|
||||
}
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
|
||||
// Set up pending connection tracking
|
||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||
root.pendingConnection = {
|
||||
ssid: ssid,
|
||||
bssid: hasBssid ? bssid : "",
|
||||
callback: callback
|
||||
};
|
||||
|
||||
function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
|
||||
// Set up pending connection tracking
|
||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||
root.pendingConnection = {
|
||||
ssid: ssid,
|
||||
bssid: hasBssid ? bssid : "",
|
||||
callback: callback
|
||||
};
|
||||
Nmcli.connectToNetworkWithPasswordCheck(ssid, isSecure, result => {
|
||||
if (result && result.success) {
|
||||
// Connection successful
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
} else if (result && result.needsPassword) {
|
||||
// Password needed - callback will handle showing dialog
|
||||
if (callback)
|
||||
callback(result);
|
||||
} else {
|
||||
// Connection failed
|
||||
if (result && result.error) {
|
||||
root.connectionFailed(ssid);
|
||||
}
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
}
|
||||
}, bssid);
|
||||
}
|
||||
|
||||
Nmcli.connectToNetworkWithPasswordCheck(ssid, isSecure, result => {
|
||||
if (result && result.success) {
|
||||
// Connection successful
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
} else if (result && result.needsPassword) {
|
||||
// Password needed - callback will handle showing dialog
|
||||
if (callback)
|
||||
callback(result);
|
||||
} else {
|
||||
// Connection failed
|
||||
if (result && result.error) {
|
||||
root.connectionFailed(ssid);
|
||||
}
|
||||
if (callback)
|
||||
callback(result);
|
||||
root.pendingConnection = null;
|
||||
}
|
||||
}, bssid);
|
||||
}
|
||||
function disconnectEthernet(connectionName: string): void {
|
||||
Nmcli.disconnectEthernet(connectionName, result => {
|
||||
if (result.success) {
|
||||
getEthernetDevices();
|
||||
// Clear device details after disconnection
|
||||
Qt.callLater(() => {
|
||||
root.ethernetDeviceDetails = null;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function disconnectFromNetwork(): void {
|
||||
// Try to disconnect - use connection name if available, otherwise use device
|
||||
Nmcli.disconnectFromNetwork();
|
||||
// Refresh network list after disconnection
|
||||
Qt.callLater(() => {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}, 500);
|
||||
}
|
||||
function disconnectFromNetwork(): void {
|
||||
// Try to disconnect - use connection name if available, otherwise use device
|
||||
Nmcli.disconnectFromNetwork();
|
||||
// Refresh network list after disconnection
|
||||
Qt.callLater(() => {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}, 500);
|
||||
}
|
||||
|
||||
function forgetNetwork(ssid: string): void {
|
||||
// Delete the connection profile for this network
|
||||
// This will remove the saved password and connection settings
|
||||
Nmcli.forgetNetwork(ssid, result => {
|
||||
if (result.success) {
|
||||
// Refresh network list after deletion
|
||||
Qt.callLater(() => {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}, 500);
|
||||
}
|
||||
});
|
||||
}
|
||||
function enableWifi(enabled: bool): void {
|
||||
Nmcli.enableWifi(enabled, result => {
|
||||
if (result.success) {
|
||||
root.getWifiStatus();
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
property list<string> savedConnections: []
|
||||
property list<string> savedConnectionSsids: []
|
||||
function forgetNetwork(ssid: string): void {
|
||||
// Delete the connection profile for this network
|
||||
// This will remove the saved password and connection settings
|
||||
Nmcli.forgetNetwork(ssid, result => {
|
||||
if (result.success) {
|
||||
// Refresh network list after deletion
|
||||
Qt.callLater(() => {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}, 500);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Sync saved connections from Nmcli when they're updated
|
||||
Connections {
|
||||
target: Nmcli
|
||||
function onSavedConnectionsChanged() {
|
||||
root.savedConnections = Nmcli.savedConnections;
|
||||
}
|
||||
function onSavedConnectionSsidsChanged() {
|
||||
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
||||
}
|
||||
}
|
||||
function getEthernetDevices(): void {
|
||||
root.ethernetProcessRunning = true;
|
||||
Nmcli.getEthernetInterfaces(interfaces => {
|
||||
root.ethernetDevices = Nmcli.ethernetDevices;
|
||||
root.ethernetDeviceCount = Nmcli.ethernetDevices.length;
|
||||
root.ethernetProcessRunning = false;
|
||||
});
|
||||
}
|
||||
|
||||
function syncNetworksFromNmcli(): void {
|
||||
const rNetworks = root.networks;
|
||||
const nNetworks = Nmcli.networks;
|
||||
function getWifiStatus(): void {
|
||||
Nmcli.getWifiStatus(enabled => {
|
||||
root.wifiEnabled = enabled;
|
||||
});
|
||||
}
|
||||
|
||||
// Build a map of existing networks by key
|
||||
const existingMap = new Map();
|
||||
for (const rn of rNetworks) {
|
||||
const key = `${rn.frequency}:${rn.ssid}:${rn.bssid}`;
|
||||
existingMap.set(key, rn);
|
||||
}
|
||||
function hasSavedProfile(ssid: string): bool {
|
||||
// Use Nmcli's hasSavedProfile which has the same logic
|
||||
return Nmcli.hasSavedProfile(ssid);
|
||||
}
|
||||
|
||||
// Build a map of new networks by key
|
||||
const newMap = new Map();
|
||||
for (const nn of nNetworks) {
|
||||
const key = `${nn.frequency}:${nn.ssid}:${nn.bssid}`;
|
||||
newMap.set(key, nn);
|
||||
}
|
||||
function rescanWifi(): void {
|
||||
Nmcli.rescanWifi();
|
||||
}
|
||||
|
||||
// Remove networks that no longer exist
|
||||
for (const [key, network] of existingMap) {
|
||||
if (!newMap.has(key)) {
|
||||
const index = rNetworks.indexOf(network);
|
||||
if (index >= 0) {
|
||||
rNetworks.splice(index, 1);
|
||||
network.destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
function syncNetworksFromNmcli(): void {
|
||||
const rNetworks = root.networks;
|
||||
const nNetworks = Nmcli.networks;
|
||||
|
||||
// Add or update networks from Nmcli
|
||||
for (const [key, nNetwork] of newMap) {
|
||||
const existing = existingMap.get(key);
|
||||
if (existing) {
|
||||
// Update existing network's lastIpcObject
|
||||
existing.lastIpcObject = nNetwork.lastIpcObject;
|
||||
} else {
|
||||
// Create new AccessPoint from Nmcli's data
|
||||
rNetworks.push(apComp.createObject(root, {
|
||||
lastIpcObject: nNetwork.lastIpcObject
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
// Build a map of existing networks by key
|
||||
const existingMap = new Map();
|
||||
for (const rn of rNetworks) {
|
||||
const key = `${rn.frequency}:${rn.ssid}:${rn.bssid}`;
|
||||
existingMap.set(key, rn);
|
||||
}
|
||||
|
||||
component AccessPoint: QtObject {
|
||||
required property var lastIpcObject
|
||||
readonly property string ssid: lastIpcObject.ssid
|
||||
readonly property string bssid: lastIpcObject.bssid
|
||||
readonly property int strength: lastIpcObject.strength
|
||||
readonly property int frequency: lastIpcObject.frequency
|
||||
readonly property bool active: lastIpcObject.active
|
||||
readonly property string security: lastIpcObject.security
|
||||
readonly property bool isSecure: security.length > 0
|
||||
}
|
||||
// Build a map of new networks by key
|
||||
const newMap = new Map();
|
||||
for (const nn of nNetworks) {
|
||||
const key = `${nn.frequency}:${nn.ssid}:${nn.bssid}`;
|
||||
newMap.set(key, nn);
|
||||
}
|
||||
|
||||
Component {
|
||||
id: apComp
|
||||
AccessPoint {}
|
||||
}
|
||||
// Remove networks that no longer exist
|
||||
for (const [key, network] of existingMap) {
|
||||
if (!newMap.has(key)) {
|
||||
const index = rNetworks.indexOf(network);
|
||||
if (index >= 0) {
|
||||
rNetworks.splice(index, 1);
|
||||
network.destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function hasSavedProfile(ssid: string): bool {
|
||||
// Use Nmcli's hasSavedProfile which has the same logic
|
||||
return Nmcli.hasSavedProfile(ssid);
|
||||
}
|
||||
// Add or update networks from Nmcli
|
||||
for (const [key, nNetwork] of newMap) {
|
||||
const existing = existingMap.get(key);
|
||||
if (existing) {
|
||||
// Update existing network's lastIpcObject
|
||||
existing.lastIpcObject = nNetwork.lastIpcObject;
|
||||
} else {
|
||||
// Create new AccessPoint from Nmcli's data
|
||||
rNetworks.push(apComp.createObject(root, {
|
||||
lastIpcObject: nNetwork.lastIpcObject
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getWifiStatus(): void {
|
||||
Nmcli.getWifiStatus(enabled => {
|
||||
root.wifiEnabled = enabled;
|
||||
});
|
||||
}
|
||||
function toggleWifi(): void {
|
||||
Nmcli.toggleWifi(result => {
|
||||
if (result.success) {
|
||||
root.getWifiStatus();
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getEthernetDevices(): void {
|
||||
root.ethernetProcessRunning = true;
|
||||
Nmcli.getEthernetInterfaces(interfaces => {
|
||||
root.ethernetDevices = Nmcli.ethernetDevices;
|
||||
root.ethernetDeviceCount = Nmcli.ethernetDevices.length;
|
||||
root.ethernetProcessRunning = false;
|
||||
});
|
||||
}
|
||||
function updateEthernetDeviceDetails(interfaceName: string): void {
|
||||
Nmcli.getEthernetDeviceDetails(interfaceName, details => {
|
||||
root.ethernetDeviceDetails = details;
|
||||
});
|
||||
}
|
||||
|
||||
function connectEthernet(connectionName: string, interfaceName: string): void {
|
||||
Nmcli.connectEthernet(connectionName, interfaceName, result => {
|
||||
if (result.success) {
|
||||
getEthernetDevices();
|
||||
// Refresh device details after connection
|
||||
Qt.callLater(() => {
|
||||
const activeDevice = root.ethernetDevices.find(function (d) {
|
||||
return d.connected;
|
||||
});
|
||||
if (activeDevice && activeDevice.interface) {
|
||||
updateEthernetDeviceDetails(activeDevice.interface);
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
function updateWirelessDeviceDetails(): void {
|
||||
// Find the wireless interface by looking for wifi devices
|
||||
// Pass empty string to let Nmcli find the active interface automatically
|
||||
Nmcli.getWirelessDeviceDetails("", details => {
|
||||
root.wirelessDeviceDetails = details;
|
||||
});
|
||||
}
|
||||
|
||||
function disconnectEthernet(connectionName: string): void {
|
||||
Nmcli.disconnectEthernet(connectionName, result => {
|
||||
if (result.success) {
|
||||
getEthernetDevices();
|
||||
// Clear device details after disconnection
|
||||
Qt.callLater(() => {
|
||||
root.ethernetDeviceDetails = null;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
Component.onCompleted: {
|
||||
// Trigger ethernet device detection after initialization
|
||||
Qt.callLater(() => {
|
||||
getEthernetDevices();
|
||||
});
|
||||
// Load saved connections on startup
|
||||
Nmcli.loadSavedConnections(() => {
|
||||
root.savedConnections = Nmcli.savedConnections;
|
||||
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
||||
});
|
||||
// Get initial WiFi status
|
||||
Nmcli.getWifiStatus(enabled => {
|
||||
root.wifiEnabled = enabled;
|
||||
});
|
||||
// Sync networks from Nmcli on startup
|
||||
Qt.callLater(() => {
|
||||
syncNetworksFromNmcli();
|
||||
}, 100);
|
||||
}
|
||||
|
||||
function updateEthernetDeviceDetails(interfaceName: string): void {
|
||||
Nmcli.getEthernetDeviceDetails(interfaceName, details => {
|
||||
root.ethernetDeviceDetails = details;
|
||||
});
|
||||
}
|
||||
// Sync saved connections from Nmcli when they're updated
|
||||
Connections {
|
||||
function onSavedConnectionSsidsChanged() {
|
||||
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
||||
}
|
||||
|
||||
function updateWirelessDeviceDetails(): void {
|
||||
// Find the wireless interface by looking for wifi devices
|
||||
// Pass empty string to let Nmcli find the active interface automatically
|
||||
Nmcli.getWirelessDeviceDetails("", details => {
|
||||
root.wirelessDeviceDetails = details;
|
||||
});
|
||||
}
|
||||
function onSavedConnectionsChanged() {
|
||||
root.savedConnections = Nmcli.savedConnections;
|
||||
}
|
||||
|
||||
function cidrToSubnetMask(cidr: string): string {
|
||||
// Convert CIDR notation (e.g., "24") to subnet mask (e.g., "255.255.255.0")
|
||||
const cidrNum = parseInt(cidr);
|
||||
if (isNaN(cidrNum) || cidrNum < 0 || cidrNum > 32) {
|
||||
return "";
|
||||
}
|
||||
target: Nmcli
|
||||
}
|
||||
|
||||
const mask = (0xffffffff << (32 - cidrNum)) >>> 0;
|
||||
const octets = [(mask >>> 24) & 0xff, (mask >>> 16) & 0xff, (mask >>> 8) & 0xff, mask & 0xff];
|
||||
Component {
|
||||
id: apComp
|
||||
|
||||
return octets.join(".");
|
||||
}
|
||||
AccessPoint {
|
||||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
running: true
|
||||
command: ["nmcli", "m"]
|
||||
stdout: SplitParser {
|
||||
onRead: {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
getEthernetDevices();
|
||||
}
|
||||
}
|
||||
}
|
||||
Process {
|
||||
command: ["nmcli", "m"]
|
||||
running: true
|
||||
|
||||
stdout: SplitParser {
|
||||
onRead: {
|
||||
Nmcli.getNetworks(() => {
|
||||
syncNetworksFromNmcli();
|
||||
});
|
||||
getEthernetDevices();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
component AccessPoint: QtObject {
|
||||
readonly property bool active: lastIpcObject.active
|
||||
readonly property string bssid: lastIpcObject.bssid
|
||||
readonly property int frequency: lastIpcObject.frequency
|
||||
readonly property bool isSecure: security.length > 0
|
||||
required property var lastIpcObject
|
||||
readonly property string security: lastIpcObject.security
|
||||
readonly property string ssid: lastIpcObject.ssid
|
||||
readonly property int strength: lastIpcObject.strength
|
||||
}
|
||||
}
|
||||
|
||||
+1349
-1343
File diff suppressed because it is too large
Load Diff
+280
-279
@@ -14,335 +14,336 @@ import qs.Paths
|
||||
import qs.Config
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
id: root
|
||||
|
||||
property list<Notif> list: []
|
||||
readonly property list<Notif> notClosed: list.filter( n => !n.closed )
|
||||
readonly property list<Notif> popups: list.filter( n => n.popup )
|
||||
property alias dnd: props.dnd
|
||||
property alias server: server
|
||||
property alias dnd: props.dnd
|
||||
property list<Notif> list: []
|
||||
property bool loaded
|
||||
readonly property list<Notif> notClosed: list.filter(n => !n.closed)
|
||||
readonly property list<Notif> popups: list.filter(n => n.popup)
|
||||
property alias server: server
|
||||
|
||||
property bool loaded
|
||||
onListChanged: {
|
||||
if (loaded) {
|
||||
saveTimer.restart();
|
||||
}
|
||||
if (root.list.length > 0) {
|
||||
HasNotifications.hasNotifications = true;
|
||||
} else {
|
||||
HasNotifications.hasNotifications = false;
|
||||
}
|
||||
}
|
||||
|
||||
onListChanged: {
|
||||
if ( loaded ) {
|
||||
saveTimer.restart();
|
||||
}
|
||||
if ( root.list.length > 0 ) {
|
||||
HasNotifications.hasNotifications = true;
|
||||
} else {
|
||||
HasNotifications.hasNotifications = false;
|
||||
}
|
||||
}
|
||||
Timer {
|
||||
id: saveTimer
|
||||
|
||||
Timer {
|
||||
id: saveTimer
|
||||
interval: 1000
|
||||
onTriggered: storage.setText( JSON.stringify( root.notClosed.map( n => ({
|
||||
time: n.time,
|
||||
id: n.id,
|
||||
summary: n.summary,
|
||||
body: n.body,
|
||||
appIcon: n.appIcon,
|
||||
appName: n.appName,
|
||||
image: n.image,
|
||||
expireTimeout: n.expireTimeout,
|
||||
urgency: n.urgency,
|
||||
resident: n.resident,
|
||||
hasActionIcons: n.hasActionIcons,
|
||||
actions: n.actions
|
||||
}))));
|
||||
}
|
||||
interval: 1000
|
||||
|
||||
PersistentProperties {
|
||||
id: props
|
||||
onTriggered: storage.setText(JSON.stringify(root.notClosed.map(n => ({
|
||||
time: n.time,
|
||||
id: n.id,
|
||||
summary: n.summary,
|
||||
body: n.body,
|
||||
appIcon: n.appIcon,
|
||||
appName: n.appName,
|
||||
image: n.image,
|
||||
expireTimeout: n.expireTimeout,
|
||||
urgency: n.urgency,
|
||||
resident: n.resident,
|
||||
hasActionIcons: n.hasActionIcons,
|
||||
actions: n.actions
|
||||
}))))
|
||||
}
|
||||
|
||||
property bool dnd
|
||||
PersistentProperties {
|
||||
id: props
|
||||
|
||||
reloadableId: "notifs"
|
||||
}
|
||||
property bool dnd
|
||||
|
||||
NotificationServer {
|
||||
id: server
|
||||
reloadableId: "notifs"
|
||||
}
|
||||
|
||||
keepOnReload: false
|
||||
actionsSupported: true
|
||||
bodyHyperlinksSupported: true
|
||||
bodyImagesSupported: true
|
||||
bodyMarkupSupported: true
|
||||
imageSupported: true
|
||||
persistenceSupported: true
|
||||
NotificationServer {
|
||||
id: server
|
||||
|
||||
onNotification: notif => {
|
||||
notif.tracked = true;
|
||||
actionsSupported: true
|
||||
bodyHyperlinksSupported: true
|
||||
bodyImagesSupported: true
|
||||
bodyMarkupSupported: true
|
||||
imageSupported: true
|
||||
keepOnReload: false
|
||||
persistenceSupported: true
|
||||
|
||||
const comp = notifComp.createObject(root, {
|
||||
popup: !props.dnd,
|
||||
notification: notif
|
||||
});
|
||||
root.list = [comp, ...root.list];
|
||||
}
|
||||
}
|
||||
onNotification: notif => {
|
||||
notif.tracked = true;
|
||||
|
||||
FileView {
|
||||
id: storage
|
||||
path: `${Paths.state}/notifs.json`
|
||||
const comp = notifComp.createObject(root, {
|
||||
popup: !props.dnd,
|
||||
notification: notif
|
||||
});
|
||||
root.list = [comp, ...root.list];
|
||||
}
|
||||
}
|
||||
|
||||
onLoaded: {
|
||||
const data = JSON.parse(text());
|
||||
for (const notif of data)
|
||||
root.list.push(notifComp.createObject(root, notif));
|
||||
root.list.sort((a, b) => b.time - a.time);
|
||||
root.loaded = true;
|
||||
}
|
||||
FileView {
|
||||
id: storage
|
||||
|
||||
onLoadFailed: err => {
|
||||
if (err === FileViewError.FileNotFound) {
|
||||
root.loaded = true;
|
||||
setText("[]");
|
||||
}
|
||||
}
|
||||
}
|
||||
path: `${Paths.state}/notifs.json`
|
||||
|
||||
CustomShortcut {
|
||||
name: "clearnotifs"
|
||||
description: "Clear all notifications"
|
||||
onPressed: {
|
||||
for (const notif of root.list.slice())
|
||||
notif.close();
|
||||
}
|
||||
}
|
||||
onLoadFailed: err => {
|
||||
if (err === FileViewError.FileNotFound) {
|
||||
root.loaded = true;
|
||||
setText("[]");
|
||||
}
|
||||
}
|
||||
onLoaded: {
|
||||
const data = JSON.parse(text());
|
||||
for (const notif of data)
|
||||
root.list.push(notifComp.createObject(root, notif));
|
||||
root.list.sort((a, b) => b.time - a.time);
|
||||
root.loaded = true;
|
||||
}
|
||||
}
|
||||
|
||||
IpcHandler {
|
||||
target: "notifs"
|
||||
CustomShortcut {
|
||||
description: "Clear all notifications"
|
||||
name: "clearnotifs"
|
||||
|
||||
function clear(): void {
|
||||
for (const notif of root.list.slice())
|
||||
notif.close();
|
||||
}
|
||||
onPressed: {
|
||||
for (const notif of root.list.slice())
|
||||
notif.close();
|
||||
}
|
||||
}
|
||||
|
||||
function isDndEnabled(): bool {
|
||||
return props.dnd;
|
||||
}
|
||||
IpcHandler {
|
||||
function clear(): void {
|
||||
for (const notif of root.list.slice())
|
||||
notif.close();
|
||||
}
|
||||
|
||||
function toggleDnd(): void {
|
||||
props.dnd = !props.dnd;
|
||||
}
|
||||
function disableDnd(): void {
|
||||
props.dnd = false;
|
||||
}
|
||||
|
||||
function enableDnd(): void {
|
||||
props.dnd = true;
|
||||
}
|
||||
function enableDnd(): void {
|
||||
props.dnd = true;
|
||||
}
|
||||
|
||||
function disableDnd(): void {
|
||||
props.dnd = false;
|
||||
}
|
||||
}
|
||||
function isDndEnabled(): bool {
|
||||
return props.dnd;
|
||||
}
|
||||
|
||||
component Notif: QtObject {
|
||||
id: notif
|
||||
function toggleDnd(): void {
|
||||
props.dnd = !props.dnd;
|
||||
}
|
||||
|
||||
property bool popup
|
||||
property bool closed
|
||||
property var locks: new Set()
|
||||
target: "notifs"
|
||||
}
|
||||
|
||||
property date time: new Date()
|
||||
readonly property string timeStr: {
|
||||
const diff = Time.date.getTime() - time.getTime();
|
||||
const m = Math.floor(diff / 60000);
|
||||
Component {
|
||||
id: notifComp
|
||||
|
||||
if (m < 1)
|
||||
return qsTr("now");
|
||||
Notif {
|
||||
}
|
||||
}
|
||||
|
||||
const h = Math.floor(m / 60);
|
||||
const d = Math.floor(h / 24);
|
||||
component Notif: QtObject {
|
||||
id: notif
|
||||
|
||||
if (d > 0)
|
||||
return `${d}d`;
|
||||
if (h > 0)
|
||||
return `${h}h`;
|
||||
return `${m}m`;
|
||||
}
|
||||
property list<var> actions
|
||||
property string appIcon
|
||||
property string appName
|
||||
property string body
|
||||
property bool closed
|
||||
readonly property Connections conn: Connections {
|
||||
function onActionsChanged(): void {
|
||||
notif.actions = notif.notification.actions.map(a => ({
|
||||
identifier: a.identifier,
|
||||
text: a.text,
|
||||
invoke: () => a.invoke()
|
||||
}));
|
||||
}
|
||||
|
||||
property Notification notification
|
||||
property string id
|
||||
property string summary
|
||||
property string body
|
||||
property string appIcon
|
||||
property string appName
|
||||
property string image
|
||||
property real expireTimeout: 5
|
||||
property int urgency: NotificationUrgency.Normal
|
||||
property bool resident
|
||||
property bool hasActionIcons
|
||||
property list<var> actions
|
||||
function onAppIconChanged(): void {
|
||||
notif.appIcon = notif.notification.appIcon;
|
||||
}
|
||||
|
||||
readonly property Timer timer: Timer {
|
||||
property int totalTime: Config.notifs.defaultExpireTimeout
|
||||
property int remainingTime: totalTime
|
||||
property bool paused: false
|
||||
function onAppNameChanged(): void {
|
||||
notif.appName = notif.notification.appName;
|
||||
}
|
||||
|
||||
running: !paused
|
||||
repeat: true
|
||||
interval: 50
|
||||
onTriggered: {
|
||||
remainingTime -= interval;
|
||||
function onBodyChanged(): void {
|
||||
notif.body = notif.notification.body;
|
||||
}
|
||||
|
||||
if ( remainingTime <= 0 ) {
|
||||
remainingTime = 0;
|
||||
notif.popup = false;
|
||||
stop();
|
||||
function onClosed(): void {
|
||||
notif.close();
|
||||
}
|
||||
|
||||
function onExpireTimeoutChanged(): void {
|
||||
notif.expireTimeout = notif.notification.expireTimeout;
|
||||
}
|
||||
|
||||
function onHasActionIconsChanged(): void {
|
||||
notif.hasActionIcons = notif.notification.hasActionIcons;
|
||||
}
|
||||
|
||||
function onImageChanged(): void {
|
||||
notif.image = notif.notification.image;
|
||||
if (notif.notification?.image)
|
||||
notif.dummyImageLoader.active = true;
|
||||
}
|
||||
|
||||
function onResidentChanged(): void {
|
||||
notif.resident = notif.notification.resident;
|
||||
}
|
||||
|
||||
function onSummaryChanged(): void {
|
||||
notif.summary = notif.notification.summary;
|
||||
}
|
||||
|
||||
function onUrgencyChanged(): void {
|
||||
notif.urgency = notif.notification.urgency;
|
||||
}
|
||||
|
||||
target: notif.notification
|
||||
}
|
||||
readonly property LazyLoader dummyImageLoader: LazyLoader {
|
||||
active: false
|
||||
|
||||
PanelWindow {
|
||||
color: "transparent"
|
||||
implicitHeight: Config.notifs.sizes.image
|
||||
implicitWidth: Config.notifs.sizes.image
|
||||
|
||||
mask: Region {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
readonly property LazyLoader dummyImageLoader: LazyLoader {
|
||||
active: false
|
||||
Image {
|
||||
function tryCache(): void {
|
||||
if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
|
||||
return;
|
||||
|
||||
PanelWindow {
|
||||
implicitWidth: Config.notifs.sizes.image
|
||||
implicitHeight: Config.notifs.sizes.image
|
||||
color: "transparent"
|
||||
mask: Region {}
|
||||
const cacheKey = notif.appName + notif.summary + notif.id;
|
||||
let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
|
||||
for (let i = 0; i < cacheKey.length; i++) {
|
||||
ch = cacheKey.charCodeAt(i);
|
||||
h1 = Math.imul(h1 ^ ch, 2654435761);
|
||||
h2 = Math.imul(h2 ^ ch, 1597334677);
|
||||
}
|
||||
h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
|
||||
h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
|
||||
h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
|
||||
h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
|
||||
const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);
|
||||
|
||||
Image {
|
||||
function tryCache(): void {
|
||||
if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
|
||||
return;
|
||||
|
||||
const cacheKey = notif.appName + notif.summary + notif.id;
|
||||
let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
|
||||
for (let i = 0; i < cacheKey.length; i++) {
|
||||
ch = cacheKey.charCodeAt(i);
|
||||
h1 = Math.imul(h1 ^ ch, 2654435761);
|
||||
h2 = Math.imul(h2 ^ ch, 1597334677);
|
||||
}
|
||||
h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
|
||||
h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
|
||||
h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
|
||||
h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
|
||||
const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);
|
||||
|
||||
const cache = `${Paths.notifimagecache}/${hash}.png`;
|
||||
const cache = `${Paths.notifimagecache}/${hash}.png`;
|
||||
ZShellIo.saveItem(this, Qt.resolvedUrl(cache), () => {
|
||||
notif.image = cache;
|
||||
notif.dummyImageLoader.active = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
anchors.fill: parent
|
||||
source: Qt.resolvedUrl(notif.image)
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
cache: false
|
||||
asynchronous: true
|
||||
opacity: 0
|
||||
anchors.fill: parent
|
||||
asynchronous: true
|
||||
cache: false
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
opacity: 0
|
||||
source: Qt.resolvedUrl(notif.image)
|
||||
|
||||
onStatusChanged: tryCache()
|
||||
onWidthChanged: tryCache()
|
||||
onHeightChanged: tryCache()
|
||||
}
|
||||
}
|
||||
}
|
||||
onHeightChanged: tryCache()
|
||||
onStatusChanged: tryCache()
|
||||
onWidthChanged: tryCache()
|
||||
}
|
||||
}
|
||||
}
|
||||
property real expireTimeout: 5
|
||||
property bool hasActionIcons
|
||||
property string id
|
||||
property string image
|
||||
property var locks: new Set()
|
||||
property Notification notification
|
||||
property bool popup
|
||||
property bool resident
|
||||
property string summary
|
||||
property date time: new Date()
|
||||
readonly property string timeStr: {
|
||||
const diff = Time.date.getTime() - time.getTime();
|
||||
const m = Math.floor(diff / 60000);
|
||||
|
||||
readonly property Connections conn: Connections {
|
||||
target: notif.notification
|
||||
if (m < 1)
|
||||
return qsTr("now");
|
||||
|
||||
function onClosed(): void {
|
||||
notif.close();
|
||||
}
|
||||
const h = Math.floor(m / 60);
|
||||
const d = Math.floor(h / 24);
|
||||
|
||||
function onSummaryChanged(): void {
|
||||
notif.summary = notif.notification.summary;
|
||||
}
|
||||
if (d > 0)
|
||||
return `${d}d`;
|
||||
if (h > 0)
|
||||
return `${h}h`;
|
||||
return `${m}m`;
|
||||
}
|
||||
readonly property Timer timer: Timer {
|
||||
property bool paused: false
|
||||
property int remainingTime: totalTime
|
||||
property int totalTime: Config.notifs.defaultExpireTimeout
|
||||
|
||||
function onBodyChanged(): void {
|
||||
notif.body = notif.notification.body;
|
||||
}
|
||||
interval: 50
|
||||
repeat: true
|
||||
running: !paused
|
||||
|
||||
function onAppIconChanged(): void {
|
||||
notif.appIcon = notif.notification.appIcon;
|
||||
}
|
||||
onTriggered: {
|
||||
remainingTime -= interval;
|
||||
|
||||
function onAppNameChanged(): void {
|
||||
notif.appName = notif.notification.appName;
|
||||
}
|
||||
if (remainingTime <= 0) {
|
||||
remainingTime = 0;
|
||||
notif.popup = false;
|
||||
stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
property int urgency: NotificationUrgency.Normal
|
||||
|
||||
function onImageChanged(): void {
|
||||
notif.image = notif.notification.image;
|
||||
if (notif.notification?.image)
|
||||
notif.dummyImageLoader.active = true;
|
||||
}
|
||||
function close(): void {
|
||||
closed = true;
|
||||
if (locks.size === 0 && root.list.includes(this)) {
|
||||
root.list = root.list.filter(n => n !== this);
|
||||
notification?.dismiss();
|
||||
destroy();
|
||||
}
|
||||
}
|
||||
|
||||
function onExpireTimeoutChanged(): void {
|
||||
notif.expireTimeout = notif.notification.expireTimeout;
|
||||
}
|
||||
function lock(item: Item): void {
|
||||
locks.add(item);
|
||||
}
|
||||
|
||||
function onUrgencyChanged(): void {
|
||||
notif.urgency = notif.notification.urgency;
|
||||
}
|
||||
function unlock(item: Item): void {
|
||||
locks.delete(item);
|
||||
if (closed)
|
||||
close();
|
||||
}
|
||||
|
||||
function onResidentChanged(): void {
|
||||
notif.resident = notif.notification.resident;
|
||||
}
|
||||
Component.onCompleted: {
|
||||
if (!notification)
|
||||
return;
|
||||
|
||||
function onHasActionIconsChanged(): void {
|
||||
notif.hasActionIcons = notif.notification.hasActionIcons;
|
||||
}
|
||||
|
||||
function onActionsChanged(): void {
|
||||
notif.actions = notif.notification.actions.map(a => ({
|
||||
identifier: a.identifier,
|
||||
text: a.text,
|
||||
invoke: () => a.invoke()
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
function lock(item: Item): void {
|
||||
locks.add(item);
|
||||
}
|
||||
|
||||
function unlock(item: Item): void {
|
||||
locks.delete(item);
|
||||
if (closed)
|
||||
close();
|
||||
}
|
||||
|
||||
function close(): void {
|
||||
closed = true;
|
||||
if (locks.size === 0 && root.list.includes(this)) {
|
||||
root.list = root.list.filter(n => n !== this);
|
||||
notification?.dismiss();
|
||||
destroy();
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (!notification)
|
||||
return;
|
||||
|
||||
id = notification.id;
|
||||
summary = notification.summary;
|
||||
body = notification.body;
|
||||
appIcon = notification.appIcon;
|
||||
appName = notification.appName;
|
||||
image = notification.image;
|
||||
if (notification?.image)
|
||||
dummyImageLoader.active = true;
|
||||
expireTimeout = notification.expireTimeout;
|
||||
urgency = notification.urgency;
|
||||
resident = notification.resident;
|
||||
hasActionIcons = notification.hasActionIcons;
|
||||
actions = notification.actions.map(a => ({
|
||||
identifier: a.identifier,
|
||||
text: a.text,
|
||||
invoke: () => a.invoke()
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: notifComp
|
||||
|
||||
Notif {}
|
||||
}
|
||||
id = notification.id;
|
||||
summary = notification.summary;
|
||||
body = notification.body;
|
||||
appIcon = notification.appIcon;
|
||||
appName = notification.appName;
|
||||
image = notification.image;
|
||||
if (notification?.image)
|
||||
dummyImageLoader.active = true;
|
||||
expireTimeout = notification.expireTimeout;
|
||||
urgency = notification.urgency;
|
||||
resident = notification.resident;
|
||||
hasActionIcons = notification.hasActionIcons;
|
||||
actions = notification.actions.map(a => ({
|
||||
identifier: a.identifier,
|
||||
text: a.text,
|
||||
invoke: () => a.invoke()
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user