no message

This commit is contained in:
2025-01-11 18:13:25 +03:00
parent 9c6198656f
commit 0d3edd7e3f
6 changed files with 8 additions and 15 deletions

9
.idea/workspace.xml generated
View File

@@ -12,14 +12,7 @@
<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/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -16,7 +16,8 @@
"collapseProjectTrees": false, "collapseProjectTrees": false,
"BackupWorkspace": "_sapfor_x64_backups", "BackupWorkspace": "_sapfor_x64_backups",
"Workspace": "E:\\Workspace", "Workspace": "E:\\Workspace",
"ProjectsSearchDirectory": "E:\\Workspace", "ProjectsSearchDirectory": "E:\\BUG",
"EditorFontSize": 16,
"BackupHour": 5, "BackupHour": 5,
"BackupMinute": 0, "BackupMinute": 0,
"EmailAdminsOnStart": false, "EmailAdminsOnStart": false,

View File

@@ -2,8 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName { public enum SettingName {
Undefined, Undefined,
//-------------- //--------------
EditorFontSize,
//--------------
FastAccessPassesCount, FastAccessPassesCount,
LastOpenedProjectsCount, LastOpenedProjectsCount,
ShowFullArraysDeclarations, ShowFullArraysDeclarations,

View File

@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
public void AddAll() throws Exception { public void AddAll() throws Exception {
//проверка списка всех настроек. //проверка списка всех настроек.
//<editor-fold desc="Global"> //<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false));
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.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));

View File

@@ -52,6 +52,8 @@ public class GlobalProperties {
@Expose @Expose
public String ProjectsSearchDirectory=""; public String ProjectsSearchDirectory="";
@Expose @Expose
public int EditorFontSize=14;
@Expose
public int BackupHour = 5; public int BackupHour = 5;
@Expose @Expose
public int BackupMinute = 0; public int BackupMinute = 0;

View File

@@ -48,7 +48,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
highlighter = (RSyntaxTextAreaHighlighter) getHighlighter(); highlighter = (RSyntaxTextAreaHighlighter) getHighlighter();
autoComplete = new SapforAutoComplete(this); autoComplete = new SapforAutoComplete(this);
//------------------------- //-------------------------
float font_size = (float) (Global.mainModule.getDb()).settings.get(SettingName.EditorFontSize).toInt32(); float font_size = (float) Global.properties.EditorFontSize;
setFont(getFont().deriveFont(font_size)); setFont(getFont().deriveFont(font_size));
//------------------------- //-------------------------
setText(Utils.ReadAllText(file.file).replace("\r", " ")); setText(Utils.ReadAllText(file.file).replace("\r", " "));
@@ -187,8 +187,8 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
} }
@Override @Override
protected void saveFont() { protected void saveFont() {
Global.mainModule.getPass(PassCode.UpdateSetting).Do( Global.mainModule.getPass(PassCode.UpdateProperty).Do(
SettingName.EditorFontSize, "EditorFontSize",
getFont().getSize()); getFont().getSize());
} }
@Override @Override