diff --git a/common/modules/pkgselect/CMakeLists.txt b/common/modules/pkgselect/CMakeLists.txt index 343dbfb..74fa2b3 100644 --- a/common/modules/pkgselect/CMakeLists.txt +++ b/common/modules/pkgselect/CMakeLists.txt @@ -25,7 +25,7 @@ calamares_add_plugin( pkgselect EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES PackageSelectViewStep.cpp - RESOURCES - pkgselect.qrc + UI + pkgselect.ui SHARED_LIB ) diff --git a/common/modules/pkgselect/PackageSelectViewStep.cpp b/common/modules/pkgselect/PackageSelectViewStep.cpp index 052e1fb..bd255fc 100644 --- a/common/modules/pkgselect/PackageSelectViewStep.cpp +++ b/common/modules/pkgselect/PackageSelectViewStep.cpp @@ -5,10 +5,19 @@ #include PackageSelectViewStep::PackageSelectViewStep( QObject* parent ) - : Calamares::QmlViewStep( parent ), m_packageSelections(QVariantMap()) -{} + : Calamares::ViewStep( parent ), + m_packageSelections(QVariantMap()), + ui(new Ui::pkgselect) +{ + m_widget = new QWidget(); + ui->setupUi(m_widget); +} -PackageSelectViewStep::~PackageSelectViewStep() {} +PackageSelectViewStep::~PackageSelectViewStep() +{ + delete ui; + delete m_widget; +} QString PackageSelectViewStep::prettyName() const @@ -21,10 +30,89 @@ bool PackageSelectViewStep::exists_and_true(const QString& key) const return m_packageSelections.contains(key) && m_packageSelections[key].toBool() == true; } -void -PackageSelectViewStep::onActivate() +QWidget* PackageSelectViewStep::widget() +{ + return m_widget; +} + +Calamares::JobList PackageSelectViewStep::jobs() const +{ + return Calamares::JobList(); +} + +bool PackageSelectViewStep::isNextEnabled() const +{ + return true; +} + +bool PackageSelectViewStep::isBackEnabled() const +{ + return true; +} + +bool PackageSelectViewStep::isAtBeginning() const +{ + return true; +} + +bool PackageSelectViewStep::isAtEnd() const { - setContextProperty("packageSelect", this); + return true; +} + +void PackageSelectViewStep::onActivate() +{ + // Connect the Minimal Installation radio button + connect(ui->minimal_button, &QRadioButton::toggled, this, [this](bool checked) { + ui->extraparty_scroll->setVisible(!checked); + ui->extraparty_text->setVisible(!checked); + + ui->element_button->setChecked(false); + ui->thunderbird_button->setChecked(false); + ui->virtmanager_button->setChecked(false); + ui->krita_button->setChecked(false); + + ui->element_button->setEnabled(!checked); + ui->thunderbird_button->setEnabled(!checked); + ui->virtmanager_button->setEnabled(!checked); + ui->krita_button->setEnabled(!checked); + }); + + // Connect the Normal Installation radio button + connect(ui->normal_button, &QRadioButton::toggled, this, [this](bool checked) { + if (checked) { + ui->extraparty_scroll->setVisible(true); + ui->extraparty_text->setVisible(true); + + ui->element_button->setChecked(false); + ui->thunderbird_button->setChecked(false); + ui->virtmanager_button->setChecked(false); + ui->krita_button->setChecked(false); + + ui->element_button->setEnabled(true); + ui->thunderbird_button->setEnabled(true); + ui->virtmanager_button->setEnabled(true); + ui->krita_button->setEnabled(true); + } + }); + + // Connect the Full Installation radio button + connect(ui->full_button, &QRadioButton::toggled, this, [this](bool checked) { + if (checked) { + ui->extraparty_scroll->setVisible(true); + ui->extraparty_text->setVisible(true); + + ui->element_button->setChecked(true); + ui->thunderbird_button->setChecked(true); + ui->virtmanager_button->setChecked(true); + ui->krita_button->setChecked(true); + + ui->element_button->setEnabled(false); + ui->thunderbird_button->setEnabled(false); + ui->virtmanager_button->setEnabled(false); + ui->krita_button->setEnabled(false); + } + }); } void diff --git a/common/modules/pkgselect/PackageSelectViewStep.h b/common/modules/pkgselect/PackageSelectViewStep.h index 21f072b..ec2ac23 100644 --- a/common/modules/pkgselect/PackageSelectViewStep.h +++ b/common/modules/pkgselect/PackageSelectViewStep.h @@ -6,18 +6,30 @@ #include "DllMacro.h" #include "utils/PluginFactory.h" -#include "viewpages/QmlViewStep.h" +#include "viewpages/ViewStep.h" -class PLUGINDLLEXPORT PackageSelectViewStep : public Calamares::QmlViewStep +#include "ui_pkgselect.h" + +namespace Ui { + class pkgselect; +} + +class PLUGINDLLEXPORT PackageSelectViewStep : public Calamares::ViewStep { Q_OBJECT - Q_PROPERTY(QVariantMap packageSelections READ packageSelections WRITE setPackageSelections NOTIFY packageSelectionsChanged) public: - PackageSelectViewStep( QObject* parent = nullptr ); - virtual ~PackageSelectViewStep() override; + explicit PackageSelectViewStep( QObject* parent = nullptr ); + ~PackageSelectViewStep() override; QString prettyName() const override; + QWidget* widget() override; + Calamares::JobList jobs() const override; + + bool isNextEnabled() const override; + bool isBackEnabled() const override; + bool isAtBeginning() const override; + bool isAtEnd() const override; void onActivate() override; void onLeave() override; @@ -30,7 +42,8 @@ signals: private: QVariantMap m_packageSelections; - + Ui::pkgselect *ui; + QWidget* m_widget; bool exists_and_true(const QString& key) const; }; diff --git a/common/modules/pkgselect/pkgselect.qml b/common/modules/pkgselect/pkgselect.qml deleted file mode 100644 index 725f5f4..0000000 --- a/common/modules/pkgselect/pkgselect.qml +++ /dev/null @@ -1,239 +0,0 @@ -import io.calamares.ui 1.0 - -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtQuick.Window 2.2 -import QtQuick.Layouts 1.3 -import QtQuick.Controls.Material 2.1 - -Item { - property bool isRegularInstall: true - - function updatePackageSelections(objectName, checked) { - var newMap = JSON.parse(JSON.stringify(packageSelect.packageSelections)); - newMap[objectName] = checked; - packageSelect.packageSelections = newMap; - element.enabled = true; - thunderbird.enabled = true; - virtManager.enabled = true; - krita.enabled = true; - if (objectName === "minimalInstall") { - isMinimalInstall = checked; - element.checked = false; - thunderbird.checked = false; - virtManager.checked = false; - krita.checked = false; - element.enabled = false; - thunderbird.enabled = false; - virtManager.enabled = false; - krita.enabled = false; - } else if (objectName === "fullInstall") { - isMinimalInstall = false; - element.checked = true; - thunderbird.checked = true; - virtManager.checked = true; - krita.checked = true; - } else { - isMinimalInstall = false; - } - } - - ColumnLayout { - scale: 0.9 - - Text { - text: qsTr("What apps would you like to start with?") - font.bold: true - font.pointSize: 14 - } - RadioButton { - text: qsTr("Full Installation") - objectName: "fullInstall" - font.pointSize: 12 - indicator.width: 20 - indicator.height: 20 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("All applications in the Normal Installation, and all extra third-party packages listed below.") - font.pointSize: 10 - font.italic: true - } - RadioButton { - checked: true - text: qsTr("Normal Installation") - font.pointSize: 12 - indicator.width: 20 - indicator.height: 20 - } - Text { - text: qsTr("Web browser, utilities, office software, games, and media players.") - font.pointSize: 10 - font.italic: true - } - RadioButton { - text: qsTr("Minimal Installation") - objectName: "minimalInstall" - font.pointSize: 12 - indicator.width: 20 - indicator.height: 20 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("Only the desktop environment.") - font.pointSize: 10 - font.italic: true - } - - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: 1 - color: "grey" - } - - Text { - text: qsTr("Additional Options") - font.bold: true - font.pointSize: 14 - } - CheckBox { - text: qsTr("Download and install updates following installation") - objectName: "updateNow" - font.pointSize: 12 - indicator.width: 20 - indicator.height: 20 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("This saves time after the installation, and keeps your system secure.") - font.pointSize: 10 - font.italic: true - } - CheckBox { - text: qsTr("Install third-party software for graphics, WiFi hardware, and additional media formats") - objectName: "restrictedExtras" - font.pointSize: 12 - indicator.width: 20 - indicator.height: 20 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("This software is subject to license terms included with its documentation, and some may be proprietary.") - font.pointSize: 10 - font.italic: true - } - - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: 1 - color: "grey" - } - - Text { - text: qsTr("Install additional third-party packages:") - font.bold: true - font.pointSize: 14 - } - Flickable { - Layout.fillWidth: true - height: 200 - contentHeight: column.height - clip: true - - Column { - id: column - width: parent.width - - CheckBox { - text: qsTr("Element") - checked: isFullInstall - enabled: !isMinimalInstall - objectName: "element" - font.pointSize: 11 - indicator.width: 18 - indicator.height: 18 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("Matrix-based end-to-end encrypted messenger and secure collaboration app") - font.italic: true - font.pointSize: 10 - } - CheckBox { - text: qsTr("Thunderbird") - checked: isFullInstall - enabled: !isMinimalInstall - objectName: "thunderbird" - font.pointSize: 11 - indicator.width: 18 - indicator.height: 18 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("Email, newsfeed, chat, and calendaring client") - font.italic: true - font.pointSize: 10 - } - CheckBox { - text: qsTr("Virtual Machine Manager") - checked: isFullInstall - enabled: !isMinimalInstall - objectName: "virt-manager" - font.pointSize: 11 - indicator.width: 18 - indicator.height: 18 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("Desktop user interface for managing virtual machines through libvirt") - font.italic: true - font.pointSize: 10 - } - CheckBox { - text: qsTr("Krita") - checked: isFullInstall - enabled: !isMinimalInstall - objectName: "krita" - font.pointSize: 11 - indicator.width: 18 - indicator.height: 18 - onClicked: { - updatePackageSelections(objectName, checked); - } - } - Text { - text: qsTr("Graphics editor designed primarily for digital art and 2D animation") - font.italic: true - font.pointSize: 10 - } - } - ScrollBar.vertical: ScrollBar { - active: true - } - } - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: 1 - color: "white" - } - Text { - text: qsTr("Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.") + "
" + qsTr("Use at your own risk.") - font.bold: true - font.pointSize: 12 - } - } -} diff --git a/common/modules/pkgselect/pkgselect.qrc b/common/modules/pkgselect/pkgselect.qrc deleted file mode 100644 index 0fb3a0d..0000000 --- a/common/modules/pkgselect/pkgselect.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - pkgselect.qml - - diff --git a/common/modules/pkgselect/pkgselect.ui b/common/modules/pkgselect/pkgselect.ui new file mode 100644 index 0000000..2b8b69f --- /dev/null +++ b/common/modules/pkgselect/pkgselect.ui @@ -0,0 +1,399 @@ + + + pkgselect + + + + 0 + 0 + 830 + 573 + + + + Form + + + + + + + 12 + + + + Minimal Installation + + + + + + + + 10 + true + + + + Only the desktop environment + + + + + + + + 18 + 50 + false + + + + Install additional third-party packages + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 12 + + + + Normal Installation + + + true + + + + + + + true + + + + + 0 + -80 + 741 + 208 + + + + + + + Element + + + + + + + + 10 + true + + + + Matrix-based end-to-end encrypted messenger and secure collaboration app + + + + + + + Thunderbird + + + + + + + + 10 + true + + + + Email, newsfeed, chat, and calendaring client + + + + + + + Virtual Machine Manager + + + + + + + + 10 + true + + + + Desktop user interface for managing virtual machines through libvirt + + + + + + + Krita + + + + + + + + 10 + true + + + + Graphics editor designed primarily for digital art and 2D animation + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + + + + + + 12 + + + + Download and install updates following installation + + + + + + + + 10 + true + + + + This saves time after installation, and keeps your system secure + + + + + + + + 12 + + + + Full Installation + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + 10 + true + + + + This software is subject to license terms included with its documentation, and some may be proprietary + + + + + + + + 18 + 50 + false + + + + Additional Options + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + 18 + 50 + false + + + + Installation Mode + + + + + + + + 10 + true + + + + All applications in the Normal Installation, and all extra third-party packages listed below + + + + + + + + 12 + + + + Install third-party software for graphics, WiFi hardware, and additional media formats + + + + + + + + 10 + true + + + + Web browser, utilities, office software, games, and media players + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 20 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 20 + 20 + + + + + + + + + diff --git a/common/modules/pkgselect/ui_pkgselect.h b/common/modules/pkgselect/ui_pkgselect.h new file mode 100644 index 0000000..de89d20 --- /dev/null +++ b/common/modules/pkgselect/ui_pkgselect.h @@ -0,0 +1,280 @@ +/******************************************************************************** +** Form generated from reading UI file 'pkgselect.ui' +** +** Created by: Qt User Interface Compiler version 5.15.12 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_PKGSELECT_H +#define UI_PKGSELECT_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_pkgselect +{ +public: + QGridLayout *gridLayout; + QRadioButton *minimal_button; + QLabel *minimal_text; + QLabel *extraparty_text; + QSpacerItem *pushup; + QRadioButton *normal_button; + QScrollArea *extraparty_scroll; + QWidget *extraparty_scrollhouse; + QVBoxLayout *verticalLayout; + QCheckBox *element_button; + QLabel *element_text; + QCheckBox *thunderbird_button; + QLabel *thunderbird_text; + QCheckBox *virtmanager_button; + QLabel *virtmanager_text; + QCheckBox *krita_button; + QLabel *krita_text; + QSpacerItem *pushup_tiny; + QCheckBox *updates_button; + QLabel *updates_text; + QRadioButton *full_button; + QSpacerItem *verticalSpacer; + QLabel *party_text; + QLabel *label; + QSpacerItem *verticalSpacer_3; + QLabel *apps_label; + QLabel *full_text; + QCheckBox *party_button; + QLabel *normal_text; + QSpacerItem *verticalSpacer_2; + QSpacerItem *horizontalSpacer_2; + QSpacerItem *horizontalSpacer; + + void setupUi(QWidget *pkgselect) + { + if (pkgselect->objectName().isEmpty()) + pkgselect->setObjectName(QString::fromUtf8("pkgselect")); + pkgselect->resize(830, 573); + gridLayout = new QGridLayout(pkgselect); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + minimal_button = new QRadioButton(pkgselect); + minimal_button->setObjectName(QString::fromUtf8("minimal_button")); + QFont font; + font.setPointSize(12); + minimal_button->setFont(font); + + gridLayout->addWidget(minimal_button, 6, 1, 1, 1); + + minimal_text = new QLabel(pkgselect); + minimal_text->setObjectName(QString::fromUtf8("minimal_text")); + QFont font1; + font1.setPointSize(10); + font1.setItalic(true); + minimal_text->setFont(font1); + + gridLayout->addWidget(minimal_text, 7, 1, 1, 1); + + extraparty_text = new QLabel(pkgselect); + extraparty_text->setObjectName(QString::fromUtf8("extraparty_text")); + QFont font2; + font2.setPointSize(18); + font2.setBold(false); + font2.setWeight(50); + extraparty_text->setFont(font2); + + gridLayout->addWidget(extraparty_text, 15, 1, 1, 1); + + pushup = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout->addItem(pushup, 17, 1, 1, 1); + + normal_button = new QRadioButton(pkgselect); + normal_button->setObjectName(QString::fromUtf8("normal_button")); + normal_button->setFont(font); + normal_button->setChecked(true); + + gridLayout->addWidget(normal_button, 4, 1, 1, 1); + + extraparty_scroll = new QScrollArea(pkgselect); + extraparty_scroll->setObjectName(QString::fromUtf8("extraparty_scroll")); + extraparty_scroll->setWidgetResizable(true); + extraparty_scrollhouse = new QWidget(); + extraparty_scrollhouse->setObjectName(QString::fromUtf8("extraparty_scrollhouse")); + extraparty_scrollhouse->setGeometry(QRect(0, -80, 741, 208)); + verticalLayout = new QVBoxLayout(extraparty_scrollhouse); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + element_button = new QCheckBox(extraparty_scrollhouse); + element_button->setObjectName(QString::fromUtf8("element_button")); + + verticalLayout->addWidget(element_button); + + element_text = new QLabel(extraparty_scrollhouse); + element_text->setObjectName(QString::fromUtf8("element_text")); + element_text->setFont(font1); + + verticalLayout->addWidget(element_text); + + thunderbird_button = new QCheckBox(extraparty_scrollhouse); + thunderbird_button->setObjectName(QString::fromUtf8("thunderbird_button")); + + verticalLayout->addWidget(thunderbird_button); + + thunderbird_text = new QLabel(extraparty_scrollhouse); + thunderbird_text->setObjectName(QString::fromUtf8("thunderbird_text")); + thunderbird_text->setFont(font1); + + verticalLayout->addWidget(thunderbird_text); + + virtmanager_button = new QCheckBox(extraparty_scrollhouse); + virtmanager_button->setObjectName(QString::fromUtf8("virtmanager_button")); + + verticalLayout->addWidget(virtmanager_button); + + virtmanager_text = new QLabel(extraparty_scrollhouse); + virtmanager_text->setObjectName(QString::fromUtf8("virtmanager_text")); + virtmanager_text->setFont(font1); + + verticalLayout->addWidget(virtmanager_text); + + krita_button = new QCheckBox(extraparty_scrollhouse); + krita_button->setObjectName(QString::fromUtf8("krita_button")); + + verticalLayout->addWidget(krita_button); + + krita_text = new QLabel(extraparty_scrollhouse); + krita_text->setObjectName(QString::fromUtf8("krita_text")); + krita_text->setFont(font1); + + verticalLayout->addWidget(krita_text); + + pushup_tiny = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + + verticalLayout->addItem(pushup_tiny); + + extraparty_scroll->setWidget(extraparty_scrollhouse); + + gridLayout->addWidget(extraparty_scroll, 16, 1, 1, 1); + + updates_button = new QCheckBox(pkgselect); + updates_button->setObjectName(QString::fromUtf8("updates_button")); + updates_button->setFont(font); + + gridLayout->addWidget(updates_button, 10, 1, 1, 1); + + updates_text = new QLabel(pkgselect); + updates_text->setObjectName(QString::fromUtf8("updates_text")); + updates_text->setFont(font1); + + gridLayout->addWidget(updates_text, 11, 1, 1, 1); + + full_button = new QRadioButton(pkgselect); + full_button->setObjectName(QString::fromUtf8("full_button")); + full_button->setFont(font); + + gridLayout->addWidget(full_button, 2, 1, 1, 1); + + verticalSpacer = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed); + + gridLayout->addItem(verticalSpacer, 0, 1, 1, 1); + + party_text = new QLabel(pkgselect); + party_text->setObjectName(QString::fromUtf8("party_text")); + party_text->setFont(font1); + + gridLayout->addWidget(party_text, 13, 1, 1, 1); + + label = new QLabel(pkgselect); + label->setObjectName(QString::fromUtf8("label")); + label->setFont(font2); + + gridLayout->addWidget(label, 9, 1, 1, 1); + + verticalSpacer_3 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed); + + gridLayout->addItem(verticalSpacer_3, 14, 1, 1, 1); + + apps_label = new QLabel(pkgselect); + apps_label->setObjectName(QString::fromUtf8("apps_label")); + apps_label->setFont(font2); + + gridLayout->addWidget(apps_label, 1, 1, 1, 1); + + full_text = new QLabel(pkgselect); + full_text->setObjectName(QString::fromUtf8("full_text")); + full_text->setFont(font1); + + gridLayout->addWidget(full_text, 3, 1, 1, 1); + + party_button = new QCheckBox(pkgselect); + party_button->setObjectName(QString::fromUtf8("party_button")); + party_button->setFont(font); + + gridLayout->addWidget(party_button, 12, 1, 1, 1); + + normal_text = new QLabel(pkgselect); + normal_text->setObjectName(QString::fromUtf8("normal_text")); + normal_text->setFont(font1); + + gridLayout->addWidget(normal_text, 5, 1, 1, 1); + + verticalSpacer_2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed); + + gridLayout->addItem(verticalSpacer_2, 8, 1, 1, 1); + + horizontalSpacer_2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1); + + horizontalSpacer = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer, 0, 0, 1, 1); + + + retranslateUi(pkgselect); + + QMetaObject::connectSlotsByName(pkgselect); + } // setupUi + + void retranslateUi(QWidget *pkgselect) + { + pkgselect->setWindowTitle(QCoreApplication::translate("pkgselect", "Form", nullptr)); + minimal_button->setText(QCoreApplication::translate("pkgselect", "Minimal Installation", nullptr)); + minimal_text->setText(QCoreApplication::translate("pkgselect", "Only the desktop environment", nullptr)); + extraparty_text->setText(QCoreApplication::translate("pkgselect", "Install additional third-party packages", nullptr)); + normal_button->setText(QCoreApplication::translate("pkgselect", "Normal Installation", nullptr)); + element_button->setText(QCoreApplication::translate("pkgselect", "Element", nullptr)); + element_text->setText(QCoreApplication::translate("pkgselect", "Matrix-based end-to-end encrypted messenger and secure collaboration app", nullptr)); + thunderbird_button->setText(QCoreApplication::translate("pkgselect", "Thunderbird", nullptr)); + thunderbird_text->setText(QCoreApplication::translate("pkgselect", "Email, newsfeed, chat, and calendaring client", nullptr)); + virtmanager_button->setText(QCoreApplication::translate("pkgselect", "Virtual Machine Manager", nullptr)); + virtmanager_text->setText(QCoreApplication::translate("pkgselect", "Desktop user interface for managing virtual machines through libvirt", nullptr)); + krita_button->setText(QCoreApplication::translate("pkgselect", "Krita", nullptr)); + krita_text->setText(QCoreApplication::translate("pkgselect", "Graphics editor designed primarily for digital art and 2D animation", nullptr)); + updates_button->setText(QCoreApplication::translate("pkgselect", "Download and install updates following installation", nullptr)); + updates_text->setText(QCoreApplication::translate("pkgselect", "This saves time after installation, and keeps your system secure", nullptr)); + full_button->setText(QCoreApplication::translate("pkgselect", "Full Installation", nullptr)); + party_text->setText(QCoreApplication::translate("pkgselect", "This software is subject to license terms included with its documentation, and some may be proprietary", nullptr)); + label->setText(QCoreApplication::translate("pkgselect", "Additional Options", nullptr)); + apps_label->setText(QCoreApplication::translate("pkgselect", "Installation Mode", nullptr)); + full_text->setText(QCoreApplication::translate("pkgselect", "All applications in the Normal Installation, and all extra third-party packages listed below", nullptr)); + party_button->setText(QCoreApplication::translate("pkgselect", "Install third-party software for graphics, WiFi hardware, and additional media formats", nullptr)); + normal_text->setText(QCoreApplication::translate("pkgselect", "Web browser, utilities, office software, games, and media players", nullptr)); + } // retranslateUi + +}; + +namespace Ui { + class pkgselect: public Ui_pkgselect {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_PKGSELECT_H diff --git a/debian/calamares-settings-lubuntu.install b/debian/calamares-settings-lubuntu.install index 1910d22..e5908ff 100644 --- a/debian/calamares-settings-lubuntu.install +++ b/debian/calamares-settings-lubuntu.install @@ -1,4 +1,3 @@ -common/modules/pkgselect/pkgselect.qml etc/calamares/branding/lubuntu/ lubuntu/branding/ etc/calamares/ lubuntu/calamares-logs-helper usr/bin/ lubuntu/calamares-launch-normal usr/bin/ diff --git a/common/modules/pkgselect_context.conf b/lubuntu/modules/pkgselect_context.conf similarity index 100% rename from common/modules/pkgselect_context.conf rename to lubuntu/modules/pkgselect_context.conf diff --git a/common/modules/pkgselect_snap_context.conf b/lubuntu/modules/pkgselect_snap_context.conf similarity index 100% rename from common/modules/pkgselect_snap_context.conf rename to lubuntu/modules/pkgselect_snap_context.conf