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-10 22:22:23 +03:00
parent 10a4ebfe43
commit 0b7b793571
11 changed files with 78 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/_VisualDVM/Visual/Menus/MainMenuBar/VersionsComparisonMenu.java Normal file
View File

@@ -0,0 +1,19 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class VersionsComparisonMenu extends SettingsSubmenu {
public VersionsComparisonMenu() {
super("Сравнение версий", null);
String[] propertiesNames = new String[]{
"RegisterOn",
"SpacesOn",
"EmptyLinesOn",
"FortranWrapsOn",
"ExtensionsOn",
"ComparsionDiffMergeOn",
};
for (String name : propertiesNames) {
Global.properties.addFlagMenuItem(this, name);
}
}
}

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

@@ -4,6 +4,7 @@ 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 {
@@ -27,14 +28,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
));
}
add(new SynchronizationSettingsMenu());
add(new SettingsSubmenu("Сравнение", null,
SettingName.ExtensionsOn,
SettingName.RegisterOn,
SettingName.SpacesOn,
SettingName.EmptyLinesOn,
SettingName.FortranWrapsOn,
SettingName.ComparsionDiffMergeOn
));
add(new VersionsComparisonMenu());
add((Global.mainModule.getDb()).settings.get(SettingName.Workspace).getMenuItem());
add((Global.mainModule.getDb()).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
}

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

@@ -81,10 +81,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = (Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = (Global.properties.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.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (Global.properties.ComparsionDiffMergeOn) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -154,7 +154,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.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (Global.properties.ExtensionsOn) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_name)) {
cbFile.setSelectedIndex(i);

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

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

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

@@ -28,10 +28,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = (Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = (Global.properties.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.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (Global.properties.ComparsionDiffMergeOn) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -82,7 +82,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.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (Global.properties.ExtensionsOn) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
@@ -105,6 +105,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return (Global.mainModule.getDb()).settings.get(SettingName.FortranWrapsOn).toBoolean();
return Global.properties.FortranWrapsOn;
}
}