FileChooser: newFolderIcon, upFolderIcon, homeFolderIcon, detailsViewIcon and listViewIcon added

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatFileChooserDetailsViewIcon.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+
+/**
+ * "details view" icon for {@link javax.swing.JFileChooser}.
+ *
+ * @uiDefault FileChooser.icon.detailsViewColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatFileChooserDetailsViewIcon
+	extends FlatAbstractIcon
+{
+	public FlatFileChooserDetailsViewIcon() {
+		super( 16, 16, UIManager.getColor( "FileChooser.icon.detailsViewColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <g fill="none" fill-rule="evenodd">
+			    <rect width="4" height="4" x="3" y="3" fill="#6E6E6E"/>
+			    <rect width="4" height="4" x="3" y="9" fill="#6E6E6E"/>
+			    <rect width="4" height="4" x="9" y="9" fill="#6E6E6E"/>
+			    <rect width="4" height="4" x="9" y="3" fill="#6E6E6E"/>
+			  </g>
+			</svg>
+		*/
+
+		g.fillRect( 3, 3, 4, 4 );
+		g.fillRect( 3, 9, 4, 4 );
+		g.fillRect( 9, 9, 4, 4 );
+		g.fillRect( 9, 3, 4, 4 );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatFileChooserHomeFolderIcon.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * "home folder" icon for {@link javax.swing.JFileChooser}.
+ *
+ * @uiDefault FileChooser.icon.homeFolderColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatFileChooserHomeFolderIcon
+	extends FlatAbstractIcon
+{
+	public FlatFileChooserHomeFolderIcon() {
+		super( 16, 16, UIManager.getColor( "FileChooser.icon.homeFolderColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <polygon fill="#6E6E6E" fill-rule="evenodd" points="2 8 8 2 14 8 12 8 12 13 9 13 9 10 7 10 7 13 4 13 4 8"/>
+			</svg>
+		*/
+
+		g.fill( FlatUIUtils.createPath( 2,8, 8,2, 14,8, 12,8, 12,13, 9,13, 9,10, 7,10, 7,13, 4,13, 4,8 ) );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatFileChooserListViewIcon.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+
+/**
+ * "list view" icon for {@link javax.swing.JFileChooser}.
+ *
+ * @uiDefault FileChooser.icon.listViewColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatFileChooserListViewIcon
+	extends FlatAbstractIcon
+{
+	public FlatFileChooserListViewIcon() {
+		super( 16, 16, UIManager.getColor( "FileChooser.icon.listViewColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <g fill="none" fill-rule="evenodd">
+			    <rect width="2" height="2" x="2" y="3" fill="#6E6E6E"/>
+			    <rect width="2" height="2" x="2" y="7" fill="#6E6E6E"/>
+			    <rect width="2" height="2" x="2" y="11" fill="#6E6E6E"/>
+			    <rect width="8" height="2" x="6" y="3" fill="#6E6E6E"/>
+			    <rect width="8" height="2" x="6" y="7" fill="#6E6E6E"/>
+			    <rect width="8" height="2" x="6" y="11" fill="#6E6E6E"/>
+			  </g>
+			</svg>
+		*/
+
+		g.fillRect( 2, 3, 2, 2 );
+		g.fillRect( 2, 7, 2, 2 );
+		g.fillRect( 2, 11, 2, 2 );
+		g.fillRect( 6, 3, 8, 2 );
+		g.fillRect( 6, 7, 8, 2 );
+		g.fillRect( 6, 11, 8, 2 );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatFileChooserNewFolderIcon.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * "new folder" icon for {@link javax.swing.JFileChooser}.
+ *
+ * @uiDefault FileChooser.icon.newFolderColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatFileChooserNewFolderIcon
+	extends FlatAbstractIcon
+{
+	public FlatFileChooserNewFolderIcon() {
+		super( 16, 16, UIManager.getColor( "FileChooser.icon.newFolderColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <g fill="none" fill-rule="evenodd">
+			    <polygon fill="#6E6E6E" points="2 3 5.5 3 7 5 14 5 14 8 11 8 11 10 9 10 9 13 2 13"/>
+			    <path fill="#59A869" d="M14,11 L16,11 L16,13 L14,13 L14,15 L12,15 L12,13 L10,13 L10,11 L12,11 L12,9 L14,9 L14,11 Z"/>
+			  </g>
+			</svg>
+		*/
+
+		g.fill( FlatUIUtils.createPath( 2,3, 5.5,3, 7,5, 14,5, 14,8, 11,8, 11,10, 9,10, 9,13, 2,13 ) );
+		g.fill( FlatUIUtils.createPath( 14,11, 16,11, 16,13, 14,13, 14,15, 12,15, 12,13, 10,13, 10,11, 12,11, 12,9, 14,9, 14,11 ) );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatFileChooserUpFolderIcon.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * "up folder" icon for {@link javax.swing.JFileChooser}.
+ *
+ * @uiDefault FileChooser.icon.upFolderColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatFileChooserUpFolderIcon
+	extends FlatAbstractIcon
+{
+	public FlatFileChooserUpFolderIcon() {
+		super( 16, 16, UIManager.getColor( "FileChooser.icon.upFolderColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <g fill="none" fill-rule="evenodd">
+			    <polygon fill="#6E6E6E" points="2 3 5.5 3 7 5 9 5 9 9 13 9 13 5 14 5 14 13 2 13"/>
+			    <path fill="#389FD6" d="M12,4 L12,8 L10,8 L10,4 L8,4 L11,1 L14,4 L12,4 Z"/>
+			  </g>
+			</svg>
+		*/
+
+		g.fill( FlatUIUtils.createPath( 2,3, 5.5,3, 7,5, 9,5, 9,9, 13,9, 13,5, 14,5, 14,13, 2,13 ) );
+		g.fill( FlatUIUtils.createPath( 12,4, 12,8, 10,8, 10,4, 8,4, 11,1, 14,4, 12,4 ) );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java

@@ -168,6 +168,15 @@ public class FlatUIUtils
 		return rect;
 	}
 
+	public static Path2D createPath( double... points ) {
+		Path2D path = new Path2D.Float();
+		path.moveTo( points[0], points[1] );
+		for( int i = 2; i < points.length; i += 2 )
+			path.lineTo( points[i], points[i + 1] );
+		path.closePath();
+		return path;
+	}
+
 	/**
 	 * Replacement for SwingUtilities2.drawStringUnderlineCharAt()
 	 */

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties

@@ -104,6 +104,21 @@ EditorPane.background=@textComponentBackground
 EditorPane.margin=@textComponentMargin
 
 
+#---- FileChooser ----
+
+FileChooser.newFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserNewFolderIcon
+FileChooser.upFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon
+FileChooser.homeFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon
+FileChooser.detailsViewIcon=com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon
+FileChooser.listViewIcon=com.formdev.flatlaf.icons.FlatFileChooserListViewIcon
+
+FileChooser.icon.newFolderColor=@icon
+FileChooser.icon.upFolderColor=@icon
+FileChooser.icon.homeFolderColor=@icon
+FileChooser.icon.detailsViewColor=@icon
+FileChooser.icon.listViewColor=@icon
+
+
 #---- FormattedTextField ----
 
 FormattedTextField.border=com.formdev.flatlaf.ui.FlatBorder

flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.java

@@ -38,6 +38,8 @@ public class FlatChooserTest
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JLabel colorChooserLabel = new JLabel();
 		JColorChooser colorChooser1 = new JColorChooser();
+		JLabel fileChooserLabel = new JLabel();
+		JFileChooser fileChooser1 = new JFileChooser();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -46,12 +48,18 @@ public class FlatChooserTest
 			"[]" +
 			"[]",
 			// rows
+			"[top]" +
 			"[top]"));
 
 		//---- colorChooserLabel ----
 		colorChooserLabel.setText("JColorChooser:");
 		add(colorChooserLabel, "cell 0 0");
 		add(colorChooser1, "cell 1 0");
+
+		//---- fileChooserLabel ----
+		fileChooserLabel.setText("JFileChooser:");
+		add(fileChooserLabel, "cell 0 1");
+		add(fileChooser1, "cell 1 1");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 

flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.jfd

@@ -9,7 +9,7 @@ new FormModel {
 		add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr"
 			"$columnConstraints": "[][]"
-			"$rowConstraints": "[top]"
+			"$rowConstraints": "[top][top]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -23,6 +23,17 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 0"
 			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "fileChooserLabel"
+				"text": "JFileChooser:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 1"
+			} )
+			add( new FormComponent( "javax.swing.JFileChooser" ) {
+				name: "fileChooser1"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 1"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
 			"size": new java.awt.Dimension( 790, 715 )

flatlaf-core/svg/FileChooserDetailsViewIcon.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="4" height="4" x="3" y="3" fill="#6E6E6E"/>
+    <rect width="4" height="4" x="3" y="9" fill="#6E6E6E"/>
+    <rect width="4" height="4" x="9" y="9" fill="#6E6E6E"/>
+    <rect width="4" height="4" x="9" y="3" fill="#6E6E6E"/>
+  </g>
+</svg>

flatlaf-core/svg/FileChooserHomeFolderIcon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="2 8 8 2 14 8 12 8 12 13 9 13 9 10 7 10 7 13 4 13 4 8"/>
+</svg>

flatlaf-core/svg/FileChooserListViewIcon.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="2" height="2" x="2" y="3" fill="#6E6E6E"/>
+    <rect width="2" height="2" x="2" y="7" fill="#6E6E6E"/>
+    <rect width="2" height="2" x="2" y="11" fill="#6E6E6E"/>
+    <rect width="8" height="2" x="6" y="3" fill="#6E6E6E"/>
+    <rect width="8" height="2" x="6" y="7" fill="#6E6E6E"/>
+    <rect width="8" height="2" x="6" y="11" fill="#6E6E6E"/>
+  </g>
+</svg>

flatlaf-core/svg/FileChooserNewFolderIcon.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#6E6E6E" points="2 3 5.5 3 7 5 14 5 14 8 11 8 11 10 9 10 9 13 2 13"/>
+    <path fill="#59A869" d="M14,11 L16,11 L16,13 L14,13 L14,15 L12,15 L12,13 L10,13 L10,11 L12,11 L12,9 L14,9 L14,11 Z"/>
+  </g>
+</svg>

flatlaf-core/svg/FileChooserUpFolderIcon.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#6E6E6E" points="2 3 5.5 3 7 5 9 5 9 9 13 9 13 5 14 5 14 13 2 13"/>
+    <path fill="#389FD6" d="M12,4 L12,8 L10,8 L10,4 L8,4 L11,1 L14,4 L12,4 Z"/>
+  </g>
+</svg>