Correct xml/binary serialization ui behaviour

Author: sanny32

omodsim/mainwindow.cpp

@@ -375,25 +375,52 @@ void MainWindow::on_actionSaveAs_triggered()
     auto frm = currentMdiChild();
     if(!frm) return;
 
-    QStringList filters;
-    filters << tr("XML files (*.xml)");
-    filters << tr("All files (*)");
+    saveAs(frm, static_cast<SerializationFormat>(-1));
+}
+
+///
+/// \brief MainWindow::saveAs
+/// \param frm
+/// \param format
+///
+void MainWindow::saveAs(FormModSim* frm, SerializationFormat format)
+{
+    if(!frm) return;
 
     const auto dir = QString("%1%2%3").arg(_savePath, QDir::separator(), frm->windowTitle());
 
-    QString selectedFilter;
-    auto filename = QFileDialog::getSaveFileName(this, QString(), dir, filters.join(";;"), &selectedFilter);
+    QString filename;
+    QStringList filters;
+    switch (format) {
+        case SerializationFormat::Binary:
+            filters << tr("All files (*)");
+            filename = QFileDialog::getSaveFileName(this, QString(), dir, filters.join(";;"));
+            break;
+        case SerializationFormat::Xml:
+            filters << tr("XML files (*.xml)");
+            filename = QFileDialog::getSaveFileName(this, QString(), dir, filters.join(";;"));
+            break;
+        default:
+        {
+            filters << tr("XML files (*.xml)");
+            filters << tr("All files (*)");
 
-    if(filename.isEmpty()) return;
+            QString selectedFilter;
+            filename = QFileDialog::getSaveFileName(this, QString(), dir, filters.join(";;"), &selectedFilter);
 
-    auto format = SerializationFormat::Binary;
-    if(selectedFilter == filters[0]) {
-        format = SerializationFormat::Xml;
-        if(!filename.endsWith(".xml", Qt::CaseInsensitive)) {
-            filename.append(".xml");
+            format = SerializationFormat::Binary;
+            if(selectedFilter == filters[0]) {
+                format = SerializationFormat::Xml;
+                if(!filename.endsWith(".xml", Qt::CaseInsensitive)) {
+                    filename.append(".xml");
+                }
+            }
         }
+        break;
     }
 
+    if(filename.isEmpty()) return;
+
     _savePath = QFileInfo(filename).absoluteDir().absolutePath();
     frm->setFilename(filename);
 
@@ -1517,10 +1544,11 @@ void MainWindow::saveConfig(const QString& filename, SerializationFormat format)
             const auto activeWnd = ui->mdiArea->currentSubWindow();
             for(auto&& wnd : ui->mdiArea->subWindowList())
             {
+                const auto frm = qobject_cast<FormModSim*>(wnd->widget());
+
                 windowActivate(wnd);
-                ui->actionSave->trigger();
+                saveAs(frm, format);
 
-                const auto frm = qobject_cast<FormModSim*>(wnd->widget());
                 const auto filename = frm->filename();
                 if(!filename.isEmpty()) listFilename.push_back(filename);
             }

omodsim/mainwindow.h

@@ -159,6 +159,8 @@ private slots:
     void loadSettings();
     void saveSettings();
 
+    void saveAs(FormModSim* frm, SerializationFormat format);
+
 private:
     Ui::MainWindow *ui;
     QWidgetAction* _actionRunMode;

omodsim/translations/omodsim_ru.ts

@@ -1754,22 +1754,24 @@ Script.onInit(()=>{
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="332"/>
-        <location filename="../mainwindow.cpp" line="380"/>
-        <location filename="../mainwindow.cpp" line="410"/>
-        <location filename="../mainwindow.cpp" line="436"/>
+        <location filename="../mainwindow.cpp" line="396"/>
+        <location filename="../mainwindow.cpp" line="406"/>
+        <location filename="../mainwindow.cpp" line="437"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>All files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="331"/>
-        <location filename="../mainwindow.cpp" line="379"/>
-        <location filename="../mainwindow.cpp" line="409"/>
-        <location filename="../mainwindow.cpp" line="435"/>
+        <location filename="../mainwindow.cpp" line="400"/>
+        <location filename="../mainwindow.cpp" line="405"/>
+        <location filename="../mainwindow.cpp" line="436"/>
+        <location filename="../mainwindow.cpp" line="462"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1327"/>
+        <location filename="../mainwindow.cpp" line="1354"/>
         <source>Capture Error:<byte value="xd"/>
 %1</source>
         <translation>Ошибка захвата:

omodsim/translations/omodsim_zh.ts

@@ -1762,22 +1762,24 @@ Script.onInit(()=>{
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="332"/>
-        <location filename="../mainwindow.cpp" line="380"/>
-        <location filename="../mainwindow.cpp" line="410"/>
-        <location filename="../mainwindow.cpp" line="436"/>
+        <location filename="../mainwindow.cpp" line="396"/>
+        <location filename="../mainwindow.cpp" line="406"/>
+        <location filename="../mainwindow.cpp" line="437"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>All files (*)</source>
         <translation>所有文件 (*)</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="331"/>
-        <location filename="../mainwindow.cpp" line="379"/>
-        <location filename="../mainwindow.cpp" line="409"/>
-        <location filename="../mainwindow.cpp" line="435"/>
+        <location filename="../mainwindow.cpp" line="400"/>
+        <location filename="../mainwindow.cpp" line="405"/>
+        <location filename="../mainwindow.cpp" line="436"/>
+        <location filename="../mainwindow.cpp" line="462"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1327"/>
+        <location filename="../mainwindow.cpp" line="1354"/>
         <source>Capture Error:<byte value="xd"/>
 %1</source>
         <translation>捕获错误：