From 6e28bfa8093ee379bd25ee9d46fcdef9075bd142 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 13 Jan 2025 14:38:20 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=20=D0=B2=D1=81=D0=B5=D1=85=20DBSetting=20=D0=BA=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B5=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=81=D0=BA=D0=B8=D1=85=20=D0=B2=20properties.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 +++------
 src/_VisualDVM/GlobalProperties.java          | 20 ++++++++++++++++++-
 .../ProjectData/Messages/Message.java         |  1 +
 .../Repository/Component/Visualiser.java      |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bb2ec1a1..6cc32d97 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index c2b06678..9a08b372 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -13,10 +13,11 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 public class GlobalProperties {
     LinkedHashMap<String,JMenuItem> controls= new LinkedHashMap<>();
     @Expose
-    public _VisualDVM.Mode Mode = _VisualDVM.Mode.Normal;
+    public _VisualDVM.Mode Mode = _VisualDVM.Mode.Normal; //todo унаследовать от предка.
     @Expose
     public String ServerAddress = "alex-freenas.ddns.net";
     @Expose
@@ -182,6 +183,23 @@ public class GlobalProperties {
         lastMachineId = p.lastMachineId;
         lastUserId = p.lastUserId;
         lastCompilerId = p.lastCompilerId;
+        BugReportsAgeLimit=p.BugReportsAgeLimit;
+        LastOpenedProjectsCount=p.LastOpenedProjectsCount;
+        FastAccessPassesCount=p.FastAccessPassesCount;
+        SmallScreen = p.SmallScreen;
+        ShowFullTabsNames=p.ShowFullTabsNames;
+        ShowPassesDone =p.ShowPassesDone;
+        AutoCheckTesting=p.AutoCheckTesting;
+        AutoBugReportsLoad=p.AutoBugReportsLoad;
+        AutoUpdateSearch=p.AutoUpdateSearch;
+        RegisterOn=p.RegisterOn;
+        SpacesOn=p.SpacesOn;
+        EmptyLinesOn=p.EmptyLinesOn;
+        FortranWrapsOn=p.FortranWrapsOn;
+        ExtensionsOn=p.ExtensionsOn;
+        ComparsionDiffMergeOn=p.ComparsionDiffMergeOn;
+        LocalMakePathWindows=p.LocalMakePathWindows;
+        Kernels=p.Kernels;
     }
     //--
     public GlobalProperties() {
diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index 66f32a4f..f429c33f 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -283,6 +283,7 @@ public class Message extends FileObject {
             codedMessages.put("R202", "Ссылка '%s' имеет отличный от оригинального массива размер");
 //2025
             codedMessages.put("R203", "Нельзя удалить приватную переменную '%s' - она используется в вызове функции %s");
+            codedMessages.put("R205","Массив '%s' состоящий в common блоке '%s' должен иметь описание в главной программной единице для объявления в директиве DECLARE");
 //3002
 //3001
             codedMessages.put("R108", "Добавлена across-зависимость к массиву '%s' в цикле.");
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index deaa69e2..ad05cb98 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -61,7 +61,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1132;
+        version = 1133;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());