From b48e2c995d62e0cb5e1c074acc34ebf7410363cc Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 20:02:03 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                             |  3 ++-
 properties                                      |  3 ++-
 .../GlobalData/Settings/SettingName.java        |  4 ----
 .../GlobalData/Settings/SettingsDBTable.java    |  1 -
 src/_VisualDVM/GlobalProperties.java            |  4 ++++
 src/_VisualDVM/Passes/All/UpdateProperty.java   | 17 +++++++++++++++++
 src/_VisualDVM/Passes/All/UpdateSetting.java    | 14 --------------
 .../MainMenuBar/LastOpenedProjectsMenu.java     |  2 +-
 .../CompactnessSettingsMenu.java                |  4 ++--
 9 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b3ff8f3e..ce2e2df2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,13 @@
   <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.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/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index fbe10db7..3fd07ec8 100644
--- a/properties
+++ b/properties
@@ -52,5 +52,6 @@
   "ExtensionsOn": false,
   "ComparsionDiffMergeOn": true,
   "BugReportsAgeLimit": 4,
-  "FastAccessPassesCount": 5
+  "FastAccessPassesCount": 5,
+  "LastOpenedProjectsCount": 25
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index e2bb16b7..4ce15b8c 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,
     //--------------
-    LastOpenedProjectsCount,
     ShowFullArraysDeclarations,
     ShowFullTabsNames,
     LocalMakePathWindows,
@@ -92,9 +91,6 @@ public enum SettingName {
                 return "Сохранять SPF директивы при преобразованиях";
             case PARSE_FOR_INLINE:
                 return "Синтаксический анализ для подстановки";
-
-            case LastOpenedProjectsCount:
-                return "Число отображаемых последних открытых проектов";
         }
         return "";
     }
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index a8e2ec04..20b4ab25 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -32,7 +32,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         //<editor-fold desc="Global">
         AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
-        AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
         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));
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index fa43b13e..a43fa01f 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -124,6 +124,8 @@ public class GlobalProperties {
     public int BugReportsAgeLimit = 2;
     @Expose
     public int FastAccessPassesCount=10;
+    @Expose
+    public int LastOpenedProjectsCount=10;
     public GlobalProperties(GlobalProperties p) {
         super();
         Mode = p.Mode;
@@ -175,6 +177,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "LastOpenedProjectsCount":
+                return "Число отображаемых последних открытых проектов";
             case "FastAccessPassesCount":
                 return "Число проходов на панели быстрого доступа";
             case "Workspace":
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 49d4e6ba..40d12ea8 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -2,12 +2,14 @@ package _VisualDVM.Passes.All;
 import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Visual.Windows.Dialog.SliderNumberForm;
+import Common.Visual.Windows.Dialog.SpinnerNumberForm;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalProperties;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.io.File;
 import java.lang.reflect.Field;
 public class UpdateProperty extends Pass<Object> {
@@ -24,6 +26,17 @@ public class UpdateProperty extends Pass<Object> {
         oldValue = field.get(Global.properties);
         newValue = null;
         SliderNumberForm sliderNumberForm = new SliderNumberForm();
+        SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
+            @Override
+            public void InitFields() {
+                fields.setModel(new SpinnerNumberModel(
+                        (int)oldValue,
+                        1,
+                        50,
+                        1));
+            }
+        };
+
         VDirectoryChooser directoryChooser = new VDirectoryChooser("");
         VFileChooser fileChooser = new VFileChooser("", "exe");
         //-
@@ -37,6 +50,10 @@ public class UpdateProperty extends Pass<Object> {
                     if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15))
                         newValue=sliderNumberForm.Result;
                     break;
+                case "LastOpenedProjectsCount":
+                    if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
+                        newValue=spinnerNumberForm.Result;
+                    break;
                 case "Workspace":
                     directoryChooser.setTitle(description);
                     directoryChooser.SetCurrentDirectory(
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index de76a9b0..be10ece9 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -51,20 +51,6 @@ public class UpdateSetting extends Pass<DBSetting> {
                     int min = 0;
                     int max = 0;
                     switch (target.Name) {
-                        case LastOpenedProjectsCount:
-                            SpinnerNumberForm f_ = new SpinnerNumberForm() {
-                                @Override
-                                public void InitFields() {
-                                    fields.setModel(new SpinnerNumberModel(
-                                            target.toInt32(),
-                                            1,
-                                            50,
-                                            1));
-                                }
-                            };
-                            if (f_.ShowDialog(target.Name.getDescription()))
-                                NewValue = String.valueOf(f_.Result);
-                            break;
                         case Kernels:
                             min = 1;
                             max = Utils.getMaxKernels();
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
index 4d1173cd..288d3553 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
@@ -32,7 +32,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
                         });
                         add(i);
                         ++k;
-                        if (k > ((Global.mainModule.getDb()).settings.get(SettingName.LastOpenedProjectsCount).toInt32()))
+                        if (k > Global.properties.LastOpenedProjectsCount)
                             break;
                     }
                 }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index 0d16b88f..aa9893ed 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -7,9 +7,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
         super("Компактность отображения", null,
                 SettingName.SmallScreen,
                 SettingName.ShowFullTabsNames,
-                SettingName.ShowFullArraysDeclarations,
-                SettingName.LastOpenedProjectsCount
+                SettingName.ShowFullArraysDeclarations
         );
+        add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
         add(Global.properties.getMenuItem("FastAccessPassesCount"));
         addSeparator();
         String[] propertiesNames = new String[]{