From 8b2fb67422823db518543852bd1a17b0b8eb5efc Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 21:34:17 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                         | 2 +-
 properties                                                  | 1 +
 src/_VisualDVM/GlobalData/Settings/SettingName.java         | 3 ---
 src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java     | 1 -
 src/_VisualDVM/GlobalProperties.java                        | 4 ++++
 src/_VisualDVM/Passes/All/UpdateProperty.java               | 6 ++++++
 src/_VisualDVM/Passes/All/UpdateSetting.java                | 6 ------
 .../VisualiserSettingsMenu/CompactnessSettingsMenu.java     | 5 ++---
 src/_VisualDVM/Visual/Windows/CallbackForm.java             | 2 +-
 src/_VisualDVM/Visual/Windows/ProjectForm.java              | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index efc7ed8e..9e0946df 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,7 +14,7 @@
       <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/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index cf8ee84d..4b00cccf 100644
--- a/properties
+++ b/properties
@@ -53,6 +53,7 @@
   "ComparsionDiffMergeOn": true,
   "ShowFullArraysDeclarations": false,
   "ShowFullTabsNames": true,
+  "SmallScreen": false,
   "BugReportsAgeLimit": 4,
   "FastAccessPassesCount": 5,
   "LastOpenedProjectsCount": 25
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index 6b6b592c..afb52bc9 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -3,7 +3,6 @@ public enum SettingName {
     Undefined,
     //--------------
     LocalMakePathWindows,
-    SmallScreen,
     Precompilation,
     SaveModifications, // сохранять исходную версию
     GCOVLimit,
@@ -47,8 +46,6 @@ public enum SettingName {
                 return "Нижний порог отображения GCOV";
             case Precompilation:
                 return "Предварительная компиляция";
-            case SmallScreen:
-                return "Маленький экран";
             case LocalMakePathWindows:
                 return "Путь к make.exe";
             case STATIC_SHADOW_ANALYSIS:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index d8a16beb..4441755f 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -33,7 +33,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         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));
-        AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         //</editor-fold>
         //--
         //<editor-fold desc="Sapfor">
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index a36ef5bd..36e63848 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -127,6 +127,8 @@ public class GlobalProperties {
     @Expose
     public boolean ShowFullTabsNames=true;
     @Expose
+    public boolean SmallScreen = false;
+    @Expose
     public int BugReportsAgeLimit = 2;
     @Expose
     public int FastAccessPassesCount=10;
@@ -183,6 +185,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "SmallScreen":
+                return "Маленький экран";
             case "ShowFullTabsNames":
                 return "Показывать полные имена вкладок";
             case "ShowFullArraysDeclarations":
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 5f235a6c..e0ff438e 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -116,6 +116,12 @@ public class UpdateProperty extends Pass<Object> {
                 if (Global.mainModule.HasFile())
                     Global.mainModule.getFile().form.RefreshTabsNames();
                 break;
+            case "SmallScreen":
+                if (Global.mainModule.HasProject())
+                    Global.mainModule.getUI().getMainWindow().getProjectWindow().SwitchScreen(
+                            Global.properties.SmallScreen);
+                Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen( Global.properties.SmallScreen);
+                break;
         }
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 4d13657c..0ecb9846 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -87,12 +87,6 @@ public class UpdateSetting extends Pass<DBSetting> {
                     ((SPF_GetArrayDistributionOnlyAnalysis)
                             Global.mainModule.getPass(PassCode.SPF_GetArrayDistributionOnlyAnalysis)).RefreshControls();
                     break;
-                case SmallScreen:
-                    boolean small = target.toBoolean();
-                    if (Global.mainModule.HasProject())
-                        Global.mainModule.getUI().getMainWindow().getProjectWindow().SwitchScreen(small);
-                    Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen(small);
-                    break;
                 case Precompilation:
                     Global.mainModule.getSapfor().ResetAllAnalyses();
                     break;
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index 826cf7cd..645b5619 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -4,9 +4,8 @@ import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
 public class CompactnessSettingsMenu extends SettingsSubmenu {
     public CompactnessSettingsMenu() {
-        super("Компактность отображения", null,
-                SettingName.SmallScreen
-        );
+        super("Компактность отображения", null);
+        add(Global.properties.getMenuItem("SmallScreen"));
         add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
         add(Global.properties.getMenuItem("ShowFullTabsNames"));
         add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index a5f84902..e105b807 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -152,7 +152,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         BugReportCommentAddition.setWrapStyleWord(true);
         //----------------------------------------------
         //тут развилка на то вкладки или поля.
-        SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean());
+        SwitchScreen(Global.properties.SmallScreen);
         //-
         Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
         Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index 9436d41a..f62fcfb0 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -73,7 +73,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
         Global.mainModule.getUI().getDebugWindow().ShowAll();
         ShowAllAnalyses();
         ShowProjectView();
-        SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean());
+        SwitchScreen(Global.properties.SmallScreen);
         RefreshTabsNames();
         //--
         if (Global.properties.collapseProjectTrees)