no message

This commit is contained in:
2025-01-11 20:02:03 +03:00
parent fc60b78784
commit b48e2c995d
9 changed files with 28 additions and 24 deletions

3
.idea/workspace.xml generated
View File

@@ -8,12 +8,13 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.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/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/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/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/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/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" /> <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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

View File

@@ -52,5 +52,6 @@
"ExtensionsOn": false, "ExtensionsOn": false,
"ComparsionDiffMergeOn": true, "ComparsionDiffMergeOn": true,
"BugReportsAgeLimit": 4, "BugReportsAgeLimit": 4,
"FastAccessPassesCount": 5 "FastAccessPassesCount": 5,
"LastOpenedProjectsCount": 25
} }

View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName { public enum SettingName {
Undefined, Undefined,
//-------------- //--------------
LastOpenedProjectsCount,
ShowFullArraysDeclarations, ShowFullArraysDeclarations,
ShowFullTabsNames, ShowFullTabsNames,
LocalMakePathWindows, LocalMakePathWindows,
@@ -92,9 +91,6 @@ public enum SettingName {
return "Сохранять SPF директивы при преобразованиях"; return "Сохранять SPF директивы при преобразованиях";
case PARSE_FOR_INLINE: case PARSE_FOR_INLINE:
return "Синтаксический анализ для подстановки"; return "Синтаксический анализ для подстановки";
case LastOpenedProjectsCount:
return "Число отображаемых последних открытых проектов";
} }
return ""; return "";
} }

View File

@@ -32,7 +32,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
//<editor-fold desc="Global"> //<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 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)); AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
if (Utils_.isWindows()) if (Utils_.isWindows())
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));

View File

@@ -124,6 +124,8 @@ public class GlobalProperties {
public int BugReportsAgeLimit = 2; public int BugReportsAgeLimit = 2;
@Expose @Expose
public int FastAccessPassesCount=10; public int FastAccessPassesCount=10;
@Expose
public int LastOpenedProjectsCount=10;
public GlobalProperties(GlobalProperties p) { public GlobalProperties(GlobalProperties p) {
super(); super();
Mode = p.Mode; Mode = p.Mode;
@@ -175,6 +177,8 @@ public class GlobalProperties {
//----------------- //-----------------
public String getFieldDescription(String fieldName) { public String getFieldDescription(String fieldName) {
switch (fieldName) { switch (fieldName) {
case "LastOpenedProjectsCount":
return "Число отображаемых последних открытых проектов";
case "FastAccessPassesCount": case "FastAccessPassesCount":
return "Число проходов на панели быстрого доступа"; return "Число проходов на панели быстрого доступа";
case "Workspace": case "Workspace":

View File

@@ -2,12 +2,14 @@ package _VisualDVM.Passes.All;
import Common.MainModule_; import Common.MainModule_;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.SliderNumberForm; import Common.Visual.Windows.Dialog.SliderNumberForm;
import Common.Visual.Windows.Dialog.SpinnerNumberForm;
import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VDirectoryChooser;
import Common.Visual.Windows.Dialog.VFileChooser; import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalProperties; import _VisualDVM.GlobalProperties;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
public class UpdateProperty extends Pass<Object> { public class UpdateProperty extends Pass<Object> {
@@ -24,6 +26,17 @@ public class UpdateProperty extends Pass<Object> {
oldValue = field.get(Global.properties); oldValue = field.get(Global.properties);
newValue = null; newValue = null;
SliderNumberForm sliderNumberForm = new SliderNumberForm(); 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(""); VDirectoryChooser directoryChooser = new VDirectoryChooser("");
VFileChooser fileChooser = new VFileChooser("", "exe"); VFileChooser fileChooser = new VFileChooser("", "exe");
//- //-
@@ -37,6 +50,10 @@ public class UpdateProperty extends Pass<Object> {
if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15)) if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15))
newValue=sliderNumberForm.Result; newValue=sliderNumberForm.Result;
break; break;
case "LastOpenedProjectsCount":
if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
newValue=spinnerNumberForm.Result;
break;
case "Workspace": case "Workspace":
directoryChooser.setTitle(description); directoryChooser.setTitle(description);
directoryChooser.SetCurrentDirectory( directoryChooser.SetCurrentDirectory(

View File

@@ -51,20 +51,6 @@ public class UpdateSetting extends Pass<DBSetting> {
int min = 0; int min = 0;
int max = 0; int max = 0;
switch (target.Name) { 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: case Kernels:
min = 1; min = 1;
max = Utils.getMaxKernels(); max = Utils.getMaxKernels();

View File

@@ -32,7 +32,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
}); });
add(i); add(i);
++k; ++k;
if (k > ((Global.mainModule.getDb()).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) if (k > Global.properties.LastOpenedProjectsCount)
break; break;
} }
} }

View File

@@ -7,9 +7,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
super("Компактность отображения", null, super("Компактность отображения", null,
SettingName.SmallScreen, SettingName.SmallScreen,
SettingName.ShowFullTabsNames, SettingName.ShowFullTabsNames,
SettingName.ShowFullArraysDeclarations, SettingName.ShowFullArraysDeclarations
SettingName.LastOpenedProjectsCount
); );
add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
add(Global.properties.getMenuItem("FastAccessPassesCount")); add(Global.properties.getMenuItem("FastAccessPassesCount"));
addSeparator(); addSeparator();
String[] propertiesNames = new String[]{ String[] propertiesNames = new String[]{