diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 087750d7..e7a9e933 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,10 @@ + - - - - - - - - - - - - + + diff --git a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java index b5407024..9b092268 100644 --- a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java +++ b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java @@ -1,51 +1,8 @@ package Common.UI.Menus_2023.TasksPackagesMenuBar; -import Common.Current; import Common.UI.Menus_2023.DataMenuBar; -import Common.UI.Menus_2023.MenuBarButton; -import Common.UI.Themes.VisualiserFonts; -import Common.UI.UI; -import Common.Utils.Utils; -import TestingSystem.TestingServer; import Visual_DVM_2021.Passes.PassCode_2021; - -import javax.swing.*; -import java.awt.*; public class TasksPackagesMenuBar extends DataMenuBar { - JButton autorefreshButton; - JSpinner sCheckTime; public TasksPackagesMenuBar() { - super("пакеты задач", PassCode_2021.SynchronizeTestsTasks, PassCode_2021.AbortSelectedPackages); - add(autorefreshButton = new MenuBarButton() { - { - setText("проверка раз в"); - setToolTipText("автоматическое обновление состояния пакета задач"); - Mark(); - addActionListener(e -> { - TestingServer.checkTasks = !TestingServer.checkTasks; - TestingServer.switchTimer(TestingServer.checkTasks); - Mark(); - }); - } - public void Mark() { - setIcon(Utils.getIcon(TestingServer.checkTasks ? "/icons/Pick.png" : "/icons/NotPick.png")); - } - }); - add(sCheckTime = new JSpinner()); - sCheckTime.setPreferredSize(new Dimension(60, 26)); - sCheckTime.setMaximumSize(new Dimension(60, 26)); - sCheckTime.setModel(new SpinnerNumberModel(TestingServer.checkIntervalSecond, 10, 3600, 1)); - UI.MakeSpinnerRapid(sCheckTime, e -> { - TestingServer.checkIntervalSecond = (int) sCheckTime.getValue(); - if (TestingServer.checkTasks) TestingServer.ResetTimer(); - }); - add(new JLabel(" сек") { - { - setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); - } - }); - } - - public void ShowAutorefresh() { - autorefreshButton.setIcon(Utils.getIcon(TestingServer.checkTasks ? "/icons/Pick.png" : "/icons/NotPick.png")); + super("пакеты задач", PassCode_2021.AbortSelectedPackages); } } diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java new file mode 100644 index 00000000..4c955ce4 --- /dev/null +++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java @@ -0,0 +1,50 @@ +package Common.UI.Menus_2023.TestingBar; +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 Common.Utils.Utils; +import TestingSystem.TestingServer; +import Visual_DVM_2021.Passes.PassCode_2021; + +import javax.swing.*; +import java.awt.*; +public class TestingBar extends VisualiserMenuBar { + JButton autorefreshButton; + JSpinner sCheckTime; + public TestingBar() { + addPasses(PassCode_2021.SynchronizeTestsTasks); + add(autorefreshButton = new MenuBarButton() { + { + setText("проверка раз в"); + setToolTipText("автоматическое обновление состояния пакета задач"); + Mark(); + addActionListener(e -> { + TestingServer.checkTasks = !TestingServer.checkTasks; + TestingServer.switchTimer(TestingServer.checkTasks); + Mark(); + }); + } + public void Mark() { + setIcon(Utils.getIcon(TestingServer.checkTasks ? "/icons/Pick.png" : "/icons/NotPick.png")); + } + }); + add(sCheckTime = new JSpinner()); + sCheckTime.setPreferredSize(new Dimension(60, 26)); + sCheckTime.setMaximumSize(new Dimension(60, 26)); + sCheckTime.setModel(new SpinnerNumberModel(TestingServer.checkIntervalSecond, 10, 3600, 1)); + UI.MakeSpinnerRapid(sCheckTime, e -> { + TestingServer.checkIntervalSecond = (int) sCheckTime.getValue(); + if (TestingServer.checkTasks) TestingServer.ResetTimer(); + }); + add(new JLabel(" сек") { + { + setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); + } + }); + } + public void ShowAutorefresh() { + autorefreshButton.setIcon(Utils.getIcon(TestingServer.checkTasks ? "/icons/Pick.png" : "/icons/NotPick.png")); + } +} diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java index c7f92dda..72efae1f 100644 --- a/src/Common/UI/UI.java +++ b/src/Common/UI/UI.java @@ -23,6 +23,7 @@ import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar; import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar; import Common.UI.Menus_2023.TasksPackagesMenuBar.TasksPackagesMenuBar; import Common.UI.Menus_2023.TestRunTasksMenuBar.TestRunTasksMenuBar; +import Common.UI.Menus_2023.TestingBar.TestingBar; import Common.UI.Menus_2023.TestsMenuBar.TestsMenuBar; import Common.UI.Menus_2023.UsersMenuBar.UsersMenuBar; import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar; @@ -105,6 +106,7 @@ import static Common.UI.Trees.TreeRenderers.*; public class UI { public static MenuElement[] last_menu_path; public static MainMenuBar mainMenuBar = null; + public static TestingBar testingBar = null; public static VersionsMenuBar versionsMenuBar = null; public static FastAccessMenuBar fastAccessMenuBar = null; //------------ @@ -207,6 +209,7 @@ public class UI { } public static void CreateMenus() { mainMenuBar = new MainMenuBar(); + testingBar = new TestingBar(); versionsMenuBar = new VersionsMenuBar(); fastAccessMenuBar = new FastAccessMenuBar(); //---------------------------------------------------->> diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form index b775812d..4b75930e 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.form +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form @@ -1,7 +1,6 @@
- - + @@ -12,9 +11,7 @@ - - - + diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java index 370184b4..962edcfa 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.java +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java @@ -1,14 +1,13 @@ package Visual_DVM_2021.UI.Main; import Common.Global; -import Common.UI.Menus_2023.TasksPackagesMenuBar.TasksPackagesMenuBar; import Common.UI.TextField.StyledTextField; import Common.UI.UI; import TestingSystem.Configuration.UI.ConfigurationDBTable; -import TestingSystem.TasksPackage.TasksPackageDBTable; import Visual_DVM_2021.UI.Interface.FormWithSplitters; import Visual_DVM_2021.UI.Interface.TestingWindow; import javax.swing.*; +import java.awt.*; public class TestingForm implements FormWithSplitters, TestingWindow { private JPanel content; @Override @@ -65,6 +64,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { public SapforPackagesComparisonForm sapforTestingSlave; //- public TestingForm() { + content.add(UI.testingBar, BorderLayout.NORTH); LoadSplitters(); //- dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null)); @@ -130,7 +130,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void ShowAutoActualizeTestsState() { - ((TasksPackagesMenuBar) UI.menuBars.get(TasksPackageDBTable.class)).ShowAutorefresh(); + UI.testingBar.ShowAutorefresh(); } @Override public void FocusTestingTasks() {