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

no message

Browse Source
This commit is contained in:
02090095
2025-01-18 01:36:02 +03:00
parent 69151dd7a8
commit 18b4d58682
47 changed files with 724 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
});
add(i);
++k;
if (k > Global.properties.LastOpenedProjectsCount)
if (k > Global.normalProperties.LastOpenedProjectsCount)
break;
}
}

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

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

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

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

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

@@ -4,7 +4,7 @@ import _VisualDVM.Visual.Menus.PropertiesSubmenu;
public class CompactnessSettingsMenu extends PropertiesSubmenu {
public CompactnessSettingsMenu() {
super("Компактность отображения", null,
Global.properties,
Global.normalProperties,
"SmallScreen",
"ShowFullArraysDeclarations",
"ShowFullTabsNames",
@@ -12,7 +12,7 @@ public class CompactnessSettingsMenu extends PropertiesSubmenu {
"FastAccessPassesCount");
addSeparator();
addProperties(
Global.properties,
Global.normalProperties,
"collapseProjectTrees",
"collapseFileGraphs",
"collapseFileMessages");

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

@@ -10,7 +10,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
super("Настройки визуализатора", "/Common/icons/Settings.png");
//-
add(new PropertiesSubmenu("Подтверждения и уведомления", null,
Global.properties,
Global.normalProperties,
"ShowPassesDone",
"ConfirmPassesStart",
"FocusPassesResult"
@@ -18,21 +18,21 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
add(new CompactnessSettingsMenu());
if (Utils_.isWindows()) {
add(new PropertiesSubmenu("Компиляция на локальной машине", null,
Global.properties,
Global.normalProperties,
"LocalMakePathWindows",
"Kernels"
));
}else {
add(new PropertiesSubmenu("Компиляция на локальной машине", null,
Global.properties,
Global.normalProperties,
"Kernels"
));
}
add(new SynchronizationSettingsMenu());
add(new VersionsComparisonMenu());
add(Global.properties.getMenuItem("Workspace"));
add(Global.properties.getMenuItem("BugReportsAgeLimit"));
add(Global.normalProperties.getMenuItem("Workspace"));
add(Global.normalProperties.getMenuItem("BugReportsAgeLimit"));
}
}

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

@@ -151,7 +151,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
BugReportCommentAddition.setWrapStyleWord(true);
//----------------------------------------------
//тут развилка на то вкладки или поля.
SwitchScreen(Global.properties.SmallScreen);
SwitchScreen(Global.normalProperties.SmallScreen);
//-
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);

10
src/_VisualDVM/Visual/Windows/ComponentsWindow.java
View File

@@ -14,11 +14,11 @@ public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
}
@Override
public int getDefaultWidth() {
return Global.properties.ComponentsWindowWidth;
return Global.normalProperties.ComponentsWindowWidth;
}
@Override
public int getDefaultHeight() {
return Global.properties.ComponentsWindowHeight;
return Global.normalProperties.ComponentsWindowHeight;
}
@Override
public void CreateButtons() {
@@ -37,8 +37,8 @@ public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
@Override
public void onClose() {
super.onClose();
Global.properties.ComponentsWindowWidth = getWidth();
Global.properties.ComponentsWindowHeight = getHeight();
Global.properties.Update();
Global.normalProperties.ComponentsWindowWidth = getWidth();
Global.normalProperties.ComponentsWindowHeight = getHeight();
Global.normalProperties.Update();
}
}

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

@@ -96,10 +96,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
ShowProperties();
Global.mainModule.getPass(PassCode.Save).setControlsEnabled(false);
//-
if (Global.properties.collapseFileGraphs)
if (Global.normalProperties.collapseFileGraphs)
CollapseGraphs();
//-
if (Global.properties.collapseFileMessages)
if (Global.normalProperties.collapseFileMessages)
CollapseMessages();
}
@Override
@@ -168,33 +168,33 @@ public class FileForm implements FileWindow, FormWithSplitters {
//----
@Override
public void ShowWarningsCount() {
messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
messagesTabs.setTitleAt(1, (Global.normalProperties.ShowFullTabsNames ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
}
@Override
public void ShowErrorsCount() {
messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
}
@Override
public void ShowNotesCount() {
messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
}
@Override
public void ShowRecommendationsCount() {
messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
}
//---
@Override
public void RefreshTabsNames() {
UI.ShowTabsNames(graphsTabs, Global.properties.ShowFullTabsNames );
UI.ShowTabsNames(graphsTabs, Global.normalProperties.ShowFullTabsNames );
//--
ShowNotesCount();
ShowWarningsCount();
ShowErrorsCount();
ShowRecommendationsCount();
//--
messagesTabs.setTitleAt(4, (Global.properties.ShowFullTabsNames ? "Компиляция" : ""));
messagesTabs.setTitleAt(5, (Global.properties.ShowFullTabsNames ? "Запуск" : ""));
messagesTabs.setTitleAt(6, (Global.properties.ShowFullTabsNames ? "Журнал GCOV" : ""));
messagesTabs.setTitleAt(4, (Global.normalProperties.ShowFullTabsNames ? "Компиляция" : ""));
messagesTabs.setTitleAt(5, (Global.normalProperties.ShowFullTabsNames ? "Запуск" : ""));
messagesTabs.setTitleAt(6, (Global.normalProperties.ShowFullTabsNames ? "Журнал GCOV" : ""));
}
@Override
public void FocusCompilationOut() {
@@ -229,10 +229,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
file.father.db.warnings.ClearUI();
file.father.db.errors.ClearUI();
file.father.db.recommendations.ClearUI();
messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames ? "Примечания: " : "") + "-");
messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames ? "Предупреждения: " : "") + "-");
messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames ? "Ошибки: " : "") + "-");
messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames ? "Рекомендации: " : "") + "-");
messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames ? "Примечания: " : "") + "-");
messagesTabs.setTitleAt(1, (Global.normalProperties.ShowFullTabsNames ? "Предупреждения: " : "") + "-");
messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames ? "Ошибки: " : "") + "-");
messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames ? "Рекомендации: " : "") + "-");
}
@Override
public void ShowLoops() {

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

@@ -72,10 +72,10 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
Global.mainModule.getUI().getDebugWindow().ShowAll();
ShowAllAnalyses();
ShowProjectView();
SwitchScreen(Global.properties.SmallScreen);
SwitchScreen(Global.normalProperties.SmallScreen);
RefreshTabsNames();
//--
if (Global.properties.collapseProjectTrees)
if (Global.normalProperties.collapseProjectTrees)
CollapseProjectTrees();
//--
}
@@ -225,7 +225,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void RefreshTabsNames() {
UI.ShowTabsNames(projectTabs, 1, Global.properties.ShowFullTabsNames);
UI.ShowTabsNames(projectTabs, 1, Global.normalProperties.ShowFullTabsNames);
}
@Override
public void RefreshProjectTreeAndMessages() {

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

@@ -80,10 +80,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = (Global.properties.ExtensionsOn);
boolean ExtensionsOn = (Global.normalProperties.ExtensionsOn);
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (Global.properties.ComparsionDiffMergeOn) {
if (Global.normalProperties.ComparsionDiffMergeOn) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -153,7 +153,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (Global.properties.ExtensionsOn) {
if (Global.normalProperties.ExtensionsOn) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_name)) {
cbFile.setSelectedIndex(i);

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

@@ -29,7 +29,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
//в отличие от комбо боксов, тут события нажатия на кнопку, нет.
if (isReady()) {
if (slave.isReady()) {
if (Global.properties.ComparsionDiffMergeOn) {
if (Global.normalProperties.ComparsionDiffMergeOn) {
DoComparePass(true);
} else
DoShowPass(true);
@@ -40,7 +40,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
} else {
if (isReady()) {
if (master.isReady()) {
if (Global.properties.ComparsionDiffMergeOn) {
if (Global.normalProperties.ComparsionDiffMergeOn) {
master.DoComparePass(true);
} else
master.DoShowPass(true);

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

@@ -147,7 +147,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//---
Global.mainModule.getDb().RestoreCredentials();
//---
if (Global.properties.AutoCheckTesting)
if (Global.normalProperties.AutoCheckTesting)
TestingServer.TimerOn();
}
//-

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

@@ -27,10 +27,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = (Global.properties.ExtensionsOn);
boolean ExtensionsOn = (Global.normalProperties.ExtensionsOn);
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (Global.properties.ComparsionDiffMergeOn) {
if (Global.normalProperties.ComparsionDiffMergeOn) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -81,7 +81,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (Global.properties.ExtensionsOn) {
if (Global.normalProperties.ExtensionsOn) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
@@ -104,6 +104,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return Global.properties.FortranWrapsOn;
return Global.normalProperties.FortranWrapsOn;
}
}