Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-07-09 15:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show Thunderbird on Kubuntu.

Browse Source
This commit is contained in:
Aaron Rainbolt 2024-04-19 18:37:11 -05:00
parent b2766f78bc
commit 5674431193
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#include "PackageSelectViewStep.h" #include "PackageSelectViewStep.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "Branding.h"
#include "network/Manager.h" #include "network/Manager.h"
#include <QVariantMap> #include <QVariantMap>
@ -151,6 +152,16 @@ void PackageSelectViewStep::onActivate()
ui->krita_button->setEnabled(false); ui->krita_button->setEnabled(false);
} }
// Thunderbird exists on Kubuntu already
if (Calamares::Branding::instance()->componentName() == "kubuntu") {
ui->thunderbird_button->setChecked(false);
ui->thunderbird_button->setEnabled(false);
ui->thunderbird_button->setVisible(false);
ui->thunderbird_text->setVisible(false);
ui->thunderbird_spacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
ui->thunderbird_spacer->invalidate();
}
// Connect the storage items // Connect the storage items
/// Full/Normal/Minimal /// Full/Normal/Minimal
connect(ui->minimal_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections); connect(ui->minimal_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);

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

@ -407,7 +407,7 @@ QLabel {
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<spacer name="verticalSpacer_9"> <spacer name="thunderbird_spacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
calamares-settings-ubuntu (1:24.04.36) noble; urgency=medium
* Don't show Thunderbird as an installable third-party app on Kubuntu.
(LP: #2062438)
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Fri, 19 Apr 2024 17:38:06 -0500
calamares-settings-ubuntu (1:24.04.35) noble; urgency=medium calamares-settings-ubuntu (1:24.04.35) noble; urgency=medium
* Remove timeouts for network-related package commands. (LP: #2062106) * Remove timeouts for network-related package commands. (LP: #2062106)