Add saving as generals.csf if big archive has been loaded and there attempt to save changes

Author: MahBoiDeveloper

src/GUI/EditorWindow.cpp

@@ -8,6 +8,7 @@
 #include <QComboBox>
 #include <QFileDialog>
 
+#include "../Windows/Registry.hpp"
 #include "../Windows/Locale.hpp"
 #include "../Parsers/CSFParser.hpp"
 #include "../Info.hpp"
@@ -532,6 +533,15 @@ void EditorWindow::ActSettings_Triggered()
 void EditorWindow::ActSave_Triggered()
 {
     LOGMSG("Saving changes to .csf file...");
+    
+    if (CSF_PARSER->Path.ends_with(L".big") || CSF_PARSER->Path.ends_with(L".BIG"))
+    {
+        CSF_PARSER->Path = (QString::fromStdWString(
+                                Windows::Registry::GetPathToGame(
+                                    Windows::Registry::Games::GeneralsZeroHour)) 
+                            + "Data\\English\\generals.csf"q).toStdWString();
+    }
+
     CSF_PARSER->Save();
     LOGMSG("Changes has been saved");
 }

src/GUI/Translations/ru.ts

@@ -22,99 +22,99 @@
 <context>
     <name>EditorWindow</name>
     <message>
-        <location filename="../EditorWindow.cpp" line="178"/>
+        <location filename="../EditorWindow.cpp" line="179"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="179"/>
+        <location filename="../EditorWindow.cpp" line="180"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="180"/>
+        <location filename="../EditorWindow.cpp" line="181"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="181"/>
+        <location filename="../EditorWindow.cpp" line="182"/>
         <source>Save As...</source>
         <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="182"/>
+        <location filename="../EditorWindow.cpp" line="183"/>
         <source>Special</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="198"/>
+        <location filename="../EditorWindow.cpp" line="199"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="199"/>
+        <location filename="../EditorWindow.cpp" line="200"/>
         <source>Status Bar</source>
         <translation>Строка состояния</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="200"/>
+        <location filename="../EditorWindow.cpp" line="201"/>
         <source>Enable</source>
         <translation>Включить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="201"/>
+        <location filename="../EditorWindow.cpp" line="202"/>
         <source>Disable</source>
         <translation>Отключить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="205"/>
-        <location filename="../EditorWindow.cpp" line="517"/>
+        <location filename="../EditorWindow.cpp" line="206"/>
+        <location filename="../EditorWindow.cpp" line="518"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="209"/>
-        <location filename="../EditorWindow.cpp" line="482"/>
+        <location filename="../EditorWindow.cpp" line="210"/>
+        <location filename="../EditorWindow.cpp" line="483"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="343"/>
+        <location filename="../EditorWindow.cpp" line="344"/>
         <source>Layout %1</source>
         <translation>Раскладка %1</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="462"/>
+        <location filename="../EditorWindow.cpp" line="463"/>
         <source>Authors: </source>
         <translation>Авторы: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="463"/>
+        <location filename="../EditorWindow.cpp" line="464"/>
         <source>Version: </source>
         <translation>Версия: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="464"/>
+        <location filename="../EditorWindow.cpp" line="465"/>
         <source>Program licensed with </source>
         <translation>Программа лицензирована под </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="465"/>
+        <location filename="../EditorWindow.cpp" line="466"/>
         <source>GitHub repository:</source>
         <translation>Репозиторий на GitHub:</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="467"/>
+        <location filename="../EditorWindow.cpp" line="468"/>
         <source>Support development:</source>
         <translation>Поддержать разработку:</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="557"/>
+        <location filename="../EditorWindow.cpp" line="568"/>
         <source>Binary files</source>
         <translation>Двоичные файлы</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="558"/>
+        <location filename="../EditorWindow.cpp" line="569"/>
         <source>Any files</source>
         <translation>Все файлы</translation>
     </message>

src/Parsers/CSFParser.cpp

@@ -1,7 +1,6 @@
 #include <sstream>
 #include <QStringList>
 
-#include "../Windows/Locale.hpp"
 #include "../Logger.hpp"
 #include "../Convert.hpp"
 #include "../Exception.hpp"
@@ -31,7 +30,6 @@ using namespace StringExt;
                 LOGMSG("BIG archive detected. Try to find CSF file inside...");
                 streampos offset = SetOffsetAtTheStringStart(file, " FSC"s);
                 LOGMSG("CSF file data found at offset : " + static_cast<const uint64_t&>(offset));
-                Path = Path.substr(0, Path.find_last_of('\\') + 1) + PROGRAM_CONSTANTS->BIG_ARCHIVE_CSF_PATH.toStdWString();
             }
 
             LOGMSG("Attempt to read string table from \"" + Path.c_str() + "\" file...");
@@ -44,9 +42,9 @@ using namespace StringExt;
             throw Exception("Bad file name error. Unable to open file \""q + Path + "\"");
         }
     }
-    void CSFParser::Parse(const wstring& filePath)        { Parse(filePath.c_str()); }
-    void CSFParser::Parse(const std::string& strFilePath) { Parse(strFilePath.c_str()); }
-    void CSFParser::Parse(const QString& strFilePath)     { Parse(strFilePath.toStdString().c_str()); }
+    void CSFParser::Parse(const wstring& filePath) { Parse(QString::fromStdWString(filePath)); }
+    void CSFParser::Parse(const string& filePath)  { Parse(QString::fromStdString(filePath)); }
+    void CSFParser::Parse(const QString& filePath) { Parse(filePath.toStdString().c_str()); }
 
     streampos CSFParser::SetOffsetAtTheStringStart(ifstream& file, const string& searchStr)
     {

src/Parsers/CSFParser.hpp

@@ -38,12 +38,12 @@ class CSFParser final
     const uint8_t  WRTS[4] {'W', 'R', 'T', 'S'}; // Begining of any string with extra value
     const uint32_t CNC_CSF_VERSION = 3;          // Standart file format. Legacy by WW
 
-    std::wstring              Path;
     CSFHeader                 Header;
     std::list<CompiledString> Table;
 
 public:
     inline static std::unique_ptr<CSFParser> Instance = nullptr;
+    std::wstring Path;
 
 private: // Methods
     void ReadHeader(std::ifstream* csfFile);