From 1b91cff318b62269649ca567b0c95e86847e13f3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Mar 2024 12:32:49 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B2=D0=BE=D1=80=D0=B0=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD?=
 =?UTF-8?q?=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  28 ++++----
 properties                                    |   5 +-
 src/Common/GlobalProperties.java              |   2 +
 .../CredentialsBar/CredentialsBar.java        |  66 ++++++++++++++++++
 .../Menus_2023/MainMenuBar/MainMenuBar.java   |   7 +-
 src/Common/UI/UI.java                         |   3 +
 src/GlobalData/Compiler/CompilersMenuBar.java |  17 +++++
 src/GlobalData/Machine/MachinesDBTable.java   |   5 +-
 src/GlobalData/User/UsersDBTable.java         |   4 +-
 src/Repository/Component/Visualiser.java      |   2 +-
 .../UI/Interface/TestingWindow.java           |   3 +
 src/Visual_DVM_2021/UI/Main/TestingForm.form  |   2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  43 ++++++++++--
 src/icons/CollapseUp.png                      | Bin 0 -> 1414 bytes
 src/icons/ExpandDown.png                      | Bin 0 -> 1570 bytes
 15 files changed, 159 insertions(+), 28 deletions(-)
 create mode 100644 src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
 create mode 100644 src/icons/CollapseUp.png
 create mode 100644 src/icons/ExpandDown.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75e62249..decdc7a8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,21 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/CollapseUp.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/ExpandDown.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" 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/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/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" 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$/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/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" 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" />
@@ -95,7 +99,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -108,10 +112,10 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
diff --git a/properties b/properties
index d5052f4a..436d695a 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserName": "testuser",
   "ServerUserSHHPort": 23,
   "ComponentsServerPort": 7995,
-  "TestingServerPort": 7996,
+  "TestingServerPort": 7998,
   "SocketTimeout": 5000,
   "OldServer": false,
   "SMTPHost": "smtp.mail.ru",
@@ -33,5 +33,6 @@
   "TestingKernels": 28,
   "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
-  "EmailOnTestingProgress": false
+  "EmailOnTestingProgress": false,
+  "collapseCredentials": true
 }
\ No newline at end of file
diff --git a/src/Common/GlobalProperties.java b/src/Common/GlobalProperties.java
index 8f0039f4..6fda955c 100644
--- a/src/Common/GlobalProperties.java
+++ b/src/Common/GlobalProperties.java
@@ -94,6 +94,8 @@ public class GlobalProperties extends Properties {
     public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
     @Expose
     public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
+    @Expose
+    public boolean collapseCredentials=false;
     //-
     @Override
     public File getFile() {
diff --git a/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java b/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
new file mode 100644
index 00000000..f84e073c
--- /dev/null
+++ b/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java
@@ -0,0 +1,66 @@
+package Common.UI.Menus_2023.CredentialsBar;
+import Common.Current;
+import Common.UI.Menus_2023.MenuBarButton;
+import Common.UI.Menus_2023.VisualiserMenuBar;
+import Common.UI.Themes.VisualiserFonts;
+import Common.UI.UI;
+
+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();
+                });
+                 */
+            }
+        });
+        //--
+        add(UserButton = new MenuBarButton() {
+            {
+                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());
+    }
+    public void ShowUser(){
+        UserButton.setText(Current.getUser().login);
+    }
+    public void ShowNoMachine(){
+        MachineButton.setText("?");
+    }
+    public void ShowNoUser(){
+        UserButton.setText("?");
+    }
+}
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index 5bd562fc..d301c013 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -52,17 +52,18 @@ public class MainMenuBar extends VisualiserMenuBar {
         //-
         setPreferredSize(new Dimension(0, 30));
         //---
-/*
+        /*
         add(new MenuBarButton() {
             {
                 setIcon("/icons/Apply.png");
                 setToolTipText("Test");
                 addActionListener(e -> {
-                   Pass_2021.passes.get(PassCode_2021.TestPass).Do();
+                  // Pass_2021.passes.get(PassCode_2021.TestPass).Do();
+                    UI.getMainWindow().getTestingWindow().SwitchCredentials(false);
                 });
             }
         });
- */
+         */
         //---
         ShowProject(false);
     }
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 1473b909..814063d6 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -2,6 +2,7 @@ package Common.UI;
 import Common.Current;
 import Common.Database.DataSet;
 import Common.Global;
+import Common.UI.Menus_2023.CredentialsBar.CredentialsBar;
 import Repository.BugReport.BugReportsMenuBar;
 import GlobalData.Compiler.CompilersMenuBar;
 import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
@@ -106,6 +107,7 @@ public class UI {
     public static MenuElement[] last_menu_path;
     public static MainMenuBar mainMenuBar = null;
     public static TestingBar testingBar = null;
+    public static CredentialsBar credentialsBar = null;
     public static VersionsMenuBar versionsMenuBar = null;
     public static FastAccessMenuBar fastAccessMenuBar = null;
     //------------
@@ -209,6 +211,7 @@ public class UI {
     public static void CreateMenus() {
         mainMenuBar = new MainMenuBar();
         testingBar = new TestingBar();
+        credentialsBar = new CredentialsBar();
         versionsMenuBar = new VersionsMenuBar();
         fastAccessMenuBar = new FastAccessMenuBar();
         //---------------------------------------------------->>
diff --git a/src/GlobalData/Compiler/CompilersMenuBar.java b/src/GlobalData/Compiler/CompilersMenuBar.java
index 98950781..e0b021c5 100644
--- a/src/GlobalData/Compiler/CompilersMenuBar.java
+++ b/src/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,7 +1,13 @@
 package GlobalData.Compiler;
 import Common.UI.Menus_2023.DataMenuBar;
+import Common.UI.Menus_2023.MenuBarButton;
+import Common.UI.Themes.VisualiserFonts;
+import Common.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
+
+import javax.swing.*;
 public class CompilersMenuBar extends DataMenuBar {
+    public MenuBarButton CollapseButton;
     public CompilersMenuBar() {
         super("компиляторы",
                 PassCode_2021.AddCompiler,
@@ -9,5 +15,16 @@ 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);
+                });
+            }
+        });
     }
 }
diff --git a/src/GlobalData/Machine/MachinesDBTable.java b/src/GlobalData/Machine/MachinesDBTable.java
index 1fcadd39..b63e3fe6 100644
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -84,19 +84,18 @@ public class MachinesDBTable extends iDBTable<Machine> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                //UI.testingBar.ShowMachine();
+                UI.credentialsBar.ShowMachine();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                //UI.testingBar.ShowNoMachine();
+                UI.credentialsBar.ShowNoMachine();
             }
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
-
         };
     }
     @Override
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index c9c71a27..5ba7d423 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -77,13 +77,13 @@ public class UsersDBTable extends iDBTable<User> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
               //  UI.getMainWindow().ShowCurrentCompiler();
-             //   UI.testingBar.ShowUser();
+                UI.credentialsBar.ShowUser();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
              //   UI.getMainWindow().ShowCurrentCompiler();
-             //   UI.testingBar.ShowNoUser();
+                UI.credentialsBar.ShowNoUser();
             }
 
         };
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index d25acd02..df360886 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1077;
+        version = 1079;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 4379472d..e951f6e7 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -32,4 +32,7 @@ public interface TestingWindow extends VisualizerForm {
     void CompareSapforPackages(SapforPackage master, SapforPackage slave);
     //-
     void ShowDVMPackage(DVMPackage master);
+    void CollapseCredentials();
+    void ExpandCredentials();
+    void SwitchCredentials(boolean flag);
 }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 37de492c..c15218e9 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -38,7 +38,7 @@
                     </properties>
                     <border type="none"/>
                     <children>
-                      <grid id="f073a" layout-manager="BorderLayout" hgap="0" vgap="0">
+                      <grid id="f073a" binding="credentialsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints>
                           <splitpane position="left"/>
                         </constraints>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 4b42db49..39c11a42 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,9 +1,11 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.UI;
 import GlobalData.Compiler.CompilerType;
+import GlobalData.Credentials.Credentials;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -55,6 +57,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel compilersPanel;
     private JPanel machinesPanel;
     private JPanel usersPanel;
+    private JPanel credentialsPanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -81,6 +84,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         );
         //--->>>
         RefreshTabsNames();
+        if (Global.properties.collapseCredentials) {
+            CollapseCredentials();
+        }
         //-
         SC50.setLeftComponent(dvmTestingRunMaster.getContent());
         SC50.setRightComponent(dvmTestingRunSlave.getContent());
@@ -115,6 +121,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.sapforConfigurations.ShowUI();
         Global.testingServer.db.dvmRunTasks.ShowUI();
         //---
+        RestoreLastCredentials();
+        //---
         if (Global.properties.AutoCheckTesting)
             TestingServer.TimerOn();
     }
@@ -213,7 +221,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         dvmTestingRunMaster.ApplyObject(master);
         dvmTestingRunSlave.ApplyObject(slave);
         dvmTestingRunMaster.DoComparePass(true);
-       // testingTabs.setSelectedIndex(1);
+        // testingTabs.setSelectedIndex(1);
     }
     @Override
     public void CompareSapforPackages(SapforPackage master, SapforPackage slave) {
@@ -222,10 +230,38 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         sapforPackageTreeMaster.DoComparePass();
         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() {
-
         Credentials credentials = (Credentials) Current.get(Current.Credentials);
         if (credentials.machine_id != Constants.Nan) {
             if (Global.db.machines.containsKey(credentials.machine_id)) {
@@ -267,5 +303,4 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
             }
         }
     }
-    */
 }
diff --git a/src/icons/CollapseUp.png b/src/icons/CollapseUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fae3cebc097ea09b5c3d8ccda067e1a6dee3b302
GIT binary patch
literal 1414
zcmV;11$p|3P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000WV@Og>004R=
z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XU000XU0RWnu
z7ytkT3`s;mR7gv8R_jljRTw|-+bcy{N(Z#116oSQK;tMaBwiNcE*UdAn2`A&n9L6*
z{t<rkqu<PoF)l;qoEk1VCPWz*TVQNs86W~HG8UQw1xKM5pWk^o@V2raJUQ?C+@I$>
z=e(89o^6&`4l;yfGRgFMy==ET-*CBH=SxcL4Q7kkuGMM{Bui{;Y^*$AT@6PfOMR=W
z&xUt*6B(^m$0WkOn*;nWNGg@e$g<3;s;aN}8v>tJR8%$=6cjLxMzgPRh-50o;+van
zabaO(Vlw>s-0aMElpl1nd}alq3^OK^$??va^Ix1gRo_}rV5ZC%OQ+LZ4hI4vVI%~8
zJRWBg6XCAGf!{vfif=yG>U2;5Wi%d7CD%?S_cCU4p|7>Iy*ChSd@C<6j~jExSn+ol
zg9Cve#|r)9$IEMN$BJ7bk*9rITU#+v5f6eEney{XTie=ysrUP9WLYr=4gwtk!53Ab
zrKP3z605c7-2D7pXCjf<rb;D^+g(9A61#Zuy>A;Eo8FWplz-SB$ONG^I-QQo)O`Bq
zE1=QHteC(gxr+9v6RPsw-d@J%tLgCj1Mk!15KnOoz$vm5D`<Uv{oq;fkr)6w6o*8D
zjZGg^SNkr(zsBeDYA>|B`?bg8ai}-=FiWKZ8fP{(HpY5;diZ;#+nv=e5TGF$o=vnz
zB=J0c{OFqObe1($Re9@$A_z_dAycE#$i_xT*}b75E+3+GbYz4X3<iek)%v8sgW=g*
zT^)2d%lxw2?P;-C3J(Mz(GEC3fZ^d`HZU;2a9+T(SS)OCaFC4<9~FWpY=jR~X)Ux$
zbj~iw&N5enPNzMx3iK8M`tRIfwY9bE?bD|jO$=*pZf3Q0b*#U?pUa`AwiCX<FDr8e
zWvkU{7Xq~+Di{xkS#NhYtEs7BZI>^ze3OaMMzTCw@m_QCB;TV@D8yT*wpRkltf;8S
zDeLtHgIcIoLMsBnAa_VN0ZY+ffS;!81c$G!t&IgqZXms*eBius|G4aOs{qjfWpprE
zdq)R%h{=;l50FTnp?B~h_ct_f{aha)x=9l9#>V=J2$CBNn+Icn%lCOg4nVHvsR{mK
zvGs_&yc`L=OevRO1RPblnuI)^&ajn#mP7L2^MCck<6C?Tg-{tstZJgGo|3`F1GzfF
zP6UC!&CQJr-C?~l-I!x@b2A}q5)=UOtR`GHMK&ArdcDkME6Q#WO_40)df7kq6cm#+
zJ3BK<of_9To%T#BnTo#p+Ur*^K`@4bVx%a8P<mluAqxZo%xtzOgFpckxpFQ9@P(u=
zC%gT_&8rmT35~E`nwpyYeq{LGEjU7%96VTdMF3io%f~<nz#fSX4gG$D{QjiV=_Q&<
zntRIX$J@6)die0cG%DbVWB_FVI?5g#UK=79z^kVfc92a@OicB3|9q7!6<d6?NFZ%*
zZ*4CvE%qEME;-|HI7-BKLj(eZQviHHa7>?D{u~|;-~Z~`mzSc^wP)mm8ytLoDKjY=
zjmD;@A9d-px{6Y}qYitdY~o?Y0^rD0jmRE*aQANi^&8i}`EYG*Z3Ww)XsUt$WFWnG
z@$dH3)cvlfk);Rp?#j=9rQB#VWVK2V+8m3;GUManKW=t)e$v<5{n^gW&I?h2z)OF3
z?e6aKYoolpvdMSi#5r06Hk-{!85&8pL+ywxE-r*-XP*2@>!0MD-*r@Vjz7l!1K}4T
U!;M<3SO5S307*qoM6N<$f>er%cmMzZ

literal 0
HcmV?d00001

diff --git a/src/icons/ExpandDown.png b/src/icons/ExpandDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..2077df97e9b5e514c021c537e09d54fa7834f0fd
GIT binary patch
literal 1570
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
UT%p_06aWAK07*qoM6N<$f?ea|hyVZp

literal 0
HcmV?d00001