zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing app templating after refactor

Browse Source
This commit is contained in:
ItsLemmy
2025-11-08 20:50:21 -05:00
parent 355271768c
commit 168bf54f41
28 changed files with 113 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Background/Background.qml
+2 -2
View File
@@ -332,10 +332,10 @@ Variants {
var dim = Qt.size(0, 0)
if (screenWidth >= screenHeight) {
const w = Math.min(screenWidth, wpWidth)
dim = Qt.size(w, w / imageAspectRatio)
dim = Qt.size(Math.round(w), Math.round(w / imageAspectRatio))
} else {
const h = Math.min(screenHeight, wpHeight)
dim = Qt.size(h * imageAspectRatio, h)
dim = Qt.size(Math.round(h * imageAspectRatio), Math.round(h))
}
Logger.d("Background", `Wallpaper resized on ${modelData.name} ${screenWidth}x${screenHeight} @ ${compositorScale}x`, "src:", wpWidth, wpHeight, "dst:", dim.width, dim.height)
Modules/Bar/Widgets/ScreenRecorder.qml
+1 -1
View File
@@ -24,7 +24,7 @@ NIconButton {
function handleClick() {
if (!ScreenRecorderService.isAvailable) {
ToastService.showError(I18n.tr("toast.recording.not-installed"), I18n.tr("toast.recording.not-installed-desc"), 7000)
ToastService.showError(I18n.tr("toast.recording.not-installed"), I18n.tr("toast.recording.not-installed-desc"))
return
}
ScreenRecorderService.toggleRecording()
Modules/MainScreen/AllScreens.qml
+4 -2
View File
@@ -15,8 +15,10 @@ Variants {
required property ShellScreen modelData
property bool shouldBeActive: {
if (!modelData || !modelData.name)
Logger.d("Shell", "MainScreen activated for", modelData?.name)
if (!modelData || !modelData.name) {
return false
}
Logger.d("Shell", "MainScreen activated for", modelData?.name)
return true
}
Modules/MainScreen/MainScreen.qml
+1 -16
View File
@@ -163,7 +163,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "audioPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(audioPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -175,7 +174,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "batteryPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(batteryPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -187,7 +185,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "bluetoothPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(bluetoothPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -199,7 +196,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "controlCenterPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(controlCenterPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -211,7 +207,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "calendarPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(calendarPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -223,7 +218,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "launcherPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(launcherPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -235,7 +229,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "notificationHistoryPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(notificationHistoryPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -247,7 +240,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "sessionMenuPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(sessionMenuPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -259,7 +251,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "settingsPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(settingsPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -271,7 +262,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "setupWizardPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(setupWizardPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -283,7 +273,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "trayDrawerPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(trayDrawerPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -295,7 +284,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "trayMenuPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(trayMenuPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -307,7 +295,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "wallpaperPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(wallpaperPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -319,7 +306,6 @@ PanelWindow {
Component.onCompleted: {
objectName = "wifiPanel-" + (screen?.name || "unknown")
PanelService.registerPanel(wifiPanel)
Logger.d("MainScreen", "Panel registered:", objectName, "on screen:", screen?.name)
}
}
@@ -338,9 +324,8 @@ PanelWindow {
property ShellScreen screen: root.screen
onLoaded: {
Logger.d("MainScreen", "Bar loaded:", item !== null)
if (item) {
Logger.d("MainScreen", "Bar screen", item.screen?.name, "size:", item.width, "x", item.height)
Logger.d("MainScreen", "Bar loaded with screen", item.screen?.name)
// Bind screen to bar component (use binding for reactivity)
item.screen = Qt.binding(function () {
return barLoader.screen
Modules/Panels/Launcher/Launcher.qml
+3 -1
View File
@@ -4,8 +4,10 @@ import QtQuick.Layouts
import Quickshell
import Quickshell.Widgets
import qs.Commons
import qs.Widgets
import qs.Modules.MainScreen
import qs.Services.Keyboard
import qs.Widgets
import "Plugins"
SmartPanel {
Modules/Panels/Settings/Tabs/ColorSchemeTab.qml
+5 -5
View File
@@ -4,7 +4,7 @@ import QtQuick.Layouts
import Quickshell
import Quickshell.Io
import qs.Commons
import qs.Services.DynamicTheming
import qs.Services.Theming
import qs.Services.System
import qs.Services.UI
import qs.Widgets
@@ -113,9 +113,9 @@ ColumnLayout {
if (exitCode === 0) {
Settings.data.colorSchemes.useWallpaperColors = true
AppThemeService.generate()
ToastService.showNotice(I18n.tr("settings.color-scheme.color-source.use-wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.enabled"), "settings-color-scheme")
ToastService.showNotice(I18n.tr("toast.wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.enabled"), "settings-color-scheme")
} else {
ToastService.showWarning(I18n.tr("settings.color-scheme.color-source.use-wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.not-installed"))
ToastService.showWarning(I18n.tr("oast.wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.not-installed"))
}
}
@@ -130,7 +130,6 @@ ColumnLayout {
Repeater {
model: ColorSchemeService.schemes
delegate: Item {
FileView {
path: modelData
@@ -250,7 +249,7 @@ ColumnLayout {
matugenCheck.running = true
} else {
Settings.data.colorSchemes.useWallpaperColors = false
ToastService.showNotice(I18n.tr("settings.color-scheme.color-source.use-wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.disabled"), "settings-color-scheme")
ToastService.showNotice(I18n.tr("toast.wallpaper-colors.label"), I18n.tr("toast.wallpaper-colors.disabled"), "settings-color-scheme")
if (Settings.data.colorSchemes.predefinedScheme) {
ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme)
@@ -470,6 +469,7 @@ ColumnLayout {
ColumnLayout {
Layout.fillWidth: true
spacing: Style.marginL
visible: Settings.data.colorSchemes.useWallpaperColors || Settings.data.colorSchemes.generateTemplatesForPredefined
NHeader {
label: I18n.tr("settings.color-scheme.templates.section.label")