From b5f2f779445144c25a8d3aa48d49e3b528518b7d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 8 Sep 2021 00:08:54 +0200 Subject: [PATCH] Theme Editor: layout of "All" preview tab improvements: - right align "enabled" and "focused" check boxes - two columns for controls - removed help button - JTextArea, JEditorPane and JTextPane in single line - reduced some vertical gaps --- .../themeeditor/FlatThemePreviewAll.java | 135 ++++++++--------- .../themeeditor/FlatThemePreviewAll.jfd | 140 ++++++++---------- 2 files changed, 127 insertions(+), 148 deletions(-) diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java index 25b7bc57..76c65137 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java @@ -210,6 +210,7 @@ class FlatThemePreviewAll private void initComponents() { // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents + JPanel hSpacer1 = new JPanel(null); enabledCheckBox = new JCheckBox(); focusedCheckBox = new JCheckBox(); JLabel labelLabel = new JLabel(); @@ -218,20 +219,15 @@ class FlatThemePreviewAll JLabel buttonLabel = new JLabel(); JButton button1 = new JButton(); FlatThemePreviewAll.PreviewDefaultButton testDefaultButton1 = new FlatThemePreviewAll.PreviewDefaultButton(); - FlatButton helpButton = new FlatButton(); - JPanel hSpacer2 = new JPanel(null); JLabel toggleButtonLabel = new JLabel(); JToggleButton toggleButton1 = new JToggleButton(); JToggleButton toggleButton3 = new JToggleButton(); - JPanel hSpacer1 = new JPanel(null); JLabel checkBoxLabel = new JLabel(); JCheckBox checkBox1 = new JCheckBox(); JCheckBox checkBox3 = new JCheckBox(); - JPanel hSpacer3 = new JPanel(null); JLabel radioButtonLabel = new JLabel(); JRadioButton radioButton1 = new JRadioButton(); JRadioButton radioButton3 = new JRadioButton(); - JPanel hSpacer4 = new JPanel(null); JLabel comboBoxLabel = new JLabel(); FlatComboBox comboBox1 = new FlatComboBox<>(); JComboBox comboBox3 = new JComboBox<>(); @@ -285,6 +281,7 @@ class FlatThemePreviewAll JButton button6 = new JButton(); JToggleButton button7 = new JToggleButton(); JToggleButton button8 = new JToggleButton(); + JToggleButton button9 = new JToggleButton(); JLabel tabbedPaneLabel = new JLabel(); tabbedPane1 = new FlatThemePreviewAll.PreviewTabbedPane(); JLabel listTreeLabel = new JLabel(); @@ -306,15 +303,10 @@ class FlatThemePreviewAll "insets dialog,hidemode 3", // columns "[fill]" + - "[130,fill]", + "[60,sizegroup 1,fill]" + + "[60,sizegroup 1,fill]", // rows - "[]unrel" + - "[]" + - "[]" + - "[]" + - "[]" + - "[]" + - "[]" + + "[]para" + "[]" + "[]" + "[]" + @@ -324,9 +316,14 @@ class FlatThemePreviewAll "[]" + "[]" + "[]" + + "[fill]" + + "[]" + + "[]4" + "[]" + "[]" + + "[]0" + "[]" + + "[]0" + "[]" + "[]" + "[]" + @@ -335,17 +332,18 @@ class FlatThemePreviewAll "[]" + "[100,fill]" + "[grow]")); + add(hSpacer1, "cell 0 0 3 1,growx"); //---- enabledCheckBox ---- enabledCheckBox.setText("Enabled"); enabledCheckBox.setSelected(true); enabledCheckBox.addActionListener(e -> enabledChanged()); - add(enabledCheckBox, "cell 0 0 2 1,alignx left,growx 0"); + add(enabledCheckBox, "cell 0 0 3 1"); //---- focusedCheckBox ---- focusedCheckBox.setText("Focused"); focusedCheckBox.addActionListener(e -> focusedChanged()); - add(focusedCheckBox, "cell 0 0 2 1"); + add(focusedCheckBox, "cell 0 0 3 1"); //---- labelLabel ---- labelLabel.setText("JLabel:"); @@ -353,7 +351,7 @@ class FlatThemePreviewAll //---- label1 ---- label1.setText("Some Text"); - add(label1, "cell 1 1"); + add(label1, "cell 1 1 2 1"); //---- flatButton1 ---- flatButton1.setText("Help"); @@ -367,16 +365,11 @@ class FlatThemePreviewAll //---- button1 ---- button1.setText("OK"); - add(button1, "cell 1 2,alignx left,growx 0"); + add(button1, "cell 1 2"); //---- testDefaultButton1 ---- testDefaultButton1.setText("Default"); - add(testDefaultButton1, "cell 1 2"); - - //---- helpButton ---- - helpButton.setButtonType(FlatButton.ButtonType.help); - add(helpButton, "cell 1 2"); - add(hSpacer2, "cell 1 2"); + add(testDefaultButton1, "cell 2 2"); //---- toggleButtonLabel ---- toggleButtonLabel.setText("JToggleButton:"); @@ -384,13 +377,12 @@ class FlatThemePreviewAll //---- toggleButton1 ---- toggleButton1.setText("Unselected"); - add(toggleButton1, "cell 1 3,alignx left,growx 0"); + add(toggleButton1, "cell 1 3"); //---- toggleButton3 ---- toggleButton3.setText("Selected"); toggleButton3.setSelected(true); - add(toggleButton3, "cell 1 3"); - add(hSpacer1, "cell 1 3"); + add(toggleButton3, "cell 2 3"); //---- checkBoxLabel ---- checkBoxLabel.setText("JCheckBox"); @@ -403,8 +395,7 @@ class FlatThemePreviewAll //---- checkBox3 ---- checkBox3.setText("Selected"); checkBox3.setSelected(true); - add(checkBox3, "cell 1 4,alignx left,growx 0"); - add(hSpacer3, "cell 1 4"); + add(checkBox3, "cell 2 4,alignx left,growx 0"); //---- radioButtonLabel ---- radioButtonLabel.setText("JRadioButton:"); @@ -417,8 +408,7 @@ class FlatThemePreviewAll //---- radioButton3 ---- radioButton3.setText("Selected"); radioButton3.setSelected(true); - add(radioButton3, "cell 1 5,alignx left,growx 0"); - add(hSpacer4, "cell 1 5"); + add(radioButton3, "cell 2 5,alignx left,growx 0"); //---- comboBoxLabel ---- comboBoxLabel.setText("JComboBox:"); @@ -442,7 +432,7 @@ class FlatThemePreviewAll })); comboBox1.setMaximumRowCount(6); comboBox1.setPlaceholderText("placeholder text"); - add(comboBox1, "cell 1 6,width 50"); + add(comboBox1, "cell 1 6"); //---- comboBox3 ---- comboBox3.setModel(new DefaultComboBoxModel<>(new String[] { @@ -460,12 +450,12 @@ class FlatThemePreviewAll "kkk" })); comboBox3.setMaximumRowCount(6); - add(comboBox3, "cell 1 6,width 50"); + add(comboBox3, "cell 2 6"); //---- spinnerLabel ---- spinnerLabel.setText("JSpinner:"); add(spinnerLabel, "cell 0 7"); - add(spinner1, "cell 1 7"); + add(spinner1, "cell 1 7 2 1"); //---- textFieldLabel ---- textFieldLabel.setText("JTextField:
JFormattedTextF.:
JPasswordField:"); @@ -474,21 +464,21 @@ class FlatThemePreviewAll //---- textField1 ---- textField1.setText("Some Text"); textField1.setPlaceholderText("placeholder text"); - add(textField1, "cell 1 8"); + add(textField1, "cell 1 8 2 1"); //---- formattedTextField1 ---- formattedTextField1.setText("Some Text"); formattedTextField1.setPlaceholderText("placeholder text"); - add(formattedTextField1, "cell 1 9,width 50"); + add(formattedTextField1, "cell 1 9"); //---- passwordField1 ---- passwordField1.setText("Some Text"); passwordField1.setPlaceholderText("placeholder text"); - add(passwordField1, "cell 1 9,width 50"); + add(passwordField1, "cell 2 9"); //---- textAreaLabel ---- - textAreaLabel.setText("JTextArea:

JEditorPane:
JTextPane:"); - add(textAreaLabel, "cell 0 10 1 2"); + textAreaLabel.setText("JTextArea:
JEditorPane:
JTextPane:"); + add(textAreaLabel, "cell 0 10"); //======== scrollPane1 ======== { @@ -496,11 +486,11 @@ class FlatThemePreviewAll scrollPane1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //---- textArea1 ---- - textArea1.setText("Some Text"); + textArea1.setText("Text"); textArea1.setRows(2); scrollPane1.setViewportView(textArea1); } - add(scrollPane1, "cell 1 10"); + add(scrollPane1, "cell 1 10 2 1,width 40"); //======== scrollPane5 ======== { @@ -508,10 +498,10 @@ class FlatThemePreviewAll scrollPane5.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //---- editorPane1 ---- - editorPane1.setText("Some Text"); + editorPane1.setText("Text"); scrollPane5.setViewportView(editorPane1); } - add(scrollPane5, "cell 1 11,width 50"); + add(scrollPane5, "cell 1 10 2 1,width 40"); //======== scrollPane9 ======== { @@ -519,14 +509,14 @@ class FlatThemePreviewAll scrollPane9.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //---- textPane1 ---- - textPane1.setText("Some Text"); + textPane1.setText("Text"); scrollPane9.setViewportView(textPane1); } - add(scrollPane9, "cell 1 11,width 50"); + add(scrollPane9, "cell 1 10 2 1,width 40"); //---- menuBarLabel ---- menuBarLabel.setText("JMenuBar:"); - add(menuBarLabel, "cell 0 12"); + add(menuBarLabel, "cell 0 11"); //---- menuUnderlineSelectionButton ---- menuUnderlineSelectionButton.setText("_"); @@ -535,7 +525,7 @@ class FlatThemePreviewAll menuUnderlineSelectionButton.setFocusable(false); menuUnderlineSelectionButton.setFont(menuUnderlineSelectionButton.getFont().deriveFont(menuUnderlineSelectionButton.getFont().getSize() - 2f)); menuUnderlineSelectionButton.addActionListener(e -> menuUnderlineSelectionChanged()); - add(menuUnderlineSelectionButton, "cell 0 12"); + add(menuUnderlineSelectionButton, "cell 0 11"); //======== menuBar1 ======== { @@ -613,33 +603,33 @@ class FlatThemePreviewAll } menuBar1.add(menu3); } - add(menuBar1, "cell 1 12"); + add(menuBar1, "cell 1 11 2 1"); //---- scrollBarLabel ---- scrollBarLabel.setText("JScrollBar:"); - add(scrollBarLabel, "cell 0 13"); + add(scrollBarLabel, "cell 0 12 1 2,aligny top,growy 0"); //---- scrollBar1 ---- scrollBar1.setOrientation(Adjustable.HORIZONTAL); - add(scrollBar1, "cell 1 13"); + add(scrollBar1, "cell 1 12 2 1"); //---- scrollBar5 ---- scrollBar5.setOrientation(Adjustable.HORIZONTAL); scrollBar5.setShowButtons(true); - add(scrollBar5, "cell 1 14"); + add(scrollBar5, "cell 1 13 2 1"); //---- separatorLabel ---- separatorLabel.setText("JSeparator:"); - add(separatorLabel, "cell 0 15"); - add(separator1, "cell 1 15"); + add(separatorLabel, "cell 0 14"); + add(separator1, "cell 1 14 2 1"); //---- sliderLabel ---- sliderLabel.setText("JSlider:"); - add(sliderLabel, "cell 0 16"); + add(sliderLabel, "cell 0 15"); //---- slider1 ---- slider1.setValue(30); - add(slider1, "cell 1 16"); + add(slider1, "cell 1 15 2 1,width 100"); //---- slider3 ---- slider3.setMinorTickSpacing(10); @@ -648,32 +638,32 @@ class FlatThemePreviewAll slider3.setPaintLabels(true); slider3.setValue(30); slider3.addChangeListener(e -> changeProgress()); - add(slider3, "cell 1 17"); + add(slider3, "cell 1 16 2 1,width 100"); //---- progressBarLabel ---- progressBarLabel.setText("JProgressBar:"); - add(progressBarLabel, "cell 0 18"); + add(progressBarLabel, "cell 0 17"); //---- progressBar1 ---- progressBar1.setValue(60); - add(progressBar1, "cell 1 18"); + add(progressBar1, "cell 1 17 2 1"); //---- progressBar2 ---- progressBar2.setValue(50); progressBar2.setStringPainted(true); - add(progressBar2, "cell 1 19"); + add(progressBar2, "cell 1 18 2 1"); //---- toolTipLabel ---- toolTipLabel.setText("JToolTip:"); - add(toolTipLabel, "cell 0 20"); + add(toolTipLabel, "cell 0 19"); //---- toolTip1 ---- toolTip1.setTipText("Some text in tool tip."); - add(toolTip1, "cell 1 20,alignx left,growx 0"); + add(toolTip1, "cell 1 19 2 1,alignx left,growx 0"); //---- toolBarLabel ---- toolBarLabel.setText("JToolBar:"); - add(toolBarLabel, "cell 0 21"); + add(toolBarLabel, "cell 0 20"); //======== toolBar1 ======== { @@ -695,17 +685,22 @@ class FlatThemePreviewAll button8.setIcon(UIManager.getIcon("Tree.leafIcon")); button8.setSelected(true); toolBar1.add(button8); + + //---- button9 ---- + button9.setIcon(UIManager.getIcon("Tree.leafIcon")); + button9.setSelected(true); + toolBar1.add(button9); } - add(toolBar1, "cell 1 21"); + add(toolBar1, "cell 1 20 2 1"); //---- tabbedPaneLabel ---- tabbedPaneLabel.setText("JTabbedPane:"); - add(tabbedPaneLabel, "cell 0 22"); - add(tabbedPane1, "cell 1 22"); + add(tabbedPaneLabel, "cell 0 21"); + add(tabbedPane1, "cell 1 21 2 1"); //---- listTreeLabel ---- listTreeLabel.setText("JList / JTree:
JSplitPane:"); - add(listTreeLabel, "cell 0 23,aligny top,growy 0"); + add(listTreeLabel, "cell 0 22,aligny top,growy 0"); //======== splitPane1 ======== { @@ -748,11 +743,11 @@ class FlatThemePreviewAll } splitPane1.setRightComponent(scrollPane3); } - add(splitPane1, "cell 1 23,height 50"); + add(splitPane1, "cell 1 22 2 1,height 50"); //---- tableLabel ---- tableLabel.setText("JTable:"); - add(tableLabel, "cell 0 24"); + add(tableLabel, "cell 0 23"); //======== scrollPane4 ======== { @@ -769,11 +764,11 @@ class FlatThemePreviewAll )); scrollPane4.setViewportView(table1); } - add(scrollPane4, "cell 1 24,height 70"); + add(scrollPane4, "cell 1 23 2 1,width 100,height 70"); //---- internalFrameLabel ---- internalFrameLabel.setText("JDesktopPane:
JInternalFrame:"); - add(internalFrameLabel, "cell 0 25,aligny top,growy 0"); + add(internalFrameLabel, "cell 0 24,aligny top,growy 0"); //======== desktopPane1 ======== { @@ -806,7 +801,7 @@ class FlatThemePreviewAll desktopPane1.add(internalFrame2, JLayeredPane.DEFAULT_LAYER); internalFrame2.setBounds(new Rectangle(new Point(5, 50), internalFrame2.getPreferredSize())); } - add(desktopPane1, "cell 1 25"); + add(desktopPane1, "cell 1 24 2 1"); //---- buttonGroup1 ---- ButtonGroup buttonGroup1 = new ButtonGroup(); diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd index 017ba596..63d9b268 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd @@ -1,4 +1,4 @@ -JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8" +JFDML JFormDesigner: "999.9.9.9.9999" Java: "1.8.0_202" encoding: "UTF-8" new FormModel { contentType: "form/swing" @@ -8,10 +8,15 @@ new FormModel { } add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "insets dialog,hidemode 3" - "$columnConstraints": "[fill][130,fill]" - "$rowConstraints": "[]unrel[][][][][][][][][][][][][][][][][][][][][][][][][100,fill][grow]" + "$columnConstraints": "[fill][60,sizegroup 1,fill][60,sizegroup 1,fill]" + "$rowConstraints": "[]para[][][][][][][][][][fill][][]4[][][]0[][]0[][][][][][][100,fill][grow]" } ) { name: "this" + add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) { + name: "hSpacer1" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 0 3 1,growx" + } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "enabledCheckBox" "text": "Enabled" @@ -21,7 +26,7 @@ new FormModel { } addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "enabledChanged", false ) ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 0 2 1,alignx left,growx 0" + "value": "cell 0 0 3 1" } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "focusedCheckBox" @@ -31,7 +36,7 @@ new FormModel { } addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "focusedChanged", false ) ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 0 2 1" + "value": "cell 0 0 3 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "labelLabel" @@ -43,7 +48,7 @@ new FormModel { name: "label1" "text": "Some Text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 1" + "value": "cell 1 1 2 1" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatButton" ) { name: "flatButton1" @@ -63,24 +68,13 @@ new FormModel { name: "button1" "text": "OK" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 2,alignx left,growx 0" + "value": "cell 1 2" } ) add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewAll$PreviewDefaultButton" ) { name: "testDefaultButton1" "text": "Default" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 2" - } ) - add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatButton" ) { - name: "helpButton" - "buttonType": enum com.formdev.flatlaf.extras.components.FlatButton$ButtonType help - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 2" - } ) - add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) { - name: "hSpacer2" - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 2" + "value": "cell 2 2" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "toggleButtonLabel" @@ -92,19 +86,14 @@ new FormModel { name: "toggleButton1" "text": "Unselected" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 3,alignx left,growx 0" + "value": "cell 1 3" } ) add( new FormComponent( "javax.swing.JToggleButton" ) { name: "toggleButton3" "text": "Selected" "selected": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 3" - } ) - add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) { - name: "hSpacer1" - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 3" + "value": "cell 2 3" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "checkBoxLabel" @@ -123,12 +112,7 @@ new FormModel { "text": "Selected" "selected": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 4,alignx left,growx 0" - } ) - add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) { - name: "hSpacer3" - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 4" + "value": "cell 2 4,alignx left,growx 0" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "radioButtonLabel" @@ -149,12 +133,7 @@ new FormModel { "selected": true "$buttonGroup": new FormReference( "buttonGroup1" ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 5,alignx left,growx 0" - } ) - add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) { - name: "hSpacer4" - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 5" + "value": "cell 2 5,alignx left,growx 0" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "comboBoxLabel" @@ -186,7 +165,7 @@ new FormModel { "JavaCodeGenerator.typeParameters": "String" } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 6,width 50" + "value": "cell 1 6" } ) add( new FormComponent( "javax.swing.JComboBox" ) { name: "comboBox3" @@ -207,7 +186,7 @@ new FormModel { } "maximumRowCount": 6 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 6,width 50" + "value": "cell 2 6" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "spinnerLabel" @@ -218,7 +197,7 @@ new FormModel { add( new FormComponent( "javax.swing.JSpinner" ) { name: "spinner1" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 7" + "value": "cell 1 7 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "textFieldLabel" @@ -234,27 +213,27 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 8" + "value": "cell 1 8 2 1" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatFormattedTextField" ) { name: "formattedTextField1" "text": "Some Text" "placeholderText": "placeholder text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 9,width 50" + "value": "cell 1 9" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatPasswordField" ) { name: "passwordField1" "text": "Some Text" "placeholderText": "placeholder text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 9,width 50" + "value": "cell 2 9" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "textAreaLabel" - "text": "JTextArea:

JEditorPane:
JTextPane:" + "text": "JTextArea:
JEditorPane:
JTextPane:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 10 1 2" + "value": "cell 0 10" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane1" @@ -262,11 +241,11 @@ new FormModel { "horizontalScrollBarPolicy": 31 add( new FormComponent( "javax.swing.JTextArea" ) { name: "textArea1" - "text": "Some Text" + "text": "Text" "rows": 2 } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 10" + "value": "cell 1 10 2 1,width 40" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane5" @@ -274,10 +253,10 @@ new FormModel { "horizontalScrollBarPolicy": 31 add( new FormComponent( "javax.swing.JEditorPane" ) { name: "editorPane1" - "text": "Some Text" + "text": "Text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 11,width 50" + "value": "cell 1 10 2 1,width 40" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane9" @@ -285,16 +264,16 @@ new FormModel { "horizontalScrollBarPolicy": 31 add( new FormComponent( "javax.swing.JTextPane" ) { name: "textPane1" - "text": "Some Text" + "text": "Text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 11,width 50" + "value": "cell 1 10 2 1,width 40" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "menuBarLabel" "text": "JMenuBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 12" + "value": "cell 0 11" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatToggleButton" ) { name: "menuUnderlineSelectionButton" @@ -308,7 +287,7 @@ new FormModel { } addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuUnderlineSelectionChanged", false ) ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 12" + "value": "cell 0 11" } ) add( new FormContainer( "javax.swing.JMenuBar", new FormLayoutManager( class javax.swing.JMenuBar ) ) { name: "menuBar1" @@ -389,43 +368,43 @@ new FormModel { } ) } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 12" + "value": "cell 1 11 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "scrollBarLabel" "text": "JScrollBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 13" + "value": "cell 0 12 1 2,aligny top,growy 0" } ) add( new FormComponent( "javax.swing.JScrollBar" ) { name: "scrollBar1" "orientation": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 13" + "value": "cell 1 12 2 1" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatScrollBar" ) { name: "scrollBar5" "orientation": 0 "showButtons": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 14" + "value": "cell 1 13 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "separatorLabel" "text": "JSeparator:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 15" + "value": "cell 0 14" } ) add( new FormComponent( "javax.swing.JSeparator" ) { name: "separator1" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 15" + "value": "cell 1 14 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "sliderLabel" "text": "JSlider:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 16" + "value": "cell 0 15" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider1" @@ -434,7 +413,7 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 16" + "value": "cell 1 15 2 1,width 100" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider3" @@ -448,13 +427,13 @@ new FormModel { } addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "changeProgress", false ) ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 17" + "value": "cell 1 16 2 1,width 100" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "progressBarLabel" "text": "JProgressBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 18" + "value": "cell 0 17" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatProgressBar" ) { name: "progressBar1" @@ -463,7 +442,7 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 18" + "value": "cell 1 17 2 1" } ) add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatProgressBar" ) { name: "progressBar2" @@ -473,25 +452,25 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 19" + "value": "cell 1 18 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "toolTipLabel" "text": "JToolTip:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 20" + "value": "cell 0 19" } ) add( new FormComponent( "javax.swing.JToolTip" ) { name: "toolTip1" "tipText": "Some text in tool tip." }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 20,alignx left,growx 0" + "value": "cell 1 19 2 1,alignx left,growx 0" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "toolBarLabel" "text": "JToolBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 21" + "value": "cell 0 20" } ) add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) { name: "toolBar1" @@ -518,14 +497,19 @@ new FormModel { "icon": #SwingIcon0 "selected": true } ) + add( new FormComponent( "javax.swing.JToggleButton" ) { + name: "button9" + "icon": #SwingIcon0 + "selected": true + } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 21" + "value": "cell 1 20 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "tabbedPaneLabel" "text": "JTabbedPane:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 22" + "value": "cell 0 21" } ) add( new FormContainer( "com.formdev.flatlaf.themeeditor.FlatThemePreviewAll$PreviewTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) { name: "tabbedPane1" @@ -533,13 +517,13 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 22" + "value": "cell 1 21 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "listTreeLabel" "text": "JList / JTree:
JSplitPane:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 23,aligny top,growy 0" + "value": "cell 0 22,aligny top,growy 0" } ) add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) { name: "splitPane1" @@ -584,13 +568,13 @@ new FormModel { "value": "right" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 23,height 50" + "value": "cell 1 22 2 1,height 50" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "tableLabel" "text": "JTable:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 24" + "value": "cell 0 23" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane4" @@ -623,13 +607,13 @@ new FormModel { } } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 24,height 70" + "value": "cell 1 23 2 1,width 100,height 70" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "internalFrameLabel" "text": "JDesktopPane:
JInternalFrame:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 25,aligny top,growy 0" + "value": "cell 0 24,aligny top,growy 0" } ) add( new FormContainer( "javax.swing.JDesktopPane", new FormLayoutManager( class javax.swing.JDesktopPane ) ) { name: "desktopPane1" @@ -667,7 +651,7 @@ new FormModel { "y": 50 } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 25" + "value": "cell 1 24 2 1" } ) }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 )