core: respect QT_LOGGING_RULES var

printers: fix input field height
fixes #1254
2026-01-24 13:32:50 -05:00 · 2026-01-03 11:05:47 -05:00 · 2026-01-03 10:54:53 -05:00
2 changed files with 8 additions and 7 deletions
--- a/core/cmd/dms/shell.go
+++ b/core/cmd/dms/shell.go
@@ -186,8 +186,10 @@ func runShellInteractive(session bool) {

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
-		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
+	if os.Getenv("QT_LOGGING_RULES") == "" {
+		if qtRules := log.GetQtLoggingRules(); qtRules != "" {
+			cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
+		}
 	}

 	if isSessionManaged && hasSystemdRun() {
@@ -424,8 +426,10 @@ func runShellDaemon(session bool) {

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
-		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
+	if os.Getenv("QT_LOGGING_RULES") == "" {
+		if qtRules := log.GetQtLoggingRules(); qtRules != "" {
+			cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
+		}
 	}

 	if isSessionManaged && hasSystemdRun() {
--- a/quickshell/Modules/Settings/PrinterTab.qml
+++ b/quickshell/Modules/Settings/PrinterTab.qml
@@ -421,7 +421,6 @@ Item {

                                DankTextField {
                                    width: parent.width - 80 - Theme.spacingS
-                                    height: 40
                                    placeholderText: I18n.tr("Printer name (no spaces)")
                                    text: printerTab.newPrinterName
                                    onTextEdited: printerTab.newPrinterName = text.replace(/\s/g, "-")
@@ -443,7 +442,6 @@ Item {

                                DankTextField {
                                    width: parent.width - 80 - Theme.spacingS
-                                    height: 40
                                    placeholderText: I18n.tr("Optional location")
                                    text: printerTab.newPrinterLocation
                                    onTextEdited: printerTab.newPrinterLocation = text
@@ -465,7 +463,6 @@ Item {

                                DankTextField {
                                    width: parent.width - 80 - Theme.spacingS
-                                    height: 40
                                    placeholderText: I18n.tr("Optional description")
                                    text: printerTab.newPrinterInfo
                                    onTextEdited: printerTab.newPrinterInfo = text
Author	SHA1	Message	Date
bbedward	faddc46185	core: respect QT_LOGGING_RULES var	2026-01-03 11:05:47 -05:00
bbedward	2991aac82e	printers: fix input field height fixes #1254	2026-01-03 10:54:53 -05:00