mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-31 08:52:49 -05:00
Compare commits
2 Commits
e1817027b1
...
faddc46185
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
faddc46185 | ||
|
|
2991aac82e |
@@ -186,8 +186,10 @@ func runShellInteractive(session bool) {
|
|||||||
|
|
||||||
cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
|
cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
|
||||||
cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
|
cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
|
||||||
if qtRules := log.GetQtLoggingRules(); qtRules != "" {
|
if os.Getenv("QT_LOGGING_RULES") == "" {
|
||||||
cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
|
if qtRules := log.GetQtLoggingRules(); qtRules != "" {
|
||||||
|
cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if isSessionManaged && hasSystemdRun() {
|
if isSessionManaged && hasSystemdRun() {
|
||||||
@@ -424,8 +426,10 @@ func runShellDaemon(session bool) {
|
|||||||
|
|
||||||
cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
|
cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
|
||||||
cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
|
cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
|
||||||
if qtRules := log.GetQtLoggingRules(); qtRules != "" {
|
if os.Getenv("QT_LOGGING_RULES") == "" {
|
||||||
cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
|
if qtRules := log.GetQtLoggingRules(); qtRules != "" {
|
||||||
|
cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if isSessionManaged && hasSystemdRun() {
|
if isSessionManaged && hasSystemdRun() {
|
||||||
|
|||||||
@@ -421,7 +421,6 @@ Item {
|
|||||||
|
|
||||||
DankTextField {
|
DankTextField {
|
||||||
width: parent.width - 80 - Theme.spacingS
|
width: parent.width - 80 - Theme.spacingS
|
||||||
height: 40
|
|
||||||
placeholderText: I18n.tr("Printer name (no spaces)")
|
placeholderText: I18n.tr("Printer name (no spaces)")
|
||||||
text: printerTab.newPrinterName
|
text: printerTab.newPrinterName
|
||||||
onTextEdited: printerTab.newPrinterName = text.replace(/\s/g, "-")
|
onTextEdited: printerTab.newPrinterName = text.replace(/\s/g, "-")
|
||||||
@@ -443,7 +442,6 @@ Item {
|
|||||||
|
|
||||||
DankTextField {
|
DankTextField {
|
||||||
width: parent.width - 80 - Theme.spacingS
|
width: parent.width - 80 - Theme.spacingS
|
||||||
height: 40
|
|
||||||
placeholderText: I18n.tr("Optional location")
|
placeholderText: I18n.tr("Optional location")
|
||||||
text: printerTab.newPrinterLocation
|
text: printerTab.newPrinterLocation
|
||||||
onTextEdited: printerTab.newPrinterLocation = text
|
onTextEdited: printerTab.newPrinterLocation = text
|
||||||
@@ -465,7 +463,6 @@ Item {
|
|||||||
|
|
||||||
DankTextField {
|
DankTextField {
|
||||||
width: parent.width - 80 - Theme.spacingS
|
width: parent.width - 80 - Theme.spacingS
|
||||||
height: 40
|
|
||||||
placeholderText: I18n.tr("Optional description")
|
placeholderText: I18n.tr("Optional description")
|
||||||
text: printerTab.newPrinterInfo
|
text: printerTab.newPrinterInfo
|
||||||
onTextEdited: printerTab.newPrinterInfo = text
|
onTextEdited: printerTab.newPrinterInfo = text
|
||||||
|
|||||||
Reference in New Issue
Block a user