no message

This commit is contained in:
2025-01-11 21:34:17 +03:00
parent fe752d2073
commit 8b2fb67422
10 changed files with 16 additions and 16 deletions

2
.idea/workspace.xml generated
View File

@@ -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" />

View File

@@ -53,6 +53,7 @@
"ComparsionDiffMergeOn": true,
"ShowFullArraysDeclarations": false,
"ShowFullTabsNames": true,
"SmallScreen": false,
"BugReportsAgeLimit": 4,
"FastAccessPassesCount": 5,
"LastOpenedProjectsCount": 25

View File

@@ -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:

View File

@@ -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">

View File

@@ -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":

View File

@@ -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;
}
}
}

View File

@@ -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;

View File

@@ -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"));

View File

@@ -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);

View File

@@ -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)