M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "вкладки. v++"

Browse Source 
This reverts commit 2379f65803.
This commit is contained in:
02090095
2023-12-22 18:12:21 +03:00
parent 2379f65803
commit cf8c237fa3
4 changed files with 320 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

556
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -15,37 +15,63 @@
<properties/>
<border type="none"/>
<children>
<grid id="66764" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="e6dae" binding="dvmTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title="DVM система" icon="icons/DVM.png"/>
<tabbedpane title="DVM система" icon="icons/DVM.png">
<tooltip value="DVM система"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children>
<tabbedpane id="7f50a" binding="dvmTabs">
<constraints border-constraint="Center"/>
<properties/>
<splitpane id="f4599" binding="SC48">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="200" height="200"/>
</grid>
</constraints>
<properties>
<dividerLocation value="150"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="fcf99" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="2ead5" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Settings.png">
<tooltip value="Настройки и пакеты задач"/>
</tabbedpane>
<splitpane position="left"/>
</constraints>
<properties>
<minimumSize width="0" height="150"/>
</properties>
<border type="none"/>
<children>
<grid id="8060d" binding="configurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="2ad88" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="46704" binding="SC48">
<splitpane id="c6872" binding="SC49">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="150"/>
<dividerLocation value="100"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="3e979" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="89d8b" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
@@ -54,7 +80,7 @@
</properties>
<border type="none"/>
<children>
<grid id="ff76f" binding="configurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
@@ -62,195 +88,60 @@
</grid>
</children>
</grid>
<grid id="ee322" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="a8520" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="3a098" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
<grid id="e8a2c" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Testing.png"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="79e9b" binding="SC46">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="131"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="1bd8e" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="56dec" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties>
<minimumSize width="0" height="150"/>
</properties>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="c89e7" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="240" height="150"/>
</properties>
<border type="none"/>
<children>
<splitpane id="4905" binding="SC50">
<constraints border-constraint="Center"/>
<splitpane id="670fe" binding="SC46">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="200" height="200"/>
</grid>
</constraints>
<properties>
<dividerLocation value="131"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children/>
</splitpane>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>
</tabbedpane>
</children>
</grid>
<grid id="12b6a" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="Система SAPFOR" icon="icons/Arrays/SpfPrivate.png"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<tabbedpane id="18230" binding="sapforTabs">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<grid id="f1c94" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Settings.png">
<tooltip value="Настройки и пакеты задач"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="b085" binding="SC68">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="3c37a" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="10918" binding="SC63">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="200"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="3ebb2" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="148f3" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="10937" binding="serverSapforsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="242a7" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<properties>
<minimumSize width="0" height="150"/>
</properties>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="59f66" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="77cf1" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<properties>
<minimumSize width="240" height="150"/>
</properties>
<border type="none"/>
<children>
<splitpane id="8ec35" binding="SC59">
<splitpane id="f24" binding="SC50">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="450"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="3065" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<minimumSize width="300" height="100"/>
</properties>
<border type="none"/>
<children>
<grid id="a9b70" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="3edb3" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="300" height="0"/>
</properties>
<border type="none"/>
<children>
<grid id="f21f2" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
<children/>
</splitpane>
</children>
</grid>
@@ -258,88 +149,263 @@
</splitpane>
</children>
</grid>
<grid id="d9729" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="f9d45" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
<grid id="bec64" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Comparsion.png"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="cdd2b" binding="SC64">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="400"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<splitpane id="32da5" binding="SC65">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="eef68" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
<splitpane id="1f9df" binding="SC66">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="cea21" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</splitpane>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
<grid id="530e" binding="sapforTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title="SAPFOR" icon="icons/Arrays/SpfPrivate.png">
<tooltip value="SAPFOR"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="b68b4" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="8543b" binding="SC53">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="100"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="208f9" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="760d4" binding="SC56">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="100"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="e5393" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<tabbedpane id="30729" binding="sapforPackageTabs">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Comparsion.png">
<tooltip value="Сравнение пакетов"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="17ec9" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<splitpane id="c2b4" binding="SC64">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="400"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<splitpane id="8e1d0" binding="SC65">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="10a70" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
<splitpane id="e0ceb" binding="SC66">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="490c4" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</splitpane>
</children>
</grid>
</children>
</grid>
</children>
</tabbedpane>
</children>
</grid>
<grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<minimumSize width="24" height="100"/>
<preferredSize width="204" height="100"/>
</properties>
<border type="none"/>
<children>
<grid id="a8a6" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
<grid id="6e6e0" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="fd5c0" binding="SC63">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="200" height="200"/>
</grid>
</constraints>
<properties>
<dividerLocation value="200"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="71344" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="3f38c" binding="serverSapforsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="75d3f" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="3edb9" binding="SC59">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="450"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="c8c41" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<minimumSize width="300" height="100"/>
</properties>
<border type="none"/>
<children>
<grid id="f3493" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="a6851" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="300" height="0"/>
</properties>
<border type="none"/>
<children>
<grid id="25242" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>
</grid>
</children>

13
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -17,14 +17,16 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
return content;
}
public JSplitPane SC50;
public JSplitPane SC65;
public JSplitPane SC66;
public JSplitPane SC48;
public JSplitPane SC49;
public JSplitPane SC46;
public JSplitPane SC68;
public JSplitPane SC53;
public JSplitPane SC56;
public JSplitPane SC63;
public JSplitPane SC59;
public JSplitPane SC64;
public JSplitPane SC65;
public JSplitPane SC66;
//-
//---
private JTabbedPane testingTabs;
@@ -35,6 +37,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel configurationsPanel;
private JPanel dvmPackagesPanel;
private JButton bCompilationFilter;
private JPanel dvmTestingPanel;
private JPanel sapforTestingPanel;
private JPanel packageVersionsPanel;
private JPanel sapforConfigurationsPanel;
private JLabel sapforConfigurationsLabel;
@@ -43,8 +47,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel sapforScenariosPanel;
private JPanel serverSapforsPanel;
private JPanel sapforPackagesPanel;
private JTabbedPane dvmTabs;
private JTabbedPane sapforTabs;
private JTabbedPane sapforPackageTabs;
private JPanel testsRunTasksBackground;
private JCheckBox filterFinished;
private JButton bTest;