--- /Users/catlan/Desktop/ConfigureToolbarPanel.java 2005-09-25 23:11:14.000000000 +0200 +++ ./netbeans-src//core/windows/src/org/netbeans/core/windows/view/ui/toolbars/ConfigureToolbarPanel.java 2005-09-25 23:24:18.000000000 +0200 @@ -14,6 +14,7 @@ package org.netbeans.core.windows.view.ui.toolbars; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; import java.awt.datatransfer.DataFlavor; @@ -51,13 +52,14 @@ import org.openide.util.NbBundle; import org.openide.util.datatransfer.ExTransferable; import org.openide.util.datatransfer.NewType; + /** * Toolbar Customizer showing a tree of all available actions. Users can drag actions * to toolbars to add new toolbar buttons. * * @author Stanislav Aubrecht */ -public class ConfigureToolbarPanel extends javax.swing.JPanel implements Runnable { +public class ConfigureToolbarPanel extends javax.swing.JPanel implements Runnable/*, DragGestureListener*/ { private static WeakReference dialogRef; // is weak reference necessary? @@ -67,6 +69,9 @@ private ConfigureToolbarPanel() { initComponents(); + org.openide.awt.Mnemonics.setLocalizedText( + closeButton, getBundleString("CTL_Close")); + setCursor( Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR ) ); FileSystem fs = Repository.getDefault().getDefaultFileSystem(); @@ -81,10 +86,12 @@ } public void run() { - ActionsTree tree = new ActionsTree( root ); - palettePanel.removeAll(); - palettePanel.setBorder( BorderFactory.createEmptyBorder() ); - palettePanel.add( new JScrollPane(tree), BorderLayout.CENTER ); + ConfigureToolbarPanelAqua cfpa = new ConfigureToolbarPanelAqua(root); + + palettePanel.removeAll(); + JScrollPane sp = new JScrollPane(cfpa); + sp.setBorder(null); + palettePanel.add( sp, BorderLayout.CENTER ); invalidate(); validate(); repaint(); @@ -96,20 +103,13 @@ if (dialogRef != null) dialog = (JDialog) dialogRef.get(); if (dialog == null) { - JButton closeButton = new JButton(); - closeButton.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e) { - endToolbarEditMode(); - } - }); - org.openide.awt.Mnemonics.setLocalizedText( - closeButton, getBundleString("CTL_Close")); + ConfigureToolbarPanel cp = new ConfigureToolbarPanel(); DialogDescriptor dd = new DialogDescriptor( - new ConfigureToolbarPanel(), + cp, getBundleString("CustomizerTitle"), false, - new Object[] { closeButton }, - closeButton, + new Object[]{}, + cp.closeButton, DialogDescriptor.DEFAULT_ALIGN, null, null); @@ -185,32 +185,34 @@ palettePanel = new javax.swing.JPanel(); checkSmallIcons = new javax.swing.JCheckBox(); btnNewToolbar = new javax.swing.JButton(); + closeButton = new javax.swing.JButton(); setLayout(new java.awt.GridBagLayout()); + lblHint.setFont(new java.awt.Font("Lucida Grande", 1, 13)); lblHint.setLabelFor(palettePanel); lblHint.setText(getBundleString("CTL_TreeLabel")); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = 2; + gridBagConstraints.gridwidth = 3; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.insets = new java.awt.Insets(10, 10, 1, 10); add(lblHint, gridBagConstraints); palettePanel.setLayout(new java.awt.BorderLayout()); - palettePanel.setBorder(new javax.swing.border.EtchedBorder()); + palettePanel.setBorder(new LineBorder(null, null, new Color(135,135,135), null)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 2; + gridBagConstraints.gridwidth = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(1, 10, 5, 10); + gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0); add(palettePanel, gridBagConstraints); checkSmallIcons.setText(getBundleString("CTL_SmallIcons")); - checkSmallIcons.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); + checkSmallIcons.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkSmallIcons.setMargin(new java.awt.Insets(0, 0, 0, 0)); checkSmallIcons.setSelected( ToolbarPool.getDefault().getPreferredIconSize() == 16 ); checkSmallIcons.addActionListener(new java.awt.event.ActionListener() { @@ -222,8 +224,10 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(10, 10, 0, 10); + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); add(checkSmallIcons, gridBagConstraints); btnNewToolbar.setText(getBundleString("CTL_NewToolbar")); @@ -237,12 +241,30 @@ gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(10, 10, 0, 10); + gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); add(btnNewToolbar, gridBagConstraints); + closeButton.setText("jButton1"); + closeButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + closeButtonActionPerformed(evt); + } + }); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); + add(closeButton, gridBagConstraints); + } // //GEN-END:initComponents + private void closeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_closeButtonActionPerformed + endToolbarEditMode(); + }//GEN-LAST:event_closeButtonActionPerformed + private void newToolbar(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newToolbar ToolbarFolderNode tf = new ToolbarFolderNode(); NewType[] newTypes = tf.getNewTypes(); @@ -270,11 +292,12 @@ tbConf.refresh(); } }//GEN-LAST:event_switchIconSize - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnNewToolbar; private javax.swing.JCheckBox checkSmallIcons; + private javax.swing.JButton closeButton; private javax.swing.JLabel lblHint; private javax.swing.JPanel palettePanel; // End of variables declaration//GEN-END:variables @@ -323,7 +346,7 @@ super( original, Children.LEAF ); } - public Transferable drag() throws IOException { + public Transferable drag() throws IOException { return new ExTransferable.Single( nodeDataFlavor ) { public Object getData() { return ItemActionNode.this;