diff --git a/editor/nbproject/project.xml b/editor/nbproject/project.xml --- a/editor/nbproject/project.xml +++ b/editor/nbproject/project.xml @@ -151,7 +151,7 @@ - 7.7 + 7.38 diff --git a/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java b/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java --- a/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java +++ b/editor/src/org/netbeans/modules/editor/impl/ReplaceBar.java @@ -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 --git a/editor/src/org/netbeans/modules/editor/impl/SearchBar.java b/editor/src/org/netbeans/modules/editor/impl/SearchBar.java --- a/editor/src/org/netbeans/modules/editor/impl/SearchBar.java +++ b/editor/src/org/netbeans/modules/editor/impl/SearchBar.java @@ -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 --git a/openide.awt/apichanges.xml b/openide.awt/apichanges.xml --- a/openide.awt/apichanges.xml +++ b/openide.awt/apichanges.xml @@ -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 --git a/openide.awt/manifest.mf b/openide.awt/manifest.mf --- a/openide.awt/manifest.mf +++ b/openide.awt/manifest.mf @@ -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 --git a/openide.awt/src/org/openide/awt/CloseButtonFactory.java b/openide.awt/src/org/openide/awt/CloseButtonFactory.java new file mode 100644 --- /dev/null +++ b/openide.awt/src/org/openide/awt/CloseButtonFactory.java @@ -0,0 +1,252 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + +package org.openide.awt; + +import java.awt.Dimension; +import java.awt.Image; +import java.awt.Toolkit; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.UIManager; +import org.openide.util.ImageUtilities; + +/** + * Factory class for Close Buttons. + * + * @author M. Kristofic + * @since 7.38 + */ +public final class CloseButtonFactory{ + + private static Image closeTabImage; + private static Image closeTabPressedImage; + private static Image closeTabMouseOverImage; + private static Image bigCloseTabImage; + private static Image bigCloseTabPressedImage; + private static Image bigCloseTabMouseOverImage; + + private CloseButtonFactory() { + } + + /** + * Creates a small 'close' JButton with close icon, rollover icon and pressed icon according to Look and Feel + * + * @return JButton with close icons. + */ + public static JButton createCloseButton() { + JButton closeButton = new JButton(); + int size = 16; + closeButton.setPreferredSize(new Dimension(size, size)); + closeButton.setContentAreaFilled(false); + closeButton.setFocusable(false); + closeButton.setBorder(BorderFactory.createEmptyBorder()); + closeButton.setBorderPainted(false); + closeButton.setRolloverEnabled(true); + closeButton.setIcon(ImageUtilities.image2Icon(getCloseTabImage())); + closeButton.setRolloverIcon(ImageUtilities.image2Icon(getCloseTabRolloverImage())); + closeButton.setPressedIcon(ImageUtilities.image2Icon(getCloseTabPressedImage())); + return closeButton; + } + + /** + * Creates a big 'close' JButton with close icon, rollover icon and pressed icon according to Look and Feel + * + * @return JButton with close icons. + */ + public static JButton createBigCloseButton() { + JButton closeButton = new JButton(); + int size = 19; + closeButton.setPreferredSize(new Dimension(size, size)); + closeButton.setContentAreaFilled(false); + closeButton.setFocusable(false); + closeButton.setBorder(BorderFactory.createEmptyBorder()); + closeButton.setBorderPainted(false); + closeButton.setRolloverEnabled(true); + closeButton.setIcon(ImageUtilities.image2Icon(getBigCloseTabImage())); + closeButton.setRolloverIcon(ImageUtilities.image2Icon(getBigCloseTabRolloverImage())); + closeButton.setPressedIcon(ImageUtilities.image2Icon(getBigCloseTabPressedImage())); + return closeButton; + } + + private static boolean isWindowsVistaLaF() { + String osName = System.getProperty("os.name"); + return osName.indexOf("Vista") >= 0 + || (osName.equals("Windows NT (unknown)") && "6.0".equals(System.getProperty("os.version"))); + } + + private static boolean isWindowsXPLaF() { + Boolean isXP = (Boolean) Toolkit.getDefaultToolkit(). + getDesktopProperty("win.xpstyle.themeActive"); //NOI18N + return isWindowsLaF() && (isXP == null ? false : isXP.booleanValue()); + } + + private static boolean isWindowsLaF() { + String lfID = UIManager.getLookAndFeel().getID(); + return lfID.endsWith("Windows"); //NOI18N + } + + private static boolean isAquaLaF() { + return "Aqua".equals(UIManager.getLookAndFeel().getID()); + } + + private static boolean isGTKLaF () { + return "GTK".equals( UIManager.getLookAndFeel().getID() ); //NOI18N + } + + private static 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 if( isGTKLaF() ) { + closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_close_enabled.png"); // NOI18N + } else { + closeTabImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_enabled.png"); // NOI18N + } + } + return closeTabImage; + } + + private static 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 if( isGTKLaF() ) { + closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_close_pressed.png"); // NOI18N + } else { + closeTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_pressed.png"); // NOI18N + } + } + return closeTabPressedImage; + } + + private static 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 if( isGTKLaF() ) { + closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_close_rollover.png"); // NOI18N + } else { + closeTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_close_rollover.png"); // NOI18N + } + } + return closeTabMouseOverImage; + } + + + private static Image getBigCloseTabImage() { + if( null == bigCloseTabImage ) { + if( isWindowsVistaLaF() ) { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_bigclose_enabled.png"); // NOI18N + } else if( isWindowsXPLaF() ) { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_bigclose_enabled.png"); // NOI18N + } else if( isWindowsLaF() ) { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/win_bigclose_enabled.png"); // NOI18N + } else if( isAquaLaF() ) { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_bigclose_enabled.png"); // NOI18N + } else if( isGTKLaF() ) { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_bigclose_enabled.png"); // NOI18N + } else { + bigCloseTabImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_bigclose_enabled.png"); // NOI18N + } + } + return bigCloseTabImage; + } + + private static Image getBigCloseTabPressedImage() { + if( null == bigCloseTabPressedImage ) { + if( isWindowsVistaLaF() ) { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_bigclose_pressed.png"); // NOI18N + } else if( isWindowsXPLaF() ) { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_bigclose_pressed.png"); // NOI18N + } else if( isWindowsLaF() ) { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/win_bigclose_pressed.png"); // NOI18N + } else if( isAquaLaF() ) { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_bigclose_pressed.png"); // NOI18N + } else if( isGTKLaF() ) { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_bigclose_pressed.png"); // NOI18N + } else { + bigCloseTabPressedImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_bigclose_pressed.png"); // NOI18N + } + } + return bigCloseTabPressedImage; + } + + private static Image getBigCloseTabRolloverImage() { + if( null == bigCloseTabMouseOverImage ) { + if( isWindowsVistaLaF() ) { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/vista_bigclose_rollover.png"); // NOI18N + } else if( isWindowsXPLaF() ) { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/xp_bigclose_rollover.png"); // NOI18N + } else if( isWindowsLaF() ) { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/win_bigclose_rollover.png"); // NOI18N + } else if( isAquaLaF() ) { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/mac_bigclose_rollover.png"); // NOI18N + } else if( isGTKLaF() ) { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/gtk_bigclose_rollover.png"); // NOI18N + } else { + bigCloseTabMouseOverImage = ImageUtilities.loadImage("org/openide/awt/resources/metal_bigclose_rollover.png"); // NOI18N + } + } + return bigCloseTabMouseOverImage; + } +} diff --git a/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java b/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java --- a/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java +++ b/openide.awt/src/org/openide/awt/CloseButtonTabbedPane.java @@ -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 --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_enabled.png b/openide.awt/src/org/openide/awt/resources/gtk_bigclose_enabled.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_enabled.png copy to openide.awt/src/org/openide/awt/resources/gtk_bigclose_enabled.png diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_pressed.png b/openide.awt/src/org/openide/awt/resources/gtk_bigclose_pressed.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_pressed.png copy to openide.awt/src/org/openide/awt/resources/gtk_bigclose_pressed.png diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_rollover.png b/openide.awt/src/org/openide/awt/resources/gtk_bigclose_rollover.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_bigclose_rollover.png copy to openide.awt/src/org/openide/awt/resources/gtk_bigclose_rollover.png diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_enabled.png b/openide.awt/src/org/openide/awt/resources/gtk_close_enabled.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_enabled.png copy to openide.awt/src/org/openide/awt/resources/gtk_close_enabled.png diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_pressed.png b/openide.awt/src/org/openide/awt/resources/gtk_close_pressed.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_pressed.png copy to openide.awt/src/org/openide/awt/resources/gtk_close_pressed.png diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_rollover.png b/openide.awt/src/org/openide/awt/resources/gtk_close_rollover.png copy from o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/resources/gtk_close_rollover.png copy to openide.awt/src/org/openide/awt/resources/gtk_close_rollover.png diff --git a/openide.awt/src/org/openide/awt/resources/mac_bigclose_enabled.png b/openide.awt/src/org/openide/awt/resources/mac_bigclose_enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..c39cde6edc08eb7620e151290c587f86a181e6c9 GIT binary patch literal 490 zc$@+10Tup003>6 z004820083o004%W004M{007iZ001+*0010$W8ohx00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$9Fmkdbk^le!Oi4sRR47w*QcH@1 zKoA`vi(JA}%*qqY0p=p+5Q0X@k6?ZZ5*0&|Ass{;FOc1wVs_pjo7B{6@RL9qp50d0 zd-bZjH6r?G#&|r|@Av!n3|5Pz{H}pV4Ua*CvAqIF4gjmL*)*rR8!- zo6Ux{+b#LNPt)m?JkJw68%@3IY>8}7LJ^ga$UUmLzs4TO>-Ac;#K~k*BiLAMs=QVYf&i}SmdL%; z{l4B2_xnA>JK|!oko{`!tY%q8Q51Dn(J*Xq@a^FwNkZrInV8%i4wH0-z$VDA*Ma!u za-r+>DtPX$1I@;9Y#a^;aXOu#O8if0nyM;AQIM2Ugi+5i9m07*qoM6N<$f;&&qcmMzZ diff --git a/openide.awt/src/org/openide/awt/resources/mac_bigclose_pressed.png b/openide.awt/src/org/openide/awt/resources/mac_bigclose_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..816404d5bedd29773f87a10912bc33ab7ddb12a9 GIT binary patch literal 499 zc$@+A0Sx|$P)003>6 z004820083o004%W004M{007iZ001+*0010$W8ohx00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$9Fmkdbk^le!RY^oaR47w@l2LAg zKoEwD58Q%N^vM(S0KEc11jH3Z6B8sPm>75lfYP)i z!@|sb^Uv(A1OPAXqwBhIyfOQ}$mgFQQO023%tdHLmqr#5klpSaoM)TNWt1?u-!%YX` zY|Un~`PJSK^gNGpdeFA*vIYNZb-&-kcDwCc#rYTwkIp|g$M=1R;}{U`HwWbvG)_T+ zhsQzwBuOAmQ;utY95n21w;N+M9z_v^VF>sSK@bR))9FMz%<<+tUx4;D91aHstFrU? pTw-FA=Xp~UMTy3;EE7tt{Q$pDmyGo&%)kHu002ovPDHLkV1f)d%98*9 diff --git a/openide.awt/src/org/openide/awt/resources/mac_bigclose_rollover.png b/openide.awt/src/org/openide/awt/resources/mac_bigclose_rollover.png new file mode 100644 index 0000000000000000000000000000000000000000..7322e97b870a912c6d3f40ee8e888aabba27c8eb GIT binary patch literal 496 zc$@+70T2F(P)003>6 z004820083o004%W004M{007iZ001+*0010$W8ohx00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$9Fmkdbk^le!Qb|NXR47w@l3i+p zKoG}k9=wI8=u=M61M~`#m=ASLqJcmn0RurF#0T*Mk{guloAeMpMc=%F;B;o`YGP=G zao3so&HTq*1pr>;V;F|kG|hY4wr`4}yrNO)Ycv{ts;c^trs;Q=Od#2GIvwk}&S$e3 zFveiLUc+Xy0mpG*xm*JJIj&=wFCcVklgWevBH8o22XkFl6f;ee+qSI+v-$Kz3S$+8T}vgCMk9xs5r4d?S&!>TOL^9mE| m%jHsEuh$BV6-6OBN&5kP3Zjr>RV?KI0000M3l0dPA!yR6L9Fc;Us#uWQCerieUr8p;zuR&h9X2WN=_eyxQ?BWKAQp zfP)WEAm`AtbO{Cy1+|!23Fi(kl~ibu@boD9Kk+Y@fWs0MhA9k8915F)`5YP;8S40q VYws-0`2=(vgQu&X%Q~loCIC)`R&4+P diff --git a/openide.awt/src/org/openide/awt/resources/metal_bigclose_pressed.png b/openide.awt/src/org/openide/awt/resources/metal_bigclose_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..c4cf1d5de37a10a72ad8dcc290c0ecfb83f9d925 GIT binary patch literal 301 zc%17D@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTL_H=O!skoK2=GCl|4l)cJ3StV|ioYtZcz5BQE(7C{BMv4&F`+3;ECNoMrCss@ zil-NLGJrU*=lBX_?yyp*e0D~12U7!sQz1i)Y0TYo+~*%`Vqk1}7uJ#GQ|iDV;PArh zA)kSvq2pvG4h1!!(B}(xco~64x2)t#(qERwrvth(uUgVH;;paQ`L1|>FVdQ&MBb@0FioJ@&Et; diff --git a/openide.awt/src/org/openide/awt/resources/metal_bigclose_rollover.png b/openide.awt/src/org/openide/awt/resources/metal_bigclose_rollover.png new file mode 100644 index 0000000000000000000000000000000000000000..5e14849c3ec6c8c3f70866f553c1292b8b66d9a3 GIT binary patch literal 291 zc%17D@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND9DoT z=#Qpx}T diff --git a/openide.awt/src/org/openide/awt/resources/vista_bigclose_enabled.png b/openide.awt/src/org/openide/awt/resources/vista_bigclose_enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..e6058316a2410666250d07f68da54517f0d6a6a6 GIT binary patch literal 349 zc%17D@N?(olHy`uVBq!ia0vp@K+Mm<1|;p3UCV(KORIKQzm zQK_f?(T#gLF=nan?(Xe$3<^@33>00oWQohOd9l)x3#0@e{Qv*IASdsoiLQditN)+H z_5ZQ6xc;sG^yK9Kh6OABKbz)vdBW9&x2OF7^RxTq%t%)r)2&N+EGtua&d=Z9U@4mJ z;4@{)loL8S=h8AV-=%f;F_pD}p4`njxgN@xNAi}#Q3 diff --git a/openide.awt/src/org/openide/awt/resources/vista_bigclose_pressed.png b/openide.awt/src/org/openide/awt/resources/vista_bigclose_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..8df8b070df932f8609a3282b0fd4d631f9e8c185 GIT binary patch literal 427 zc%17D@N?(olHy`uVBq!ia0vp@K+Mm<1|;p3UCV(KORc0%*D|Kh*5{kMOz;A{PIuIpRMpZooF4{HxS+^#MDPrm5F zumA7vXs(em{FAaJL;CR2IT~&6{pEc22TeJUV3DuP>}S8R+q)I$7$5srOOAf{d$RfE zvekSkb@iVTei@qA^4J?HsW1Ni-2bp;Q`@qh6E$IWb^3CtTi;5|>R|oiUCnTA!i=N4 Trax2w1}uZ8tDnm{r-UW|`Rly+ diff --git a/openide.awt/src/org/openide/awt/resources/vista_bigclose_rollover.png b/openide.awt/src/org/openide/awt/resources/vista_bigclose_rollover.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd51c9ce776e31aff8d99c870e5a18f7a5a1703 GIT binary patch literal 327 zc%17D@N?(olHy`uVBq!ia0vp@K+Mm<1|;p3UCV(KOR&QIIQ0Mj|HB{sMA!X~m$Us*f5P$ge;_BbU1rO_`hDfUL7e|5UR^NtwSKbT z>;J=3x&QN9X8f%$ep=MS@qE!5w+kDqI1h;liUEr(F|K<(6|;ZBRYRra96AfHH;YvLG$_@W)xp|qBgx3{Ut+)Hg?*wIfPP@` MboFyt=akR{04xHAjQ{`u diff --git a/openide.awt/src/org/openide/awt/resources/win_bigclose_disabled.png b/openide.awt/src/org/openide/awt/resources/win_bigclose_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..97b1ea9b350d9ba9fdc2c7d786ceaa8abdbd127c GIT binary patch literal 206 zc%17D@N?(olHy`uVBq!ia0vp^0w6XA6Oh!uSy>FESkfJR9T^y|-MHc(VFct$mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$h@N{tuskoK&=l_3uX3Yk{6%St> zo$RtIZgV2LFmoq^>*1fDk2iAc=jdW{cJ}U2+L5(G!OmVmx^tP-ZutjY7ebN?g=X<) ztUJDr@m-$D{|7v(KI#i!F04JW(cz2WdPao<3>Q{A*e$$O@D^wngQu&X%Q~loCIEpu BNqhhR diff --git a/openide.awt/src/org/openide/awt/resources/win_bigclose_enabled.png b/openide.awt/src/org/openide/awt/resources/win_bigclose_enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..dfca0ee29fa1edb3079ff71c20a6d352a3c6d47d GIT binary patch literal 273 zc%17D@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND9DoT z=edv{YO6v`iMg|9l#H$@=SH1ulSCGkc zv*ql00|o&HpB*L-xeWvuI27E9Cd)W5Oq|QWz|@h`%fQISVAO3~yCsqx#3oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hVpdAc};RNP9+$;e1h;A3DB;1+0SsSpTRzBZpvz`=*dg}H%2$x+jRL2=3}i3kS4 zO)|4MK%BUp1x!l3;q2lq3=IrUg$yyK%d8X_I21~@A6k0x3L~Qf!$NJ>Vg@6ikeW}a z!{-Zkco`WOkF>1hTdm*7pwJLu5Zmd^qR`;c!PLNz)ObYS(2J3Yhr#5f#*K~3ME?O@ O#^CAd=d#Wzp$Pz!(@8o2 diff --git a/openide.awt/src/org/openide/awt/resources/win_bigclose_rollover.png b/openide.awt/src/org/openide/awt/resources/win_bigclose_rollover.png new file mode 100644 index 0000000000000000000000000000000000000000..2693621654bfab03eb3e1343e69ffeb6484a9939 GIT binary patch literal 283 zc%17D@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND9DoT z=3Ky48Tnf)QX42*0HbAqhZr|Yc$ Q33METr>mdKI;Vst0Fm8HxBvhE diff --git a/openide.awt/src/org/openide/awt/resources/xp_bigclose_enabled.png b/openide.awt/src/org/openide/awt/resources/xp_bigclose_enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..01147a8f78caca394da0941dae329771ff05484c GIT binary patch literal 258 zc%17D@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamUKs7M+S!VC(K#9UIO`&C9V-A z!TD(=<%vb942~)JNvR5+xryniL8*x;m4zo$ZGeiVc)B=-RNPAX^Z&m+vn7KJ)4O&1#*H8L9L+awTw!1lXzMNfXn4+kqcKDSp<}; zm=vz{GcX?U$UDWzp|EK&vqHm(Ya9X&DcLL>1`Kx@{G^X|x4r_pkHOQ`&t;ucLK6TJ C)Kzr= diff --git a/openide.awt/src/org/openide/awt/resources/xp_bigclose_pressed.png b/openide.awt/src/org/openide/awt/resources/xp_bigclose_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1071793e5af3ce2879892066fcb518ee27d923 GIT binary patch literal 548 zc$@(w0^9wGP)`(=2>~GWABY(tMgy7u{{I6r zKpG%o{~4H=nHi*oxj{S?fB*t%Wcc?FBFV(W2v+bPrkeqw2?YQC`NQz{?;o%bKmaj8 z#6c$i0}Gg%nK76F@x_Z5!PvsWlEK2#3a;k=KZrVj0Ahi89OMj;sk3L#Vn|I*V@OL& zhX=~c8PgchEdU50Cb%rrW%~O146|m>L};2hok3Sm5A58(|A0>Y_ZKV<5I|s!fB*gh z`tvW?vBe{tjAiw|zq4`@={dJH40000VQ~<0YA6{#7%~VHj4oQi1FOH!yrwIR8({rczFfz>iYco1H+v= zS3t}-fB<3uYP|jF)BFGb{{15Y|NReA3(^A+KrA5VadY!B{Qv)tfsv7k;Xe>E{9|DF z`|l3}P>=zroB`w=1|ZGC%Fe*T#0;`g1t5Sx8X5ln1*!yUU}j+gYWfe>3^E8L#sJmy z4@m#|`Gev2uODD%0|XEghyXePj6sUb%*`3h%`F%%UAn|@5s0mA>=FC z@1H+ljQ|0}0`oWvD;wCRS+i#_q@`vsWMpK)17+&eiBM;QEP!YP2p}f7?7#nDtf#Bb zFmuLqgr;ee7<9C?!T$XH`zH|p0*eC#5Ln~SpI;gN{QU(EkP8>iF{Ec?!Zl`R