From 277de7efe06a55489c0e46b56bd46f784cbf657b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 22:59:55 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D1=82=D0=B5=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D1=8B=D0=BC=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=B7=D0=B7=D0=B0=D1=80=D0=B5=D0=B3=D0=BD=D1=83=D1=82=D1=8B?=
 =?UTF-8?q?=D0=BC=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 ++---
 .../UI/Menus_2023/MainMenuBar/MainWindow.java |  4 +-
 src/Visual_DVM_2021/UI/Main/CallbackForm.java |  4 +-
 src/Visual_DVM_2021/UI/Main/MainForm.java     | 39 ++++++++-----------
 4 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cd6177b..df5c4ab3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,9 @@
   <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/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.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$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
index f42213d4..619eeca9 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
@@ -15,9 +15,7 @@ public interface MainWindow {
     void FocusCallback();
     void FocusTests();
     void FocusTesting();
-
-    void ShowTestingTab();
-    void HideTestingTab();
+    void SwitchTestingTabs(boolean flag);
     //-
     void ShowCredentials();
     void ShowCheckedTestsCount();
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 298b9a3e..974caecf 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -359,7 +359,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     public void EnableBugreports() {
         UI.Clear(accountPanel);
         accountPanel.add(SC10);
-        UI.getMainWindow().ShowTestingTab();
+        UI.getMainWindow().SwitchTestingTabs(true);
     }
     @Override
     public void setUserRights() {
@@ -393,7 +393,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
             case Undefined:
                 UI.Clear(accountPanel);
                 accountPanel.add(new CallbackWelcomeForm().content);
-                UI.getMainWindow().HideTestingTab();
+                UI.getMainWindow().SwitchTestingTabs(false);
                 break;
             case User:
                 //видит только свои баги.
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index e3e72f79..9b7d2df2 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -29,7 +29,6 @@ public class MainForm extends Form implements MainWindow {
     private JPanel Content;
     private JTabbedPane globalTabs;
     private JPanel mainPanel;
-
     @Override
     protected JPanel getMainPanel() {
         return Content;
@@ -60,7 +59,7 @@ public class MainForm extends Form implements MainWindow {
         SaveTestsPanel();
         SaveTestingPanel();
         //--
-        if (UI.debugWindow!=null)
+        if (UI.debugWindow != null)
             ((FormWithSplitters) UI.debugWindow).SaveSplitters();
         //--
         Global.FinishApplication();
@@ -138,20 +137,10 @@ public class MainForm extends Form implements MainWindow {
     }
     private void InstallTestingPanel() {
         testingForm = new TestingForm();
-        ShowTestingTab();
-    }
-    @Override
-    public void ShowTestingTab() {
-        if (globalTabs.getTabCount() < 5)
-            globalTabs.insertTab("Тестирование",
-                    Utils.getIcon("/icons/Session.png"),
-                    testingForm.getContent(),
-                    "Система тестирования", 4);
-    }
-    @Override
-    public void HideTestingTab() {
-        if (globalTabs.getTabCount() == 5)
-            globalTabs.removeTabAt(4);
+        globalTabs.insertTab("Тестирование",
+                Utils.getIcon("/icons/Session.png"),
+                testingForm.getContent(),
+                "Система тестирования", 4);
     }
     @Override
     public void ShowCredentials() {
@@ -162,19 +151,17 @@ public class MainForm extends Form implements MainWindow {
             if (Current.HasUser()) {
                 res = Current.getUser().login + res;
             } else res = "?" + res;
-            /*
+
             if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
-                testingTabs.setTitleAt(3, "DVM система: " + Current.getCompiler().description);
+                res += "DVM система: " + Current.getCompiler().description;
             } else {
-                testingTabs.setTitleAt(3, "DVM система: ?");
+                res += "DVM система: ?";
             }
-             */
-        /*д
         } else {
             res += "?@?";
         }
         globalTabs.setTitleAt(2, res);
-    */
+        */
     }
     @Override
     public void ShowCheckedTestsCount() {
@@ -183,7 +170,7 @@ public class MainForm extends Form implements MainWindow {
             Vector<Test> selected_tests = new Vector<>();
             Vector<Test> group_tests = new Vector<>();
             for (Test test : Global.testingServer.db.tests.Data.values()) {
-                if (test.group_id==group.id) {
+                if (test.group_id == group.id) {
                     if (test.isSelected())
                         selected_tests.add(test);
                     else
@@ -248,6 +235,12 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.setSelectedIndex(4);
     }
     @Override
+    public void SwitchTestingTabs(boolean flag) {
+        globalTabs.setEnabledAt(2, flag);
+        globalTabs.setEnabledAt(3, flag);
+        globalTabs.setEnabledAt(4, flag);
+    }
+    @Override
     public TestingWindow getTestingWindow() {
         return testingForm;
     }