# HG changeset patch # User Daniele Nicolodi # Date 1323098406 -3600 # Node ID 03d92954b93996c2d1ab701b1f5cc535b7ba3766 # Parent 5e7477b94d944027f5c8e63af905d2eed89a5a71 Improve look of LTPDAPreferences diaolog diff -r 5e7477b94d94 -r 03d92954b939 src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.form --- a/src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.form Mon Dec 05 16:20:06 2011 +0100 +++ b/src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.form Mon Dec 05 16:20:06 2011 +0100 @@ -28,16 +28,24 @@ - - + + + + + + + + + - - + + + @@ -46,65 +54,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - - - - + - - - - - - - - - - - + + + + + + + + + diff -r 5e7477b94d94 -r 03d92954b939 src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.java --- a/src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.java Mon Dec 05 16:20:06 2011 +0100 +++ b/src/MPipeline2/src/mpipeline/ltpdapreferences/LTPDAPrefsGui.java Mon Dec 05 16:20:06 2011 +0100 @@ -75,7 +75,6 @@ private void initComponents() { mainPanel = new javax.swing.JPanel(); - jPanel2 = new javax.swing.JPanel(); doneBtn = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); @@ -88,21 +87,19 @@ } }); - mainPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + mainPanel.setBorder(null); org.jdesktop.layout.GroupLayout mainPanelLayout = new org.jdesktop.layout.GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 632, Short.MAX_VALUE) + .add(0, 612, Short.MAX_VALUE) ); mainPanelLayout.setVerticalGroup( mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 411, Short.MAX_VALUE) + .add(0, 422, Short.MAX_VALUE) ); - jPanel2.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - doneBtn.setText("Done"); doneBtn.setToolTipText("Close without applying the preferences."); doneBtn.addActionListener(new java.awt.event.ActionListener() { @@ -111,50 +108,30 @@ } }); - org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel2Layout.createSequentialGroup() - .addContainerGap(538, Short.MAX_VALUE) - .add(doneBtn) - .addContainerGap()) - ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jPanel2Layout.createSequentialGroup() - .addContainerGap() - .add(doneBtn) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(mainPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() + .addContainerGap() + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(mainPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(doneBtn)) + .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() + .addContainerGap() .add(mainPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(18, 18, 18) - .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(doneBtn) + .addContainerGap()) ); pack(); }// //GEN-END:initComponents - private void doneBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_doneBtnActionPerformed - - prefs.writeToDisk(); -// this.dispose(); - - this.formWindowClosing(null); - - }//GEN-LAST:event_doneBtnActionPerformed - private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing // System.err.println("Form closing"); @@ -167,9 +144,17 @@ } }//GEN-LAST:event_formWindowClosing + +private void doneBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_doneBtnActionPerformed + + prefs.writeToDisk(); +// this.dispose(); + + this.formWindowClosing(null); +}//GEN-LAST:event_doneBtnActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton doneBtn; - private javax.swing.JPanel jPanel2; private javax.swing.JPanel mainPanel; // End of variables declaration//GEN-END:variables // public void update(Observable o, Object arg) {