revert WIP package-chooser constraintsv3.2.20-parabola2

4 files changed, 10 insertions, 43 deletions

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index ec0f2c6b7..f68166d92 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -31,7 +31,6 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "PacstrapCppJob.h"
 
 #include "locale/TranslatableConfiguration.h"
 #include "utils/CalamaresUtilsSystem.h"
@@ -114,11 +113,11 @@ PackageChooserViewStep::isNextEnabled() const
     case PackageChooserMode::Optional:
     case PackageChooserMode::OptionalMultiple:
         // zero or one OR zero or more
-        return true && hasRequisitesSatisfied();
+        return true;
     case PackageChooserMode::Required:
     case PackageChooserMode::RequiredMultiple:
         // exactly one OR one or more
-        return m_widget->hasSelection() && hasRequisitesSatisfied();
+        return m_widget->hasSelection();
     }
 
     NOTREACHED return true;
@@ -344,31 +343,3 @@ PackageChooserViewStep::hookupModel()
         }
     }
 }
-
-bool
-PackageChooserViewStep::hasRequisitesSatisfied() const
-{
-  Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage() ;
-  QString desktop_key          = gs->value(GS::DESKTOP_KEY    ).toString() ;
-  bool is_online               = gs->value(GS::IS_ONLINE_KEY  ).toBool() ;
-  bool has_isorepo             = gs->value(GS::HAS_ISOREPO_KEY).toBool() ;
-  bool is_gui_selected         = desktop_key != PacstrapCppJob::CLI_PACKAGES_KEY ;
-  bool has_internet_satisfied  = true ;
-  bool has_gui_satisfied       = true ;
-
-  for (int pkg_set_n = 0 ; pkg_set_n < m_model->packageCount() ; ++pkg_set_n)
-  {
-    const PackageItem& pkg_item = m_model->packageData(pkg_set_n) ;
-//     is_internet_required   = m_model->data(pkg_set_n , PackageListModel::NetinstallRole).toBool() ;
-//     is_gui_required        = m_model->data(pkg_set_n , PackageListModel::GuiRole).toBool() ;
-    bool is_internet_required   = pkg_item.netinstall ;
-    bool is_gui_required        = pkg_item.gui ;
-    has_internet_satisfied      = has_internet_satisfied                 &&
-                                  ( is_internet_required && is_online  ) ||
-                                  (!is_internet_required && has_isorepo)  ;
-    has_gui_satisfied           = has_gui_satisfied                     &&
-                                  (!is_gui_required || is_gui_selected)  ;
-  }
-
-  return has_internet_satisfied && has_gui_satisfied ;
-}
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index 73592773b..f09a095fd 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -60,7 +60,6 @@ public:
 private:
     void fillModel( const QVariantList& items );
     void hookupModel();
-    bool hasRequisitesSatisfied() const;
 
     PackageChooserPage* m_widget;
     PackageListModel* m_model;
diff --git a/src/modules/packagechooser/packagechooser-wmde.conf b/src/modules/packagechooser/packagechooser-wmde.conf
index 1c931e1a1..ec1a30241 100644
--- a/src/modules/packagechooser/packagechooser-wmde.conf
+++ b/src/modules/packagechooser/packagechooser-wmde.conf
@@ -11,28 +11,28 @@ items:
     name[nl]:        "Geen desktop"
     description:     "Command-line only. No Graphical Desktop Environment or X-server."
     screenshot:      ":/images/parabola-cli.png"
-    netinstall:      false
+    offline:         true
   - id:              'gnome' # globalStorage[GS::INITSYSTEM_KEY] == PacstrapCppJob::GNOME_PACKAGES_KEY
     package:         'gnome'
     name:            "GNOME"
     description:     "Heavy-weight desktop environment. Very nice-looking and user-friendly; but not recommended for older computers or high-efficiency work-stations."
     screenshot:      ":/images/parabola-gnome.png"
-    netinstall:      true
+    offline:         false
   - id:              'kde'   # globalStorage[GS::INITSYSTEM_KEY] == PacstrapCppJob::KDE_PACKAGES_KEY
     package:         'plasma'
     name:            "KDE"
     description:     "Heavy-weight desktop environment. Very nice-looking and user-friendly; but not recommended for older computers or high-efficiency work-stations."
     screenshot:      ":/images/parabola-kde.png"
-    netinstall:      true
+    offline:         false
   - id:              'lxde'  # globalStorage[GS::INITSYSTEM_KEY] == PacstrapCppJob::LXDE_PACKAGES_KEY
     package:         'lxde'
     name:            "LXDE"
     description:     "Light-weight desktop environment. An excellent choice for older computers and high-efficiency work-stations."
     screenshot:      ":/images/parabola-lxde.png"
-    netinstall:      true
+    offline:         true
   - id:              'mate'  # globalStorage[GS::INITSYSTEM_KEY] == PacstrapCppJob::MATE_PACKAGES_KEY
     package:         'mate'
     name:            "Mate"
     description:     "Light-weight desktop environment. An excellent choice for older computers and high-efficiency work-stations."
     screenshot:      ":/images/parabola-mate.png"
-    netinstall:      true
+    offline:         false
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index 11f5770be..7c1415012 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -72,12 +72,9 @@ labels:
 #                     e.g. ":/images/no-selection.png".
 #
 # parabola custom keys:
-# - *netinstall* : (optional) Boolean value specifying whether this package set requires
-#                  an active internet connection.
-#                  Default: true.
-# - *gui* : (optional) Boolean value specifying whether this package set requires X.
-#           This is relevant only for 'packagechooser@extra' module.
-#           Default: true.
+# - *offline* : (optional) Boolean value specifying whether or not
+#               this package set is included in the "complete" ISOs isorepo.
+#               Default: false.
 #
 # Use the empty string "" as ID / key for the "no selection" item if
 # you want to customize the display of that item as well.