summaryrefslogtreecommitdiff
path: root/experimental/horizon/noninstall-mount.patch
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/horizon/noninstall-mount.patch')
-rw-r--r--experimental/horizon/noninstall-mount.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/experimental/horizon/noninstall-mount.patch b/experimental/horizon/noninstall-mount.patch
new file mode 100644
index 000000000..2b0e7152a
--- /dev/null
+++ b/experimental/horizon/noninstall-mount.patch
@@ -0,0 +1,61 @@
+diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
+index 143ae43..556a6f3 100644
+--- a/ui/qt5/horizonwizard.cc
++++ b/ui/qt5/horizonwizard.cc
+@@ -542,7 +542,9 @@ QString HorizonWizard::toHScript() {
+ break;
+ }
+
++#ifdef HAS_INSTALL_ENV
+ part_lines << (dynamic_cast<PartitionMountPage *>(page(Page_PartitionMount)))->mountLines();
++#endif /* HAS_INSTALL_ENV */
+
+ if(chosen_disk.empty()) {
+ lines << part_lines;
+diff --git a/ui/qt5/mountdialog.cc b/ui/qt5/mountdialog.cc
+index f986423..103e442 100644
+--- a/ui/qt5/mountdialog.cc
++++ b/ui/qt5/mountdialog.cc
+@@ -16,6 +16,7 @@
+ #include <QLabel>
+ #include <QLineEdit>
+ #include <QPushButton>
++#include <QSet>
+ #include <QVBoxLayout>
+
+ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
+@@ -75,7 +76,11 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
+
+ QVBoxLayout *controlLayout = new QVBoxLayout;
+ controlLayout->addWidget(new QLabel(tr("Partition")));
++#ifdef HAS_INSTALL_ENV
+ controlLayout->addWidget(partList);
++#else /* !HAS_INSTALL_ENV */
++ controlLayout->addWidget(partInput);
++#endif /* HAS_INSTALL_ENV */
+ controlLayout->addWidget(new QLabel(tr("will be mounted on")));
+ controlLayout->addWidget(pathInput);
+
+@@ -87,14 +92,22 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
+ }
+
+ QString MountDialog::partition() const {
++#ifdef HAS_INSTALL_ENV
+ assert(partList->currentItem() != nullptr);
+ return partList->currentItem()->text();
++#else /* !HAS_INSTALL_ENV */
++ return partInput->text();
++#endif /* HAS_INSTALL_ENV */
+ }
+
+ void MountDialog::setPartition(const QString &part) {
++#ifdef HAS_INSTALL_ENV
+ QList<QListWidgetItem *> candidate = partList->findItems(part, Qt::MatchExactly);
+ if(candidate.empty()) return;
+ partList->setCurrentItem(candidate.at(0));
++#else /* !HAS_INSTALL_ENV */
++ partInput->setText(part);
++#endif /* HAS_INSTALL_ENV */
+ }
+
+ QString MountDialog::mountPoint() const {