diff --git a/common/modules/pkgselect/PackageSelectViewStep.cpp b/common/modules/pkgselect/PackageSelectViewStep.cpp
index f216c05..1069a6a 100644
--- a/common/modules/pkgselect/PackageSelectViewStep.cpp
+++ b/common/modules/pkgselect/PackageSelectViewStep.cpp
@@ -135,8 +135,6 @@ void PackageSelectViewStep::onActivate()
ui->additional_label->setVisible(false);
ui->updates_button->setVisible(false);
ui->updates_text->setVisible(false);
- ui->party_button->setVisible(false);
- ui->party_text->setVisible(false);
ui->extraparty_scroll->setVisible(false);
ui->extraparty_text->setVisible(false);
@@ -160,7 +158,6 @@ void PackageSelectViewStep::onActivate()
connect(ui->full_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
/// Additional Options
connect(ui->updates_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
- connect(ui->party_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
/// Third-Party Apps
connect(ui->element_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);
connect(ui->thunderbird_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);
diff --git a/common/modules/pkgselect/pkgselect.ui b/common/modules/pkgselect/pkgselect.ui
index 2c1c621..1864e8f 100644
--- a/common/modules/pkgselect/pkgselect.ui
+++ b/common/modules/pkgselect/pkgselect.ui
@@ -28,18 +28,18 @@ QLabel {
}
- -
-
+
-
+
- Qt::Horizontal
+ Qt::Vertical
- QSizePolicy::Minimum
+ QSizePolicy::Fixed
20
- 20
+ 3
@@ -62,8 +62,43 @@ QLabel {
- -
-
+
-
+
+
+
+ 18
+ 50
+ false
+
+
+
+ padding-left: 0px; padding-right: 0px;
+
+
+ Install additional third-party packages
+
+
+
+ -
+
+
+
+ 16777215
+ 21
+
+
+
+
+ 12
+
+
+
+ Full Installation
+
+
+
+ -
+
10
@@ -71,17 +106,17 @@ QLabel {
- This software is subject to license terms included with its documentation, and some may be proprietary
+ Only the desktop environment
- -
-
+
-
+
- Qt::Vertical
+ Qt::Horizontal
- QSizePolicy::Fixed
+ QSizePolicy::Minimum
@@ -91,54 +126,80 @@ QLabel {
- -
-
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
- 16777215
- 21
+ 20
+ 20
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
- 12
+ 18
+ 50
+ false
+
+ padding-left: 0px; padding-right: 0px;
+
- Full Installation
+ Additional Options
- -
-
-
-
- 16777215
- 21
-
-
+
-
+
- 12
+ 10
+ true
- Normal Installation
+ All applications in the Normal Installation, and all extra third-party packages listed below
-
- true
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
- -
-
+
-
+
Qt::Vertical
+
+ QSizePolicy::Fixed
+
20
- 40
+ 10
@@ -159,8 +220,8 @@ QLabel {
- -
-
+
-
+
Qt::Vertical
@@ -193,19 +254,6 @@ QLabel {
- -
-
-
-
- 10
- true
-
-
-
- Only the desktop environment
-
-
-
-
@@ -219,38 +267,6 @@ QLabel {
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 10
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 10
-
-
-
-
-
@@ -264,8 +280,8 @@ QLabel {
- -
-
+
-
+
Qt::Vertical
@@ -275,62 +291,52 @@ QLabel {
20
- 3
+ 20
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
+
-
+
+
- 20
- 10
+ 16777215
+ 21
-
-
- -
-
- 10
- true
+ 12
- All applications in the Normal Installation, and all extra third-party packages listed below
+ Normal Installation
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+ true
- -
-
+
-
+
- 18
- 50
- false
+ 11
+ 75
+ false
+ true
-
- padding-left: 0px; padding-right: 0px;
-
- Installation Mode
+ Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.
+
+
+ true
- -
-
+
-
+
18
@@ -342,11 +348,11 @@ QLabel {
padding-left: 0px; padding-right: 0px;
- Install additional third-party packages
+ Installation Mode
- -
+
-
true
@@ -357,7 +363,7 @@ QLabel {
0
0
762
- 269
+ 281
@@ -565,75 +571,22 @@ QLabel {
- -
-
-
-
- 16777215
- 21
-
-
-
-
- 12
-
-
-
- Install third-party software for graphics, WiFi hardware, and additional media formats
-
-
-
- -
-
-
-
- 18
- 50
- false
-
-
-
- padding-left: 0px; padding-right: 0px;
-
-
- Additional Options
-
-
-
- -
-
+
-
+
- Qt::Horizontal
+ Qt::Vertical
- QSizePolicy::Minimum
+ QSizePolicy::Fixed
20
- 20
+ 10
- -
-
-
-
- 11
- 75
- false
- true
-
-
-
- Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.
-
-
- true
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 4dde507..8ae1007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:24.04.32) noble; urgency=medium
+
+ * Remove the third-party driver installation checkbox from pkgselect, its
+ functionality was not implemented.
+
+ -- Aaron Rainbolt Wed, 17 Apr 2024 23:18:12 -0500
+
calamares-settings-ubuntu (1:24.04.31) noble; urgency=medium
* Add Kubuntu branding. (LP: #2060845)