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

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,