Now getFilename2Write uses FileExtensions. Refs #16228

eclipse-sumo · Feb 27, 2025 · dfd8508 · dfd8508
1 parent 79d9764
commit dfd8508
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 26 deletions.
diff --git a/src/gui/dialogs/GUIDialog_Breakpoints.cpp b/src/gui/dialogs/GUIDialog_Breakpoints.cpp
@@ -162,7 +162,9 @@ GUIDialog_Breakpoints::onCmdLoad(FXObject*, FXSelector, void*) {
 
 long
 GUIDialog_Breakpoints::onCmdSave(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Save Breakpoints"), ".txt", GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save Breakpoints"),
+                    SUMOXMLDefinitions::TXTFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
     if (file == "") {
         return 1;
     }

diff --git a/src/netedit/dialogs/GNEFixDemandElements.cpp b/src/netedit/dialogs/GNEFixDemandElements.cpp
@@ -198,8 +198,8 @@ GNEFixDemandElements::FixOptions::setInvalidElements(const std::vector<GNEDemand
 
 bool
 GNEFixDemandElements::FixOptions::saveContents() const {
-    const FXString file = MFXUtils::getFilename2Write(myTable,
-                          TL("Save list of conflicted items"), ".txt",
+    const FXString file = MFXUtils::getFilename2Write(myTable, TL("Save list of conflicted items"),
+                          SUMOXMLDefinitions::TXTFileExtensions.getMultilineString().c_str(),
                           GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return false;

diff --git a/src/netedit/dialogs/GNEFixNetworkElements.cpp b/src/netedit/dialogs/GNEFixNetworkElements.cpp
@@ -186,7 +186,8 @@ GNEFixNetworkElements::FixOptions::setInvalidElements(const std::vector<GNENetwo
 bool
 GNEFixNetworkElements::FixOptions::saveContents() const {
     const FXString file = MFXUtils::getFilename2Write(myTable,
-                          TL("Save list of conflicted items"), ".txt",
+                          TL("Save list of conflicted items"),
+                          SUMOXMLDefinitions::TXTFileExtensions.getMultilineString().c_str(),
                           GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return false;

diff --git a/src/netedit/dialogs/GNEMultipleParametersDialog.cpp b/src/netedit/dialogs/GNEMultipleParametersDialog.cpp
@@ -324,7 +324,8 @@ long
 GNEMultipleParametersDialog::ParametersOperations::onCmdSaveParameters(FXObject*, FXSelector, void*) {
     // obtain file to save parameters
     FXString file = MFXUtils::getFilename2Write(this,
-                    TL("Save Parameter Template file"), ".xml",
+                    TL("Save Parameter Template file"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
                     GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE),
                     gCurrentFolder);
     if (file == "") {

diff --git a/src/netedit/dialogs/GNESingleParametersDialog.cpp b/src/netedit/dialogs/GNESingleParametersDialog.cpp
@@ -323,7 +323,8 @@ long
 GNESingleParametersDialog::ParametersOperations::onCmdSaveParameters(FXObject*, FXSelector, void*) {
     // obtain file to save parameters
     FXString file = MFXUtils::getFilename2Write(this,
-                    TL("Save Parameter Template file"), ".xml",
+                    TL("Save Parameter Template file"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
                     GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE),
                     gCurrentFolder);
     if (file == "") {

diff --git a/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp b/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp
@@ -315,10 +315,9 @@ GNEVTypeDistributionsDialog::ParametersOperations::onCmdLoadParameters(FXObject*
 long
 GNEVTypeDistributionsDialog::ParametersOperations::onCmdSaveParameters(FXObject*, FXSelector, void*) {
     // obtain file to save parameters
-    FXString file = MFXUtils::getFilename2Write(this,
-                    TL("Save Parameter Template file"), ".xml",
-                    GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE),
-                    gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save Parameter Template file"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE), gCurrentFolder);
     if (file == "") {
         // None parameter file was selected, then stop function
         return 1;

diff --git a/src/netedit/frames/common/GNESelectorFrame.cpp b/src/netedit/frames/common/GNESelectorFrame.cpp
@@ -338,8 +338,8 @@ GNESelectorFrame::SelectionOperation::onCmdLoad(FXObject*, FXSelector, void*) {
 
 long
 GNESelectorFrame::SelectionOperation::onCmdSave(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this,
-                    TL("Save List of selected Items"), ".txt",
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save List of selected Items"),
+                    SUMOXMLDefinitions::TXTFileExtensions.getMultilineString().c_str(),
                     GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return 1;

diff --git a/src/netedit/frames/network/GNETLSEditorFrame.cpp b/src/netedit/frames/network/GNETLSEditorFrame.cpp
@@ -2976,10 +2976,9 @@ GNETLSEditorFrame::TLSFile::onCmdLoadTLSProgram(FXObject*, FXSelector, void*) {
 
 long
 GNETLSEditorFrame::TLSFile::onCmdSaveTLSProgram(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this,
-                    TL("Save TLS Program as"), ".xml",
-                    GUIIconSubSys::getIcon(GUIIcon::MODETLS),
-                    gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save TLS Program as"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::MODETLS), gCurrentFolder);
     // check file
     if (file != "") {
         // add xml extension

diff --git a/src/utils/foxtools/MFXUtils.cpp b/src/utils/foxtools/MFXUtils.cpp
@@ -79,21 +79,20 @@ MFXUtils::assureExtension(const FXString& filename, const FXString& defaultExten
 
 
 FXString
-MFXUtils::getFilename2Write(FXWindow* parent,
-                            const FXString& header, const FXString& extension,
+MFXUtils::getFilename2Write(FXWindow* parent, const FXString& header, const FXString& extensions,
                             FXIcon* icon, FXString& currentFolder) {
     // get the new file name
     FXFileDialog opendialog(parent, header);
     opendialog.setIcon(icon);
     opendialog.setSelectMode(SELECTFILE_ANY);
-    opendialog.setPatternList("*" + extension);
+    opendialog.setPatternList(extensions);
     if (currentFolder.length() != 0) {
         opendialog.setDirectory(currentFolder);
     }
     if (!opendialog.execute()) {
         return "";
     }
-    FXString file = assureExtension(opendialog.getFilename(), extension.after('.')).text();
+    FXString file = assureExtension(opendialog.getFilename(), extensions.after('.')).text();
     if (!userPermitsOverwritingWhenFileExists(parent, file)) {
         return "";
     }

diff --git a/src/utils/foxtools/MFXUtils.h b/src/utils/foxtools/MFXUtils.h
@@ -114,7 +114,7 @@ class MFXUtils {
      * @return The name of the file to write
      */
     static FXString getFilename2Write(FXWindow* parent,
-                                      const FXString& header, const FXString& extension,
+                                      const FXString& header, const FXString& extensions,
                                       FXIcon* icon, FXString& currentFolder);
 
 

diff --git a/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp b/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp
@@ -151,7 +151,9 @@ GUIDialog_GLChosenEditor::onCmdLoad(FXObject*, FXSelector, void*) {
 
 long
 GUIDialog_GLChosenEditor::onCmdSave(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Save List of selected Items"), ".txt", GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save List of selected Items"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return 1;
     }

diff --git a/src/utils/gui/tracker/GUIParameterTracker.cpp b/src/utils/gui/tracker/GUIParameterTracker.cpp
@@ -215,7 +215,9 @@ GUIParameterTracker::onCmdChangeAggregation(FXObject*, FXSelector, void*) {
 
 long
 GUIParameterTracker::onCmdSave(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Save Data"), ".csv", GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save Data"),
+                    SUMOXMLDefinitions::CSVFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
     if (file == "") {
         return 1;
     }

diff --git a/src/utils/gui/windows/GUIDialog_EditViewport.cpp b/src/utils/gui/windows/GUIDialog_EditViewport.cpp
@@ -230,7 +230,9 @@ GUIDialog_EditViewport::onCmdLoad(FXObject*, FXSelector, void*) {
 
 long
 GUIDialog_EditViewport::onCmdSave(FXObject*, FXSelector, void*) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Save Viewport"), ".xml", GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save Viewport"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return 1;
     }

diff --git a/src/utils/gui/windows/GUIDialog_ViewSettings.cpp b/src/utils/gui/windows/GUIDialog_ViewSettings.cpp
@@ -1100,7 +1100,9 @@ GUIDialog_ViewSettings::onUpdDeleteSetting(FXObject* sender, FXSelector, void* p
 
 long
 GUIDialog_ViewSettings::onCmdExportSetting(FXObject*, FXSelector, void* /*data*/) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Export view settings"), ".xml", GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Export view settings"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::SAVE), gCurrentFolder);
     if (file == "") {
         return 1;
     }
@@ -1202,7 +1204,9 @@ GUIDialog_ViewSettings::onCmdLoadXMLDecals(FXObject*, FXSelector, void* /*data*/
 
 long
 GUIDialog_ViewSettings::onCmdSaveXMLDecals(FXObject*, FXSelector, void* /*data*/) {
-    FXString file = MFXUtils::getFilename2Write(this, TL("Save Decals"), ".xml", GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
+    FXString file = MFXUtils::getFilename2Write(this, TL("Save Decals"),
+                    SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str(),
+                    GUIIconSubSys::getIcon(GUIIcon::EMPTY), gCurrentFolder);
     if (file == "") {
         return 1;
     }