Skip to content

Commit

Permalink
Merge pull request #76 from SeeSharpSoft/fb_scrollable_panels
Browse files Browse the repository at this point in the history 
[FIX] top and bottom panel scrollable & add column/row buttons removed
  • Loading branch information
@SeeSharpSoft
SeeSharpSoft committed Dec 16, 2018
2 parents d114f72 + 50863bd commit c28b430
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 42 deletions.
84 changes: 45 additions & 39 deletions ...in/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,15 @@
<properties/>
<border type="none"/>
<children>
<grid id="67e39" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<scrollpane id="67e39">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<toolbar id="92f32">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="-1" height="20"/>
</grid>
</constraints>
<constraints/>
<properties>
<floatable value="false"/>
</properties>
Expand Down Expand Up @@ -61,7 +56,7 @@
<component id="9bf69" class="javax.swing.JLabel" binding="lblTextlines">
<constraints/>
<properties>
<text value="Textlines per row:"/>
<text value="Textlines per row: "/>
</properties>
</component>
<component id="65e44" class="javax.swing.JComboBox" binding="comboRowHeight">
Expand Down Expand Up @@ -95,6 +90,7 @@
<minimumSize width="56" height="28"/>
<preferredSize width="56" height="28"/>
<toolTipText value="Add row"/>
<visible value="false"/>
</properties>
</component>
<component id="294f4" class="javax.swing.JButton" binding="btnRemoveRow">
Expand Down Expand Up @@ -123,6 +119,7 @@
<minimumSize width="56" height="28"/>
<preferredSize width="56" height="28"/>
<toolTipText value="Add column"/>
<visible value="false"/>
</properties>
</component>
<component id="a0fe5" class="javax.swing.JButton" binding="btnRemoveColumn">
Expand Down Expand Up @@ -161,7 +158,7 @@
</children>
</toolbar>
</children>
</grid>
</scrollpane>
<scrollpane id="6b9c5">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
Expand All @@ -177,44 +174,53 @@
</component>
</children>
</scrollpane>
<grid id="90794" binding="panelInfo" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
<scrollpane id="d27f" binding="panelInfo">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="fbd00" class="javax.swing.JButton" binding="btnCloseInfoPanel">
<constraints/>
<properties>
<autoscrolls value="false"/>
<background color="-855310"/>
<borderPainted value="false"/>
<contentAreaFilled value="false"/>
<focusPainted value="false"/>
<icon value="actions/close.png"/>
<maximumSize width="24" height="24"/>
<minimumSize width="24" height="24"/>
<preferredSize width="24" height="24"/>
<text value=""/>
</properties>
</component>
<component id="c0dc0" class="javax.swing.JLabel">
<grid id="90794" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
<constraints/>
<properties>
<text value="Editing via Table Editor might change the format of the CSV file. Follow the link for more infos, addressing issues and providing suggestions:"/>
<autoscrolls value="true"/>
</properties>
</component>
<component id="7fcf0" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkPlugin">
<constraints/>
<properties>
<horizontalTextPosition value="10"/>
<iconTextGap value="2"/>
<text value="CSV plugin"/>
</properties>
</component>
<border type="none"/>
<children>
<component id="fbd00" class="javax.swing.JButton" binding="btnCloseInfoPanel">
<constraints/>
<properties>
<autoscrolls value="false"/>
<background color="-855310"/>
<borderPainted value="false"/>
<contentAreaFilled value="false"/>
<focusPainted value="false"/>
<icon value="actions/close.png"/>
<maximumSize width="24" height="24"/>
<minimumSize width="24" height="24"/>
<preferredSize width="24" height="24"/>
<text value=""/>
</properties>
</component>
<component id="c0dc0" class="javax.swing.JLabel">
<constraints/>
<properties>
<text value="Editing via Table Editor might change the format of the CSV file. Follow the link for more infos, addressing issues and providing suggestions:"/>
</properties>
</component>
<component id="7fcf0" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkPlugin">
<constraints/>
<properties>
<horizontalTextPosition value="10"/>
<iconTextGap value="2"/>
<text value="CSV plugin"/>
</properties>
</component>
</children>
</grid>
</children>
</grid>
</scrollpane>
</children>
</grid>
</form>
4 changes: 1 addition & 3 deletions ...in/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class CsvTableEditorSwing extends CsvTableEditor implements TableDataChan
protected JButton btnAddColumnBefore;
private LinkLabel lnkPlugin;
private JButton btnCloseInfoPanel;
private JPanel panelInfo;
private JComponent panelInfo;
private JComboBox comboRowHeight;
private JLabel lblTextlines;

Expand Down Expand Up @@ -272,8 +272,6 @@ private void updateEditActionElements(boolean isEditable) {
tblEditor.getTableHeader().setReorderingAllowed(isEditable);
btnUndo.setVisible(isEditable);
btnRedo.setVisible(isEditable);
btnAddColumn.setVisible(isEditable);
btnAddRow.setVisible(isEditable);
}


Expand Down

0 comments on commit c28b430

Please sign in to comment.