From f8bf44933528b1f155881a8e84ca91be1ec8c1db Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 22 Nov 2023 18:30:35 -0600 Subject: [PATCH] Add some testing code to the QML file to make it do what we'd like. --- common/modules/pkgselect/pkgselect.qml | 25 ++++++++++++++++++++++--- debian/changelog | 1 + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/common/modules/pkgselect/pkgselect.qml b/common/modules/pkgselect/pkgselect.qml index 983d236..725f5f4 100644 --- a/common/modules/pkgselect/pkgselect.qml +++ b/common/modules/pkgselect/pkgselect.qml @@ -8,16 +8,33 @@ import QtQuick.Controls.Material 2.1 Item { property bool isRegularInstall: true - property bool isFullInstall: true function updatePackageSelections(objectName, checked) { var newMap = JSON.parse(JSON.stringify(packageSelect.packageSelections)); newMap[objectName] = checked; packageSelect.packageSelections = newMap; + element.enabled = true; + thunderbird.enabled = true; + virtManager.enabled = true; + krita.enabled = true; if (objectName === "minimalInstall") { isMinimalInstall = checked; + element.checked = false; + thunderbird.checked = false; + virtManager.checked = false; + krita.checked = false; + element.enabled = false; + thunderbird.enabled = false; + virtManager.enabled = false; + krita.enabled = false; } else if (objectName === "fullInstall") { - isFullInstall = checked; + isMinimalInstall = false; + element.checked = true; + thunderbird.checked = true; + virtManager.checked = true; + krita.checked = true; + } else { + isMinimalInstall = false; } } @@ -30,12 +47,14 @@ Item { font.pointSize: 14 } RadioButton { - checked: true text: qsTr("Full Installation") objectName: "fullInstall" font.pointSize: 12 indicator.width: 20 indicator.height: 20 + onClicked: { + updatePackageSelections(objectName, checked); + } } Text { text: qsTr("All applications in the Normal Installation, and all extra third-party packages listed below.") diff --git a/debian/changelog b/debian/changelog index 887ea6e..02528a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ calamares-settings-ubuntu (1:24.04.8) UNRELEASED; urgency=medium minimal install is selected. * Update snaps used for Krita. * Install the QML file to the proper directory. + * Add some testing code to the QML file to make it do what we'd like. -- Simon Quigley Wed, 22 Nov 2023 15:22:22 -0600