From 779b4812b629244434d623b802d2f415cea07f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ania=20K=C5=82os?= Date: Sat, 16 Apr 2011 13:37:21 +0000 Subject: [PATCH] --- Winda/src/winda/gui/WindaAboutBox.form | 2 +- Winda/src/winda/gui/WindaAboutBox.java | 2 +- Winda/src/winda/gui/WindaView.form | 48 +++++++++----------- Winda/src/winda/gui/WindaView.java | 63 ++++++++++++-------------- 4 files changed, 54 insertions(+), 61 deletions(-) diff --git a/Winda/src/winda/gui/WindaAboutBox.form b/Winda/src/winda/gui/WindaAboutBox.form index 9bef379..b3e1515 100644 --- a/Winda/src/winda/gui/WindaAboutBox.form +++ b/Winda/src/winda/gui/WindaAboutBox.form @@ -36,7 +36,7 @@ - + diff --git a/Winda/src/winda/gui/WindaAboutBox.java b/Winda/src/winda/gui/WindaAboutBox.java index 23d0fcc..ee69d76 100644 --- a/Winda/src/winda/gui/WindaAboutBox.java +++ b/Winda/src/winda/gui/WindaAboutBox.java @@ -109,7 +109,7 @@ public class WindaAboutBox extends javax.swing.JDialog { .addComponent(jLabel2) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(jLabel6) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 406, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 342, Short.MAX_VALUE) .addComponent(closeButton)) .addComponent(jLabel5) .addComponent(jLabel4) diff --git a/Winda/src/winda/gui/WindaView.form b/Winda/src/winda/gui/WindaView.form index e17c4d8..449a47f 100644 --- a/Winda/src/winda/gui/WindaView.form +++ b/Winda/src/winda/gui/WindaView.form @@ -18,9 +18,9 @@ - + - + @@ -31,8 +31,8 @@ - - + + @@ -45,9 +45,9 @@ - + - + @@ -62,7 +62,7 @@ - + @@ -249,39 +249,35 @@ - - - - + + + + + + + + - - - - - - - - - - + + - + - + - + @@ -501,7 +497,7 @@ - + @@ -626,7 +622,7 @@ - + diff --git a/Winda/src/winda/gui/WindaView.java b/Winda/src/winda/gui/WindaView.java index d914b88..cd9b1e7 100644 --- a/Winda/src/winda/gui/WindaView.java +++ b/Winda/src/winda/gui/WindaView.java @@ -255,8 +255,8 @@ public class WindaView extends FrameView{ .addComponent(jLabel3)) .addGap(18, 18, 18) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 52, Short.MAX_VALUE) - .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 52, Short.MAX_VALUE)) + .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE) + .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE)) .addGap(28, 28, 28)) ); jPanel1Layout.setVerticalGroup( @@ -334,30 +334,27 @@ public class WindaView extends FrameView{ .addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 127, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(jPanel2Layout.createSequentialGroup() - .addComponent(jCheckBox1) - .addGap(18, 18, 18) - .addComponent(jSpinner5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jSpinner4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(jCheckBox1) + .addGap(18, 18, 18) + .addComponent(jSpinner5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jSpinner3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addGap(24, 24, 24)) .addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup() - .addComponent(jLabel6) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE) - .addComponent(jSpinner4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(jPanel2Layout.createSequentialGroup() - .addComponent(jLabel5) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 41, Short.MAX_VALUE) - .addComponent(jSpinner3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(28, 28, 28))) + .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel5, javax.swing.GroupLayout.Alignment.LEADING)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 70, Short.MAX_VALUE))) .addGap(56, 56, 56)) - .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE) + .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 248, Short.MAX_VALUE) .addGroup(jPanel2Layout.createSequentialGroup() .addContainerGap() .addComponent(jButton5) .addGap(18, 18, 18) .addComponent(jButton6) - .addContainerGap(149, Short.MAX_VALUE)) + .addContainerGap(94, Short.MAX_VALUE)) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -380,7 +377,7 @@ public class WindaView extends FrameView{ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jCheckBox1) .addComponent(jSpinner5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 19, Short.MAX_VALUE) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButton5) .addComponent(jButton6)) @@ -421,16 +418,16 @@ public class WindaView extends FrameView{ .addGroup(jPanel3Layout.createSequentialGroup() .addGap(50, 50, 50) .addComponent(jLabel7) - .addContainerGap(65, Short.MAX_VALUE)) + .addContainerGap(74, Short.MAX_VALUE)) .addComponent(jSeparator5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE) .addGroup(jPanel3Layout.createSequentialGroup() .addContainerGap() .addComponent(jRadioButton1) - .addContainerGap(124, Short.MAX_VALUE)) + .addContainerGap(136, Short.MAX_VALUE)) .addGroup(jPanel3Layout.createSequentialGroup() .addContainerGap() .addComponent(jRadioButton2) - .addContainerGap(67, Short.MAX_VALUE)) + .addContainerGap(88, Short.MAX_VALUE)) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -491,7 +488,7 @@ public class WindaView extends FrameView{ .addGroup(jPanel4Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator6, javax.swing.GroupLayout.DEFAULT_SIZE, 185, Short.MAX_VALUE) + .addComponent(jSeparator6, javax.swing.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE) .addComponent(jLabel9))) .addGroup(jPanel4Layout.createSequentialGroup() .addGap(45, 45, 45) @@ -562,7 +559,7 @@ public class WindaView extends FrameView{ .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel5Layout.createSequentialGroup() .addContainerGap() - .addComponent(jSeparator7, javax.swing.GroupLayout.DEFAULT_SIZE, 185, Short.MAX_VALUE)) + .addComponent(jSeparator7, javax.swing.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)) .addGroup(jPanel5Layout.createSequentialGroup() .addGap(61, 61, 61) .addComponent(jLabel11)) @@ -589,7 +586,7 @@ public class WindaView extends FrameView{ .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) .addComponent(jLabel13) - .addContainerGap(231, Short.MAX_VALUE)) + .addContainerGap(228, Short.MAX_VALUE)) ); scrollPane1.setName("scrollPane1"); // NOI18N @@ -608,7 +605,7 @@ public class WindaView extends FrameView{ .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(mainPanelLayout.createSequentialGroup() .addComponent(jButton1) - .addGap(18, 18, 18) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jButton2))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -617,9 +614,9 @@ public class WindaView extends FrameView{ .addGap(10, 10, 10) .addComponent(jButton3) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jButton4) - .addGap(28, 28, 28) - .addComponent(jSlider1, javax.swing.GroupLayout.DEFAULT_SIZE, 420, Short.MAX_VALUE)) + .addComponent(jButton4, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(jSlider1, javax.swing.GroupLayout.DEFAULT_SIZE, 397, Short.MAX_VALUE)) .addGroup(mainPanelLayout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(scrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 551, javax.swing.GroupLayout.PREFERRED_SIZE))) @@ -628,8 +625,8 @@ public class WindaView extends FrameView{ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(212, 212, 212)) + .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(230, 230, 230)) .addGroup(mainPanelLayout.createSequentialGroup() .addGap(419, 419, 419) .addComponent(jLabel1))) @@ -639,12 +636,12 @@ public class WindaView extends FrameView{ mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup() .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(mainPanelLayout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 558, Short.MAX_VALUE) + .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 541, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() .addGap(19, 19, 19) .addComponent(jLabel1) @@ -670,7 +667,7 @@ public class WindaView extends FrameView{ .addComponent(jButton3) .addComponent(jButton4)) .addComponent(jSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 508, Short.MAX_VALUE)))) + .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 490, Short.MAX_VALUE)))) .addContainerGap()) );