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

Сворачивание левой панели графов файла

Browse Source
This commit is contained in:
02090095
2024-03-17 01:55:10 +03:00
parent 4e611e4333
commit 2a2000147c
15 changed files with 216 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/GlobalProperties.java
View File

@@ -96,6 +96,8 @@ public class GlobalProperties extends Properties {
public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
@Expose
public boolean collapseCredentials=false;
@Expose
public boolean collapseFileGraphs = false;
//-
@Override
public File getFile() {

7
src/Common/UI/Menus_2023/ECButtonPosition.java Normal file
View File

@@ -0,0 +1,7 @@
package Common.UI.Menus_2023;
public enum ECButtonPosition {
Up,
Down,
Left,
Right
}

51
src/Common/UI/Menus_2023/ExpandCollapseButton.java Normal file
View File

@@ -0,0 +1,51 @@
package Common.UI.Menus_2023;
public class ExpandCollapseButton extends MenuBarButton {
protected String description;
protected ECButtonPosition position;
public ExpandCollapseButton(String description_in, ECButtonPosition position_in) {
description = description_in;
position = position_in;
Switch(true);
}
public void Switch(boolean flag) {
String prefix = "?";
String icon_name = "Help";
if (flag) {
prefix = "Развернуть";
switch (position) {
case Up:
icon_name = "ExpandUp";
break;
case Down:
icon_name = "CollapseDown";
break;
case Left:
icon_name = "SilwerArrowLeft";
break;
case Right:
icon_name = "SilwerArrowRight";
break;
}
} else {
prefix = "Свернуть";
switch (position) {
case Up:
icon_name = "ExpandDown";
break;
case Down:
icon_name = "CollapseUp";
break;
case Left:
icon_name = "SilwerArrowRight";
break;
case Right:
icon_name = "SilwerArrowLeft";
break;
}
}
setToolTipText(prefix + " " + description);
setIcon("/icons/" + icon_name + ".png");
revalidate();
repaint();
}
}

12
src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java
View File

@@ -1,6 +1,10 @@
package Common.UI.Menus_2023.FileMenuBar;
import Common.Current;
import Common.UI.Menus_2023.ECButtonPosition;
import Common.UI.Menus_2023.ExpandCollapseButton;
import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import ProjectData.Files.UI.Editor.SPFEditor;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -8,6 +12,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
import java.awt.*;
public class FileMenuBar extends VisualiserMenuBar {
public ExpandCollapseButton LeftECButton;
public JSpinner sToGo;
JLabel LineCountLabel;
public JLabel CurrentSymbolLabel;
@@ -15,6 +20,13 @@ public class FileMenuBar extends VisualiserMenuBar {
FileSettingsMenu fileSettingsMenu;
public FileMenuBar(SPFEditor editor_in) {
editor = editor_in;
add(LeftECButton = new ExpandCollapseButton("область графов файла", ECButtonPosition.Left) {
{
addActionListener(e -> {
Current.getFile().form.SwitchGraphs();
});
}
});
add(new MenuBarButton() {
{
setToolTipText("Поиск(Ctrl+F)");

7
src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
View File

@@ -1,4 +1,5 @@
package Common.UI.Menus_2023.MainMenuBar;
import Common.Current;
import Common.Global;
import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar;
@@ -52,18 +53,18 @@ public class MainMenuBar extends VisualiserMenuBar {
//-
setPreferredSize(new Dimension(0, 30));
//---
/*
/*
add(new MenuBarButton() {
{
setIcon("/icons/Apply.png");
setToolTipText("Test");
addActionListener(e -> {
// Pass_2021.passes.get(PassCode_2021.TestPass).Do();
UI.getMainWindow().getTestingWindow().SwitchCredentials(false);
Current.getFile().form.SwitchGraphs(false);
});
}
});
*/
*/
//---
ShowProject(false);
}

67
src/Common/UI/UI.java
View File

@@ -3,31 +3,11 @@ import Common.Current;
import Common.Database.DataSet;
import Common.Global;
import Common.UI.Menus_2023.CredentialsBar.CredentialsBar;
import Repository.BugReport.BugReportsMenuBar;
import GlobalData.Compiler.CompilersMenuBar;
import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import Common.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
import TestingSystem.Common.Group.GroupsMenuBar;
import GlobalData.Machine.MachinesMenuBar;
import Common.UI.Menus_2023.FileMenuBar.FileMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainWindow;
import GlobalData.Makefile.MakefilesMenuBar;
import GlobalData.Module.ModulesMenuBar;
import GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsMenuBar;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import Repository.Subscribes.SubscribersMenuBar;
import TestingSystem.Common.TestingBar;
import TestingSystem.Common.Test.TestsMenuBar;
import GlobalData.User.UsersMenuBar;
import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
import Common.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
import Common.UI.Tables.*;
@@ -38,31 +18,34 @@ import Common.UI.Windows.FormType;
import Common.UI.Windows.SearchReplaceForm;
import Common.Utils.Utils;
import GlobalData.Compiler.CompilersDBTable;
import GlobalData.Compiler.CompilersMenuBar;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import GlobalData.Machine.MachinesDBTable;
import GlobalData.Machine.MachinesMenuBar;
import GlobalData.Makefile.MakefilesDBTable;
import GlobalData.Makefile.MakefilesMenuBar;
import GlobalData.Module.ModulesDBTable;
import GlobalData.Module.ModulesMenuBar;
import GlobalData.RemoteFile.UI.RemoteFileChooser;
import GlobalData.RemoteFile.UI.RemoteFileRenderer;
import GlobalData.RunConfiguration.RunConfigurationsDBTable;
import GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import GlobalData.SapforProfile.SapforProfilesDBTable;
import GlobalData.Settings.SettingName;
import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import GlobalData.User.UsersMenuBar;
import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer;
import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import ProjectData.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -72,18 +55,39 @@ import ProjectData.SapforData.Regions.RegionsSet;
import ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable;
import Repository.BugReport.BugReportsMenuBar;
import Repository.Component.UI.ComponentsForm;
import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import Repository.Subscribes.SubscribersMenuBar;
import Repository.Subscribes.SubsribersDBTable;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.Common.Group.GroupsMenuBar;
import TestingSystem.Common.Test.TestDBTable;
import TestingSystem.Common.Test.TestsMenuBar;
import TestingSystem.Common.TestingBar;
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsMenuBar;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.UI.Interface.DebugWindow;
import Visual_DVM_2021.UI.Interface.VersionsWindow;
import Visual_DVM_2021.UI.Main.*;
import Visual_DVM_2021.UI.Main.DebugForm;
import Visual_DVM_2021.UI.Main.MainForm;
import Visual_DVM_2021.UI.Main.ProfilesForm;
import Visual_DVM_2021.UI.Main.VersionsForm;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
@@ -108,6 +112,7 @@ public class UI {
public static MainMenuBar mainMenuBar = null;
public static TestingBar testingBar = null;
public static CredentialsBar credentialsBar = null;
public static FileMenuBar fileMenuBar = null;
public static VersionsMenuBar versionsMenuBar = null;
public static FastAccessMenuBar fastAccessMenuBar = null;
//------------