nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: use global config for global properties

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-12 22:47:30 +10:00
parent 129b063381
commit b8d17ad8ef
20 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/background/DesktopClock.qml
View file

@ -106,7 +106,7 @@ Item {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.topMargin: Tokens.padding.large * 1.4 * root.clockScale Layout.topMargin: Tokens.padding.large * 1.4 * root.clockScale
active: Config.services.useTwelveHourClock active: GlobalConfig.services.useTwelveHourClock
visible: active visible: active
sourceComponent: StyledText { sourceComponent: StyledText {

2
modules/bar/components/Clock.qml
View file

@ -62,7 +62,7 @@ StyledRect {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: StyledText.AlignHCenter horizontalAlignment: StyledText.AlignHCenter
text: Time.format(Config.services.useTwelveHourClock ? "hh\nmm\nA" : "hh\nmm") text: Time.format(GlobalConfig.services.useTwelveHourClock ? "hh\nmm\nA" : "hh\nmm")
font.pointSize: Tokens.font.size.smaller font.pointSize: Tokens.font.size.smaller
font.family: Tokens.font.family.mono font.family: Tokens.font.family.mono
color: root.colour color: root.colour

4
modules/controlcenter/launcher/Settings.qml
View file

@ -100,13 +100,13 @@ ColumnLayout {
PropertyRow { PropertyRow {
label: qsTr("Special prefix") label: qsTr("Special prefix")
value: Config.launcher.specialPrefix || qsTr("None") value: GlobalConfig.launcher.specialPrefix || qsTr("None")
} }
PropertyRow { PropertyRow {
showTopMargin: true showTopMargin: true
label: qsTr("Action prefix") label: qsTr("Action prefix")
value: Config.launcher.actionPrefix || qsTr("None") value: GlobalConfig.launcher.actionPrefix || qsTr("None")
} }
} }

2
modules/dashboard/Performance.qml
View file

@ -14,7 +14,7 @@ Item {
readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.large * 2 readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.large * 2
function displayTemp(temp: real): string { function displayTemp(temp: real): string {
return `${Math.ceil(Config.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${Config.services.useFahrenheitPerformance ? "F" : "C"}`; return `${Math.ceil(GlobalConfig.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${GlobalConfig.services.useFahrenheitPerformance ? "F" : "C"}`;
} }
implicitWidth: Math.max(minWidth, content.implicitWidth) implicitWidth: Math.max(minWidth, content.implicitWidth)

2
modules/dashboard/WeatherTab.qml
View file

@ -193,7 +193,7 @@ Item {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Config.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°" text: GlobalConfig.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°"
font.weight: 600 font.weight: 600
color: Colours.palette.m3tertiary color: Colours.palette.m3tertiary
} }

2
modules/dashboard/dash/DateTime.qml
View file

@ -51,7 +51,7 @@ Item {
asynchronous: true asynchronous: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
active: Config.services.useTwelveHourClock active: GlobalConfig.services.useTwelveHourClock
visible: active visible: active
sourceComponent: StyledText { sourceComponent: StyledText {

2
modules/launcher/AppList.qml
View file

@ -50,7 +50,7 @@ StyledListView {
state: { state: {
const text = search.text; const text = search.text;
const prefix = Config.launcher.actionPrefix; const prefix = GlobalConfig.launcher.actionPrefix;
if (text.startsWith(prefix)) { if (text.startsWith(prefix)) {
for (const action of ["calc", "scheme", "variant"]) for (const action of ["calc", "scheme", "variant"])
if (text.startsWith(`${prefix}${action} `)) if (text.startsWith(`${prefix}${action} `))

6
modules/launcher/Content.qml
View file

@ -78,7 +78,7 @@ Item {
topPadding: Tokens.padding.larger topPadding: Tokens.padding.larger
bottomPadding: Tokens.padding.larger bottomPadding: Tokens.padding.larger
placeholderText: qsTr("Type \"%1\" for commands").arg(Config.launcher.actionPrefix) placeholderText: qsTr("Type \"%1\" for commands").arg(GlobalConfig.launcher.actionPrefix)
onAccepted: { onAccepted: {
const currentItem = list.currentList?.currentItem; const currentItem = list.currentList?.currentItem;
@ -88,8 +88,8 @@ Item {
Wallpapers.previewColourLock = true; Wallpapers.previewColourLock = true;
Wallpapers.setWallpaper(currentItem.modelData.path); Wallpapers.setWallpaper(currentItem.modelData.path);
root.visibilities.launcher = false; root.visibilities.launcher = false;
} else if (text.startsWith(Config.launcher.actionPrefix)) { } else if (text.startsWith(GlobalConfig.launcher.actionPrefix)) {
if (text.startsWith(`${Config.launcher.actionPrefix}calc `)) if (text.startsWith(`${GlobalConfig.launcher.actionPrefix}calc `))
currentItem.onClicked(); currentItem.onClicked();
else else
currentItem.modelData.onClicked(list.currentList); currentItem.modelData.onClicked(list.currentList);

2
modules/launcher/ContentList.qml
View file

@ -18,7 +18,7 @@ Item {
required property int padding required property int padding
required property int rounding required property int rounding
readonly property bool showWallpapers: search.text.startsWith(`${Config.launcher.actionPrefix}wallpaper `) readonly property bool showWallpapers: search.text.startsWith(`${GlobalConfig.launcher.actionPrefix}wallpaper `)
readonly property var currentList: showWallpapers ? wallpaperList.item : appList.item // Can be either ListView or PathView, so can't type properly readonly property var currentList: showWallpapers ? wallpaperList.item : appList.item // Can be either ListView or PathView, so can't type properly
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

2
modules/launcher/items/AppItem.qml
View file

@ -78,7 +78,7 @@ Item {
asynchronous: true asynchronous: true
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
active: root.modelData && Strings.testRegexList(Config.launcher.favouriteApps, root.modelData.id) active: root.modelData && Strings.testRegexList(GlobalConfig.launcher.favouriteApps, root.modelData.id)
sourceComponent: MaterialIcon { sourceComponent: MaterialIcon {
text: "favorite" text: "favorite"

2
modules/launcher/items/CalcItem.qml
View file

@ -10,7 +10,7 @@ Item {
id: root id: root
required property var list required property var list
readonly property string math: list.search.text.slice(`${Config.launcher.actionPrefix}calc `.length) readonly property string math: list.search.text.slice(`${GlobalConfig.launcher.actionPrefix}calc `.length)
function onClicked(): void { function onClicked(): void {
Quickshell.execDetached(["wl-copy", Qalculator.rawResult]); Quickshell.execDetached(["wl-copy", Qalculator.rawResult]);

4
modules/launcher/services/Actions.qml
View file

@ -11,7 +11,7 @@ Searcher {
id: root id: root
function transformSearch(search: string): string { function transformSearch(search: string): string {
return search.slice(Config.launcher.actionPrefix.length); return search.slice(GlobalConfig.launcher.actionPrefix.length);
} }
list: variants.instances list: variants.instances
@ -39,7 +39,7 @@ Searcher {
return; return;
if (command[0] === "autocomplete" && command.length > 1) { if (command[0] === "autocomplete" && command.length > 1) {
list.search.text = `${Config.launcher.actionPrefix}${command[1]} `; list.search.text = `${GlobalConfig.launcher.actionPrefix}${command[1]} `;
} else if (command[0] === "setMode" && command.length > 1) { } else if (command[0] === "setMode" && command.length > 1) {
list.visibilities.launcher = false; list.visibilities.launcher = false;
Colours.setMode(command[1]); Colours.setMode(command[1]);

2
modules/launcher/services/Apps.qml
View file

@ -24,7 +24,7 @@ Searcher {
} }
function search(search: string): list<var> { function search(search: string): list<var> {
const prefix = Config.launcher.specialPrefix; const prefix = GlobalConfig.launcher.specialPrefix;
if (search.startsWith(`${prefix}i `)) { if (search.startsWith(`${prefix}i `)) {
keys = ["id", "name"]; keys = ["id", "name"];

2
modules/launcher/services/M3Variants.qml
View file

@ -10,7 +10,7 @@ Searcher {
id: root id: root
function transformSearch(search: string): string { function transformSearch(search: string): string {
return search.slice(`${Config.launcher.actionPrefix}variant `.length); return search.slice(`${GlobalConfig.launcher.actionPrefix}variant `.length);
} }
list: [ list: [

2
modules/launcher/services/Schemes.qml
View file

@ -14,7 +14,7 @@ Searcher {
property string currentVariant property string currentVariant
function transformSearch(search: string): string { function transformSearch(search: string): string {
return search.slice(`${Config.launcher.actionPrefix}scheme `.length); return search.slice(`${GlobalConfig.launcher.actionPrefix}scheme `.length);
} }
function selector(item: var): string { function selector(item: var): string {

2
modules/lock/Center.qml
View file

@ -58,7 +58,7 @@ ColumnLayout {
Layout.leftMargin: Tokens.spacing.small Layout.leftMargin: Tokens.spacing.small
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
active: Config.services.useTwelveHourClock active: GlobalConfig.services.useTwelveHourClock
visible: active visible: active
sourceComponent: StyledText { sourceComponent: StyledText {

2
modules/lock/WeatherInfo.qml
View file

@ -159,7 +159,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C` text: GlobalConfig.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
font.pointSize: Tokens.font.size.larger font.pointSize: Tokens.font.size.larger
} }

4
modules/osd/Content.qml
View file

@ -46,7 +46,7 @@ Item {
icon: Icons.getVolumeIcon(value, root.muted) icon: Icons.getVolumeIcon(value, root.muted)
value: root.volume value: root.volume
to: Config.services.maxVolume to: GlobalConfig.services.maxVolume
onMoved: Audio.setVolume(value) onMoved: Audio.setVolume(value)
} }
} }
@ -71,7 +71,7 @@ Item {
icon: Icons.getMicVolumeIcon(value, root.sourceMuted) icon: Icons.getMicVolumeIcon(value, root.sourceMuted)
value: root.sourceVolume value: root.sourceVolume
to: Config.services.maxVolume to: GlobalConfig.services.maxVolume
onMoved: Audio.setSourceVolume(value) onMoved: Audio.setSourceVolume(value)
} }
} }

2
modules/utilities/cards/IdleInhibit.qml
View file

@ -93,7 +93,7 @@ StyledRect {
id: activeText id: activeText
anchors.centerIn: parent anchors.centerIn: parent
text: qsTr("Active since %1").arg(Qt.formatTime(IdleInhibitor.enabledSince, Config.services.useTwelveHourClock ? "hh:mm a" : "hh:mm")) text: qsTr("Active since %1").arg(Qt.formatTime(IdleInhibitor.enabledSince, GlobalConfig.services.useTwelveHourClock ? "hh:mm a" : "hh:mm"))
color: Colours.palette.m3onPrimary color: Colours.palette.m3onPrimary
font.pointSize: Math.round(Tokens.font.size.small * 0.9) font.pointSize: Math.round(Tokens.font.size.small * 0.9)
} }

8
services/Weather.qml
View file

@ -17,12 +17,12 @@ Singleton {
readonly property string icon: cc ? Icons.getWeatherIcon(cc.weatherCode) : "cloud_alert" readonly property string icon: cc ? Icons.getWeatherIcon(cc.weatherCode) : "cloud_alert"
readonly property string description: cc?.weatherDesc ?? qsTr("No weather") readonly property string description: cc?.weatherDesc ?? qsTr("No weather")
readonly property string temp: Config.services.useFahrenheit ? `${cc?.tempF ?? 0}°F` : `${cc?.tempC ?? 0}°C` readonly property string temp: GlobalConfig.services.useFahrenheit ? `${cc?.tempF ?? 0}°F` : `${cc?.tempC ?? 0}°C`
readonly property string feelsLike: Config.services.useFahrenheit ? `${cc?.feelsLikeF ?? 0}°F` : `${cc?.feelsLikeC ?? 0}°C` readonly property string feelsLike: GlobalConfig.services.useFahrenheit ? `${cc?.feelsLikeF ?? 0}°F` : `${cc?.feelsLikeC ?? 0}°C`
readonly property int humidity: cc?.humidity ?? 0 readonly property int humidity: cc?.humidity ?? 0
readonly property real windSpeed: cc?.windSpeed ?? 0 readonly property real windSpeed: cc?.windSpeed ?? 0
readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--" readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), GlobalConfig.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--" readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), GlobalConfig.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
readonly property var cachedCities: new Map() readonly property var cachedCities: new Map()