Merge pull request #13 from RapidScada/develop

Merge develop to master
RapidScada · Sep 23, 2015 · 1b014e2 · 1b014e2
2 parents 65bfff8 + e363583
commit 1b014e2
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 51 deletions.
diff --git a/ScadaAdmin/ScadaAdmin/FrmAbout.cs b/ScadaAdmin/ScadaAdmin/FrmAbout.cs
@@ -36,7 +36,7 @@ namespace ScadaAdmin
     /// </summary>
     public partial class FrmAbout : Form
     {
-        private const string Version = "4.5.0.0"; // версия приложения
+        private const string Version = "4.5.0.1"; // версия приложения
         private static FrmAbout frmAbout = null;  // экземпляр формы о программе
 
         private bool inited;    // форма инициализирована

diff --git a/ScadaAdmin/ScadaAdmin/FrmMain.cs b/ScadaAdmin/ScadaAdmin/FrmMain.cs
@@ -586,16 +586,19 @@ private void PrepareCloseAll(bool showError)
         private void FrmMain_Load(object sender, EventArgs e)
         {
             // локализация приложения
-            if (!Localization.UseRussian)
-            {
-                string langDir = AppData.ExeDir + "Lang\\";
-                string errMsg;
+            string langDir = AppData.ExeDir + "Lang\\";
+            string errMsg;
 
+            if (Localization.LoadingRequired(langDir, "ScadaData"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     ScadaUtils.ShowError(errMsg);
+            }
 
+            if (Localization.LoadingRequired(langDir, "ScadaAdmin"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaAdmin", out errMsg))
                 {
                     Localization.TranslateForm(this, "ScadaAdmin.FrmMain", null, contextExpolorer, contextInCnls);

diff --git a/ScadaAdmin/ScadaAdmin/FrmTable.cs b/ScadaAdmin/ScadaAdmin/FrmTable.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2010
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -362,7 +362,7 @@ private void FrmTable_Load(object sender, EventArgs e)
         {
             // перевод формы
             Localization.TranslateForm(this, "ScadaAdmin.FrmTable");
-            if (!Localization.UseRussian)
+            if (bindingNavigatorCountItem.Text.Contains("{0}"))
                 bindingNavigator.CountItemFormat = bindingNavigatorCountItem.Text;
         }
 

diff --git a/ScadaComm/ScadaCommCtrl/FrmAbout.cs b/ScadaComm/ScadaCommCtrl/FrmAbout.cs
@@ -36,7 +36,7 @@ namespace Scada.Comm.Ctrl
     /// </summary>
     public partial class FrmAbout : Form
     {
-        private const string Version = "4.5.0.1"; // версия приложения
+        private const string Version = "4.5.0.2"; // версия приложения
         private static FrmAbout frmAbout = null;  // форма о программе
 
         private string exeDir;  // директория исполняемого файла приложения

diff --git a/ScadaComm/ScadaCommCtrl/FrmMain.cs b/ScadaComm/ScadaCommCtrl/FrmMain.cs
@@ -953,13 +953,17 @@ private void FrmMain_Load(object sender, EventArgs e)
             // локализация приложения
             StringBuilder sbError = new StringBuilder();
             string errMsg;
-            if (!Localization.UseRussian)
+
+            if (Localization.LoadingRequired(appDirs.LangDir, "ScadaData"))
             {
                 if (Localization.LoadDictionaries(appDirs.LangDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     sbError.AppendLine(errMsg);
+            }
 
+            if (Localization.LoadingRequired(appDirs.LangDir, "ScadaComm"))
+            {
                 if (Localization.LoadDictionaries(appDirs.LangDir, "ScadaComm", out errMsg))
                 {
                     Localization.TranslateForm(this, "Scada.Comm.Ctrl.FrmMain", toolTip, cmsNotify, cmsLine, cmsKP);

diff --git a/ScadaComm/ScadaCommSvc/Manager.cs b/ScadaComm/ScadaCommSvc/Manager.cs
@@ -47,7 +47,7 @@ internal sealed class Manager
         /// <summary>
         /// Версия приложения
         /// </summary>
-        private const string AppVersion = "4.5.0.1";
+        private const string AppVersion = "4.5.0.2";
         /// <summary>
         /// Имя файла конфигурации
         /// </summary>

diff --git a/ScadaData/ScadaData/Common/Localization.cs b/ScadaData/ScadaData/Common/Localization.cs
@@ -534,6 +534,15 @@ public static string GetDictionaryFileName(string directory, string fileNamePref
                 (string.IsNullOrEmpty(Culture.Name) ? "" : "." + Culture.Name) + ".xml";
         }
 
+        /// <summary>
+        /// Определить, что загрузка словаря необходима: 
+        /// не используется русская локализация или существует файл словаря
+        /// </summary>
+        public static bool LoadingRequired(string directory, string fileNamePrefix)
+        {
+            return !Localization.UseRussian || File.Exists(GetDictionaryFileName(directory, fileNamePrefix));
+        }
+
 
         /// <summary>
         /// Перевести форму, используя заданный словарь

diff --git a/ScadaScheme/ScadaSchemeEditor/FrmAbout.cs b/ScadaScheme/ScadaSchemeEditor/FrmAbout.cs
@@ -36,7 +36,7 @@ namespace Scada.Scheme.Editor
     /// </summary>
     public partial class FrmAbout : Form
     {
-        private const string Version = "4.5.0.0"; // версия приложения
+        private const string Version = "4.5.0.1"; // версия приложения
         private static FrmAbout frmAbout = null;  // форма о программе
 
         private string exeDir;  // директория исполняемого файла приложения

diff --git a/ScadaScheme/ScadaSchemeEditor/FrmMain.cs b/ScadaScheme/ScadaSchemeEditor/FrmMain.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2012
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -252,16 +252,19 @@ private void FrmMain_Load(object sender, EventArgs e)
             exeDir = ScadaUtils.NormalDir(Path.GetDirectoryName(Application.ExecutablePath));
 
             // локализация приложения
-            if (!Localization.UseRussian)
-            {
-                string langDir = exeDir + "lang\\";
-                string errMsg;
+            string langDir = exeDir + "lang\\";
+            string errMsg;
 
+            if (Localization.LoadingRequired(langDir, "ScadaData"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     ScadaUtils.ShowError(errMsg);
+            }
 
+            if (Localization.LoadingRequired(langDir, "ScadaSchemeEditor"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaSchemeEditor", out errMsg))
                 {
                     Localization.TranslateForm(this, "Scada.Scheme.Editor.FrmMain");

diff --git a/ScadaServer/ScadaServerCtrl/FrmAbout.cs b/ScadaServer/ScadaServerCtrl/FrmAbout.cs
@@ -36,7 +36,7 @@ namespace Scada.Server.Ctrl
     /// </summary>
     public partial class FrmAbout : Form
     {
-        private const string Version = "4.5.0.4"; // версия приложения
+        private const string Version = "4.5.0.5"; // версия приложения
         private static FrmAbout frmAbout = null;  // форма о программе
 
         private string exeDir;  // директория исполняемого файла приложения

diff --git a/ScadaServer/ScadaServerCtrl/FrmBaseTableView.cs b/ScadaServer/ScadaServerCtrl/FrmBaseTableView.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2013
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -134,7 +134,7 @@ private void FrmBaseTableView_Load(object sender, EventArgs e)
         {
             // перевод формы
             Localization.TranslateForm(this, "Scada.Server.Ctrl.FrmBaseTableView");
-            if (!Localization.UseRussian)
+            if (lblCount.Text.Contains("{0}"))
                 bindingNavigator.CountItemFormat = lblCount.Text;
 
             // настройка элементов управления

diff --git a/ScadaServer/ScadaServerCtrl/FrmEventTableEdit.cs b/ScadaServer/ScadaServerCtrl/FrmEventTableEdit.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2013
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -173,7 +173,7 @@ private void FrmEventTableEdit_Load(object sender, EventArgs e)
         {
             // перевод формы
             Localization.TranslateForm(this, "Scada.Server.Ctrl.FrmEventTableEdit");
-            if (!Localization.UseRussian)
+            if (lblCount.Text.Contains("{0}"))
                 bindingNavigator.CountItemFormat = lblCount.Text;
 
             // настройка элементов управления

diff --git a/ScadaServer/ScadaServerCtrl/FrmMain.cs b/ScadaServer/ScadaServerCtrl/FrmMain.cs
@@ -627,13 +627,17 @@ private void FrmMain_Load(object sender, EventArgs e)
             // локализация приложения
             StringBuilder sbError = new StringBuilder();
             string errMsg;
-            if (!Localization.UseRussian)
+
+            if (Localization.LoadingRequired(appDirs.LangDir, "ScadaData"))
             {
                 if (Localization.LoadDictionaries(appDirs.LangDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     sbError.AppendLine(errMsg);
+            }
 
+            if (Localization.LoadingRequired(appDirs.LangDir, "ScadaServer"))
+            {
                 if (Localization.LoadDictionaries(appDirs.LangDir, "ScadaServer", out errMsg))
                 {
                     ModPhrases.InitFromDictionaries();

diff --git a/ScadaServer/ScadaServerCtrl/FrmSrezTableEdit.cs b/ScadaServer/ScadaServerCtrl/FrmSrezTableEdit.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2013
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -235,11 +235,10 @@ private void FrmSrezTableEdit_Load(object sender, EventArgs e)
         {
             // перевод формы
             Localization.TranslateForm(this, "Scada.Server.Ctrl.FrmSrezTableEdit");
-            if (!Localization.UseRussian)
-            {
+            if (lblCount1.Text.Contains("{0}"))
                 bindingNavigator1.CountItemFormat = lblCount1.Text;
+            if (lblCount2.Text.Contains("{0}"))
                 bindingNavigator2.CountItemFormat = lblCount2.Text;
-            }
 
             // настройка элементов управления
             Text = (editMode ? AppPhrases.EditSrezTableTitle : AppPhrases.ViewSrezTableTitle) + 

diff --git a/ScadaServer/ScadaServerSvc/Comm.cs b/ScadaServer/ScadaServerSvc/Comm.cs
@@ -812,6 +812,7 @@ private void ProcCommand(ClientInfo client, byte cmd, int cmdLen)
                             // передача команды ТУ подключенным клиентам
                             if (passToClients)
                             {
+                                ctrlCmd.PrepareCmdData();
                                 foreach (ClientInfo cl in clients)
                                     if (cl.UserRoleID == BaseValues.Roles.App)
                                         cl.CmdList.Add(ctrlCmd);

diff --git a/ScadaServer/ScadaServerSvc/MainLogic.cs b/ScadaServer/ScadaServerSvc/MainLogic.cs
@@ -92,7 +92,7 @@ static WorkStateNames()
         /// <summary>
         /// Строковая запись версии приложения
         /// </summary>
-        public const string AppVersion = "4.5.0.4";
+        public const string AppVersion = "4.5.0.5";
         /// <summary>
         /// Имя файла журнала приложения
         /// </summary>

diff --git a/ScadaWeb/ScadaTableEditor/FrmAbout.cs b/ScadaWeb/ScadaTableEditor/FrmAbout.cs
@@ -36,7 +36,7 @@ namespace ScadaTableEditor
     /// </summary>
     public partial class FrmAbout : Form
     {
-        private const string Version = "4.5.0.0"; // версия приложения
+        private const string Version = "4.5.0.1"; // версия приложения
         private static FrmAbout frmAbout = null;  // форма о программе
 
         private string exeDir;  // директория исполняемого файла приложения

diff --git a/ScadaWeb/ScadaTableEditor/FrmMain.cs b/ScadaWeb/ScadaTableEditor/FrmMain.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mikhail Shiryaev
+ * Copyright 2015 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2013
- * Modified : 2014
+ * Modified : 2015
  */
 
 using System;
@@ -551,16 +551,19 @@ private void FrmMain_Load(object sender, EventArgs e)
             exeDir = ScadaUtils.NormalDir(Path.GetDirectoryName(Application.ExecutablePath));
 
             // локализация приложения
-            if (!Localization.UseRussian)
-            {
-                string langDir = exeDir + "Lang\\";
-                string errMsg;
+            string langDir = exeDir + "Lang\\";
+            string errMsg;
 
+            if (Localization.LoadingRequired(langDir, "ScadaData"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     ScadaUtils.ShowError(errMsg);
+            }
 
+            if (Localization.LoadingRequired(langDir, "ScadaTableEditor"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaTableEditor", out errMsg))
                 {
                     Localization.TranslateForm(this, "ScadaTableEditor.FrmMain", toolTip);

diff --git a/ScadaWeb/ScadaWebCommon/AppData.cs b/ScadaWeb/ScadaWebCommon/AppData.cs
@@ -140,22 +140,25 @@ private static void RefreshWebSettings()
         /// </summary>
         private static void RefreshDictionaries()
         {
-            if (!Localization.UseRussian)
+            DateTime fileWriteTime1 = GetFileWriteTime(Localization.GetDictionaryFileName(LangDir, "ScadaData"));
+            DateTime fileWriteTime2 = GetFileWriteTime(Localization.GetDictionaryFileName(LangDir, "ScadaWeb"));
+            string writeTimeStr = fileWriteTime1.ToString() + fileWriteTime2.ToString();
+
+            if (dictWriteTimeStr != writeTimeStr)
             {
-                DateTime fileWriteTime1 = GetFileWriteTime(Localization.GetDictionaryFileName(LangDir, "ScadaData"));
-                DateTime fileWriteTime2 = GetFileWriteTime(Localization.GetDictionaryFileName(LangDir, "ScadaWeb"));
-                string writeTimeStr = fileWriteTime1.ToString() + fileWriteTime2.ToString();
+                dictWriteTimeStr = writeTimeStr;
+                string errMsg;
 
-                if (dictWriteTimeStr != writeTimeStr)
+                if (Localization.LoadingRequired(LangDir, "ScadaData"))
                 {
-                    dictWriteTimeStr = writeTimeStr;
-                    string errMsg;
-
                     if (Localization.LoadDictionaries(LangDir, "ScadaData", out errMsg))
                         CommonPhrases.Init();
                     else
                         Log.WriteAction(errMsg, Log.ActTypes.Error);
+                }
 
+                if (Localization.LoadingRequired(LangDir, "ScadaWeb"))
+                {
                     if (Localization.LoadDictionaries(LangDir, "ScadaWeb", out errMsg))
                         WebPhrases.Init();
                     else

diff --git a/ScadaWeb/ScadaWebConfig/FrmMain.cs b/ScadaWeb/ScadaWebConfig/FrmMain.cs
@@ -376,16 +376,19 @@ private void FrmMain_Load(object sender, EventArgs e)
             exeDir = ScadaUtils.NormalDir(Path.GetDirectoryName(Application.ExecutablePath));
 
             // локализация приложения
-            if (!Localization.UseRussian)
-            {
-                string langDir = exeDir + "Lang\\";
-                string errMsg;
+            string langDir = exeDir + "Lang\\";
+            string errMsg;
 
+            if (Localization.LoadingRequired(langDir, "ScadaData"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaData", out errMsg))
                     CommonPhrases.Init();
                 else
                     ScadaUtils.ShowError(errMsg);
+            }
 
+            if (Localization.LoadingRequired(langDir, "ScadaWebConfig"))
+            {
                 if (Localization.LoadDictionaries(langDir, "ScadaWebConfig", out errMsg))
                 {
                     Localization.TranslateForm(this, "ScadaWebConfig.FrmMain");