diff -r 0bdfb411360a editor/nbproject/project.xml --- a/editor/nbproject/project.xml Tue Aug 30 14:36:38 2011 +0200 +++ b/editor/nbproject/project.xml Wed Sep 07 17:26:29 2011 +0200 @@ -151,7 +151,7 @@ - 7.7 + 7.38 diff -r 0bdfb411360a editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java --- a/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java Tue Aug 30 14:36:38 2011 +0200 +++ b/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java Wed Sep 07 17:26:29 2011 +0200 @@ -235,8 +235,6 @@ padding.setOpaque(false); add(padding); - add(createCloseButton()); - searchBarFocusTraversalPolicy = createSearchBarFocusTraversalPolicy(); setVisible(false); @@ -542,20 +540,6 @@ return incSearchComboBox; } - private JButton createCloseButton() throws MissingResourceException { - JButton closeButton = new JButton(ImageUtilities.loadImageIcon("org/netbeans/modules/editor/resources/find_close.png", false)); // NOI18N - closeButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - looseFocus(); - } - }); - closeButton.setToolTipText(NbBundle.getMessage(SearchBar.class, "TOOLTIP_CloseIncrementalSearchSidebar")); // NOI18N - closeButton.setMargin(BUTTON_INSETS); - return closeButton; - } - private void addEscapeKeystrokeFocusBackTo(JPanel jpanel) { jpanel.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, true), "loose-focus"); // NOI18N @@ -595,8 +579,21 @@ } } + private ActionListener closeButtonListener; + private ActionListener getCloseButtonListener() { + if (closeButtonListener == null) + closeButtonListener = new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + looseFocus(); + } + }; + return closeButtonListener; + } + private void unchangeSearchBarToBeOnlySearchBar() throws MissingResourceException { - searchBar.getCloseButton().setVisible(true); + searchBar.getCloseButton().removeActionListener(getCloseButtonListener()); Mnemonics.setLocalizedText(searchBar.getFindLabel(), NbBundle.getMessage(SearchBar.class, "CTL_Find")); // NOI18N searchBar.getFindLabel().setPreferredSize(searchBar.getFindLabel().getMinimumSize()); searchBar.addEscapeKeystrokeFocusBackTo(searchBar); @@ -610,7 +607,7 @@ } private void changeSearchBarToBePartOfReplaceBar() throws MissingResourceException { - searchBar.getCloseButton().setVisible(false); + searchBar.getCloseButton().addActionListener(getCloseButtonListener()); Mnemonics.setLocalizedText(searchBar.getFindLabel(), NbBundle.getMessage(SearchBar.class, "CTL_Replace_Find")); // NOI18N searchBar.getFindLabel().setPreferredSize(new Dimension(replaceLabel.getPreferredSize().width, searchBar.getFindLabel().getPreferredSize().height)); this.addEscapeKeystrokeFocusBackTo(searchBar); diff -r 0bdfb411360a editor/src/org/netbeans/modules/editor/impl/SearchBar.java --- a/editor/src/org/netbeans/modules/editor/impl/SearchBar.java Tue Aug 30 14:36:38 2011 +0200 +++ b/editor/src/org/netbeans/modules/editor/impl/SearchBar.java Wed Sep 07 17:26:29 2011 +0200 @@ -102,6 +102,7 @@ import javax.swing.text.Keymap; import org.netbeans.api.editor.EditorRegistry; import org.netbeans.modules.editor.lib2.search.EditorFindSupport; +import org.openide.awt.CloseButtonFactory; import org.openide.awt.Mnemonics; import org.openide.awt.StatusDisplayer; import org.openide.filesystems.FileObject; @@ -467,7 +468,7 @@ } private JButton createCloseButton() throws MissingResourceException { - JButton button = new JButton(ImageUtilities.loadImageIcon("org/netbeans/modules/editor/resources/find_close.png", false)); // NOI18N + JButton button = CloseButtonFactory.createBigCloseButton(); button.addActionListener(new ActionListener() { @Override @@ -476,7 +477,6 @@ } }); button.setToolTipText(NbBundle.getMessage(SearchBar.class, "TOOLTIP_CloseIncrementalSearchSidebar")); // NOI18N - button.setMargin(BUTTON_INSETS); return button; } @@ -686,7 +686,7 @@ int parentWidth = this.getParent().getWidth(); int totalWidth = 0; for (Component c : this.getComponents()) { - if (c != padding && (c != closeButton || c.isVisible())) { + if (c != padding) { totalWidth += c.getPreferredSize().width; } } diff -r 0bdfb411360a openide.awt/apichanges.xml --- a/openide.awt/apichanges.xml Tue Aug 30 14:36:38 2011 +0200 +++ b/openide.awt/apichanges.xml Wed Sep 07 17:26:29 2011 +0200 @@ -50,6 +50,21 @@ AWT API + + + Close Button API + + + + + +

+ New close button factory to a create close button or a big close button. +

+ + + + Turn on Mnemonics in Popup Menus diff -r 0bdfb411360a openide.awt/manifest.mf --- a/openide.awt/manifest.mf Tue Aug 30 14:36:38 2011 +0200 +++ b/openide.awt/manifest.mf Wed Sep 07 17:26:29 2011 +0200 @@ -2,5 +2,5 @@ OpenIDE-Module: org.openide.awt OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties AutoUpdate-Essential-Module: true -OpenIDE-Module-Specification-Version: 7.37 +OpenIDE-Module-Specification-Version: 7.38 diff -r 0bdfb411360a openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java --- a/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java Tue Aug 30 14:36:38 2011 +0200 +++ b/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java Wed Sep 07 17:26:29 2011 +0200 @@ -320,57 +320,6 @@ return "GTK".equals( UIManager.getLookAndFeel().getID() ); //NOI18N } - private Image getCloseTabImage() { - if( null == closeTabImage ) { - if( isWindowsVistaLaF() ) { - closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_close_enabled.png"); // NOI18N - } else if( isWindowsXPLaF() ) { - closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_close_enabled.png"); // NOI18N - } else if( isWindowsLaF() ) { - closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/win_close_enabled.png"); // NOI18N - } else if( isAquaLaF() ) { - closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_close_enabled.png"); // NOI18N - } else { - closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_enabled.png"); // NOI18N - } - } - return closeTabImage; - } - - private Image getCloseTabPressedImage() { - if( null == closeTabPressedImage ) { - if( isWindowsVistaLaF() ) { - closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_close_pressed.png"); // NOI18N - } else if( isWindowsXPLaF() ) { - closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_close_pressed.png"); // NOI18N - } else if( isWindowsLaF() ) { - closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/win_close_pressed.png"); // NOI18N - } else if( isAquaLaF() ) { - closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_close_pressed.png"); // NOI18N - } else { - closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_pressed.png"); // NOI18N - } - } - return closeTabPressedImage; - } - - private Image getCloseTabRolloverImage() { - if( null == closeTabMouseOverImage ) { - if( isWindowsVistaLaF() ) { - closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_close_rollover.png"); // NOI18N - } else if( isWindowsXPLaF() ) { - closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_close_rollover.png"); // NOI18N - } else if( isWindowsLaF() ) { - closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/win_close_rollover.png"); // NOI18N - } else if( isAquaLaF() ) { - closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_close_rollover.png"); // NOI18N - } else { - closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_rollover.png"); // NOI18N - } - } - return closeTabMouseOverImage; - } - private void setPressedCloseButtonIndex(int index) { if (pressedCloseButtonIndex == index) return; @@ -564,30 +513,18 @@ } }; add(label); - add(new TabButton()); - } + JButton tabCloseButton = CloseButtonFactory.createCloseButton(); + tabCloseButton.addActionListener(new ActionListener() { - private class TabButton extends JButton implements ActionListener { - public TabButton() { - int size = 16; - setPreferredSize(new Dimension(size, size)); - setContentAreaFilled(false); - setFocusable(false); - setBorder(BorderFactory.createEmptyBorder()); - setBorderPainted(false); - setRolloverEnabled(true); - addActionListener(this); - setIcon(ImageUtilities.image2Icon(getCloseTabImage())); - setRolloverIcon(ImageUtilities.image2Icon(getCloseTabRolloverImage())); - setPressedIcon(ImageUtilities.image2Icon(getCloseTabPressedImage())); - } - - public void actionPerformed(ActionEvent e) { - int i = indexOfTabComponent(ButtonTab.this); - if (i != -1) { - fireCloseRequest(CloseButtonTabbedPane.this.getComponentAt(i)); + @Override + public void actionPerformed(ActionEvent e) { + int i = indexOfTabComponent(ButtonTab.this); + if (i != -1) { + fireCloseRequest(CloseButtonTabbedPane.this.getComponentAt(i)); + } } - } + }); + add(tabCloseButton); } } diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_bigclose_enabled.png Binary file openide.awt/src/org/openide/awt/resources/gtk_bigclose_enabled.png has changed diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_bigclose_pressed.png Binary file openide.awt/src/org/openide/awt/resources/gtk_bigclose_pressed.png has changed diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_bigclose_rollover.png Binary file openide.awt/src/org/openide/awt/resources/gtk_bigclose_rollover.png has changed diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_close_enabled.png Binary file openide.awt/src/org/openide/awt/resources/gtk_close_enabled.png has changed diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_close_pressed.png Binary file openide.awt/src/org/openide/awt/resources/gtk_close_pressed.png has changed diff -r 0bdfb411360a openide.awt/src/org/openide/awt/resources/gtk_close_rollover.png Binary file openide.awt/src/org/openide/awt/resources/gtk_close_rollover.png has changed