Add a full installation radio button, and disable the bottom checkboxes if minimal install is selected.

This commit is contained in:
Simon Quigley 2023-11-22 16:51:02 -06:00
parent 52cf0936d6
commit e54b912e24
2 changed files with 32 additions and 1 deletions

View File

@ -7,10 +7,18 @@ import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material 2.1
Item { Item {
property bool isRegularInstall: true
property bool isFullInstall: true
function updatePackageSelections(objectName, checked) { function updatePackageSelections(objectName, checked) {
var newMap = JSON.parse(JSON.stringify(packageSelect.packageSelections)); var newMap = JSON.parse(JSON.stringify(packageSelect.packageSelections));
newMap[objectName] = checked; newMap[objectName] = checked;
packageSelect.packageSelections = newMap; packageSelect.packageSelections = newMap;
if (objectName === "minimalInstall") {
isMinimalInstall = checked;
} else if (objectName === "fullInstall") {
isFullInstall = checked;
}
} }
ColumnLayout { ColumnLayout {
@ -21,6 +29,19 @@ Item {
font.bold: true font.bold: true
font.pointSize: 14 font.pointSize: 14
} }
RadioButton {
checked: true
text: qsTr("Full Installation")
objectName: "fullInstall"
font.pointSize: 12
indicator.width: 20
indicator.height: 20
}
Text {
text: qsTr("All applications in the Normal Installation, and all extra third-party packages listed below.")
font.pointSize: 10
font.italic: true
}
RadioButton { RadioButton {
checked: true checked: true
text: qsTr("Normal Installation") text: qsTr("Normal Installation")
@ -114,6 +135,8 @@ Item {
CheckBox { CheckBox {
text: qsTr("Element") text: qsTr("Element")
checked: isFullInstall
enabled: !isMinimalInstall
objectName: "element" objectName: "element"
font.pointSize: 11 font.pointSize: 11
indicator.width: 18 indicator.width: 18
@ -129,6 +152,8 @@ Item {
} }
CheckBox { CheckBox {
text: qsTr("Thunderbird") text: qsTr("Thunderbird")
checked: isFullInstall
enabled: !isMinimalInstall
objectName: "thunderbird" objectName: "thunderbird"
font.pointSize: 11 font.pointSize: 11
indicator.width: 18 indicator.width: 18
@ -144,6 +169,8 @@ Item {
} }
CheckBox { CheckBox {
text: qsTr("Virtual Machine Manager") text: qsTr("Virtual Machine Manager")
checked: isFullInstall
enabled: !isMinimalInstall
objectName: "virt-manager" objectName: "virt-manager"
font.pointSize: 11 font.pointSize: 11
indicator.width: 18 indicator.width: 18
@ -159,6 +186,8 @@ Item {
} }
CheckBox { CheckBox {
text: qsTr("Krita") text: qsTr("Krita")
checked: isFullInstall
enabled: !isMinimalInstall
objectName: "krita" objectName: "krita"
font.pointSize: 11 font.pointSize: 11
indicator.width: 18 indicator.width: 18
@ -183,7 +212,7 @@ Item {
color: "white" color: "white"
} }
Text { Text {
text: qsTr("Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list. Use at your own risk.") text: qsTr("Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.") + "<br />" + qsTr("Use at your own risk.")
font.bold: true font.bold: true
font.pointSize: 12 font.pointSize: 12
} }

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ calamares-settings-ubuntu (1:24.04.8) UNRELEASED; urgency=medium
workflow on the live system. Remove this package at the end of the install workflow on the live system. Remove this package at the end of the install
as well. as well.
* Go back to fullscreen. * Go back to fullscreen.
* Add a full installation radio button, and disable the bottom checkboxes if
minimal install is selected.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 22 Nov 2023 15:22:22 -0600 -- Simon Quigley <tsimonq2@ubuntu.com> Wed, 22 Nov 2023 15:22:22 -0600