кнопка для сворачивания машин, и отмена восстановления меню анализов
This commit is contained in:
9
.idea/workspace.xml
generated
9
.idea/workspace.xml
generated
@@ -8,10 +8,11 @@
|
|||||||
<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 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/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.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" />
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
"SMTPHost": "smtp.mail.ru",
|
"SMTPHost": "smtp.mail.ru",
|
||||||
"SMTPPort": 465,
|
"SMTPPort": 465,
|
||||||
"MailSocketPort": 465,
|
"MailSocketPort": 465,
|
||||||
"collapseCredentials": false,
|
"collapseCredentials": true,
|
||||||
"collapseFileGraphs": true,
|
"collapseFileGraphs": true,
|
||||||
"collapseFileMessages": true,
|
"collapseFileMessages": true,
|
||||||
"collapseProjectTrees": false,
|
"collapseProjectTrees": false,
|
||||||
|
|||||||
@@ -4,12 +4,29 @@ 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.Themes.VisualiserFonts;
|
||||||
import Common.UI.UI;
|
import Common.UI.UI;
|
||||||
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
|
import Visual_DVM_2021.Passes.Pass_2021;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
public class CredentialsBar extends VisualiserMenuBar {
|
public class CredentialsBar extends VisualiserMenuBar {
|
||||||
public MenuBarButton MachineButton;
|
public MenuBarButton MachineButton;
|
||||||
public MenuBarButton UserButton;
|
public MenuBarButton UserButton;
|
||||||
|
MenuBarButton bExpand;
|
||||||
public CredentialsBar(){
|
public CredentialsBar(){
|
||||||
|
this.add(bExpand = new MenuBarButton() {
|
||||||
|
{
|
||||||
|
setIcon("/icons/ExpandDown.png");
|
||||||
|
setToolTipText("Развернуть");
|
||||||
|
addActionListener(new ActionListener() {
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do("collapseCredentials", false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
add(MachineButton = new MenuBarButton() {
|
add(MachineButton = new MenuBarButton() {
|
||||||
{
|
{
|
||||||
setIcon("/icons/Machine.png");
|
setIcon("/icons/Machine.png");
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
|
|||||||
);
|
);
|
||||||
addSeparator();
|
addSeparator();
|
||||||
String [] propertiesNames = new String[]{
|
String [] propertiesNames = new String[]{
|
||||||
"collapseCredentials",
|
// "collapseCredentials",
|
||||||
"collapseProjectTrees",
|
"collapseProjectTrees",
|
||||||
"collapseFileGraphs",
|
"collapseFileGraphs",
|
||||||
"collapseFileMessages"
|
"collapseFileMessages"
|
||||||
|
|||||||
@@ -1,11 +1,29 @@
|
|||||||
package GlobalData.Machine;
|
package GlobalData.Machine;
|
||||||
import Common.UI.Menus_2023.DataMenuBar;
|
import Common.UI.Menus_2023.DataMenuBar;
|
||||||
|
import Common.UI.Menus_2023.MenuBarButton;
|
||||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
|
import Visual_DVM_2021.Passes.Pass_2021;
|
||||||
|
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
public class MachinesMenuBar extends DataMenuBar {
|
public class MachinesMenuBar extends DataMenuBar {
|
||||||
|
MenuBarButton bCollapse;
|
||||||
public MachinesMenuBar() {
|
public MachinesMenuBar() {
|
||||||
super("машины",
|
super("машины",
|
||||||
PassCode_2021.AddMachine,
|
PassCode_2021.AddMachine,
|
||||||
PassCode_2021.EditMachine,
|
PassCode_2021.EditMachine,
|
||||||
PassCode_2021.DeleteMachine);
|
PassCode_2021.DeleteMachine);
|
||||||
|
this.add(bCollapse = new MenuBarButton() {
|
||||||
|
{
|
||||||
|
setIcon("/icons/CollapseUp.png");
|
||||||
|
setToolTipText("Свернуть");
|
||||||
|
addActionListener(new ActionListener() {
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do("collapseCredentials", true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Common.Current;
|
|||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.UI.DebugPrintLevel;
|
import Common.UI.DebugPrintLevel;
|
||||||
import Common.UI.Menus_2023.PassControl;
|
import Common.UI.Menus_2023.PassControl;
|
||||||
|
import Common.UI.Menus_2023.PassMenuItem;
|
||||||
import Common.UI.UI;
|
import Common.UI.UI;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -165,4 +166,10 @@ public class SapforAnalysis extends SapforPass {
|
|||||||
if (!asDonePhase)
|
if (!asDonePhase)
|
||||||
super.showFinish();
|
super.showFinish();
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public JMenuItem createMenuItem() {
|
||||||
|
if (menuItem == null)
|
||||||
|
menuItem = new PassMenuItem(this);
|
||||||
|
return menuItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user