Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-06-10 01:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the third-party drivers checkbox.

Browse Source
This commit is contained in:
Aaron Rainbolt 2024-04-17 23:19:09 -05:00
parent c48927d938
commit 0d65dd0d20
3 changed files with 147 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/modules/pkgselect/PackageSelectViewStep.cpp
View File

@ -135,8 +135,6 @@ void PackageSelectViewStep::onActivate()
ui->additional_label->setVisible(false); ui->additional_label->setVisible(false);
ui->updates_button->setVisible(false); ui->updates_button->setVisible(false);
ui->updates_text->setVisible(false); ui->updates_text->setVisible(false);
ui->party_button->setVisible(false);
ui->party_text->setVisible(false);
ui->extraparty_scroll->setVisible(false); ui->extraparty_scroll->setVisible(false);
ui->extraparty_text->setVisible(false); ui->extraparty_text->setVisible(false);
@ -160,7 +158,6 @@ void PackageSelectViewStep::onActivate()
connect(ui->full_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections); connect(ui->full_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
/// Additional Options /// Additional Options
connect(ui->updates_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections); connect(ui->updates_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
connect(ui->party_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
/// Third-Party Apps /// Third-Party Apps
connect(ui->element_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections); connect(ui->element_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);
connect(ui->thunderbird_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections); connect(ui->thunderbird_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);

327
common/modules/pkgselect/pkgselect.ui
View File

@ -28,18 +28,18 @@ QLabel {
}</string> }</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="2"> <item row="17" column="1">
<spacer name="right_spacer"> <spacer name="verticalSpacer_11">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>3</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -62,35 +62,23 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="1"> <item row="16" column="1">
<widget class="QLabel" name="party_text"> <widget class="QLabel" name="extraparty_text">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>18</pointsize>
<italic>true</italic> <weight>50</weight>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text"> <property name="text">
<string>This software is subject to license terms included with its documentation, and some may be proprietary</string> <string>Install additional third-party packages</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="1">
<spacer name="verticalSpacer_3">
<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>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QRadioButton" name="full_button"> <widget class="QRadioButton" name="full_button">
<property name="maximumSize"> <property name="maximumSize">
@ -109,28 +97,52 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="10" column="1">
<widget class="QRadioButton" name="normal_button"> <widget class="QLabel" name="minimal_text">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>21</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>12</pointsize> <pointsize>10</pointsize>
<italic>true</italic>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Normal Installation</string> <string>Only the desktop environment</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="23" column="1"> <item row="0" column="0">
<spacer name="left_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<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>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="20" column="1">
<spacer name="pushup"> <spacer name="pushup">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -143,6 +155,55 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </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="3" column="1">
<widget class="QLabel" name="full_text">
<property name="font">
<font>
<pointsize>10</pointsize>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>All applications in the Normal Installation, and all extra third-party packages listed below</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</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">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1"> <item row="0" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@ -159,8 +220,8 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="11" column="1"> <item row="15" column="1">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -193,19 +254,6 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </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"> <item row="14" column="1">
<widget class="QLabel" name="updates_text"> <widget class="QLabel" name="updates_text">
<property name="font"> <property name="font">
@ -219,38 +267,6 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </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"> <item row="7" column="1">
<widget class="QLabel" name="normal_text"> <widget class="QLabel" name="normal_text">
<property name="font"> <property name="font">
@ -264,8 +280,8 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="1"> <item row="11" column="1">
<spacer name="verticalSpacer_11"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -275,40 +291,47 @@ QLabel {
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>3</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="8" column="1"> <item row="6" column="1">
<spacer name="verticalSpacer_6"> <widget class="QRadioButton" name="normal_button">
<property name="orientation"> <property name="maximumSize">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>16777215</width>
<height>10</height> <height>21</height>
</size> </size>
</property> </property>
</spacer>
</item>
<item row="3" column="1">
<widget class="QLabel" name="full_text">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>12</pointsize>
<italic>true</italic>
</font> </font>
</property> </property>
<property name="text"> <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>
<property name="alignment"> <property name="checked">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <bool>true</bool>
</property>
</widget>
</item>
<item row="19" 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> </property>
</widget> </widget>
</item> </item>
@ -329,24 +352,7 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="1"> <item row="18" 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="21" column="1">
<widget class="QScrollArea" name="extraparty_scroll"> <widget class="QScrollArea" name="extraparty_scroll">
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
@ -357,7 +363,7 @@ QLabel {
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>762</width> <width>762</width>
<height>269</height> <height>281</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
@ -565,75 +571,22 @@ QLabel {
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="16" column="1"> <item row="4" column="1">
<widget class="QCheckBox" name="party_button"> <spacer name="verticalSpacer_5">
<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">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>10</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </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> </layout>
</widget> </widget>
<resources/> <resources/>

7
debian/changelog vendored
View File

@ -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 calamares-settings-ubuntu (1:24.04.31) noble; urgency=medium
* Add Kubuntu branding. (LP: #2060845) * Add Kubuntu branding. (LP: #2060845)