From 0d65dd0d20e829625763097eda343e5b531a459b Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@gmail.com>
Date: Wed, 17 Apr 2024 23:19:09 -0500
Subject: [PATCH] Get rid of the third-party drivers checkbox.

---
 .../pkgselect/PackageSelectViewStep.cpp       |   3 -
 common/modules/pkgselect/pkgselect.ui         | 305 ++++++++----------
 debian/changelog                              |   7 +
 3 files changed, 136 insertions(+), 179 deletions(-)

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 {
 }</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="2">
-    <spacer name="right_spacer">
+   <item row="17" column="1">
+    <spacer name="verticalSpacer_11">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Minimum</enum>
+      <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>20</height>
+       <height>3</height>
       </size>
      </property>
     </spacer>
@@ -62,8 +62,43 @@ QLabel {
      </property>
     </widget>
    </item>
-   <item row="17" column="1">
-    <widget class="QLabel" name="party_text">
+   <item row="16" column="1">
+    <widget class="QLabel" name="extraparty_text">
+     <property name="font">
+      <font>
+       <pointsize>18</pointsize>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">padding-left: 0px; padding-right: 0px;</string>
+     </property>
+     <property name="text">
+      <string>Install additional third-party packages</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QRadioButton" name="full_button">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>21</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>Full Installation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="QLabel" name="minimal_text">
      <property name="font">
       <font>
        <pointsize>10</pointsize>
@@ -71,17 +106,17 @@ QLabel {
       </font>
      </property>
      <property name="text">
-      <string>This software is subject to license terms included with its documentation, and some may be proprietary</string>
+      <string>Only the desktop environment</string>
      </property>
     </widget>
    </item>
-   <item row="18" column="1">
-    <spacer name="verticalSpacer_3">
+   <item row="0" column="0">
+    <spacer name="left_spacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
+      <enum>QSizePolicy::Minimum</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -91,54 +126,80 @@ QLabel {
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
-    <widget class="QRadioButton" name="full_button">
-     <property name="maximumSize">
+   <item row="0" column="2">
+    <spacer name="right_spacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>16777215</width>
-       <height>21</height>
+       <width>20</width>
+       <height>20</height>
       </size>
      </property>
+    </spacer>
+   </item>
+   <item row="20" column="1">
+    <spacer name="pushup">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="12" column="1">
+    <widget class="QLabel" name="additional_label">
      <property name="font">
       <font>
-       <pointsize>12</pointsize>
+       <pointsize>18</pointsize>
+       <weight>50</weight>
+       <bold>false</bold>
       </font>
      </property>
+     <property name="styleSheet">
+      <string notr="true">padding-left: 0px; padding-right: 0px;</string>
+     </property>
      <property name="text">
-      <string>Full Installation</string>
+      <string>Additional Options</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="QRadioButton" name="normal_button">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>21</height>
-      </size>
-     </property>
+   <item row="3" column="1">
+    <widget class="QLabel" name="full_text">
      <property name="font">
       <font>
-       <pointsize>12</pointsize>
+       <pointsize>10</pointsize>
+       <italic>true</italic>
       </font>
      </property>
      <property name="text">
-      <string>Normal Installation</string>
+      <string>All applications in the Normal Installation, and all extra third-party packages listed below</string>
      </property>
-     <property name="checked">
-      <bool>true</bool>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
-   <item row="23" column="1">
-    <spacer name="pushup">
+   <item row="8" column="1">
+    <spacer name="verticalSpacer_6">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>10</height>
       </size>
      </property>
     </spacer>
@@ -159,8 +220,8 @@ QLabel {
      </property>
     </spacer>
    </item>
-   <item row="11" column="1">
-    <spacer name="verticalSpacer_2">
+   <item row="15" column="1">
+    <spacer name="verticalSpacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -193,19 +254,6 @@ QLabel {
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
-    <widget class="QLabel" name="minimal_text">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="text">
-      <string>Only the desktop environment</string>
-     </property>
-    </widget>
-   </item>
    <item row="14" column="1">
     <widget class="QLabel" name="updates_text">
      <property name="font">
@@ -219,38 +267,6 @@ QLabel {
      </property>
     </widget>
    </item>
-   <item row="15" column="1">
-    <spacer name="verticalSpacer_7">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>10</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="1">
-    <spacer name="verticalSpacer_5">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>10</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="7" column="1">
     <widget class="QLabel" name="normal_text">
      <property name="font">
@@ -264,8 +280,8 @@ QLabel {
      </property>
     </widget>
    </item>
-   <item row="20" column="1">
-    <spacer name="verticalSpacer_11">
+   <item row="11" column="1">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -275,62 +291,52 @@ QLabel {
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>3</height>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="8" column="1">
-    <spacer name="verticalSpacer_6">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
+   <item row="6" column="1">
+    <widget class="QRadioButton" name="normal_button">
+     <property name="maximumSize">
       <size>
-       <width>20</width>
-       <height>10</height>
+       <width>16777215</width>
+       <height>21</height>
       </size>
      </property>
-    </spacer>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLabel" name="full_text">
      <property name="font">
       <font>
-       <pointsize>10</pointsize>
-       <italic>true</italic>
+       <pointsize>12</pointsize>
       </font>
      </property>
      <property name="text">
-      <string>All applications in the Normal Installation, and all extra third-party packages listed below</string>
+      <string>Normal Installation</string>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     <property name="checked">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="apps_label">
+   <item row="19" column="0" colspan="3">
+    <widget class="QLabel" name="mandatory_warning_label">
      <property name="font">
       <font>
-       <pointsize>18</pointsize>
-       <weight>50</weight>
-       <bold>false</bold>
+       <pointsize>11</pointsize>
+       <weight>75</weight>
+       <italic>false</italic>
+       <bold>true</bold>
       </font>
      </property>
-     <property name="styleSheet">
-      <string notr="true">padding-left: 0px; padding-right: 0px;</string>
-     </property>
      <property name="text">
-      <string>Installation Mode</string>
+      <string>Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="19" column="1">
-    <widget class="QLabel" name="extraparty_text">
+   <item row="1" column="1">
+    <widget class="QLabel" name="apps_label">
      <property name="font">
       <font>
        <pointsize>18</pointsize>
@@ -342,11 +348,11 @@ QLabel {
       <string notr="true">padding-left: 0px; padding-right: 0px;</string>
      </property>
      <property name="text">
-      <string>Install additional third-party packages</string>
+      <string>Installation Mode</string>
      </property>
     </widget>
    </item>
-   <item row="21" column="1">
+   <item row="18" column="1">
     <widget class="QScrollArea" name="extraparty_scroll">
      <property name="widgetResizable">
       <bool>true</bool>
@@ -357,7 +363,7 @@ QLabel {
         <x>0</x>
         <y>0</y>
         <width>762</width>
-        <height>269</height>
+        <height>281</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_2">
@@ -565,75 +571,22 @@ QLabel {
      </widget>
     </widget>
    </item>
-   <item row="16" column="1">
-    <widget class="QCheckBox" name="party_button">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>21</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>12</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Install third-party software for graphics, WiFi hardware, and additional media formats</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="1">
-    <widget class="QLabel" name="additional_label">
-     <property name="font">
-      <font>
-       <pointsize>18</pointsize>
-       <weight>50</weight>
-       <bold>false</bold>
-      </font>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">padding-left: 0px; padding-right: 0px;</string>
-     </property>
-     <property name="text">
-      <string>Additional Options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <spacer name="left_spacer">
+   <item row="4" column="1">
+    <spacer name="verticalSpacer_5">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Minimum</enum>
+      <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>20</height>
+       <height>10</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="22" column="0" colspan="3">
-    <widget class="QLabel" name="mandatory_warning_label">
-     <property name="font">
-      <font>
-       <pointsize>11</pointsize>
-       <weight>75</weight>
-       <italic>false</italic>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
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 <arraybolt3@ubuntu.com>  Wed, 17 Apr 2024 23:18:12 -0500
+
 calamares-settings-ubuntu (1:24.04.31) noble; urgency=medium
 
   * Add Kubuntu branding. (LP: #2060845)