Remove support for XML configuration files in SGCT

apps/OpenSpace/ext/launcher/include/filesystemaccess.h

@@ -33,7 +33,7 @@ public:
      * Constructor for filesystemAccess class.
      *
      * \param fileExtension The file extensiopn filter used to find files. Only files with
-     *        this extension will be recognized (e.g. '.xml')
+     *        this extension will be recognized (e.g. '.json')
      * \param hideFileExtensions If `true` then file extensions will be removed from the
      *        listed files in the output
      * \param useCheckboxes If `true` then the text output format will contain a '0' as

apps/OpenSpace/ext/launcher/src/launcherwindow.cpp

@@ -573,9 +573,8 @@ void LauncherWindow::populateProfilesList(std::string preset) {
 
 // Returns 'true' if the file was a configuration file, 'false' otherwise
 bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_entry& p) {
-    const bool isXml = p.path().extension() == ".xml";
     const bool isJson = p.path().extension() == ".json";
-    if (!isXml && !isJson) {
+    if (!isJson) {
         return false;
     }
     box.addItem(QString::fromStdString(p.path().filename().string()));
@@ -598,11 +597,6 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
         }
     }
 
-    // For now, mark the XML configuration files to show that they are deprecated
-    if (isXml) {
-        box.setItemData(box.count() - 1, QBrush(Qt::darkYellow), Qt::ForegroundRole);
-    }
-
     return true;
 }
 
@@ -630,8 +624,6 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     _userConfigStartingIdx++;
     _preDefinedConfigStartingIdx++;
 
-    bool hasXmlConfig = false;
-
     // Sort files
     std::vector<fs::directory_entry> files;
     for (const fs::directory_entry& p : fs::directory_iterator(_userConfigPath)) {
@@ -639,7 +631,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     }
     std::sort(files.begin(), files.end());
 
-    // Add all the files with the .xml or .json extension to the dropdown
+    // Add all the files with the .json extension to the dropdown
     for (const fs::directory_entry& p : files) {
         bool isConfigFile = handleConfigurationFile(*_windowConfigBox, p);
         if (isConfigFile) {
@@ -647,7 +639,6 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
             _userConfigStartingIdx++;
             _preDefinedConfigStartingIdx++;
         }
-        hasXmlConfig |= p.path().extension() == ".xml";
     }
     _windowConfigBox->addItem(QString::fromStdString("--- OpenSpace Configurations ---"));
     model = qobject_cast<const QStandardItemModel*>(_windowConfigBox->model());
@@ -661,10 +652,9 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
             files.push_back(p);
         }
         std::sort(files.begin(), files.end());
-        // Add all the files with the .xml or .json extension to the dropdown
+        // Add all the files with the .json extension to the dropdown
         for (const fs::directory_entry& p : files) {
             handleConfigurationFile(*_windowConfigBox, p);
-            hasXmlConfig |= p.path().extension() == ".xml";
         }
     }
     else {
@@ -674,18 +664,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
         );
     }
 
-    if (hasXmlConfig) {
-        // At least one XML configuration file is present, so we should show the tooltip
-        // informing the user that files will be deprecated
-        _windowConfigBox->setToolTip(
-            "Support for XML-based configuration files will be removed in the next "
-            "version of OpenSpace. Please convert the files to the new JSON format or "
-            "run the Node tool at "
-            "https://github.com/sgct/sgct/tree/master/support/config-converter"
-        );
-    }
-
-    // Always add the .cfg sgct default as first item
+    // Always add the .cfg SGCT default as first item
     _windowConfigBox->insertItem(
         _windowConfigBoxIndexSgctCfgDefault,
         QString::fromStdString(_sgctConfigName)

apps/OpenSpace/main.cpp

@@ -1065,16 +1065,10 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
             std::filesystem::path cj = c;
             cj.replace_extension(".json");
 
-            std::filesystem::path cx = c;
-            cx.replace_extension(".xml");
-
             if (c.extension().empty()) {
                 if (std::filesystem::exists(cj)) {
                     config += ".json";
                 }
-                else if (std::filesystem::exists(cx)) {
-                    config += ".xml";
-                }
                 else {
                     throw ghoul::RuntimeError(fmt::format(
                         "Error loading configuration file '{}'. File could not be found",
@@ -1083,7 +1077,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
                 }
             }
             else {
-                // user customzied sgct config
+                // user customized SGCT config
             }
         }
         global::configuration->windowConfiguration = config;

include/openspace/engine/configuration.h

@@ -47,7 +47,7 @@ struct Configuration {
 
     ghoul::Dictionary createDictionary();
 
-    std::string windowConfiguration = "${CONFIG}/single.xml";
+    std::string windowConfiguration = "${CONFIG}/single.json";
     std::string asset;
     std::string profile;