From 002867274f4f7c3b8a20e8a323c73394e69f78ab Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 3 Apr 2024 01:12:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B2=D0=BE=D1=80=D0=B0=D1=87=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD,=20?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE?=
 =?UTF-8?q?=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B0=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            |  9 +++++----
 properties                                     |  2 +-
 .../CredentialsBar/CredentialsBar.java         | 17 +++++++++++++++++
 .../CompactnessSettingsMenu.java               |  2 +-
 src/GlobalData/Machine/MachinesMenuBar.java    | 18 ++++++++++++++++++
 src/Visual_DVM_2021/Passes/SapforAnalysis.java |  7 +++++++
 6 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index af162bf7..2755b347 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,11 @@
   <component name="ChangeListManager">
     <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$/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$/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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/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/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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 14b2caef..d153c9ee 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": false,
+  "collapseCredentials": true,
   "collapseFileGraphs": true,
   "collapseFileMessages": true,
   "collapseProjectTrees": false,
diff --git a/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java b/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
index 9c42cbdd..b53dfc02 100644
--- a/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
+++ b/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
@@ -4,12 +4,29 @@ import Common.UI.Menus_2023.MenuBarButton;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.Themes.VisualiserFonts;
 import Common.UI.UI;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
 
 import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 public class CredentialsBar extends VisualiserMenuBar {
     public MenuBarButton MachineButton;
     public MenuBarButton UserButton;
+    MenuBarButton bExpand;
     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() {
             {
                 setIcon("/icons/Machine.png");
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index 609c0eed..6e0f74af 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -17,7 +17,7 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
         );
         addSeparator();
         String [] propertiesNames = new String[]{
-                "collapseCredentials",
+            //    "collapseCredentials",
                 "collapseProjectTrees",
                 "collapseFileGraphs",
                 "collapseFileMessages"
diff --git a/src/GlobalData/Machine/MachinesMenuBar.java b/src/GlobalData/Machine/MachinesMenuBar.java
index c4594d4a..3f5cfe42 100644
--- a/src/GlobalData/Machine/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,11 +1,29 @@
 package GlobalData.Machine;
 import Common.UI.Menus_2023.DataMenuBar;
+import Common.UI.Menus_2023.MenuBarButton;
 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 {
+    MenuBarButton bCollapse;
     public MachinesMenuBar() {
         super("машины",
                 PassCode_2021.AddMachine,
                 PassCode_2021.EditMachine,
                 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);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index 8f8c0b3e..28ebbb31 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -3,6 +3,7 @@ import Common.Current;
 import Common.Global;
 import Common.UI.DebugPrintLevel;
 import Common.UI.Menus_2023.PassControl;
+import Common.UI.Menus_2023.PassMenuItem;
 import Common.UI.UI;
 
 import javax.swing.*;
@@ -165,4 +166,10 @@ public class SapforAnalysis extends SapforPass {
         if (!asDonePhase)
             super.showFinish();
     }
+    @Override
+    public JMenuItem createMenuItem() {
+        if (menuItem == null)
+            menuItem = new PassMenuItem(this);
+        return menuItem;
+    }
 }