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 17:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the items show up in globalStorage, but fail at actually using them

Browse Source
This commit is contained in:
Simon Quigley 2024-03-21 22:44:13 -05:00
parent 45d0d7bb62
commit a6ece69a5a
4 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,20 @@ void PackageSelectViewStep::onActivate()
ui->krita_button->setEnabled(false); ui->krita_button->setEnabled(false);
} }
}); });
// Connect the storage items
/// Full/Normal/Minimal
connect(ui->minimal_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
connect(ui->normal_button, &QRadioButton::toggled, this, &PackageSelectViewStep::updatePackageSelections);
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);
connect(ui->virtmanager_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);
connect(ui->krita_button, &QCheckBox::toggled, this, &PackageSelectViewStep::updatePackageSelections);
} }
void void
@ -128,12 +142,12 @@ PackageSelectViewStep::onLeave()
gs->insert("packages", config); gs->insert("packages", config);
} }
void PackageSelectViewStep::setPackageSelections(const QVariantMap &value) void PackageSelectViewStep::updatePackageSelections(bool checked) {
{ QObject* sender_obj = sender();
if (m_packageSelections != value) { if (!sender_obj) return;
m_packageSelections = value;
emit packageSelectionsChanged(); QString key = "packages." + sender_obj->objectName();
} m_packageSelections[key] = checked;
} }
CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageSelectViewStepFactory, registerPlugin< PackageSelectViewStep >(); ) CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageSelectViewStepFactory, registerPlugin< PackageSelectViewStep >(); )

2
common/modules/pkgselect/PackageSelectViewStep.h
View File

@ -35,7 +35,7 @@ public:
void onLeave() override; void onLeave() override;
QVariantMap packageSelections() const { return m_packageSelections; } QVariantMap packageSelections() const { return m_packageSelections; }
void setPackageSelections(const QVariantMap &value); void updatePackageSelections(bool checked);
signals: signals:
void packageSelectionsChanged(); void packageSelectionsChanged();

10
lubuntu/modules/pkgselect_context.conf
View File

@ -1,17 +1,17 @@
--- ---
dontChroot: false dontChroot: false
timeout: 300 timeout: 300
"packages.minimalInstall": "packages.minimal_button":
true: true:
- "apt-get -y --purge remove snapd vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*" - "apt-get -y --purge remove snapd vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*"
- "apt-get -y autoremove" - "apt-get -y autoremove"
"packages.restrictedExtras": "packages.party_button":
true: true:
- "apt-get update" - "apt-get update"
- "apt-get -y install ubuntu-restricted-addons unrar" - "apt-get -y install ubuntu-restricted-addons unrar"
"packages.updateNow": "packages.updates_button":
true: "apt-get -y full-upgrade" true: "apt-get -y full-upgrade"
"packages.virt-manager": "packages.virtmanager_button":
true: "apt-get -y install virt-manager" true: "apt-get -y install virt-manager"
"packages.thunderbird": "packages.thunderbird_button":
true: "apt-get -y install thunderbird" true: "apt-get -y install thunderbird"

10
lubuntu/modules/pkgselect_snap_context.conf
View File

@ -1,7 +1,9 @@
--- ---
dontChroot: true dontChroot: true
timeout: 600 timeout: 600
"packages.element": "packages.element_button":
true: "calamares_snap_install ${ROOT} element-desktop=stable" true: "calamares_snap_install ${ROOT} element-desktop=stable gtk-common-themes=stable gnome-42-2204=stable core22=stable"
"packages.krita": "packages.krita_button":
true: "calamares_snap_install ${ROOT} cups=stable kf5-5-111-qt-5-15-11-core22=stable krita=stable" true: "calamares_snap_install ${ROOT} cups=stable kf5-5-111-qt-5-15-11-core22=stable gtk-common-themes=stable core22=stable krita=stable"
"packages.full_button":
true: "calamares_snap_install ${ROOT} gtk-common-themes=stable gnome-42-2204=stable core22=stable kf5-5-111-qt-5-15-11-core22=stable bare=stable element-desktop=stable cups=stable snapd=stable krita=stable"