This is an automated email from the ASF dual-hosted git repository. ebakke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ca502ee9dccac63452720007f29462f7cf793b87 Author: Eirik Bakke <[email protected]> AuthorDate: Sun Dec 22 15:28:15 2024 -0500 On FlatLAF, add custom icons for file choosers and OptionPane to match the style of other NetBeans icons. The icons for OptionPane are 32x32 pixel version of the info/error/warning/question icons (scaled up from similar 16x16 SVG icons, but maintaining the 1px border width as this looks better). The icons for file chooser are "folder", "file", "parent folder", and "home folder". To keep the SVG loader module optional for NetBeans Platform apps, PNG versions of the icons are used here. SVG versions will be added in a separate commit (together with a bunch of other SVG files). --- .../org/netbeans/swing/laf/flatlaf/FlatLaf.properties | 17 +++++++++++++++++ ...TreeClosedIcon.java => NBFlatFileViewFileIcon.java} | 8 ++++---- ...atTreeClosedIcon.java => NBFlatHomeFolderIcon.java} | 8 ++++---- ...latTreeClosedIcon.java => NBFlatNewFolderIcon.java} | 8 ++++---- ...eClosedIcon.java => NBFlatOptionPaneErrorIcon.java} | 8 ++++---- ...dIcon.java => NBFlatOptionPaneInformationIcon.java} | 8 ++++---- ...osedIcon.java => NBFlatOptionPaneQuestionIcon.java} | 8 ++++---- ...losedIcon.java => NBFlatOptionPaneWarningIcon.java} | 8 ++++---- .../swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java | 2 +- .../swing/laf/flatlaf/icons/NBFlatTreeOpenIcon.java | 2 +- ...FlatTreeClosedIcon.java => NBFlatUpFolderIcon.java} | 8 ++++---- .../netbeans/swing/laf/flatlaf/resources/error32.png | Bin 0 -> 571 bytes .../netbeans/swing/laf/flatlaf/resources/filePlain.png | Bin 0 -> 208 bytes .../netbeans/swing/laf/flatlaf/resources/folderUp.png | Bin 0 -> 300 bytes .../org/netbeans/swing/laf/flatlaf/resources/home.png | Bin 0 -> 430 bytes .../netbeans/swing/laf/flatlaf/resources/info32.png | Bin 0 -> 762 bytes .../netbeans/swing/laf/flatlaf/resources/newFolder.png | Bin 0 -> 368 bytes .../swing/laf/flatlaf/resources/question32.png | Bin 0 -> 976 bytes .../netbeans/swing/laf/flatlaf/resources/warning32.png | Bin 0 -> 699 bytes 19 files changed, 51 insertions(+), 34 deletions(-) diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties index b3018b7e3f1..6d7580f13cc 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties @@ -52,6 +52,23 @@ TabbedPane.cardTabArc = 0 Tree.closedIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatTreeClosedIcon Tree.openIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatTreeOpenIcon +#---- OptionPane icons ---- + +OptionPane.errorIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatOptionPaneErrorIcon +OptionPane.informationIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatOptionPaneInformationIcon +OptionPane.questionIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatOptionPaneQuestionIcon +OptionPane.warningIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatOptionPaneWarningIcon + +#---- Swing File Chooser icons ---- + +FileView.directoryIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatTreeClosedIcon +FileView.fileIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatFileViewFileIcon +#FileView.computerIcon = com.formdev.flatlaf.icons.FlatFileViewComputerIcon +#FileView.hardDriveIcon = com.formdev.flatlaf.icons.FlatFileViewHardDriveIcon +#FileView.floppyDriveIcon = com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon +FileChooser.newFolderIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatNewFolderIcon +FileChooser.upFolderIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatUpFolderIcon +FileChooser.homeFolderIcon = org.netbeans.swing.laf.flatlaf.icons.NBFlatHomeFolderIcon #---- TabbedContainer ---- diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatFileViewFileIcon.java similarity index 78% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatFileViewFileIcon.java index 4863184bbad..7ea7887d4e5 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatFileViewFileIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatFileViewFileIcon extends NBFlatAdapterIcon { + public NBFlatFileViewFileIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/filePlain.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatHomeFolderIcon.java similarity index 78% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatHomeFolderIcon.java index 4863184bbad..0d3f2768b10 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatHomeFolderIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatHomeFolderIcon extends NBFlatAdapterIcon { + public NBFlatHomeFolderIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/home.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatNewFolderIcon.java similarity index 78% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatNewFolderIcon.java index 4863184bbad..4c4ecfb0ae9 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatNewFolderIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatNewFolderIcon extends NBFlatAdapterIcon { + public NBFlatNewFolderIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/newFolder.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneErrorIcon.java similarity index 77% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneErrorIcon.java index 4863184bbad..68bd4949bc6 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneErrorIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatOptionPaneErrorIcon extends NBFlatAdapterIcon { + public NBFlatOptionPaneErrorIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/error32.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneInformationIcon.java similarity index 76% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneInformationIcon.java index 4863184bbad..ca88bc3ba2d 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneInformationIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatOptionPaneInformationIcon extends NBFlatAdapterIcon { + public NBFlatOptionPaneInformationIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/info32.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneQuestionIcon.java similarity index 77% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneQuestionIcon.java index 4863184bbad..435786350a4 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneQuestionIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatOptionPaneQuestionIcon extends NBFlatAdapterIcon { + public NBFlatOptionPaneQuestionIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/question32.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneWarningIcon.java similarity index 77% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneWarningIcon.java index 4863184bbad..91debd9981d 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatOptionPaneWarningIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatOptionPaneWarningIcon extends NBFlatAdapterIcon { + public NBFlatOptionPaneWarningIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/warning32.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java index 4863184bbad..f4d8444731a 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java @@ -20,7 +20,7 @@ package org.netbeans.swing.laf.flatlaf.icons; public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. + // Will load the SVG version if an SVG loader is available. super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeOpenIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeOpenIcon.java index 1e75d745237..8382cc17281 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeOpenIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeOpenIcon.java @@ -20,7 +20,7 @@ package org.netbeans.swing.laf.flatlaf.icons; public class NBFlatTreeOpenIcon extends NBFlatAdapterIcon { public NBFlatTreeOpenIcon() { - // Will load the SVG version if available. + // Will load the SVG version if an SVG loader is available. super("org/netbeans/swing/plaf/resources/hidpi-folder-open.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatUpFolderIcon.java similarity index 78% copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatUpFolderIcon.java index 4863184bbad..765e5f483b8 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatTreeClosedIcon.java +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/icons/NBFlatUpFolderIcon.java @@ -18,9 +18,9 @@ */ package org.netbeans.swing.laf.flatlaf.icons; -public class NBFlatTreeClosedIcon extends NBFlatAdapterIcon { - public NBFlatTreeClosedIcon() { - // Will load the SVG version if available. - super("org/netbeans/swing/plaf/resources/hidpi-folder-closed.png"); +public class NBFlatUpFolderIcon extends NBFlatAdapterIcon { + public NBFlatUpFolderIcon() { + // Will load the SVG version if an SVG loader is available. + super("org/netbeans/swing/laf/flatlaf/resources/folderUp.png"); } } diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/error32.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/error32.png new file mode 100644 index 00000000000..ac59f46d50f Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/error32.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/filePlain.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/filePlain.png new file mode 100644 index 00000000000..90f13fb69d1 Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/filePlain.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/folderUp.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/folderUp.png new file mode 100644 index 00000000000..d7d96d08561 Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/folderUp.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/home.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/home.png new file mode 100644 index 00000000000..b18312c3576 Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/home.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/info32.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/info32.png new file mode 100644 index 00000000000..8007c8c38b5 Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/info32.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/newFolder.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/newFolder.png new file mode 100644 index 00000000000..afca072847d Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/newFolder.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/question32.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/question32.png new file mode 100644 index 00000000000..5d02ae4f146 Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/question32.png differ diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/warning32.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/warning32.png new file mode 100644 index 00000000000..749e9e3f3ae Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/warning32.png differ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
