diff --git a/plugins/NewTest.form b/plugins/NewTest.form index 13cfda6..d40b0f2 100644 --- a/plugins/NewTest.form +++ b/plugins/NewTest.form @@ -73,12 +73,19 @@ - - - - + + + + + + + + + + + + - @@ -92,28 +99,33 @@ - + - + - + - - - - - + + + + + + + + + + - + diff --git a/plugins/NewTest.java b/plugins/NewTest.java index 4ec33ba..d583d54 100644 --- a/plugins/NewTest.java +++ b/plugins/NewTest.java @@ -262,11 +262,15 @@ public class NewTest extends javax.swing.JPanel { .addComponent(lblContact)) .addGap(10, 10, 10) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(txtTestName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jComboBoxTestSuites, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jScrollPane3, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(txtContactName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(12, 12, 12)))) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(txtTestName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jComboBoxTestSuites, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.Alignment.TRAILING)) + .addGap(12, 12, 12)) + .addGroup(layout.createSequentialGroup() + .addComponent(txtContactName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()))))) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -275,24 +279,27 @@ public class NewTest extends javax.swing.JPanel { .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(lblName)) - .addComponent(txtTestName, javax.swing.GroupLayout.DEFAULT_SIZE, 36, Short.MAX_VALUE)) + .addComponent(txtTestName, javax.swing.GroupLayout.DEFAULT_SIZE, 35, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lblSuite) - .addComponent(jComboBoxTestSuites, javax.swing.GroupLayout.DEFAULT_SIZE, 37, Short.MAX_VALUE)) + .addComponent(jComboBoxTestSuites, javax.swing.GroupLayout.DEFAULT_SIZE, 36, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 127, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE) .addComponent(lblDescr)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblContact) - .addComponent(txtContactName, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(lblContact) + .addGap(29, 29, 29)) + .addGroup(layout.createSequentialGroup() + .addComponent(txtContactName, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED))) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(lblParams) - .addGap(0, 175, Short.MAX_VALUE)) + .addGap(0, 171, Short.MAX_VALUE)) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 33, javax.swing.GroupLayout.PREFERRED_SIZE) diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form index 45e05a3..8254b32 100644 --- a/plugins/TestingListDetails.form +++ b/plugins/TestingListDetails.form @@ -20,24 +20,28 @@ - + - - - - - - - + + + + + + + + + - + + + + - @@ -76,13 +80,13 @@ - + - + @@ -96,7 +100,7 @@ - + @@ -106,22 +110,17 @@ - + + + + + + - - - - - - - - - - - - - + + + @@ -464,14 +463,6 @@ - - - - - - - - diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index c848e5c..8eb7da7 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -80,7 +80,6 @@ public class TestingListDetails extends javax.swing.JPanel { jButtonMoreResult = new javax.swing.JButton(); jButtonMoreTest = new javax.swing.JButton(); jLabel9 = new javax.swing.JLabel(); - jLabel10 = new javax.swing.JLabel(); jButtonOk1 = new javax.swing.JButton(); jLabelDeviceName.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N @@ -227,9 +226,6 @@ public class TestingListDetails extends javax.swing.JPanel { jLabel9.setText("Last Result Details"); jLabel9.setVisible(false); - jLabel10.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N - jLabel10.setText("(Value valid for all devices)"); - jButtonOk1.setText("Save for this device"); jButtonOk1.setToolTipText("Save parameters values for this specific device"); jButtonOk1.addActionListener(new java.awt.event.ActionListener() { @@ -246,20 +242,22 @@ public class TestingListDetails extends javax.swing.JPanel { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel5) - .addComponent(jLabel8) - .addComponent(jLabel6) - .addComponent(jLabel9) - .addComponent(jLabelDeviceName) - .addComponent(jLabel10)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel5) + .addComponent(jLabel8) + .addComponent(jLabel6) + .addComponent(jLabel9) + .addComponent(jLabelDeviceName)) + .addGap(53, 53, 53)) .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING)) .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.LEADING)) - .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.LEADING)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel7) + .addGap(50, 50, 50))) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(txtDeviceName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(txtDeviceDescription, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -290,12 +288,12 @@ public class TestingListDetails extends javax.swing.JPanel { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, 37, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jButtonMoreTest) .addComponent(jLabel5)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtTestSuite, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(txtTestSuite, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel4)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -306,7 +304,7 @@ public class TestingListDetails extends javax.swing.JPanel { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButtonMoreResult) .addComponent(jLabel6)) - .addComponent(txtTestResultSummary, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(txtTestResultSummary, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel9) @@ -314,19 +312,15 @@ public class TestingListDetails extends javax.swing.JPanel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabelDeviceName) - .addComponent(txtDeviceName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtDeviceDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2)) - .addGap(18, 18, 18) + .addComponent(txtDeviceName, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPaneParam, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel7) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel10) - .addGap(0, 0, Short.MAX_VALUE))) + .addComponent(jLabel2) + .addComponent(txtDeviceDescription, javax.swing.GroupLayout.PREFERRED_SIZE, 47, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel7) + .addComponent(jScrollPaneParam, javax.swing.GroupLayout.PREFERRED_SIZE, 89, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButtonOk) @@ -522,7 +516,6 @@ public class TestingListDetails extends javax.swing.JPanel { private javax.swing.JButton jButtonOk; private javax.swing.JButton jButtonOk1; private javax.swing.JEditorPane jEditorPaneHelp; - private javax.swing.JLabel jLabel10; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5;