From 7a06c2ce2b20c4041028a5bee460c78ec6b91a1a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 22:48:00 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                   |  6 +++---
 properties                                            |  1 +
 src/_VisualDVM/GlobalData/Settings/SettingName.java   |  3 ---
 .../GlobalData/Settings/SettingsDBTable.java          |  2 --
 .../Windows/WindowsLocalCompilationSupervisor.java    |  2 +-
 src/_VisualDVM/GlobalProperties.java                  |  4 ++++
 src/_VisualDVM/Passes/All/Precompilation.java         |  4 ++--
 src/_VisualDVM/Passes/All/UpdateProperty.java         |  6 ++++++
 src/_VisualDVM/Passes/All/UpdateSetting.java          |  6 ------
 .../VisualiserSettingsMenu.java                       | 11 +++++++++--
 10 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e0946df..b334de4a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,12 +10,12 @@
       <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$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" 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/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 4b00cccf..a7fc1ac9 100644
--- a/properties
+++ b/properties
@@ -37,6 +37,7 @@
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
+  "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "ComponentsBackUpsCount": 10,
   "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index afb52bc9..acacb2d4 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
 public enum SettingName {
     Undefined,
     //--------------
-    LocalMakePathWindows,
     Precompilation,
     SaveModifications, // сохранять исходную версию
     GCOVLimit,
@@ -46,8 +45,6 @@ public enum SettingName {
                 return "Нижний порог отображения GCOV";
             case Precompilation:
                 return "Предварительная компиляция";
-            case LocalMakePathWindows:
-                return "Путь к make.exe";
             case STATIC_SHADOW_ANALYSIS:
                 return "Оптимизация теневых обменов";
             case STATIC_PRIVATE_ANALYSIS:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 4441755f..00f7432b 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -31,8 +31,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         //проверка списка всех настроек.
         //<editor-fold desc="Global">
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
-        if (Utils_.isWindows())
-            AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
         //</editor-fold>
         //--
         //<editor-fold desc="Sapfor">
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index 9b6b56af..4a135497 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -18,7 +18,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
     }
     @Override
     protected String getScriptText() {
-        return Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
+        return Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " 1>out.txt 2>err.txt";
     }
     //скорее всего как то выделить подготовку к компиляции как метод предка.
     @Override
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 36e63848..9723e50a 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -92,6 +92,8 @@ public class GlobalProperties {
     @Expose
     public String PerformanceAnalyzerPath = "";
     @Expose
+    public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
+    @Expose
     public int ComponentsBackUpsCount = 10;
     @Expose
     public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
@@ -185,6 +187,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "LocalMakePathWindows":
+                return "Путь к make.exe";
             case "SmallScreen":
                 return "Маленький экран";
             case "ShowFullTabsNames":
diff --git a/src/_VisualDVM/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java
index 18427ff6..d9ae8127 100644
--- a/src/_VisualDVM/Passes/All/Precompilation.java
+++ b/src/_VisualDVM/Passes/All/Precompilation.java
@@ -94,7 +94,7 @@ public class Precompilation extends Pass<db_project_info> {
         target = Global.mainModule.getProject();
         if (Utils_.isWindows()) {
             //--
-            makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString();
+            makepath = Global.properties.LocalMakePathWindows;
             if (makepath.isEmpty()) {
                 Log.Writeln_("Не задан путь к make.exe.\n " +
                         "Укажите его в меню глобальных настроек." +
@@ -185,7 +185,7 @@ public class Precompilation extends Pass<db_project_info> {
     protected void body() throws Exception {
         if (Utils_.isWindows()) {
             name_to_kill = "make.exe";
-            StartProcess(Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
+            StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
                     target.compilation_maxtime);
         } else
             StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index e0ff438e..db933f85 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -35,6 +35,12 @@ public class UpdateProperty extends Pass<Object> {
                 return true;
             }
             switch (name){
+                case "LocalMakePathWindows":
+                    fileChooser.setTitle(description);
+                    File file = fileChooser.ShowDialog();
+                    if (file != null)
+                        newValue = file.getAbsolutePath();
+                    break;
                 case "BugReportsAgeLimit":
                     if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
                        newValue=sliderNumberForm.Result;
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 0ecb9846..4d626eff 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -31,12 +31,6 @@ public class UpdateSetting extends Pass<DBSetting> {
                     break;
                 case StringField:
                     switch (target.Name) {
-                        case LocalMakePathWindows:
-                            fileChooser.setTitle(target.Name.getDescription());
-                            File file = fileChooser.ShowDialog();
-                            if (file != null)
-                                NewValue = file.getAbsolutePath();
-                            break;
                         default:
                             TextFieldDialog ff = new TextFieldDialog();
                             if (ff.ShowDialog(target.Name.getDescription(), target.Value)) {
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index 22ffb0af..821180cc 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -18,8 +18,14 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
         ));
         add(new CompactnessSettingsMenu());
         if (Utils_.isWindows()) {
-            add(new SettingsSubmenu("Компиляция на локальной машине", null,
-                    SettingName.LocalMakePathWindows,
+            add(new SettingsSubmenu("Компиляция на локальной машине", null){
+                {
+                    add(Global.properties.getMenuItem("LocalMakePathWindows"));
+                }
+            }
+            );
+        }
+            /*
                     SettingName.Kernels
             ));
         } else {
@@ -27,6 +33,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
                     SettingName.Kernels
             ));
         }
+             */
         add(new SynchronizationSettingsMenu());
         add(new VersionsComparisonMenu());
         add(Global.properties.getMenuItem("Workspace"));