Skip to content

Commit f8cc617

Browse files
JaggerothJaggeroth
committedFeb 10, 2018
Add line cap toggle
set toggle icons for eraser and snap to
·
1.4.1.9
1 parent d667ed0 commit f8cc617

File tree

3 files changed

+327
-127
lines changed

3 files changed

+327
-127
lines changed
 

‎src/main/java/net/rptools/lib/swing/ColorPicker.java

+26
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525

2626
import javax.swing.BorderFactory;
27+
import javax.swing.ImageIcon;
2728
import javax.swing.JFrame;
2829
import javax.swing.JPanel;
2930
import javax.swing.JSpinner;
@@ -40,11 +41,19 @@
4041
public class ColorPicker extends JPanel {
4142
private final JFrame owner;
4243

44+
private final ImageIcon eraserIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/eraser.png"));
45+
private final ImageIcon pencilIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/pencil.png"));
46+
private final ImageIcon roundCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/round_cap.png"));
47+
private final ImageIcon squareCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/square_cap.png"));
48+
private final ImageIcon snapToIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/shape_handles.png"));
49+
private final ImageIcon freeDrawIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/shape_no_handles.png"));
50+
4351
private final PaintedPanel foregroundColor;
4452
private final PaintedPanel backgroundColor;
4553
private final List<PaintedPanel> recentColors = new ArrayList<PaintedPanel>(16);
4654
private final JToggleButton snapToggle;
4755
private final JToggleButton eraseToggle;
56+
private final JToggleButton squareCapToggle;
4857
private final PaintChooser paintChooser;
4958
private final JSpinner penWidthSpinner;
5059
private final JSpinner transparencySpinner;
@@ -99,7 +108,16 @@ public ColorPicker(JFrame owner) {
99108
recentColors.add(paintedPanel);
100109
}
101110
snapToggle = (JToggleButton) panel.getButton("toggleSnapToGrid");
111+
snapToggle.setIcon(freeDrawIcon);
112+
snapToggle.setSelectedIcon(snapToIcon);
113+
102114
eraseToggle = (JToggleButton) panel.getButton("toggleErase");
115+
eraseToggle.setIcon(pencilIcon);
116+
eraseToggle.setSelectedIcon(eraserIcon);
117+
118+
squareCapToggle = (JToggleButton) panel.getButton("toggelSquareCap");
119+
squareCapToggle.setIcon(roundCapIcon);
120+
squareCapToggle.setSelectedIcon(squareCapIcon);
103121

104122
penWidthSpinner = panel.getSpinner("penWidth");
105123
penWidthSpinner.setModel(new SpinnerNumberModel(3, 1, maxPenWidth, 1));
@@ -173,6 +191,14 @@ public boolean isSnapSelected() {
173191
return snapToggle.isSelected();
174192
}
175193

194+
public boolean isSquareCapSelected() {
195+
return squareCapToggle.isSelected();
196+
}
197+
198+
public void setSquareCapSelected(boolean selected) {
199+
squareCapToggle.setSelected(!selected);
200+
}
201+
176202
public void setTranslucency(int percent) {
177203
percent = Math.max(0, percent);
178204
percent = Math.min(100, percent);

‎src/main/resources/net/rptools/lib/swing/forms/colorPanel.xml

+300-127
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
</at>
2525
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2626
</super>
27-
<at name="id">/Users/frank/Workspace/rplib/src/net/rptools/lib/swing/forms/colorPanel.jfrm</at>
28-
<at name="path">net/rptools/lib/swing/forms/colorPanel.jfrm</at>
29-
<at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:8PX:NONE,CENTER:DEFAULT:NONE,CENTER:10PX:NONE,CENTER:DEFAULT:NONE,CENTER:8PX:NONE,CENTER:DEFAULT:NONE</at>
27+
<at name="id">rplib\src\main\resources\net\rptools\lib\swing\forms\colorPanel.xml</at>
28+
<at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:8PX:NONE,CENTER:DEFAULT:NONE,CENTER:10PX:NONE,CENTER:DEFAULT:NONE,CENTER:6PX:NONE,CENTER:27PX:NONE,CENTER:5PX:NONE,CENTER:DEFAULT:NONE</at>
3029
<at name="colspecs">FILL:DEFAULT:NONE</at>
3130
<at name="components">
3231
<object classname="java.util.LinkedList">
@@ -47,7 +46,7 @@
4746
</at>
4847
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4948
</super>
50-
<at name="id">embedded.1352848132</at>
49+
<at name="id">embedded.163054274</at>
5150
<at name="rowspecs">FILL:32PX:NONE</at>
5251
<at name="colspecs">FILL:32PX:NONE,FILL:DEFAULT:NONE,FILL:32PX:NONE</at>
5352
<at name="components">
@@ -76,9 +75,9 @@
7675
<at name="classname">com.jeta.forms.components.colors.JETAColorWell</at>
7776
<at name="properties">
7877
<object classname="com.jeta.forms.store.support.PropertyMap">
79-
<at name="height">28</at>
80-
<at name="width">28</at>
8178
<at name="name">backgroundColor</at>
79+
<at name="width">28</at>
80+
<at name="height">28</at>
8281
</object>
8382
</at>
8483
</object>
@@ -110,9 +109,9 @@
110109
<at name="classname">com.jeta.forms.components.colors.JETAColorWell</at>
111110
<at name="properties">
112111
<object classname="com.jeta.forms.store.support.PropertyMap">
113-
<at name="height">28</at>
114-
<at name="width">28</at>
115112
<at name="name">foregroundColor</at>
113+
<at name="width">28</at>
114+
<at name="height">28</at>
116115
</object>
117116
</at>
118117
</object>
@@ -127,6 +126,16 @@
127126
<at name="classname">com.jeta.forms.gui.form.GridView</at>
128127
<at name="properties">
129128
<object classname="com.jeta.forms.store.support.PropertyMap">
129+
<at name="border">
130+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
131+
<super classname="com.jeta.forms.store.properties.BorderProperty">
132+
<at name="name">border</at>
133+
</super>
134+
<at name="borders">
135+
<object classname="java.util.LinkedList"/>
136+
</at>
137+
</object>
138+
</at>
130139
<at name="name">colorPanel</at>
131140
<at name="fill">
132141
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
@@ -160,16 +169,6 @@
160169
</at>
161170
</object>
162171
</at>
163-
<at name="border">
164-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
165-
<super classname="com.jeta.forms.store.properties.BorderProperty">
166-
<at name="name">border</at>
167-
</super>
168-
<at name="borders">
169-
<object classname="java.util.LinkedList"/>
170-
</at>
171-
</object>
172-
</at>
173172
</object>
174173
</at>
175174
</object>
@@ -219,7 +218,7 @@
219218
</at>
220219
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
221220
</super>
222-
<at name="id">embedded.396793761</at>
221+
<at name="id">embedded.1548976761</at>
223222
<at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
224223
<at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
225224
<at name="components">
@@ -743,6 +742,16 @@
743742
<at name="classname">com.jeta.forms.gui.form.GridView</at>
744743
<at name="properties">
745744
<object classname="com.jeta.forms.store.support.PropertyMap">
745+
<at name="border">
746+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
747+
<super classname="com.jeta.forms.store.properties.BorderProperty">
748+
<at name="name">border</at>
749+
</super>
750+
<at name="borders">
751+
<object classname="java.util.LinkedList"/>
752+
</at>
753+
</object>
754+
</at>
746755
<at name="name">recentColors</at>
747756
<at name="fill">
748757
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
@@ -776,16 +785,6 @@
776785
</at>
777786
</object>
778787
</at>
779-
<at name="border">
780-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
781-
<super classname="com.jeta.forms.store.properties.BorderProperty">
782-
<at name="name">border</at>
783-
</super>
784-
<at name="borders">
785-
<object classname="java.util.LinkedList"/>
786-
</at>
787-
</object>
788-
</at>
789788
</object>
790789
</at>
791790
</object>
@@ -844,7 +843,7 @@
844843
</at>
845844
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
846845
</super>
847-
<at name="id">embedded.2028496404</at>
846+
<at name="id">embedded.2144069144</at>
848847
<at name="rowspecs">CENTER:DEFAULT:NONE</at>
849848
<at name="colspecs">FILL:32PX:NONE,FILL:DEFAULT:NONE,FILL:32PX:NONE</at>
850849
<at name="components">
@@ -855,7 +854,7 @@
855854
<super classname="com.jeta.forms.store.memento.ComponentMemento">
856855
<at name="cellconstraints">
857856
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
858-
<at name="column">1</at>
857+
<at name="column">3</at>
859858
<at name="row">1</at>
860859
<at name="colspan">1</at>
861860
<at name="rowspan">1</at>
@@ -873,19 +872,6 @@
873872
<at name="classname">javax.swing.JToggleButton</at>
874873
<at name="properties">
875874
<object classname="com.jeta.forms.store.support.PropertyMap">
876-
<at name="icon">
877-
<object classname="com.jeta.forms.store.properties.IconProperty">
878-
<at name="embedded">false</at>
879-
<at name="path">net/rptools/lib/image/icons/shape_handles.png</at>
880-
<at name="description">shape_handles.png</at>
881-
<at name="width">16</at>
882-
<at name="height">16</at>
883-
</object>
884-
</at>
885-
<at name="height">26</at>
886-
<at name="width">28</at>
887-
<at name="name">toggleSnapToGrid</at>
888-
<at name="toolTipText">Snap to grid</at>
889875
<at name="border">
890876
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
891877
<super classname="com.jeta.forms.store.properties.BorderProperty">
@@ -906,6 +892,19 @@
906892
</at>
907893
</object>
908894
</at>
895+
<at name="icon">
896+
<object classname="com.jeta.forms.store.properties.IconProperty">
897+
<at name="embedded">false</at>
898+
<at name="path">net\rptools\lib\image\icons\eraser.png</at>
899+
<at name="description">eraser.png</at>
900+
<at name="width">16</at>
901+
<at name="height">16</at>
902+
</object>
903+
</at>
904+
<at name="name">toggleErase</at>
905+
<at name="width">28</at>
906+
<at name="toolTipText">Eraser</at>
907+
<at name="height">24</at>
909908
</object>
910909
</at>
911910
</object>
@@ -919,7 +918,7 @@
919918
<super classname="com.jeta.forms.store.memento.ComponentMemento">
920919
<at name="cellconstraints">
921920
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
922-
<at name="column">3</at>
921+
<at name="column">1</at>
923922
<at name="row">1</at>
924923
<at name="colspan">1</at>
925924
<at name="rowspan">1</at>
@@ -937,19 +936,6 @@
937936
<at name="classname">javax.swing.JToggleButton</at>
938937
<at name="properties">
939938
<object classname="com.jeta.forms.store.support.PropertyMap">
940-
<at name="icon">
941-
<object classname="com.jeta.forms.store.properties.IconProperty">
942-
<at name="embedded">false</at>
943-
<at name="path">net/rptools/lib/image/icons/eraser.png</at>
944-
<at name="description">eraser.png</at>
945-
<at name="width">16</at>
946-
<at name="height">16</at>
947-
</object>
948-
</at>
949-
<at name="height">26</at>
950-
<at name="width">28</at>
951-
<at name="name">toggleErase</at>
952-
<at name="toolTipText">Eraser</at>
953939
<at name="border">
954940
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
955941
<super classname="com.jeta.forms.store.properties.BorderProperty">
@@ -970,6 +956,19 @@
970956
</at>
971957
</object>
972958
</at>
959+
<at name="icon">
960+
<object classname="com.jeta.forms.store.properties.IconProperty">
961+
<at name="embedded">false</at>
962+
<at name="path">net\rptools\lib\image\icons\shape_handles.png</at>
963+
<at name="description">shape_handles.png</at>
964+
<at name="width">16</at>
965+
<at name="height">16</at>
966+
</object>
967+
</at>
968+
<at name="name">toggleSnapToGrid</at>
969+
<at name="width">28</at>
970+
<at name="toolTipText">Snap to grid</at>
971+
<at name="height">24</at>
973972
</object>
974973
</at>
975974
</object>
@@ -984,7 +983,17 @@
984983
<at name="classname">com.jeta.forms.gui.form.GridView</at>
985984
<at name="properties">
986985
<object classname="com.jeta.forms.store.support.PropertyMap">
987-
<at name="name"></at>
986+
<at name="border">
987+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
988+
<super classname="com.jeta.forms.store.properties.BorderProperty">
989+
<at name="name">border</at>
990+
</super>
991+
<at name="borders">
992+
<object classname="java.util.LinkedList"/>
993+
</at>
994+
</object>
995+
</at>
996+
<at name="name"/>
988997
<at name="fill">
989998
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
990999
<at name="name">fill</at>
@@ -1017,16 +1026,6 @@
10171026
</at>
10181027
</object>
10191028
</at>
1020-
<at name="border">
1021-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1022-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1023-
<at name="name">border</at>
1024-
</super>
1025-
<at name="borders">
1026-
<object classname="java.util.LinkedList"/>
1027-
</at>
1028-
</object>
1029-
</at>
10301029
</object>
10311030
</at>
10321031
</object>
@@ -1066,7 +1065,7 @@
10661065
<at name="cellconstraints">
10671066
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
10681067
<at name="column">1</at>
1069-
<at name="row">7</at>
1068+
<at name="row">9</at>
10701069
<at name="colspan">1</at>
10711070
<at name="rowspan">1</at>
10721071
<at name="halign">default</at>
@@ -1076,7 +1075,7 @@
10761075
</at>
10771076
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
10781077
</super>
1079-
<at name="id">embedded.834445763</at>
1078+
<at name="id">embedded.1785726373</at>
10801079
<at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:4PX:GROW(1.0),CENTER:DEFAULT:NONE</at>
10811080
<at name="colspecs">FILL:DEFAULT:NONE,FILL:4PX:GROW(1.0),FILL:42PX:NONE</at>
10821081
<at name="components">
@@ -1105,9 +1104,9 @@
11051104
<at name="classname">javax.swing.JSpinner</at>
11061105
<at name="properties">
11071106
<object classname="com.jeta.forms.store.support.PropertyMap">
1108-
<at name="height">20</at>
1109-
<at name="width">38</at>
11101107
<at name="name">penWidth</at>
1108+
<at name="width">38</at>
1109+
<at name="height">20</at>
11111110
</object>
11121111
</at>
11131112
</object>
@@ -1139,9 +1138,9 @@
11391138
<at name="classname">javax.swing.JSpinner</at>
11401139
<at name="properties">
11411140
<object classname="com.jeta.forms.store.support.PropertyMap">
1142-
<at name="height">20</at>
1143-
<at name="width">38</at>
11441141
<at name="name">opacity</at>
1142+
<at name="width">38</at>
1143+
<at name="height">20</at>
11451144
</object>
11461145
</at>
11471146
</object>
@@ -1173,24 +1172,6 @@
11731172
<at name="classname">com.jeta.forms.components.label.JETALabel</at>
11741173
<at name="properties">
11751174
<object classname="com.jeta.forms.store.support.PropertyMap">
1176-
<at name="icon">
1177-
<object classname="com.jeta.forms.store.properties.IconProperty">
1178-
<at name="embedded">false</at>
1179-
<at name="path">net/rptools/lib/image/icons/paintbrush.png</at>
1180-
<at name="description">paintbrush.png</at>
1181-
<at name="width">16</at>
1182-
<at name="height">16</at>
1183-
</object>
1184-
</at>
1185-
<at name="height">16</at>
1186-
<at name="width">16</at>
1187-
<at name="name"></at>
1188-
<at name="fill">
1189-
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1190-
<at name="name">fill</at>
1191-
</object>
1192-
</at>
1193-
<at name="toolTipText">Pen Width</at>
11941175
<at name="border">
11951176
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
11961177
<super classname="com.jeta.forms.store.properties.BorderProperty">
@@ -1211,6 +1192,24 @@
12111192
</at>
12121193
</object>
12131194
</at>
1195+
<at name="icon">
1196+
<object classname="com.jeta.forms.store.properties.IconProperty">
1197+
<at name="embedded">false</at>
1198+
<at name="path">net\rptools\lib\image\icons\paintbrush.png</at>
1199+
<at name="description">paintbrush.png</at>
1200+
<at name="width">16</at>
1201+
<at name="height">16</at>
1202+
</object>
1203+
</at>
1204+
<at name="width">16</at>
1205+
<at name="name"/>
1206+
<at name="fill">
1207+
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1208+
<at name="name">fill</at>
1209+
</object>
1210+
</at>
1211+
<at name="toolTipText">Pen Width</at>
1212+
<at name="height">16</at>
12141213
</object>
12151214
</at>
12161215
</object>
@@ -1242,24 +1241,185 @@
12421241
<at name="classname">com.jeta.forms.components.label.JETALabel</at>
12431242
<at name="properties">
12441243
<object classname="com.jeta.forms.store.support.PropertyMap">
1244+
<at name="border">
1245+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1246+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1247+
<at name="name">border</at>
1248+
</super>
1249+
<at name="borders">
1250+
<object classname="java.util.LinkedList">
1251+
<item >
1252+
<at name="value">
1253+
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1254+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1255+
<at name="name">border</at>
1256+
</super>
1257+
</object>
1258+
</at>
1259+
</item>
1260+
</object>
1261+
</at>
1262+
</object>
1263+
</at>
12451264
<at name="icon">
12461265
<object classname="com.jeta.forms.store.properties.IconProperty">
12471266
<at name="embedded">false</at>
1248-
<at name="path">net/rptools/lib/image/icons/contrast_high.png</at>
1267+
<at name="path">net\rptools\lib\image\icons\contrast_high.png</at>
12491268
<at name="description">contrast_high.png</at>
12501269
<at name="width">16</at>
12511270
<at name="height">16</at>
12521271
</object>
12531272
</at>
1254-
<at name="height">16</at>
12551273
<at name="width">16</at>
1256-
<at name="name"></at>
1274+
<at name="name"/>
12571275
<at name="fill">
12581276
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
12591277
<at name="name">fill</at>
12601278
</object>
12611279
</at>
12621280
<at name="toolTipText">Opacity</at>
1281+
<at name="height">16</at>
1282+
</object>
1283+
</at>
1284+
</object>
1285+
</at>
1286+
</object>
1287+
</at>
1288+
</item>
1289+
</object>
1290+
</at>
1291+
<at name="properties">
1292+
<object classname="com.jeta.forms.store.memento.PropertiesMemento">
1293+
<at name="classname">com.jeta.forms.gui.form.GridView</at>
1294+
<at name="properties">
1295+
<object classname="com.jeta.forms.store.support.PropertyMap">
1296+
<at name="border">
1297+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1298+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1299+
<at name="name">border</at>
1300+
</super>
1301+
<at name="borders">
1302+
<object classname="java.util.LinkedList"/>
1303+
</at>
1304+
</object>
1305+
</at>
1306+
<at name="name"/>
1307+
<at name="fill">
1308+
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1309+
<at name="name">fill</at>
1310+
</object>
1311+
</at>
1312+
<at name="scollBars">
1313+
<object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1314+
<at name="name">scollBars</at>
1315+
<at name="verticalpolicy">21</at>
1316+
<at name="horizontalpolicy">31</at>
1317+
<at name="border">
1318+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1319+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1320+
<at name="name">border</at>
1321+
</super>
1322+
<at name="borders">
1323+
<object classname="java.util.LinkedList">
1324+
<item >
1325+
<at name="value">
1326+
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1327+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1328+
<at name="name">border</at>
1329+
</super>
1330+
</object>
1331+
</at>
1332+
</item>
1333+
</object>
1334+
</at>
1335+
</object>
1336+
</at>
1337+
</object>
1338+
</at>
1339+
</object>
1340+
</at>
1341+
</object>
1342+
</at>
1343+
<at name="cellpainters">
1344+
<object classname="com.jeta.forms.store.support.Matrix">
1345+
<at name="rows">
1346+
<object classname="[Ljava.lang.Object;" size="3">
1347+
<at name="item" index="0">
1348+
<object classname="[Ljava.lang.Object;" size="3"/>
1349+
</at>
1350+
<at name="item" index="1">
1351+
<object classname="[Ljava.lang.Object;" size="3"/>
1352+
</at>
1353+
<at name="item" index="2">
1354+
<object classname="[Ljava.lang.Object;" size="3"/>
1355+
</at>
1356+
</object>
1357+
</at>
1358+
</object>
1359+
</at>
1360+
<at name="rowgroups">
1361+
<object classname="com.jeta.forms.store.memento.FormGroupSet">
1362+
<at name="groups">
1363+
<object classname="java.util.HashMap"/>
1364+
</at>
1365+
</object>
1366+
</at>
1367+
<at name="colgroups">
1368+
<object classname="com.jeta.forms.store.memento.FormGroupSet">
1369+
<at name="groups">
1370+
<object classname="java.util.HashMap"/>
1371+
</at>
1372+
</object>
1373+
</at>
1374+
</object>
1375+
</at>
1376+
</item>
1377+
<item >
1378+
<at name="value">
1379+
<object classname="com.jeta.forms.store.memento.FormMemento">
1380+
<super classname="com.jeta.forms.store.memento.ComponentMemento">
1381+
<at name="cellconstraints">
1382+
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1383+
<at name="column">1</at>
1384+
<at name="row">7</at>
1385+
<at name="colspan">1</at>
1386+
<at name="rowspan">1</at>
1387+
<at name="halign">default</at>
1388+
<at name="valign">default</at>
1389+
<at name="insets" object="insets">0,0,0,0</at>
1390+
</object>
1391+
</at>
1392+
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1393+
</super>
1394+
<at name="id">embedded.756842871</at>
1395+
<at name="rowspecs">CENTER:19PX:NONE</at>
1396+
<at name="colspecs">FILL:74PX:NONE</at>
1397+
<at name="components">
1398+
<object classname="java.util.LinkedList">
1399+
<item >
1400+
<at name="value">
1401+
<object classname="com.jeta.forms.store.memento.BeanMemento">
1402+
<super classname="com.jeta.forms.store.memento.ComponentMemento">
1403+
<at name="cellconstraints">
1404+
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1405+
<at name="column">1</at>
1406+
<at name="row">1</at>
1407+
<at name="colspan">1</at>
1408+
<at name="rowspan">1</at>
1409+
<at name="halign">default</at>
1410+
<at name="valign">default</at>
1411+
<at name="insets" object="insets">0,0,0,0</at>
1412+
</object>
1413+
</at>
1414+
<at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1415+
</super>
1416+
<at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1417+
<at name="beanclass">javax.swing.JToggleButton</at>
1418+
<at name="beanproperties">
1419+
<object classname="com.jeta.forms.store.memento.PropertiesMemento">
1420+
<at name="classname">javax.swing.JToggleButton</at>
1421+
<at name="properties">
1422+
<object classname="com.jeta.forms.store.support.PropertyMap">
12631423
<at name="border">
12641424
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
12651425
<super classname="com.jeta.forms.store.properties.BorderProperty">
@@ -1280,6 +1440,19 @@
12801440
</at>
12811441
</object>
12821442
</at>
1443+
<at name="icon">
1444+
<object classname="com.jeta.forms.store.properties.IconProperty">
1445+
<at name="embedded">false</at>
1446+
<at name="path">net\rptools\lib\image\icons\round_cap.png</at>
1447+
<at name="description">lineround.png</at>
1448+
<at name="width">16</at>
1449+
<at name="height">16</at>
1450+
</object>
1451+
</at>
1452+
<at name="name">toggelSquareCap</at>
1453+
<at name="width">70</at>
1454+
<at name="horizontalTextPosition">0</at>
1455+
<at name="height">15</at>
12831456
</object>
12841457
</at>
12851458
</object>
@@ -1294,7 +1467,17 @@
12941467
<at name="classname">com.jeta.forms.gui.form.GridView</at>
12951468
<at name="properties">
12961469
<object classname="com.jeta.forms.store.support.PropertyMap">
1297-
<at name="name"></at>
1470+
<at name="border">
1471+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1472+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1473+
<at name="name">border</at>
1474+
</super>
1475+
<at name="borders">
1476+
<object classname="java.util.LinkedList"/>
1477+
</at>
1478+
</object>
1479+
</at>
1480+
<at name="name"/>
12981481
<at name="fill">
12991482
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
13001483
<at name="name">fill</at>
@@ -1327,32 +1510,16 @@
13271510
</at>
13281511
</object>
13291512
</at>
1330-
<at name="border">
1331-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1332-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1333-
<at name="name">border</at>
1334-
</super>
1335-
<at name="borders">
1336-
<object classname="java.util.LinkedList"/>
1337-
</at>
1338-
</object>
1339-
</at>
13401513
</object>
13411514
</at>
13421515
</object>
13431516
</at>
13441517
<at name="cellpainters">
13451518
<object classname="com.jeta.forms.store.support.Matrix">
13461519
<at name="rows">
1347-
<object classname="[Ljava.lang.Object;" size="3">
1520+
<object classname="[Ljava.lang.Object;" size="1">
13481521
<at name="item" index="0">
1349-
<object classname="[Ljava.lang.Object;" size="3"/>
1350-
</at>
1351-
<at name="item" index="1">
1352-
<object classname="[Ljava.lang.Object;" size="3"/>
1353-
</at>
1354-
<at name="item" index="2">
1355-
<object classname="[Ljava.lang.Object;" size="3"/>
1522+
<object classname="[Ljava.lang.Object;" size="1"/>
13561523
</at>
13571524
</object>
13581525
</at>
@@ -1382,7 +1549,17 @@
13821549
<at name="classname">com.jeta.forms.gui.form.GridView</at>
13831550
<at name="properties">
13841551
<object classname="com.jeta.forms.store.support.PropertyMap">
1385-
<at name="name"></at>
1552+
<at name="border">
1553+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1554+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1555+
<at name="name">border</at>
1556+
</super>
1557+
<at name="borders">
1558+
<object classname="java.util.LinkedList"/>
1559+
</at>
1560+
</object>
1561+
</at>
1562+
<at name="name"/>
13861563
<at name="fill">
13871564
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
13881565
<at name="name">fill</at>
@@ -1415,24 +1592,14 @@
14151592
</at>
14161593
</object>
14171594
</at>
1418-
<at name="border">
1419-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1420-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1421-
<at name="name">border</at>
1422-
</super>
1423-
<at name="borders">
1424-
<object classname="java.util.LinkedList"/>
1425-
</at>
1426-
</object>
1427-
</at>
14281595
</object>
14291596
</at>
14301597
</object>
14311598
</at>
14321599
<at name="cellpainters">
14331600
<object classname="com.jeta.forms.store.support.Matrix">
14341601
<at name="rows">
1435-
<object classname="[Ljava.lang.Object;" size="7">
1602+
<object classname="[Ljava.lang.Object;" size="9">
14361603
<at name="item" index="0">
14371604
<object classname="[Ljava.lang.Object;" size="1"/>
14381605
</at>
@@ -1454,6 +1621,12 @@
14541621
<at name="item" index="6">
14551622
<object classname="[Ljava.lang.Object;" size="1"/>
14561623
</at>
1624+
<at name="item" index="7">
1625+
<object classname="[Ljava.lang.Object;" size="1"/>
1626+
</at>
1627+
<at name="item" index="8">
1628+
<object classname="[Ljava.lang.Object;" size="1"/>
1629+
</at>
14571630
</object>
14581631
</at>
14591632
</object>

‎version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.4.1.7

0 commit comments

Comments
 (0)
Please sign in to comment.