diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-06 08:05:41 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-06 08:05:41 -0600 |
commit | 40426b314c02727bab5e8cd720838037644defad (patch) | |
tree | b6a0dd72073b92c95de6e65da67846c46bb42f84 /ui/qt5/horizonwizard.cc | |
parent | f211fb157121547e969031fe69dbeda27fffdca4 (diff) | |
download | horizon-40426b314c02727bab5e8cd720838037644defad.tar.gz horizon-40426b314c02727bab5e8cd720838037644defad.tar.bz2 horizon-40426b314c02727bab5e8cd720838037644defad.tar.xz horizon-40426b314c02727bab5e8cd720838037644defad.zip |
Qt UI: Refactor package selection page, again
* Allows one to choose Standard, Mobile, or Compact of any DE.
* Refactor automatic package selection to better reflect what users are
likely to expect from their selection.
* Use tabs to separate graphical desktop, text-only / server, and custom
options. This will allow us to add more options later, as well.
* Fit in given size.
Diffstat (limited to 'ui/qt5/horizonwizard.cc')
-rw-r--r-- | ui/qt5/horizonwizard.cc | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 36746ea..985f416 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -217,7 +217,7 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent), arch{UnknownCPU grub{true}, eudev{true}, binsh{Dash}, sbininit{S6} { setWindowTitle(tr("Adélie Linux System Installation")); - setFixedSize(QSize(650, 512)); + setFixedSize(QSize(650, 450)); mirror_domain = "distfiles.adelielinux.org"; version = "stable"; @@ -490,13 +490,27 @@ QString packagesForDesktop(HorizonWizard::DesktopType desktop) { switch(desktop) { case HorizonWizard::Plasma: default: - return "x11 kde calligra"; + return "adelie-kde-theme plasma-desktop"; case HorizonWizard::LXQt: - return "x11 lxqt-desktop"; + return "adelie-lxqt-theme lxqt-desktop"; case HorizonWizard::MATE: - return "x11 mate-complete"; + return "adelie-mate-theme mate-complete"; case HorizonWizard::XFCE: - return "x11 xfce-desktop xfce-plugins"; + return "xfce-desktop xfce-plugins"; + } +} + + +/*! Determine the packages to install for a "full" desktop environment experience. */ +QString optionalPackagesForDesktop(HorizonWizard::DesktopType desktop) { + switch(desktop) { + case HorizonWizard::Plasma: + default: + return "x11 kde calligra"; + case HorizonWizard::LXQt: + return "x11 kde-games kde-graphics kde-multimedia kde-utilities calligra trojita"; + case HorizonWizard::MATE: + return "x11 abiword gnumeric"; } } @@ -633,15 +647,15 @@ QString HorizonWizard::toHScript() { [[ fallthrough ]]; #endif case Standard: - lines << "pkginstall adelie-base-posix bluez sddm docs"; - lines << ("pkginstall " + packagesForDesktop(desktopType)); + lines << "pkginstall adelie-base-posix bluez docs"; + lines << ("pkginstall " + optionalPackagesForDesktop(desktopType)); lines << "svcenable bluetooth"; - lines << "svcenable elogind"; - lines << "svcenable sddm"; - break; +#if __cplusplus >= 201703L + [[ fallthrough ]]; +#endif case Compact: - lines << "pkginstall adelie-base netsurf featherpad lxqt-desktop " - "abiword gnumeric sddm xorg-apps xorg-drivers xorg-server"; + lines << "pkginstall adelie-base sddm netsurf featherpad sddm x11"; + lines << ("pkginstall " + packagesForDesktop(desktopType)); lines << "svcenable elogind"; lines << "svcenable sddm"; break; |