Skip to content

Commit d934fa1

Browse files
JaggerothJaggeroth
committed
Another Layout design
1 parent 687e4e3 commit d934fa1

File tree

7 files changed

+87
-197
lines changed

7 files changed

+87
-197
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public class ColorPicker extends JPanel {
4343

4444
private final ImageIcon eraserIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/eraser.png"));
4545
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/freehand.png"));
46+
private final ImageIcon roundCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/round_cap2.png"));
47+
private final ImageIcon squareCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/square_cap2.png"));
48+
private final ImageIcon snapToIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/shape_handles2.png"));
49+
private final ImageIcon freeDrawIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/freehand2.png"));
5050

5151
private final PaintedPanel foregroundColor;
5252
private final PaintedPanel backgroundColor;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
@SuppressWarnings("serial")
3434
public class PaintedPanel extends JPanel {
35-
35+
3636
private Paint paint;
3737

3838
public PaintedPanel() {

‎src/main/resources/net/rptools/lib/image/icons/freehand2.png

456 Bytes
Loading

‎src/main/resources/net/rptools/lib/image/icons/round_cap2.png

363 Bytes
Loading

‎src/main/resources/net/rptools/lib/image/icons/shape_handles2.png

617 Bytes
Loading

‎src/main/resources/net/rptools/lib/image/icons/square_cap2.png

284 Bytes
Loading

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

Lines changed: 82 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2626
</super>
2727
<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>
28+
<at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:8PX:NONE,CENTER:DEFAULT:NONE,CENTER:10PX:NONE,CENTER:DEFAULT:NONE,CENTER:6PX:NONE,CENTER:DEFAULT:NONE</at>
2929
<at name="colspecs">FILL:DEFAULT:NONE</at>
3030
<at name="components">
3131
<object classname="java.util.LinkedList">
@@ -845,7 +845,7 @@
845845
</super>
846846
<at name="id">embedded.2144069144</at>
847847
<at name="rowspecs">CENTER:DEFAULT:NONE</at>
848-
<at name="colspecs">FILL:32PX:NONE,FILL:DEFAULT:NONE,FILL:32PX:NONE</at>
848+
<at name="colspecs">FILL:25PX:NONE,FILL:25PX:NONE,FILL:25PX:NONE</at>
849849
<at name="components">
850850
<object classname="java.util.LinkedList">
851851
<item >
@@ -854,7 +854,7 @@
854854
<super classname="com.jeta.forms.store.memento.ComponentMemento">
855855
<at name="cellconstraints">
856856
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
857-
<at name="column">3</at>
857+
<at name="column">1</at>
858858
<at name="row">1</at>
859859
<at name="colspan">1</at>
860860
<at name="rowspan">1</at>
@@ -892,18 +892,19 @@
892892
</at>
893893
</object>
894894
</at>
895+
<at name="alignmentY">0.0</at>
895896
<at name="icon">
896897
<object classname="com.jeta.forms.store.properties.IconProperty">
897898
<at name="embedded">false</at>
898-
<at name="path">net\rptools\lib\image\icons\eraser.png</at>
899-
<at name="description">eraser.png</at>
899+
<at name="path">net\rptools\lib\image\icons\shape_handles.png</at>
900+
<at name="description">shape_handles.png</at>
900901
<at name="width">16</at>
901902
<at name="height">16</at>
902903
</object>
903904
</at>
904-
<at name="name">toggleErase</at>
905-
<at name="width">28</at>
906-
<at name="toolTipText">Eraser</at>
905+
<at name="name">toggleSnapToGrid</at>
906+
<at name="width">21</at>
907+
<at name="toolTipText">Snap to grid</at>
907908
<at name="height">24</at>
908909
</object>
909910
</at>
@@ -918,7 +919,7 @@
918919
<super classname="com.jeta.forms.store.memento.ComponentMemento">
919920
<at name="cellconstraints">
920921
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
921-
<at name="column">1</at>
922+
<at name="column">2</at>
922923
<at name="row">1</at>
923924
<at name="colspan">1</at>
924925
<at name="rowspan">1</at>
@@ -965,9 +966,73 @@
965966
<at name="height">16</at>
966967
</object>
967968
</at>
968-
<at name="name">toggleSnapToGrid</at>
969-
<at name="width">28</at>
970-
<at name="toolTipText">Snap to grid</at>
969+
<at name="name">toggelSquareCap</at>
970+
<at name="width">21</at>
971+
<at name="toolTipText">Line Type</at>
972+
<at name="height">24</at>
973+
</object>
974+
</at>
975+
</object>
976+
</at>
977+
</object>
978+
</at>
979+
</item>
980+
<item >
981+
<at name="value">
982+
<object classname="com.jeta.forms.store.memento.BeanMemento">
983+
<super classname="com.jeta.forms.store.memento.ComponentMemento">
984+
<at name="cellconstraints">
985+
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
986+
<at name="column">3</at>
987+
<at name="row">1</at>
988+
<at name="colspan">1</at>
989+
<at name="rowspan">1</at>
990+
<at name="halign">default</at>
991+
<at name="valign">default</at>
992+
<at name="insets" object="insets">0,0,0,0</at>
993+
</object>
994+
</at>
995+
<at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
996+
</super>
997+
<at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
998+
<at name="beanclass">javax.swing.JToggleButton</at>
999+
<at name="beanproperties">
1000+
<object classname="com.jeta.forms.store.memento.PropertiesMemento">
1001+
<at name="classname">javax.swing.JToggleButton</at>
1002+
<at name="properties">
1003+
<object classname="com.jeta.forms.store.support.PropertyMap">
1004+
<at name="border">
1005+
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1006+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1007+
<at name="name">border</at>
1008+
</super>
1009+
<at name="borders">
1010+
<object classname="java.util.LinkedList">
1011+
<item >
1012+
<at name="value">
1013+
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1014+
<super classname="com.jeta.forms.store.properties.BorderProperty">
1015+
<at name="name">border</at>
1016+
</super>
1017+
</object>
1018+
</at>
1019+
</item>
1020+
</object>
1021+
</at>
1022+
</object>
1023+
</at>
1024+
<at name="icon">
1025+
<object classname="com.jeta.forms.store.properties.IconProperty">
1026+
<at name="embedded">false</at>
1027+
<at name="path">net\rptools\lib\image\icons\eraser.png</at>
1028+
<at name="description">eraser.png</at>
1029+
<at name="width">16</at>
1030+
<at name="height">16</at>
1031+
</object>
1032+
</at>
1033+
<at name="name">toggleErase</at>
1034+
<at name="width">21</at>
1035+
<at name="toolTipText">Eraser</at>
9711036
<at name="height">24</at>
9721037
</object>
9731038
</at>
@@ -993,7 +1058,7 @@
9931058
</at>
9941059
</object>
9951060
</at>
996-
<at name="name"/>
1061+
<at name="name"></at>
9971062
<at name="fill">
9981063
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
9991064
<at name="name">fill</at>
@@ -1065,7 +1130,7 @@
10651130
<at name="cellconstraints">
10661131
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
10671132
<at name="column">1</at>
1068-
<at name="row">9</at>
1133+
<at name="row">7</at>
10691134
<at name="colspan">1</at>
10701135
<at name="rowspan">1</at>
10711136
<at name="halign">default</at>
@@ -1303,7 +1368,7 @@
13031368
</at>
13041369
</object>
13051370
</at>
1306-
<at name="name"/>
1371+
<at name="name"></at>
13071372
<at name="fill">
13081373
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
13091374
<at name="name">fill</at>
@@ -1374,175 +1439,6 @@
13741439
</object>
13751440
</at>
13761441
</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">
1423-
<at name="border">
1424-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1425-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1426-
<at name="name">border</at>
1427-
</super>
1428-
<at name="borders">
1429-
<object classname="java.util.LinkedList">
1430-
<item >
1431-
<at name="value">
1432-
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1433-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1434-
<at name="name">border</at>
1435-
</super>
1436-
</object>
1437-
</at>
1438-
</item>
1439-
</object>
1440-
</at>
1441-
</object>
1442-
</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="toolTipText">Line type</at>
1454-
<at name="width">70</at>
1455-
<at name="horizontalTextPosition">0</at>
1456-
<at name="height">15</at>
1457-
</object>
1458-
</at>
1459-
</object>
1460-
</at>
1461-
</object>
1462-
</at>
1463-
</item>
1464-
</object>
1465-
</at>
1466-
<at name="properties">
1467-
<object classname="com.jeta.forms.store.memento.PropertiesMemento">
1468-
<at name="classname">com.jeta.forms.gui.form.GridView</at>
1469-
<at name="properties">
1470-
<object classname="com.jeta.forms.store.support.PropertyMap">
1471-
<at name="border">
1472-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1473-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1474-
<at name="name">border</at>
1475-
</super>
1476-
<at name="borders">
1477-
<object classname="java.util.LinkedList"/>
1478-
</at>
1479-
</object>
1480-
</at>
1481-
<at name="name"/>
1482-
<at name="fill">
1483-
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1484-
<at name="name">fill</at>
1485-
</object>
1486-
</at>
1487-
<at name="scollBars">
1488-
<object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1489-
<at name="name">scollBars</at>
1490-
<at name="verticalpolicy">21</at>
1491-
<at name="horizontalpolicy">31</at>
1492-
<at name="border">
1493-
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1494-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1495-
<at name="name">border</at>
1496-
</super>
1497-
<at name="borders">
1498-
<object classname="java.util.LinkedList">
1499-
<item >
1500-
<at name="value">
1501-
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1502-
<super classname="com.jeta.forms.store.properties.BorderProperty">
1503-
<at name="name">border</at>
1504-
</super>
1505-
</object>
1506-
</at>
1507-
</item>
1508-
</object>
1509-
</at>
1510-
</object>
1511-
</at>
1512-
</object>
1513-
</at>
1514-
</object>
1515-
</at>
1516-
</object>
1517-
</at>
1518-
<at name="cellpainters">
1519-
<object classname="com.jeta.forms.store.support.Matrix">
1520-
<at name="rows">
1521-
<object classname="[Ljava.lang.Object;" size="1">
1522-
<at name="item" index="0">
1523-
<object classname="[Ljava.lang.Object;" size="1"/>
1524-
</at>
1525-
</object>
1526-
</at>
1527-
</object>
1528-
</at>
1529-
<at name="rowgroups">
1530-
<object classname="com.jeta.forms.store.memento.FormGroupSet">
1531-
<at name="groups">
1532-
<object classname="java.util.HashMap"/>
1533-
</at>
1534-
</object>
1535-
</at>
1536-
<at name="colgroups">
1537-
<object classname="com.jeta.forms.store.memento.FormGroupSet">
1538-
<at name="groups">
1539-
<object classname="java.util.HashMap"/>
1540-
</at>
1541-
</object>
1542-
</at>
1543-
</object>
1544-
</at>
1545-
</item>
15461442
</object>
15471443
</at>
15481444
<at name="properties">
@@ -1560,7 +1456,7 @@
15601456
</at>
15611457
</object>
15621458
</at>
1563-
<at name="name"/>
1459+
<at name="name"></at>
15641460
<at name="fill">
15651461
<object classname="com.jeta.forms.store.properties.effects.PaintProperty">
15661462
<at name="name">fill</at>
@@ -1600,7 +1496,7 @@
16001496
<at name="cellpainters">
16011497
<object classname="com.jeta.forms.store.support.Matrix">
16021498
<at name="rows">
1603-
<object classname="[Ljava.lang.Object;" size="9">
1499+
<object classname="[Ljava.lang.Object;" size="7">
16041500
<at name="item" index="0">
16051501
<object classname="[Ljava.lang.Object;" size="1"/>
16061502
</at>
@@ -1622,12 +1518,6 @@
16221518
<at name="item" index="6">
16231519
<object classname="[Ljava.lang.Object;" size="1"/>
16241520
</at>
1625-
<at name="item" index="7">
1626-
<object classname="[Ljava.lang.Object;" size="1"/>
1627-
</at>
1628-
<at name="item" index="8">
1629-
<object classname="[Ljava.lang.Object;" size="1"/>
1630-
</at>
16311521
</object>
16321522
</at>
16331523
</object>

0 commit comments

Comments
 (0)