Make it possible to influence the default product choice on the content loading screen.

Author: matejak

CMakeLists.txt

@@ -332,6 +332,8 @@ if (CPPCHECK_EXECUTABLE)
     )
 endif()
 
+set(SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAME "ssg-<productname>-ds.xml" CACHE STRING "Name of the datastream that should be the first one on the selection list in the initial dialogue.")
+
 # only CPack should follow
 set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
 set(CPACK_SOURCE_GENERATOR "TBZ2")

include/Config.h.in

@@ -35,6 +35,7 @@
 #define SCAP_WORKBENCH_SCAP_CONTENT_DIRECTORY "@SCAP_WORKBENCH_SCAP_CONTENT_DIRECTORY@"
 
 #cmakedefine SCAP_WORKBENCH_LOCAL_SCAN_ENABLED
+#define SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAME "@SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAME@"
 #define SCAP_WORKBENCH_LOCAL_OSCAP_PATH "oscap"
 #define SCAP_WORKBENCH_LOCAL_PKEXEC_OSCAP_PATH "@CMAKE_INSTALL_FULL_LIBEXECDIR@/scap-workbench-pkexec-oscap.sh"
 #define SCAP_WORKBENCH_LOCAL_RPM_EXTRACT_PATH "@CMAKE_INSTALL_FULL_LIBEXECDIR@/scap-workbench-rpm-extract.sh"

src/SSGIntegrationDialog.cpp

@@ -89,6 +89,22 @@ void SSGIntegrationDialog::loadContent()
     accept();
 }
 
+/*
+ * Given the string list passed as the first argument,
+ * either make sure that the passed value is the first item,
+ * or don't do anything (if the value is not present in the string).
+ */
+static void put_value_as_first_item(QStringList& list, const QString& value)
+{
+    const int value_index = list.indexOf(value);
+    if (value_index == -1)
+    {
+        return;
+    }
+    list.removeAt(value_index);
+    list.push_front(value);
+}
+
 void SSGIntegrationDialog::scrapeSSGVariants()
 {
     const QDir& dir = getSSGDirectory();
@@ -97,6 +113,7 @@ void SSGIntegrationDialog::scrapeSSGVariants()
 
     int lastFavoriteIndex = 0;
     variants.sort();
+    put_value_as_first_item(variants, QString(SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAME));
     for (QStringList::const_iterator it = variants.constBegin();
          it != variants.constEnd(); ++it)
     {