mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 03:28:28 -04:00
purian23
e9d958b32b
- Added UI component & popout settings to manage ignored packages
- Added CLI support available in danklinux docs
Fixes: #2827
Closes: #2344, #1741
Port 1.5
(cherry picked from commit e4657aa5f9)
458 lines
20 KiB
QML
458 lines
20 KiB
QML
import QtQuick
|
|
import qs.Common
|
|
import qs.Services
|
|
import qs.Widgets
|
|
import qs.Modules.Settings.Widgets
|
|
|
|
Item {
|
|
id: root
|
|
|
|
readonly property var intervalOptions: [
|
|
{
|
|
label: I18n.tr("Every 15 minutes"),
|
|
seconds: 900
|
|
},
|
|
{
|
|
label: I18n.tr("Every 30 minutes"),
|
|
seconds: 1800
|
|
},
|
|
{
|
|
label: I18n.tr("Every hour"),
|
|
seconds: 3600
|
|
},
|
|
{
|
|
label: I18n.tr("Every 4 hours"),
|
|
seconds: 14400
|
|
},
|
|
{
|
|
label: I18n.tr("Once a day"),
|
|
seconds: 86400
|
|
}
|
|
]
|
|
|
|
readonly property string customIntervalLabel: I18n.tr("Custom")
|
|
property bool customIntervalSelected: false
|
|
|
|
Component.onCompleted: {
|
|
customIntervalSelected = !intervalOptions.some(o => o.seconds === SettingsData.updaterIntervalSeconds);
|
|
}
|
|
|
|
function intervalLabelFor(seconds) {
|
|
for (const opt of intervalOptions) {
|
|
if (opt.seconds === seconds) {
|
|
return opt.label;
|
|
}
|
|
}
|
|
return customIntervalLabel;
|
|
}
|
|
|
|
function intervalSecondsFor(label) {
|
|
for (const opt of intervalOptions) {
|
|
if (opt.label === label) {
|
|
return opt.seconds;
|
|
}
|
|
}
|
|
return 1800;
|
|
}
|
|
|
|
DankFlickable {
|
|
anchors.fill: parent
|
|
clip: true
|
|
contentHeight: mainColumn.height + Theme.spacingXL
|
|
contentWidth: width
|
|
|
|
Column {
|
|
id: mainColumn
|
|
topPadding: 4
|
|
width: Math.min(550, parent.width - Theme.spacingL * 2)
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
spacing: Theme.spacingXL
|
|
|
|
SettingsCard {
|
|
width: parent.width
|
|
iconName: "refresh"
|
|
title: I18n.tr("System Updater")
|
|
settingKey: "systemUpdater"
|
|
|
|
StyledText {
|
|
width: parent.width - Theme.spacingM * 2
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
visible: SystemUpdateService.backends.length > 0
|
|
text: {
|
|
const names = (SystemUpdateService.backends || []).map(b => b.displayName).join(", ");
|
|
return I18n.tr("Detected backends: %1").arg(names);
|
|
}
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceVariantText
|
|
wrapMode: Text.WordWrap
|
|
}
|
|
|
|
SettingsDropdownRow {
|
|
text: I18n.tr("Check interval")
|
|
description: I18n.tr("How often the server polls for new updates.")
|
|
options: root.intervalOptions.map(o => o.label).concat([root.customIntervalLabel])
|
|
currentValue: root.customIntervalSelected ? root.customIntervalLabel : root.intervalLabelFor(SettingsData.updaterIntervalSeconds)
|
|
onValueChanged: label => {
|
|
if (label === root.customIntervalLabel) {
|
|
root.customIntervalSelected = true;
|
|
return;
|
|
}
|
|
root.customIntervalSelected = false;
|
|
const secs = root.intervalSecondsFor(label);
|
|
SettingsData.set("updaterIntervalSeconds", secs);
|
|
SystemUpdateService.setInterval(secs);
|
|
}
|
|
}
|
|
|
|
FocusScope {
|
|
width: parent.width - Theme.spacingM * 2
|
|
height: customIntervalColumn.implicitHeight
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
visible: root.customIntervalSelected
|
|
|
|
Column {
|
|
id: customIntervalColumn
|
|
width: parent.width
|
|
spacing: Theme.spacingXS
|
|
|
|
StyledText {
|
|
text: I18n.tr("Custom interval in minutes (minimum 5)")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceVariantText
|
|
}
|
|
|
|
DankTextField {
|
|
id: customIntervalField
|
|
width: parent.width
|
|
placeholderText: "30"
|
|
backgroundColor: Theme.surfaceContainerHighest
|
|
normalBorderColor: Theme.outlineMedium
|
|
focusedBorderColor: Theme.primary
|
|
|
|
Component.onCompleted: {
|
|
text = Math.round(SettingsData.updaterIntervalSeconds / 60).toString();
|
|
}
|
|
|
|
onTextEdited: {
|
|
const minutes = parseInt(text, 10);
|
|
if (isNaN(minutes) || minutes < 5) {
|
|
return;
|
|
}
|
|
const secs = minutes * 60;
|
|
SettingsData.set("updaterIntervalSeconds", secs);
|
|
SystemUpdateService.setInterval(secs);
|
|
}
|
|
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onPressed: mouse => {
|
|
customIntervalField.forceActiveFocus();
|
|
mouse.accepted = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
SettingsToggleRow {
|
|
text: I18n.tr("Check on startup")
|
|
description: I18n.tr("When enabled, checks updates on startup. When disabled, only the interval above or a manual refresh runs a check.")
|
|
checked: SettingsData.updaterCheckOnStart
|
|
onToggled: checked => SettingsData.set("updaterCheckOnStart", checked)
|
|
}
|
|
|
|
SettingsToggleRow {
|
|
text: I18n.tr("Include Flatpak updates")
|
|
description: I18n.tr("Apply Flatpak updates alongside system updates when running 'Update All'.")
|
|
visible: (SystemUpdateService.backends || []).some(b => b.repo === "flatpak")
|
|
checked: SettingsData.updaterIncludeFlatpak
|
|
onToggled: checked => SettingsData.set("updaterIncludeFlatpak", checked)
|
|
}
|
|
|
|
SettingsToggleRow {
|
|
text: I18n.tr("Include AUR updates")
|
|
description: I18n.tr("Run paru/yay with AUR enabled when 'Update All' is clicked.")
|
|
visible: (SystemUpdateService.backends || []).some(b => b.id === "paru" || b.id === "yay")
|
|
checked: SettingsData.updaterAllowAUR
|
|
onToggled: checked => SettingsData.set("updaterAllowAUR", checked)
|
|
}
|
|
|
|
TerminalPickerRow {}
|
|
}
|
|
|
|
SettingsCard {
|
|
id: ignoredPackagesCard
|
|
width: parent.width
|
|
iconName: "inventory_2"
|
|
title: I18n.tr("Ignored Packages")
|
|
settingKey: "systemUpdaterIgnoredPackages"
|
|
tags: ["system", "update", "package", "ignore"]
|
|
|
|
function addIgnoredPackage() {
|
|
const name = newIgnoredPackageField.text.trim();
|
|
if (name === "") {
|
|
return;
|
|
}
|
|
if (!/^[A-Za-z0-9@._+:-]+$/.test(name)) {
|
|
ignoredPackageError.visible = true;
|
|
return;
|
|
}
|
|
ignoredPackageError.visible = false;
|
|
SystemUpdateService.ignorePackage(name);
|
|
newIgnoredPackageField.text = "";
|
|
}
|
|
|
|
Column {
|
|
width: parent.width
|
|
spacing: Theme.spacingS
|
|
|
|
StyledText {
|
|
width: parent.width
|
|
text: {
|
|
if (SettingsData.updaterUseCustomCommand) {
|
|
return I18n.tr("Ignored packages only apply to the built-in updater. Your custom command controls its own exclusions.");
|
|
}
|
|
return (SettingsData.updaterIgnoredPackages || []).length > 0 ? I18n.tr("Ignored packages are hidden from the updater and skipped by 'Update All'.") : I18n.tr("No packages ignored. Add one here or hover an update in the popout and click the hide button.");
|
|
}
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceVariantText
|
|
wrapMode: Text.WordWrap
|
|
bottomPadding: Theme.spacingS
|
|
}
|
|
|
|
Row {
|
|
width: parent.width
|
|
spacing: Theme.spacingS
|
|
|
|
DankTextField {
|
|
id: newIgnoredPackageField
|
|
width: parent.width - addIgnoredBtn.width - Theme.spacingS
|
|
height: 36
|
|
placeholderText: I18n.tr("Package name (e.g., docker)")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
onAccepted: ignoredPackagesCard.addIgnoredPackage()
|
|
onTextEdited: ignoredPackageError.visible = false
|
|
}
|
|
|
|
DankActionButton {
|
|
id: addIgnoredBtn
|
|
buttonSize: 36
|
|
iconName: "add"
|
|
iconSize: 20
|
|
backgroundColor: Theme.primary
|
|
iconColor: Theme.onPrimary
|
|
tooltipText: I18n.tr("Ignore package")
|
|
onClicked: ignoredPackagesCard.addIgnoredPackage()
|
|
}
|
|
}
|
|
|
|
StyledText {
|
|
id: ignoredPackageError
|
|
visible: false
|
|
text: I18n.tr("Invalid package name — letters, digits and @._+:- only.")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.error
|
|
}
|
|
|
|
SettingsCard {
|
|
width: parent.width
|
|
iconName: "visibility_off"
|
|
title: I18n.tr("Ignored (%1)").arg((SettingsData.updaterIgnoredPackages || []).length)
|
|
collapsible: true
|
|
expanded: false
|
|
visible: (SettingsData.updaterIgnoredPackages || []).length > 0
|
|
color: Theme.withAlpha(Theme.surfaceContainer, 0.5)
|
|
|
|
Repeater {
|
|
model: SettingsData.updaterIgnoredPackages
|
|
|
|
delegate: Rectangle {
|
|
required property string modelData
|
|
required property int index
|
|
|
|
width: parent.width
|
|
height: 40
|
|
radius: Theme.cornerRadius
|
|
color: Theme.withAlpha(Theme.surfaceContainer, 0.5)
|
|
|
|
DankIcon {
|
|
id: ignoredIcon
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
name: "visibility_off"
|
|
size: 18
|
|
color: Theme.surfaceVariantText
|
|
}
|
|
|
|
StyledText {
|
|
anchors.left: ignoredIcon.right
|
|
anchors.leftMargin: Theme.spacingS
|
|
anchors.right: removeIgnoredBtn.left
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
text: parent.modelData
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceText
|
|
elide: Text.ElideRight
|
|
}
|
|
|
|
DankActionButton {
|
|
id: removeIgnoredBtn
|
|
anchors.right: parent.right
|
|
anchors.rightMargin: Theme.spacingXS
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
buttonSize: 32
|
|
iconName: "delete"
|
|
iconSize: 18
|
|
iconColor: Theme.error
|
|
backgroundColor: "transparent"
|
|
tooltipText: I18n.tr("Stop ignoring %1").arg(parent.modelData)
|
|
onClicked: {
|
|
const list = (SettingsData.updaterIgnoredPackages || []).slice();
|
|
list.splice(parent.index, 1);
|
|
SettingsData.set("updaterIgnoredPackages", list);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
SettingsCard {
|
|
width: parent.width
|
|
iconName: "tune"
|
|
title: I18n.tr("Advanced")
|
|
settingKey: "systemUpdaterAdvanced"
|
|
|
|
SettingsToggleRow {
|
|
text: I18n.tr("Use Custom Command")
|
|
description: I18n.tr("Open a terminal and run a custom command instead of the in-shell upgrade flow.")
|
|
checked: SettingsData.updaterUseCustomCommand
|
|
onToggled: checked => {
|
|
if (!checked) {
|
|
updaterCustomCommand.text = "";
|
|
updaterTerminalCustomClass.text = "";
|
|
SettingsData.set("updaterCustomCommand", "");
|
|
SettingsData.set("updaterTerminalAdditionalParams", "");
|
|
}
|
|
SettingsData.set("updaterUseCustomCommand", checked);
|
|
}
|
|
}
|
|
|
|
Rectangle {
|
|
width: parent.width - Theme.spacingM * 2
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
visible: SettingsData.updaterUseCustomCommand
|
|
height: warnText.implicitHeight + Theme.spacingS * 2
|
|
radius: Theme.cornerRadius
|
|
color: Theme.warningHover
|
|
|
|
StyledText {
|
|
id: warnText
|
|
anchors.fill: parent
|
|
anchors.margins: Theme.spacingS
|
|
text: I18n.tr("Custom command and terminal params are split on whitespace; paths with spaces will break.")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.warning
|
|
wrapMode: Text.WordWrap
|
|
}
|
|
}
|
|
|
|
FocusScope {
|
|
width: parent.width - Theme.spacingM * 2
|
|
height: customCommandColumn.implicitHeight
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
visible: SettingsData.updaterUseCustomCommand
|
|
|
|
Column {
|
|
id: customCommandColumn
|
|
width: parent.width
|
|
spacing: Theme.spacingXS
|
|
|
|
StyledText {
|
|
text: I18n.tr("Custom update command")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceVariantText
|
|
}
|
|
|
|
DankTextField {
|
|
id: updaterCustomCommand
|
|
width: parent.width
|
|
placeholderText: "topgrade --no-retry"
|
|
backgroundColor: Theme.surfaceContainerHighest
|
|
normalBorderColor: Theme.outlineMedium
|
|
focusedBorderColor: Theme.primary
|
|
|
|
Component.onCompleted: {
|
|
if (SettingsData.updaterCustomCommand) {
|
|
text = SettingsData.updaterCustomCommand;
|
|
}
|
|
}
|
|
|
|
onTextEdited: SettingsData.set("updaterCustomCommand", text.trim())
|
|
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onPressed: mouse => {
|
|
updaterCustomCommand.forceActiveFocus();
|
|
mouse.accepted = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
FocusScope {
|
|
width: parent.width - Theme.spacingM * 2
|
|
height: terminalParamsColumn.implicitHeight
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: Theme.spacingM
|
|
visible: SettingsData.updaterUseCustomCommand
|
|
|
|
Column {
|
|
id: terminalParamsColumn
|
|
width: parent.width
|
|
spacing: Theme.spacingXS
|
|
|
|
StyledText {
|
|
text: I18n.tr("Terminal additional parameters")
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
color: Theme.surfaceVariantText
|
|
}
|
|
|
|
DankTextField {
|
|
id: updaterTerminalCustomClass
|
|
width: parent.width
|
|
placeholderText: "-T updater"
|
|
backgroundColor: Theme.surfaceContainerHighest
|
|
normalBorderColor: Theme.outlineMedium
|
|
focusedBorderColor: Theme.primary
|
|
|
|
Component.onCompleted: {
|
|
if (SettingsData.updaterTerminalAdditionalParams) {
|
|
text = SettingsData.updaterTerminalAdditionalParams;
|
|
}
|
|
}
|
|
|
|
onTextEdited: SettingsData.set("updaterTerminalAdditionalParams", text.trim())
|
|
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onPressed: mouse => {
|
|
updaterTerminalCustomClass.forceActiveFocus();
|
|
mouse.accepted = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|