M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный. перенос настроек в проект. есть баги. завтра доделываю, версия не вполне рабочая

Browse Source
This commit is contained in:
02090095
2025-01-16 02:26:51 +03:00
parent 483089e954
commit 0f7b65f467
92 changed files with 511 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/Visual/MainUI.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Windows.MainWindow;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import _VisualDVM.Visual.Windows.*;

1
src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -3,7 +3,6 @@ import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;

1
src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
View File

@@ -4,6 +4,7 @@ import _VisualDVM.Visual.Menus.PropertiesSubmenu;
public class SynchronizationSettingsMenu extends PropertiesSubmenu {
public SynchronizationSettingsMenu() {
super("Синхронизация", null,
Global.properties,
"AutoBugReportsLoad",
"AutoTestsLoad",
"AutoUpdateSearch");

1
src/_VisualDVM/Visual/Menus/MainMenuBar/VersionsComparisonMenu.java
View File

@@ -4,6 +4,7 @@ import _VisualDVM.Visual.Menus.PropertiesSubmenu;
public class VersionsComparisonMenu extends PropertiesSubmenu {
public VersionsComparisonMenu() {
super("Сравнение версий", null,
Global.properties,
"RegisterOn",
"SpacesOn",
"EmptyLinesOn",

9
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
View File

@@ -1,17 +1,20 @@
package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class CompactnessSettingsMenu extends PropertiesSubmenu {
public CompactnessSettingsMenu() {
super("Компактность отображения", null,
Global.properties,
"SmallScreen",
"ShowFullArraysDeclarations",
"ShowFullTabsNames",
"LastOpenedProjectsCount",
"FastAccessPassesCount");
addSeparator();
addProperties("collapseProjectTrees", "collapseFileGraphs", "collapseFileMessages");
addProperties(
Global.properties,
"collapseProjectTrees",
"collapseFileGraphs",
"collapseFileMessages");
}
}

26
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -2,36 +2,32 @@ package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.MainMenuBar.SynchronizationSettingsMenu;
import _VisualDVM.Visual.Menus.MainMenuBar.VersionsComparisonMenu;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class VisualiserSettingsMenu extends VisualiserMenu {
public VisualiserSettingsMenu() {
super("Настройки визуализатора", "/Common/icons/Settings.png");
//-
add(new PropertiesSubmenu("Подтверждения и уведомления", null,
Global.properties,
"ShowPassesDone",
"ConfirmPassesStart",
"FocusPassesResult"
));
add(new CompactnessSettingsMenu());
if (Utils_.isWindows()) {
add(new SettingsSubmenu("Компиляция на локальной машине", null){
{
add(Global.properties.getMenuItem("LocalMakePathWindows"));
add(Global.properties.getMenuItem("Kernels"));
}
}
);
add(new PropertiesSubmenu("Компиляция на локальной машине", null,
Global.properties,
"LocalMakePathWindows",
"Kernels"
));
}else {
add(new SettingsSubmenu("Компиляция на локальной машине", null){
{
add(Global.properties.getMenuItem("Kernels"));
}
}
);
add(new PropertiesSubmenu("Компиляция на локальной машине", null,
Global.properties,
"Kernels"
));
}
add(new SynchronizationSettingsMenu());

48
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
View File

@@ -1,11 +1,10 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import javax.swing.*;
@@ -34,33 +33,36 @@ public class ProjectSettingsMenu extends VisualiserMenu {
});
ShowStyle();
addSeparator();
add(new SettingsSubmenu("Анализ", null,
SettingName.Precompilation,
SettingName.STATIC_SHADOW_ANALYSIS,
SettingName.KEEP_DVM_DIRECTIVES,
SettingName.IGNORE_IO_SAPFOR,
SettingName.MPI_PROGRAM,
SettingName.ANALYSIS_OPTIONS
add(new PropertiesSubmenu("Анализ", null,
Global.mainModule.getProject().sapforProperties,
"Precompilation",
"STATIC_SHADOW_ANALYSIS",
"KEEP_DVM_DIRECTIVES",
"IGNORE_IO_SAPFOR",
"MPI_PROGRAM",
"ANALYSIS_OPTIONS"
));
addSeparator();
add(new SettingsSubmenu("Построение системы интервалов", null,
SettingName.KEEP_LOOPS_CLOSE_NESTING,
SettingName.KEEP_GCOV
add(new PropertiesSubmenu("Построение системы интервалов", null,
Global.mainModule.getProject().sapforProperties,
"KEEP_LOOPS_CLOSE_NESTING",
"KEEP_GCOV"
));
addSeparator();
add(new SettingsSubmenu("Построение версий", null,
SettingName.FREE_FORM,
SettingName.KEEP_SPF_DIRECTIVES,
SettingName.KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS,
SettingName.OUTPUT_UPPER,
SettingName.MAX_SHADOW_WIDTH,
SettingName.DVMConvertationOptions,
SettingName.SaveModifications
add(new PropertiesSubmenu("Построение версий", null,
Global.mainModule.getProject().sapforProperties,
"FREE_FORM",
"KEEP_SPF_DIRECTIVES",
"KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS",
"OUTPUT_UPPER",
"MAX_SHADOW_WIDTH",
"DVMConvertationOptions",
"SaveModifications"
));
addSeparator();
add((Global.mainModule.getDb()).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add((Global.mainModule.getDb()).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add((Global.mainModule.getDb()).settings.get(SettingName.GCOVLimit).getMenuItem());
add( Global.mainModule.getProject().sapforProperties.getMenuItem("TRANSLATE_MESSAGES"));
add( Global.mainModule.getProject().sapforProperties.getMenuItem("DEBUG_PRINT_ON"));
add( Global.mainModule.getProject().sapforProperties.getMenuItem("GCOVLimit"));
}
public void ShowLanguage() {
mLanguage.setText("Язык: " + Global.mainModule.getProject().languageName.getDescription());

12
src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
View File

@@ -1,20 +1,20 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Properties;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
import javax.swing.*;
public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... properties) {
public PropertiesSubmenu(String title, String icon, Properties properties, String... names) {
super(title);
if (icon != null)
setIcon(Utils_.getIcon(icon));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
addProperties(properties);
addProperties(properties, names);
}
public void addProperties(String... properties) {
for (String name : properties)
add(Global.properties.getMenuItem(name));
public void addProperties(Properties properties, String... names) {
for (String name : names)
add(properties.getMenuItem(name));
}
}

19
src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
View File

@@ -1,19 +0,0 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
public class SettingsSubmenu extends JMenu {
public SettingsSubmenu(String title, String icon, SettingName... settings) {
super(title);
if (icon != null)
setIcon(Utils_.getIcon(icon));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add((Global.mainModule.getDb()).settings.get(c).getMenuItem());
}
}
}

1
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;

1
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.Tables.DataTable;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;

1
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.FormWithSplitters;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.FilesTree;

1
src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;

1
src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
import java.util.Arrays;

2
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.MainModule_;
import Common.Visual.FormWithSplitters;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;

1
src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;