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

This commit is contained in:
2024-03-17 01:55:10 +03:00
parent 4e611e4333
commit 2a2000147c
15 changed files with 216 additions and 83 deletions

17
.idea/workspace.xml generated
View File

@@ -7,10 +7,21 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ECButtonPosition.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ExpandCollapseButton.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/SilwerArrowLeft.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/SilwerArrowRight.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FileWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FileWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.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" />
@@ -32,8 +43,8 @@
<list> <list>
<option value="FxmlFile" /> <option value="FxmlFile" />
<option value="Interface" /> <option value="Interface" />
<option value="Enum" />
<option value="Class" /> <option value="Class" />
<option value="Enum" />
</list> </list>
</option> </option>
</component> </component>

View File

@@ -34,5 +34,6 @@
"AutoCheckTesting": false, "AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false, "EmailOnTestingProgress": false,
"collapseCredentials": true "collapseCredentials": true,
"collapseFileGraphs": false
} }

View File

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

View File

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

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();
}
}

View File

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

View File

@@ -1,4 +1,5 @@
package Common.UI.Menus_2023.MainMenuBar; package Common.UI.Menus_2023.MainMenuBar;
import Common.Current;
import Common.Global; import Common.Global;
import Common.UI.Menus_2023.MenuBarButton; import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar; import Common.UI.Menus_2023.VisualiserMenuBar;
@@ -59,7 +60,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setToolTipText("Test"); setToolTipText("Test");
addActionListener(e -> { addActionListener(e -> {
// Pass_2021.passes.get(PassCode_2021.TestPass).Do(); // Pass_2021.passes.get(PassCode_2021.TestPass).Do();
UI.getMainWindow().getTestingWindow().SwitchCredentials(false); Current.getFile().form.SwitchGraphs(false);
}); });
} }
}); });

View File

@@ -3,31 +3,11 @@ import Common.Current;
import Common.Database.DataSet; import Common.Database.DataSet;
import Common.Global; import Common.Global;
import Common.UI.Menus_2023.CredentialsBar.CredentialsBar; 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 Common.UI.Menus_2023.DataMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import Common.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar; import Common.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
import TestingSystem.Common.Group.GroupsMenuBar; import Common.UI.Menus_2023.FileMenuBar.FileMenuBar;
import GlobalData.Machine.MachinesMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainMenuBar; import Common.UI.Menus_2023.MainMenuBar.MainMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainWindow; 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.VariantsMenuBar.VariantsMenuBar;
import Common.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar; import Common.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
import Common.UI.Tables.*; import Common.UI.Tables.*;
@@ -38,31 +18,34 @@ import Common.UI.Windows.FormType;
import Common.UI.Windows.SearchReplaceForm; import Common.UI.Windows.SearchReplaceForm;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Compiler.CompilersDBTable; import GlobalData.Compiler.CompilersDBTable;
import GlobalData.Compiler.CompilersMenuBar;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor; import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer; import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer; import GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor; import GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer; import GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import GlobalData.DVMParameter.DVMParameterDBTable; import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable; import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import GlobalData.Machine.MachinesDBTable; import GlobalData.Machine.MachinesDBTable;
import GlobalData.Machine.MachinesMenuBar;
import GlobalData.Makefile.MakefilesDBTable; import GlobalData.Makefile.MakefilesDBTable;
import GlobalData.Makefile.MakefilesMenuBar;
import GlobalData.Module.ModulesDBTable; import GlobalData.Module.ModulesDBTable;
import GlobalData.Module.ModulesMenuBar;
import GlobalData.RemoteFile.UI.RemoteFileChooser; import GlobalData.RemoteFile.UI.RemoteFileChooser;
import GlobalData.RemoteFile.UI.RemoteFileRenderer; import GlobalData.RemoteFile.UI.RemoteFileRenderer;
import GlobalData.RunConfiguration.RunConfigurationsDBTable; import GlobalData.RunConfiguration.RunConfigurationsDBTable;
import GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import GlobalData.SapforProfile.SapforProfilesDBTable; import GlobalData.SapforProfile.SapforProfilesDBTable;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable; import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable; import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable; import GlobalData.User.UsersDBTable;
import GlobalData.User.UsersMenuBar;
import ProjectData.DBArray.ArraysDBTable; import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer; 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.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet; import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer; 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.UI.VariantRankRenderer;
import ProjectData.SapforData.Variants.VariantsSet; import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable; import Repository.BugReport.BugReportsDBTable;
import Repository.BugReport.BugReportsMenuBar;
import Repository.Component.UI.ComponentsForm; import Repository.Component.UI.ComponentsForm;
import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import Repository.Subscribes.SubscribersMenuBar;
import Repository.Subscribes.SubsribersDBTable; 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.GroupsDBTable;
import TestingSystem.Common.Group.GroupsMenuBar;
import TestingSystem.Common.Test.TestDBTable; 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.Passes.PassCode_2021;
import Visual_DVM_2021.UI.Interface.DebugWindow; import Visual_DVM_2021.UI.Interface.DebugWindow;
import Visual_DVM_2021.UI.Interface.VersionsWindow; 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.Accessible;
import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleContext;
@@ -108,6 +112,7 @@ public class UI {
public static MainMenuBar mainMenuBar = null; public static MainMenuBar mainMenuBar = null;
public static TestingBar testingBar = null; public static TestingBar testingBar = null;
public static CredentialsBar credentialsBar = null; public static CredentialsBar credentialsBar = null;
public static FileMenuBar fileMenuBar = null;
public static VersionsMenuBar versionsMenuBar = null; public static VersionsMenuBar versionsMenuBar = null;
public static FastAccessMenuBar fastAccessMenuBar = null; public static FastAccessMenuBar fastAccessMenuBar = null;
//------------ //------------

View File

@@ -58,4 +58,8 @@ public interface FileWindow extends VisualizerForm{
void ShowErrorsCount(); void ShowErrorsCount();
void ShowNotesCount(); void ShowNotesCount();
void ShowRecommendationsCount(); void ShowRecommendationsCount();
//--
void CollapseGraphs();
void ExpandGraphs();
void SwitchGraphs();
} }

View File

@@ -66,7 +66,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
private TreeForm arraysForm; private TreeForm arraysForm;
//- //-
private SPFEditor Body = null; //времянка? не очень красиво. private SPFEditor Body = null; //времянка? не очень красиво.
FileMenuBar menuBar = null;
//- //-
public FileForm(DBProjectFile file_in) { public FileForm(DBProjectFile file_in) {
LoadSplitters(); LoadSplitters();
@@ -90,13 +89,17 @@ public class FileForm implements FileWindow, FormWithSplitters {
ShowGCOVLog(); ShowGCOVLog();
ShowAllAnalyses(); ShowAllAnalyses();
Body.addCaretListener(ce -> ShowCaretInfo()); Body.addCaretListener(ce -> ShowCaretInfo());
editorPanel.add(menuBar = new FileMenuBar(Body), BorderLayout.NORTH); editorPanel.add(UI.fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
ShowCaretInfo(); ShowCaretInfo();
Body.requestFocus(); Body.requestFocus();
RefreshTabsNames(); RefreshTabsNames();
menuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) menuBar.sToGo.getValue())); UI.fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) UI.fileMenuBar.sToGo.getValue()));
ShowProperties(); ShowProperties();
Pass_2021.passes.get(PassCode_2021.Save).setControlsEnabled(false); Pass_2021.passes.get(PassCode_2021.Save).setControlsEnabled(false);
//-
UI.fileMenuBar.LeftECButton.Switch(Global.properties.collapseFileGraphs);
if (Global.properties.collapseFileGraphs)
CollapseGraphs();
} }
@Override @Override
public void ShowLanguage() { public void ShowLanguage() {
@@ -116,11 +119,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
Body.setSyntaxEditingStyle(file.languageName.getStyleKey()); Body.setSyntaxEditingStyle(file.languageName.getStyleKey());
Body.setCodeFoldingEnabled(true); Body.setCodeFoldingEnabled(true);
Body.switching_language = false; Body.switching_language = false;
menuBar.ShowLanguage(); UI.fileMenuBar.ShowLanguage();
} }
@Override @Override
public void ShowType() { public void ShowType() {
menuBar.ShowType(); UI.fileMenuBar.ShowType();
} }
@Override @Override
public void ShowStyle() { public void ShowStyle() {
@@ -143,7 +146,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
} }
Body.switching_language = false; Body.switching_language = false;
menuBar.ShowStyle(); UI.fileMenuBar.ShowStyle();
} }
@Override @Override
public SPFEditorInterface getEditor() { public SPFEditorInterface getEditor() {
@@ -295,12 +298,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
int new_current_line = Body.getCurrentLine(); int new_current_line = Body.getCurrentLine();
boolean line_changed = (new_current_line != current_file_line); boolean line_changed = (new_current_line != current_file_line);
current_file_line = new_current_line; current_file_line = new_current_line;
menuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line, UI.fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
1, Body.getLineCount(), 1 1, Body.getLineCount(), 1
)); ));
//- //-
menuBar.ShowLinesCount(); UI.fileMenuBar.ShowLinesCount();
menuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol())); UI.fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
//если выделяем строку из графа, то тоже надо отключиьт события. //если выделяем строку из графа, то тоже надо отключиьт события.
//чтобы по ней не начался поиск. //чтобы по ней не начался поиск.
if (events_on && line_changed) { if (events_on && line_changed) {
@@ -359,4 +362,32 @@ public class FileForm implements FileWindow, FormWithSplitters {
public JPanel getContent() { public JPanel getContent() {
return content; return content;
} }
//--
@Override
public void CollapseGraphs() {
UI.Clear(graphsBackground);
SC12.setDividerLocation(0);
SC12.setDividerSize(0);
graphsBackground.revalidate();
graphsBackground.repaint();
}
@Override
public void ExpandGraphs() {
UI.Clear(graphsBackground);
graphsBackground.add(graphsTabs);
SC12.setDividerLocation(200);
SC12.setDividerSize(3);
graphsBackground.revalidate();
graphsBackground.repaint();
}
@Override
public void SwitchGraphs() {
if (Global.properties.collapseFileGraphs)
ExpandGraphs();
else
CollapseGraphs();
Global.properties.collapseFileGraphs =!Global.properties.collapseFileGraphs;
Global.properties.Update();
UI.fileMenuBar.LeftECButton.Switch(Global.properties.collapseFileGraphs);
}
} }

View File

@@ -109,9 +109,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
); );
//--->>> //--->>>
RefreshTabsNames(); RefreshTabsNames();
if (Global.properties.collapseCredentials) { if (Global.properties.collapseCredentials)
CollapseCredentials(); CollapseCredentials();
}
//- //-
SC50.setLeftComponent(dvmTestingRunMaster.getContent()); SC50.setLeftComponent(dvmTestingRunMaster.getContent());
SC50.setRightComponent(dvmTestingRunSlave.getContent()); SC50.setRightComponent(dvmTestingRunSlave.getContent());
@@ -258,37 +257,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
sapforPackageTreeMaster.DoComparePass(); sapforPackageTreeMaster.DoComparePass();
testingTabs.setSelectedIndex(3); testingTabs.setSelectedIndex(3);
} }
@Override
public void CollapseCredentials() {
UI.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
//SC71.setEnabled(false);
credentialsPanel.revalidate();
credentialsPanel.repaint();
}
@Override
public void ExpandCredentials() {
UI.Clear(credentialsPanel);
credentialsPanel.add(SC18);
SC71.setDividerLocation(200);
//SC71.setEnabled(true);
SC71.setDividerSize(3);
credentialsPanel.revalidate();
credentialsPanel.repaint();
}
@Override
public void SwitchCredentials(boolean flag) {
if (flag) {
ExpandCredentials();
} else {
CollapseCredentials();
}
Global.properties.collapseCredentials = !flag;
Global.properties.Update();
}
public void RestoreLastCredentials() { public void RestoreLastCredentials() {
Credentials credentials = (Credentials) Current.get(Current.Credentials); Credentials credentials = (Credentials) Current.get(Current.Credentials);
if (credentials.machine_id != Constants.Nan) { if (credentials.machine_id != Constants.Nan) {
@@ -331,4 +299,34 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
} }
} }
} }
@Override
public void CollapseCredentials() {
UI.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
//SC71.setEnabled(false);
credentialsPanel.revalidate();
credentialsPanel.repaint();
}
@Override
public void ExpandCredentials() {
UI.Clear(credentialsPanel);
credentialsPanel.add(SC18);
SC71.setDividerLocation(200);
//SC71.setEnabled(true);
SC71.setDividerSize(3);
credentialsPanel.revalidate();
credentialsPanel.repaint();
}
@Override
public void SwitchCredentials(boolean flag) {
if (flag) {
ExpandCredentials();
} else {
CollapseCredentials();
}
Global.properties.collapseCredentials = !flag;
Global.properties.Update();
}
} }

View File

@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.buffer_"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.buffer_">
<grid id="27dc6" layout-manager="BorderLayout" hgap="0" vgap="0"> <grid id="27dc6" binding="panel1" default-binding="true" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints> <constraints>
<xy x="20" y="20" width="932" height="766"/> <xy x="20" y="20" width="932" height="766"/>
</constraints> </constraints>
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children>
<toolbar id="1582f">
<constraints border-constraint="North"/>
<properties>
<orientation value="1"/>
</properties>
<border type="none"/>
<children/> <children/>
</toolbar>
</children>
</grid> </grid>
</form> </form>

View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import javax.swing.*; import javax.swing.*;
public class buffer_ { public class buffer_ {
private JPanel panel1;
//Скачать пакет задач //Скачать пакет задач
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB