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-20 23:32:24 +03:00
parent 7bfb980d69
commit 34df30fcd5
17 changed files with 101 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/workspace.xml generated
View File

@@ -7,12 +7,23 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.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/Menus_2023/MainMenuBar/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.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/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.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/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,8 +45,8 @@
<list>
<option value="FxmlFile" />
<option value="Interface" />
<option value="Class" />
<option value="Enum" />
<option value="Class" />
</list>
</option>
</component>

6
properties
View File

@@ -35,7 +35,7 @@
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false,
"collapseCredentials": false,
"collapseFileGraphs": true,
"collapseFileMessages": true,
"collapseProjectTrees": true
"collapseFileGraphs": false,
"collapseFileMessages": false,
"collapseProjectTrees": false
}

8
src/Common/GlobalProperties.java
View File

@@ -13,6 +13,14 @@ public class GlobalProperties extends Properties {
return "Запрашивать подтверждения начала выполнения проходов";
case "FocusPassesResult":
return "Переходить на результирующую вкладку проходов по их завершении";
case "collapseCredentials":
return "Свернуть раздел машин";
case "collapseFileGraphs":
return "Свернуть раздел графов файла";
case "collapseFileMessages":
return "Свернуть раздел сообщений файла";
case "collapseProjectTrees":
return "Свернуть раздел деревьев проекта";
default:
return "?";
}

5
src/Common/Properties.java
View File

@@ -1,6 +1,8 @@
package Common;
import Common.UI.Menus_2023.StableMenuItem;
import Common.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.io.File;
@@ -11,8 +13,7 @@ public abstract class Properties {
getFlag(fieldName) ? "/icons/Pick.png" : "/icons/NotPick.png");
//-
menu_item.addActionListener(e -> {
switchFlag(fieldName);
Update();
if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(Utils.getIcon(getFlag(fieldName) ? "/icons/Pick.png" : "/icons/NotPick.png"));
});
menu.add(menu_item);

25
src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
View File

@@ -9,18 +9,12 @@ import javax.swing.*;
public class CredentialsBar extends VisualiserMenuBar {
public MenuBarButton MachineButton;
public MenuBarButton UserButton;
public MenuBarButton ExpandButton;
public CredentialsBar(){
add(MachineButton = new MenuBarButton() {
{
setIcon("/icons/Machine.png");
setFont(VisualiserFonts.TreeBold);
setToolTipText("Текущая машина");
/*
addActionListener(e -> {
UI.getMainWindow().FocusCredentials();
});
*/
}
});
//--
@@ -29,28 +23,9 @@ public class CredentialsBar extends VisualiserMenuBar {
setIcon("/icons/User.png");
setFont(VisualiserFonts.TreeBold);
setToolTipText("Текущий пользователь");
/*
addActionListener(e -> {
UI.getMainWindow().FocusCredentials();
});
*/
}
});
add(new JSeparator());
//--
add(ExpandButton = new MenuBarButton() {
{
setIcon("/icons/ExpandDown.png");
setFont(VisualiserFonts.TreeBold);
setToolTipText("Развернуть");
addActionListener(e -> {
UI.getMainWindow().getTestingWindow().SwitchCredentials(true);
});
}
});
}
public void ShowMachine(){
MachineButton.setText(Current.getMachine().getURL());
}

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

@@ -12,9 +12,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
import java.awt.*;
public class FileMenuBar extends VisualiserMenuBar {
public ExpandCollapseButton LeftECButton;
public ExpandCollapseButton DownECButton;
//--
public JSpinner sToGo;
JLabel LineCountLabel;
public JLabel CurrentSymbolLabel;
@@ -22,20 +19,6 @@ 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(DownECButton = new ExpandCollapseButton("область сообщений файла", ECButtonPosition.Down) {
{
addActionListener(e -> {
Current.getFile().form.SwitchMessages();
});
}
});
add(new MenuBarButton() {
{
setToolTipText("Поиск(Ctrl+F)");

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

@@ -1,10 +1,10 @@
package Common.UI.Menus_2023.MainMenuBar;
import Common.Current;
import Common.Global;
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.Menus_2023.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import Common.UI.UI;
import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -16,7 +16,6 @@ public class MainMenuBar extends VisualiserMenuBar {
JMenu analyses;
JMenu transformations;
MenuBarButton components;
public ExpandCollapseButton RightECButton;
public MainMenuBar() {
addMenus(new LastOpenedProjectsMenu());
addPasses(PassCode_2021.OpenCurrentProject, PassCode_2021.CreateEmptyProject);
@@ -68,13 +67,6 @@ public class MainMenuBar extends VisualiserMenuBar {
}
});
*/
add(RightECButton = new ExpandCollapseButton("область деревьев проекта", ECButtonPosition.Up) {
{
addActionListener(e -> {
UI.getMainWindow().getProjectWindow().SwitchProjectTrees();
});
}
});
//---
ShowProject(false);
}

29
src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java Normal file
View File

@@ -0,0 +1,29 @@
package Common.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
import Common.Current;
import Common.Global;
import Common.UI.Menus_2023.SettingsSubmenu;
import Common.UI.Themes.VisualiserFonts;
import GlobalData.Settings.SettingName;
import javax.swing.*;
public class CompactnessSettingsMenu extends SettingsSubmenu {
public CompactnessSettingsMenu(){
super("Компактность отображения", null,
SettingName.SmallScreen,
SettingName.ShowFullTabsNames,
SettingName.ShowFullArraysDeclarations,
SettingName.FastAccessPassesCount,
SettingName.LastOpenedProjectsCount
);
addSeparator();
String [] propertiesNames = new String[]{
"collapseCredentials",
"collapseProjectTrees",
"collapseFileGraphs",
"collapseFileMessages"
};
for (String name: propertiesNames){
Global.properties.addFlagMenuItem(this, name);
};
}
}

10
src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu.java → src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.MainMenuBar;
package Common.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
import Common.Global;
import Common.UI.Menus.PropertiesSubmenu;
import Common.UI.Menus_2023.SettingsSubmenu;
@@ -13,13 +13,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
"ConfirmPassesStart",
"FocusPassesResult"
));
add(new SettingsSubmenu("Компактность отображения", null,
SettingName.SmallScreen,
SettingName.ShowFullTabsNames,
SettingName.ShowFullArraysDeclarations,
SettingName.FastAccessPassesCount,
SettingName.LastOpenedProjectsCount
));
add(new CompactnessSettingsMenu());
if (Global.isWindows) {
add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.LocalMakePathWindows,

12
src/GlobalData/Compiler/CompilersMenuBar.java
View File

@@ -7,7 +7,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class CompilersMenuBar extends DataMenuBar {
public MenuBarButton CollapseButton;
public CompilersMenuBar() {
super("компиляторы",
PassCode_2021.AddCompiler,
@@ -15,16 +14,5 @@ public class CompilersMenuBar extends DataMenuBar {
PassCode_2021.DeleteCompiler,
PassCode_2021.ShowCompilerVersion,
PassCode_2021.ShowCompilerHelp);
add(new JSeparator());
add(CollapseButton = new MenuBarButton() {
{
setIcon("/icons/CollapseUp.png");
setFont(VisualiserFonts.TreeBold);
setToolTipText("Cвернуть");
addActionListener(e -> {
UI.getMainWindow().getTestingWindow().SwitchCredentials(false);
});
}
});
}
}

36
src/Visual_DVM_2021/Passes/All/UpdateProperty.java
View File

@@ -1,6 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.GlobalProperties;
import Common.UI.UI;
import Visual_DVM_2021.Passes.Pass_2021;
import java.lang.reflect.Field;
@@ -25,4 +27,38 @@ public class UpdateProperty extends Pass_2021<Object> {
field.set(Global.properties, newValue);
Global.properties.Update();
}
@Override
protected void showDone() throws Exception {
switch (name) {
case "collapseCredentials":
if ((boolean) newValue)
UI.getMainWindow().getTestingWindow().CollapseCredentials();
else
UI.getMainWindow().getTestingWindow().ExpandCredentials();
break;
case "collapseProjectTrees":
if (Current.HasProject()) {
if ((boolean) newValue)
UI.getMainWindow().getProjectWindow().CollapseProjectTrees();
else UI.getMainWindow().getProjectWindow().ExpandProjectTrees();
}
break;
case "collapseFileGraphs":
if (Current.HasFile()) {
if ((boolean) newValue)
Current.getFile().form.CollapseGraphs();
else
Current.getFile().form.ExpandGraphs();
}
break;
case "collapseFileMessages":
if (Current.HasFile()) {
if ((boolean) newValue)
Current.getFile().form.CollapseMessages();
else
Current.getFile().form.ExpandMessages();
}
break;
}
}
}

2
src/Visual_DVM_2021/UI/Interface/FileWindow.java
View File

@@ -61,9 +61,7 @@ public interface FileWindow extends VisualizerForm{
//--
void CollapseGraphs();
void ExpandGraphs();
void SwitchGraphs();
//--
void CollapseMessages();
void ExpandMessages();
void SwitchMessages();
}

1
src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
View File

@@ -80,5 +80,4 @@ public interface ProjectWindow {
//--
void CollapseProjectTrees();
void ExpandProjectTrees();
void SwitchProjectTrees();
}

1
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -34,5 +34,4 @@ public interface TestingWindow extends VisualizerForm {
void ShowDVMPackage(DVMPackage master);
void CollapseCredentials();
void ExpandCredentials();
void SwitchCredentials(boolean flag);
}

24
src/Visual_DVM_2021/UI/Main/FileForm.java
View File

@@ -98,11 +98,9 @@ public class FileForm implements FileWindow, FormWithSplitters {
ShowProperties();
Pass_2021.passes.get(PassCode_2021.Save).setControlsEnabled(false);
//-
UI.fileMenuBar.LeftECButton.Switch(Global.properties.collapseFileGraphs);
if (Global.properties.collapseFileGraphs)
CollapseGraphs();
//-
UI.fileMenuBar.DownECButton.Switch(Global.properties.collapseFileMessages);
if (Global.properties.collapseFileMessages)
CollapseMessages();
}
@@ -389,17 +387,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
SC12.updateUI();
}
@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);
}
@Override
public void CollapseMessages() {
UI.Clear(content);
content.add(editorBackground);
@@ -419,15 +406,4 @@ public class FileForm implements FileWindow, FormWithSplitters {
SC1.updateUI();
SC12.updateUI();
}
@Override
public void SwitchMessages() {
if (Global.properties.collapseFileMessages)
ExpandMessages();
else
CollapseMessages();
//---------------
Global.properties.collapseFileMessages =!Global.properties.collapseFileMessages;
Global.properties.Update();
UI.fileMenuBar.DownECButton.Switch(Global.properties.collapseFileMessages);
}
}

13
src/Visual_DVM_2021/UI/Main/ProjectForm.java
View File

@@ -85,9 +85,9 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
SwitchScreen(Global.db.settings.get(SettingName.SmallScreen).toBoolean());
RefreshTabsNames();
//--
UI.mainMenuBar.RightECButton.Switch(Global.properties.collapseProjectTrees);
if (Global.properties.collapseProjectTrees)
CollapseProjectTrees();
//--
}
@Override
public void SaveSplitters() {
@@ -306,15 +306,4 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
projectBackground.add(SC3);
projectBackground.updateUI();
}
@Override
public void SwitchProjectTrees() {
if (Global.properties.collapseProjectTrees)
ExpandProjectTrees();
else
CollapseProjectTrees();
//---------------
Global.properties.collapseProjectTrees =!Global.properties.collapseProjectTrees;
Global.properties.Update();
UI.mainMenuBar.RightECButton.Switch(Global.properties.collapseProjectTrees);
}
}

15
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -135,6 +135,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.db.sapforPackages.mountUI(sapforPackagesPanel);
//--
if (Global.properties.collapseCredentials)
CollapseCredentials();
}
//-
@Override
@@ -305,7 +308,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
//SC71.setEnabled(false);
credentialsPanel.revalidate();
credentialsPanel.repaint();
}
@@ -314,19 +316,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
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();
}
}