Merge pull request 'Patch/release/v8.2.0' (#10) from fix/patch-releas…

…e-8.2.0-r2 into release/v8.2.0
ONLYOFFICE · Sep 13, 2024 · 3928354 · 3928354
2 parents fdd2988 + dac8fe8
commit 3928354
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
@@ -170,7 +170,7 @@ auto replace(tstring &str, const tstring &from, const tstring &to)->void {
 #ifdef _WIN32
 auto restartService()->void
 {
-    const wstring fileName = NS_File::appPath() + RESTART_BATCH;
+    wstring fileName = NS_File::appPath() + RESTART_BATCH;
     if (NS_File::fileExists(fileName) && !NS_File::removeFile(fileName)) {
         NS_Logger::WriteLog(_TR("An error occurred while deleting:") + _T(" ") + fileName, true);
         return;
@@ -195,7 +195,7 @@ auto restartService()->void
     ZeroMemory(&si, sizeof(si));
     ZeroMemory(&pi, sizeof(pi));
     si.cb = sizeof(si);
-    if (!CreateProcess(NULL, const_cast<LPWSTR>(fileName.c_str()), NULL, NULL, FALSE,
+    if (!CreateProcess(NULL, &fileName[0], NULL, NULL, FALSE,
                           CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT, NULL, NULL, &si, &pi))
     {
         NS_Logger::WriteLog(_TR("An error occurred while restarting the service!"), true);

diff --git a/win-linux/src/clangater.cpp b/win-linux/src/clangater.cpp
@@ -107,7 +107,11 @@ class CLangater::CLangaterIntf
     }
 
     QString langName(const QString& code) {
-        return m_langs.value(code).first;
+        foreach (const auto &lang, m_langs) {
+            if (lang.first == code)
+                return lang.second.first;
+        }
+        return "";
     }
 
     bool reload(const QString& lang) {
@@ -140,10 +144,10 @@ class CLangater::CLangaterIntf
     }
 
     QString findCloseLang(const QString& n) {
-        QMap<QString, std::pair<QString, QString>>::iterator i = m_langs.begin();
+        auto i = m_langs.begin();
         while ( i != m_langs.end() ) {
-            if ( i.key().startsWith(n) )
-                return i.key();
+            if ( i->first.startsWith(n) )
+                return i->first;
 
             ++i;
         }
@@ -155,7 +159,7 @@ class CLangater::CLangaterIntf
     std::list<QTranslator *> m_list;
     std::list<QString> m_dirs;
 
-    QMap<QString, std::pair<QString, QString>> m_langs{
+    QVector<std::pair<QString, std::pair<QString, QString>>> m_langs{
         {"en-US", {"English (United States)", ""}},
         {"en-GB", {"English (United Kingdom)", ""}},
         {"ru-RU", {"Русский", "Russian"}},
@@ -165,8 +169,8 @@ class CLangater::CLangaterIntf
         {"sk-SK", {"Slovenčina", "Slovak"}},
         {"cs-CZ", {"Čeština", "Czech"}},
         {"it-IT", {"Italiano", "Italian"}},
+        {"pt-PT", {"Português (Portugal)", "Portuguese (Portugal)"}},
         {"pt-BR", {"Português Brasileiro", "Portuguese (Brazil)"}}
-        ,{"pt-PT", {"Português (Portugal)", "Portuguese (Portugal)"}}
         ,{"pl-PL", {"Polski", "Polish"}}
         ,{"zh-CN", {"简体中文", "Chinese (Simplified)"}}
         ,{"zh-TW", {"繁體中文", "Chinese (Traditional)"}}
@@ -318,7 +322,7 @@ void CLangater::reloadTranslations(const QString& lang)
 #endif
 }
 
-void CLangater::refreshLangs(const QMap<QString, std::pair<QString, QString>>& map)
+void CLangater::refreshLangs(const QVector<std::pair<QString, std::pair<QString, QString>>>& map)
 {
     getInstance()->m_intf->m_langs = {map};
 }
@@ -340,9 +344,12 @@ QString CLangater::getLangName(const QString& code)
 QJsonObject CLangater::availableLangsToJson()
 {
     QJsonObject _out_obj;
+    QMap<QString, std::pair<QString, QString>> langMap;
+    foreach (const auto &lang, getInstance()->m_intf->m_langs)
+        langMap.insert(lang.first, lang.second);
 
-    QMap<QString, std::pair<QString, QString>>::const_iterator i = getInstance()->m_intf->m_langs.constBegin();
-    while ( i != getInstance()->m_intf->m_langs.constEnd() ) {
+    auto i = langMap.constBegin();
+    while ( i != langMap.constEnd() ) {
         _out_obj.insert(i.key(), QJsonObject{{"name", i.value().first},{"enname", i.value().second}});
         ++i;
     }

diff --git a/win-linux/src/clangater.h b/win-linux/src/clangater.h
@@ -15,7 +15,7 @@ class CLangater : public QObject
     static CLangater * getInstance();
     static void init();
     static void reloadTranslations(const QString&);
-    static void refreshLangs(const QMap<QString, std::pair<QString, QString>>&);
+    static void refreshLangs(const QVector<std::pair<QString, std::pair<QString, QString>>>&);
     static QString getCurrentLangCode();
     static QString getLangName(const QString& code = QString());
     static void addTranslation(const QString& dir, const QString& name);

diff --git a/win-linux/src/cthemes.cpp b/win-linux/src/cthemes.cpp
@@ -22,7 +22,7 @@
 #define REGISTRY_THEME_KEY "UITheme"
 #define REGISTRY_THEME_KEY_7_2 "UITheme2"
 #define THEME_DEFAULT_DARK_ID "theme-dark"
-#define THEME_DEFAULT_LIGHT_ID "theme-gray"
+#define THEME_DEFAULT_LIGHT_ID "theme-classic-light"
 #define THEME_ID_SYSTEM "theme-system"
 
 namespace NSTheme {