diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.gif deleted file mode 100644 index c4c8fd770..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.png new file mode 100644 index 000000000..7e790024b Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.svg new file mode 100644 index 000000000..d6f5b8c4b --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.gif deleted file mode 100644 index 9b27ba56c..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.png new file mode 100644 index 000000000..bca4855d1 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.svg new file mode 100644 index 000000000..983f67bb1 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_center_disabled.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.gif deleted file mode 100644 index 6f4b46ad6..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.png new file mode 100644 index 000000000..61a7c4998 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.svg new file mode 100644 index 000000000..01db1866d --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.gif deleted file mode 100644 index 8c8970623..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.png new file mode 100644 index 000000000..08153de73 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.svg new file mode 100644 index 000000000..8698af88c --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_centers_disabled.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.gif deleted file mode 100644 index ff834f825..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.png new file mode 100644 index 000000000..af5deabb5 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.svg new file mode 100644 index 000000000..71ead1b74 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.gif deleted file mode 100644 index 7be32be2e..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.png new file mode 100644 index 000000000..207df6fb2 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.svg new file mode 100644 index 000000000..176a3ed92 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_left_disabled.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.gif deleted file mode 100644 index 6400db71c..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.png new file mode 100644 index 000000000..1a103c544 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.svg new file mode 100644 index 000000000..9c392225c --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.gif deleted file mode 100644 index 565b45c7d..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.png new file mode 100644 index 000000000..edafa9c99 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.svg new file mode 100644 index 000000000..ef1793b8f --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_right_disabled.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.gif deleted file mode 100644 index c1bf92b89..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.png new file mode 100644 index 000000000..55f1b9b06 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.svg new file mode 100644 index 000000000..725dab321 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.gif deleted file mode 100644 index 945dd8238..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.png new file mode 100644 index 000000000..5aca08383 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.svg new file mode 100644 index 000000000..bb8433348 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_h_space_disabled.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_height.gif deleted file mode 100644 index 03ff2530a..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_height.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_height.png new file mode 100644 index 000000000..38b0aac6d Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_height.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_height.svg new file mode 100644 index 000000000..fffc368e1 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_height.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.gif deleted file mode 100644 index 169cd2e14..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.png new file mode 100644 index 000000000..a0a7597b8 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.svg new file mode 100644 index 000000000..d47ac60f5 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_height_disabled.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.gif deleted file mode 100644 index a9cce8594..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.png new file mode 100644 index 000000000..313baedf7 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.svg new file mode 100644 index 000000000..243efb2b1 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.gif deleted file mode 100644 index f1fe2219f..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.png new file mode 100644 index 000000000..64040340c Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.svg new file mode 100644 index 000000000..37c680cf4 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_bottom_disabled.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.gif deleted file mode 100644 index d3bea27b5..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.png new file mode 100644 index 000000000..69bac1c0e Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.svg new file mode 100644 index 000000000..e9b1f9da0 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.gif deleted file mode 100644 index 79bdd105d..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.png new file mode 100644 index 000000000..5c965c173 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.svg new file mode 100644 index 000000000..5096d54a3 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_center_disabled.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.gif deleted file mode 100644 index 102e1f6db..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.png new file mode 100644 index 000000000..fc6104114 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.svg new file mode 100644 index 000000000..fea89fcee --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.gif deleted file mode 100644 index 6081d7ad6..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.png new file mode 100644 index 000000000..b589e8fca Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.svg new file mode 100644 index 000000000..17914b743 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_centers_disabled.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.gif deleted file mode 100644 index 6da41460a..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.png new file mode 100644 index 000000000..cc8bd69d4 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.svg new file mode 100644 index 000000000..769788160 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.gif deleted file mode 100644 index c17f8ebab..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.png new file mode 100644 index 000000000..b30c9f938 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.svg new file mode 100644 index 000000000..9d49557ac --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_space_disabled.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.gif deleted file mode 100644 index 89ee23b36..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.png new file mode 100644 index 000000000..6c40c75f6 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.svg new file mode 100644 index 000000000..63a3f9895 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.gif deleted file mode 100644 index 7fdbe5cb0..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.png new file mode 100644 index 000000000..e4023115e Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.svg new file mode 100644 index 000000000..dc1b6690c --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_v_top_disabled.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_width.gif deleted file mode 100644 index 88fdf826d..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_width.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_width.png new file mode 100644 index 000000000..0c112f702 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_width.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_width.svg new file mode 100644 index 000000000..b2668e145 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_width.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.gif b/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.gif deleted file mode 100644 index d1344dbc7..000000000 Binary files a/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.gif and /dev/null differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.png b/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.png new file mode 100644 index 000000000..640c565a8 Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.svg b/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.svg new file mode 100644 index 000000000..d7b62794e --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/align_width_disabled.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/bring_forward.svg b/org.eclipse.wb.core/icons/info/layout/absolute/bring_forward.svg new file mode 100644 index 000000000..793109a4b --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/bring_forward.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/bring_to_front.svg b/org.eclipse.wb.core/icons/info/layout/absolute/bring_to_front.svg new file mode 100644 index 000000000..9d2f89668 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/bring_to_front.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/layout.png b/org.eclipse.wb.core/icons/info/layout/absolute/layout.png new file mode 100644 index 000000000..56d5bb06f Binary files /dev/null and b/org.eclipse.wb.core/icons/info/layout/absolute/layout.png differ diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/layout.svg b/org.eclipse.wb.core/icons/info/layout/absolute/layout.svg new file mode 100644 index 000000000..a11130b13 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/layout.svg @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + Y + W + H + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/send_backward.svg b/org.eclipse.wb.core/icons/info/layout/absolute/send_backward.svg new file mode 100644 index 000000000..86bfccdc5 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/send_backward.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/send_to_back.svg b/org.eclipse.wb.core/icons/info/layout/absolute/send_to_back.svg new file mode 100644 index 000000000..3730e9b52 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/absolute/send_to_back.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/icons/info/layout/absolute/fit_to_size.png b/org.eclipse.wb.core/icons/info/layout/fit_to_size.png similarity index 100% rename from org.eclipse.wb.core/icons/info/layout/absolute/fit_to_size.png rename to org.eclipse.wb.core/icons/info/layout/fit_to_size.png diff --git a/org.eclipse.wb.core/icons/info/layout/fit_to_size.svg b/org.eclipse.wb.core/icons/info/layout/fit_to_size.svg new file mode 100644 index 000000000..dd697fa12 --- /dev/null +++ b/org.eclipse.wb.core/icons/info/layout/fit_to_size.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java index be0791b28..14bf44710 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java @@ -86,6 +86,38 @@ public abstract class CoreImages { public static ImageDescriptor PROPERTIES_PLUS = of("properties/plus.svg"); public static ImageDescriptor PROPERTIES_TRUE = of("properties/true.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_CENTER_DISABLED = of("info/layout/absolute/align_h_center_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_CENTER = of("info/layout/absolute/align_h_center.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_CENTERS_DISABLED = of("info/layout/absolute/align_h_centers_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_CENTERS = of("info/layout/absolute/align_h_centers.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_LEFT_DISABLED = of("info/layout/absolute/align_h_left_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_LEFT = of("info/layout/absolute/align_h_left.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_RIGHT_DISABLED = of("info/layout/absolute/align_h_right_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_RIGHT = of("info/layout/absolute/align_h_right.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_SPACE_DISABLED = of("info/layout/absolute/align_h_space_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_H_SPACE = of("info/layout/absolute/align_h_space.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_HEIGHT_DISABLED = of("info/layout/absolute/align_height_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_HEIGHT = of("info/layout/absolute/align_height.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_BOTTOM_DISABLED = of("info/layout/absolute/align_v_bottom_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_BOTTOM = of("info/layout/absolute/align_v_bottom.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_CENTER_DISABLED = of("info/layout/absolute/align_v_center_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_CENTER = of("info/layout/absolute/align_v_center.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_CENTERS_DISABLED = of("info/layout/absolute/align_v_centers_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_CENTERS = of("info/layout/absolute/align_v_centers.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_SPACE_DISABLED = of("info/layout/absolute/align_v_space_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_SPACE = of("info/layout/absolute/align_v_space.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_TOP_DISABLED = of("info/layout/absolute/align_v_top_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_V_TOP = of("info/layout/absolute/align_v_top.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_WIDTH_DISABLED = of("info/layout/absolute/align_width_disabled.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_ALIGN_WIDTH = of("info/layout/absolute/align_width.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_BRING_FORWARD = of("info/layout/absolute/bring_forward.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_BRING_TO_FRONT = of("info/layout/absolute/bring_to_front.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_SEND_BACKWARD = of("info/layout/absolute/send_backward.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE_SEND_TO_BACK = of("info/layout/absolute/send_to_back.svg"); + public static ImageDescriptor LAYOUT_ABSOLUTE = of("info/layout/absolute/layout.svg"); + + public static ImageDescriptor LAYOUT_FIT_TO_SIZE = of("info/layout/fit_to_size.svg"); + /** * Images returned by this method must not be disposed. * diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/actions/AbstractAlignmentActionsSupport.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/actions/AbstractAlignmentActionsSupport.java index 029df2a9d..bc37f3e26 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/actions/AbstractAlignmentActionsSupport.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/actions/AbstractAlignmentActionsSupport.java @@ -12,14 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.gef.GefMessages; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Separator; +import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; import java.util.HashSet; @@ -113,24 +114,36 @@ protected void fillActions(List actions) { protected void addAlignmentActions(List actions) { // create horizontal actions actions.add(new Separator()); - actions.add(new SelectionAction("h_left", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_LEFT, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_LEFT_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alignLeft, ALIGN_H_LEFT)); - actions.add(new SelectionAction("h_centers", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_CENTERS, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_CENTERS_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alighHorizontalCenters, ALIGN_H_CENTERS)); - actions.add(new SelectionAction("h_right", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_RIGHT, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_RIGHT_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alignRight, ALIGN_H_RIGHT)); // create vertical actions actions.add(new Separator()); - actions.add(new SelectionAction("v_top", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_TOP, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_TOP_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alignTop, ALIGN_V_TOP)); - actions.add(new SelectionAction("v_centers", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_CENTERS, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_CENTERS_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alignVerticalCenters, ALIGN_V_CENTERS)); - actions.add(new SelectionAction("v_bottom", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_BOTTOM, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_BOTTOM_DISABLED, GefMessages.AbstractAlignmentActionsSupport_alignBottom, ALIGN_V_BOTTOM)); } @@ -138,10 +151,14 @@ protected void addAlignmentActions(List actions) { protected void addSpaceActions(List actions) { // create space actions actions.add(new Separator()); - actions.add(new SelectionAction("h_space", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_SPACE, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_SPACE_DISABLED, GefMessages.AbstractAlignmentActionsSupport_spaceEquallyHorizontal, ALIGN_H_SPACE)); - actions.add(new SelectionAction("v_space", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_SPACE, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_SPACE_DISABLED, GefMessages.AbstractAlignmentActionsSupport_spaceEquallyVertical, ALIGN_V_SPACE)); } @@ -149,10 +166,14 @@ protected void addSpaceActions(List actions) { protected void addSizeActions(List actions) { // create size actions actions.add(new Separator()); - actions.add(new SelectionAction("width", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_WIDTH, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_WIDTH_DISABLED, GefMessages.AbstractAlignmentActionsSupport_replicateWidth, ALIGN_WIDTH)); - actions.add(new SelectionAction("height", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_HEIGHT, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_HEIGHT_DISABLED, GefMessages.AbstractAlignmentActionsSupport_replicateHeight, ALIGN_HEIGHT)); } @@ -160,10 +181,14 @@ protected void addSizeActions(List actions) { protected void addCenterInContainerActions(List actions) { // create center actions actions.add(new Separator()); - actions.add(new SelectionAction("h_center", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_CENTER, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_H_CENTER_DISABLED, GefMessages.AbstractAlignmentActionsSupport_centerHorizontally, ALIGN_H_CENTER)); - actions.add(new SelectionAction("v_center", + actions.add(new SelectionAction( + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_CENTER, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_V_CENTER_DISABLED, GefMessages.AbstractAlignmentActionsSupport_centerVertically, ALIGN_V_CENTER)); } @@ -253,11 +278,10 @@ protected class SelectionAction extends Action { // Constructor // //////////////////////////////////////////////////////////////////////////// - public SelectionAction(String image, String tooltip, int command) { + public SelectionAction(ImageDescriptor image, ImageDescriptor imageDisabled, String tooltip, int command) { m_command = command; - String iconPath = "info/layout/absolute/align_" + image; - setImageDescriptor(DesignerPlugin.getImageDescriptor(iconPath + ".gif")); - setDisabledImageDescriptor(DesignerPlugin.getImageDescriptor(iconPath + "_disabled.gif")); + setImageDescriptor(image); + setDisabledImageDescriptor(imageDisabled); setEnabled(isActionEnabled(m_command)); setToolTipText(tooltip); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/layout/absolute/OrderingSupport.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/layout/absolute/OrderingSupport.java index 5ea1a30fc..0f2100b7f 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/layout/absolute/OrderingSupport.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/layout/absolute/OrderingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -13,14 +13,15 @@ package org.eclipse.wb.internal.core.model.layout.absolute; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.model.ModelMessages; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.core.utils.state.GlobalState; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.resource.ImageDescriptor; import java.util.List; @@ -58,28 +59,28 @@ public void contributeActions(IMenuManager manager) { boolean isFirst = m_components.indexOf(m_component) == 0; boolean isLast = m_components.indexOf(m_component) == m_components.size() - 1; orderMenuManager.add(new OrderAction(ModelMessages.OrderingSupport_bringToFront, - "bring_to_front.png", !isFirst) { + CoreImages.LAYOUT_ABSOLUTE_BRING_TO_FRONT, !isFirst) { @Override protected void runEx() throws Exception { GlobalState.getOrderProcessor().move(m_component, getFirstSibling()); } }); orderMenuManager.add(new OrderAction(ModelMessages.OrderingSupport_sendToBack, - "send_to_back.png", !isLast) { + CoreImages.LAYOUT_ABSOLUTE_SEND_TO_BACK, !isLast) { @Override protected void runEx() throws Exception { GlobalState.getOrderProcessor().move(m_component, null); } }); orderMenuManager.add(new OrderAction(ModelMessages.OrderingSupport_bringForward, - "bring_forward.png", !isFirst) { + CoreImages.LAYOUT_ABSOLUTE_BRING_FORWARD, !isFirst) { @Override protected void runEx() throws Exception { GlobalState.getOrderProcessor().move(m_component, getPreviousSibling()); } }); orderMenuManager.add(new OrderAction(ModelMessages.OrderingSupport_sendBackward, - "send_backward.png", !isLast) { + CoreImages.LAYOUT_ABSOLUTE_SEND_BACKWARD, !isLast) { @Override protected void runEx() throws Exception { GlobalState.getOrderProcessor().move(m_component, getNextSibling()); @@ -126,10 +127,10 @@ private IAbstractComponentInfo getNextSibling() { * Abstract super class for ordering actions. */ private abstract class OrderAction extends ObjectInfoAction { - public OrderAction(String text, String imageName, boolean enabled) { + public OrderAction(String text, ImageDescriptor image, boolean enabled) { super(m_component.getUnderlyingModel()); setText(text); - setImageDescriptor(DesignerPlugin.getImageDescriptor("info/layout/absolute/" + imageName)); + setImageDescriptor(image); setEnabled(enabled); } } diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/AlignmentsSupport.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/AlignmentsSupport.java index 93968b512..a6b778e98 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/AlignmentsSupport.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/AlignmentsSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,6 +12,7 @@ *******************************************************************************/ package org.eclipse.wb.internal.layout.group.model; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.ObjectInfoUtils; @@ -61,8 +62,10 @@ protected void fillActions(List actions) { protected void addSizeActions(List actions) { // create size actions actions.add(new Separator()); - actions.add(new SelectionAction("width", Messages.AlignmentsSupport_linkWidth, ALIGN_WIDTH)); - actions.add(new SelectionAction("height", Messages.AlignmentsSupport_linkHeight, ALIGN_HEIGHT)); + actions.add(new SelectionAction(CoreImages.LAYOUT_ABSOLUTE_ALIGN_WIDTH, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_WIDTH_DISABLED, Messages.AlignmentsSupport_linkWidth, ALIGN_WIDTH)); + actions.add(new SelectionAction(CoreImages.LAYOUT_ABSOLUTE_ALIGN_HEIGHT, + CoreImages.LAYOUT_ABSOLUTE_ALIGN_HEIGHT_DISABLED, Messages.AlignmentsSupport_linkHeight, ALIGN_HEIGHT)); } //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.swing/icons/info/layout/absolute/layout.gif b/org.eclipse.wb.swing/icons/info/layout/absolute/layout.gif deleted file mode 100644 index 31f4242f1..000000000 Binary files a/org.eclipse.wb.swing/icons/info/layout/absolute/layout.gif and /dev/null differ diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/ContainerInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/ContainerInfo.java index 07c56081e..9c42c2ba5 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/ContainerInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/ContainerInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,6 +14,7 @@ package org.eclipse.wb.internal.swing.model.component; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfo; @@ -48,7 +49,6 @@ import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.execution.RunnableEx; import org.eclipse.wb.internal.core.utils.state.EditorState; -import org.eclipse.wb.internal.swing.Activator; import org.eclipse.wb.internal.swing.model.CoordinateUtils; import org.eclipse.wb.internal.swing.model.ModelMessages; import org.eclipse.wb.internal.swing.model.layout.ImplicitLayoutCreationSupport; @@ -179,7 +179,7 @@ protected void runEx() throws Exception { } }; action.setText(ModelMessages.ContainerInfo_setLayoutAbsolute); - action.setImageDescriptor(Activator.getImageDescriptor("info/layout/absolute/layout.gif")); + action.setImageDescriptor(CoreImages.LAYOUT_ABSOLUTE); layoutsManager.add(action); } // add layout items diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbsoluteLayoutInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbsoluteLayoutInfo.java index ed2237ade..db77557b0 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbsoluteLayoutInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbsoluteLayoutInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,6 +12,7 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.model.layout.absolute; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfoUtils; import org.eclipse.wb.internal.core.model.creation.CreationSupport; @@ -25,7 +26,6 @@ import org.eclipse.wb.internal.core.utils.ast.NodeTarget; import org.eclipse.wb.internal.core.utils.ast.StatementTarget; import org.eclipse.wb.internal.core.utils.check.Assert; -import org.eclipse.wb.internal.swing.Activator; import org.eclipse.wb.internal.swing.ToolkitProvider; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; @@ -57,7 +57,7 @@ public AbsoluteLayoutInfo(AstEditor editor, CreationSupport creationSupport) thr ObjectInfoUtils.setNewId(this); getDescription().setToolkit(ToolkitProvider.DESCRIPTION); getDescription().setOrder("first"); - getDescription().setIcon(Activator.getImageDescriptor("info/layout/absolute/layout.gif")); + getDescription().setIcon(CoreImages.LAYOUT_ABSOLUTE); setVariableSupport(new AbsoluteLayoutVariableSupport(this)); } diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbstractAbsoluteLayoutInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbstractAbsoluteLayoutInfo.java index 74ee7ff12..5666ebb5a 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbstractAbsoluteLayoutInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/absolute/AbstractAbsoluteLayoutInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -13,12 +13,12 @@ package org.eclipse.wb.internal.swing.model.layout.absolute; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.broadcast.JavaEventListener; import org.eclipse.wb.core.model.broadcast.JavaInfoAddProperties; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; -import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.model.clipboard.ClipboardCommand; import org.eclipse.wb.internal.core.model.creation.CreationSupport; import org.eclipse.wb.internal.core.model.description.ComponentDescription; @@ -121,7 +121,7 @@ private void contributeComponentContextMenu(IMenuManager manager, final Componen { IAction action = new ObjectInfoAction(component, ModelMessages.AbstractAbsoluteLayoutInfo_autosize, - DesignerPlugin.getImageDescriptor("info/layout/absolute/fit_to_size.png")) { + CoreImages.LAYOUT_FIT_TO_SIZE) { @Override protected void runEx() throws Exception { command_BOUNDS(component, null, component.getPreferredSize()); diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/AbsoluteLayoutEntryInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/AbsoluteLayoutEntryInfo.java index d6c6cab47..7bc532324 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/AbsoluteLayoutEntryInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/AbsoluteLayoutEntryInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.palette; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo; import org.eclipse.wb.gef.core.requests.ICreationFactory; import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.core.tools.Tool; -import org.eclipse.wb.internal.swing.Activator; import org.eclipse.wb.internal.swing.model.layout.absolute.AbsoluteLayoutInfo; import org.eclipse.jface.resource.ImageDescriptor; @@ -28,8 +28,6 @@ * @coverage swing.editor.palette */ public final class AbsoluteLayoutEntryInfo extends ToolEntryInfo { - private static final ImageDescriptor ICON = Activator.getImageDescriptor("info/layout/absolute/layout.gif"); - //////////////////////////////////////////////////////////////////////////// // // Constructor @@ -47,7 +45,7 @@ public AbsoluteLayoutEntryInfo() { //////////////////////////////////////////////////////////////////////////// @Override public ImageDescriptor getIcon() { - return ICON; + return CoreImages.LAYOUT_ABSOLUTE; } //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.swt/icons/info/layout/FormLayout/fit_to_size.png b/org.eclipse.wb.swt/icons/info/layout/FormLayout/fit_to_size.png deleted file mode 100644 index 49eefd853..000000000 Binary files a/org.eclipse.wb.swt/icons/info/layout/FormLayout/fit_to_size.png and /dev/null differ diff --git a/org.eclipse.wb.swt/icons/info/layout/absolute/layout.gif b/org.eclipse.wb.swt/icons/info/layout/absolute/layout.gif deleted file mode 100644 index 31f4242f1..000000000 Binary files a/org.eclipse.wb.swt/icons/info/layout/absolute/layout.gif and /dev/null differ diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/absolute/AbsoluteLayoutInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/absolute/AbsoluteLayoutInfo.java index 6c8c0a475..a16eafeb5 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/absolute/AbsoluteLayoutInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/absolute/AbsoluteLayoutInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -13,6 +13,7 @@ package org.eclipse.wb.internal.swt.model.layout.absolute; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.ObjectInfoUtils; @@ -41,7 +42,6 @@ import org.eclipse.wb.internal.core.utils.check.Assert; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.execution.RunnableEx; -import org.eclipse.wb.internal.swt.Activator; import org.eclipse.wb.internal.swt.model.ModelMessages; import org.eclipse.wb.internal.swt.model.layout.LayoutClipboardCommand; import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; @@ -92,7 +92,7 @@ public AbsoluteLayoutInfo(AstEditor editor, ObjectInfoUtils.setNewId(this); getDescription().setToolkit(toolkit); getDescription().setOrder("first"); - getDescription().setIcon(Activator.getImageDescriptor("info/layout/absolute/layout.gif")); + getDescription().setIcon(CoreImages.LAYOUT_ABSOLUTE); setVariableSupport(new AbsoluteLayoutVariableSupport(this)); } @@ -233,7 +233,7 @@ private void contributeControlContextMenu(IMenuManager manager, final ControlInf { IAction action = new ObjectInfoAction(control, ModelMessages.AbsoluteLayoutInfo_autoSize, - DesignerPlugin.getImageDescriptor("info/layout/absolute/fit_to_size.png")) { + CoreImages.LAYOUT_FIT_TO_SIZE) { @Override protected void runEx() throws Exception { commandChangeBounds(control, null, control.getPreferredSize()); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfo.java index 8488bd1c5..acb11162c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -13,6 +13,7 @@ package org.eclipse.wb.internal.swt.model.layout.form; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; @@ -26,7 +27,6 @@ import org.eclipse.wb.internal.core.model.property.Property; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.core.utils.ast.AstEditor; -import org.eclipse.wb.internal.swt.Activator; import org.eclipse.wb.internal.swt.gef.policy.layout.form.FormUtils; import org.eclipse.wb.internal.swt.model.ModelMessages; import org.eclipse.wb.internal.swt.model.layout.LayoutClipboardCommand; @@ -124,7 +124,7 @@ private void contributeControlContextMenu(IMenuManager manager, final ControlInf { IAction action = new ObjectInfoAction(control, ModelMessages.FormLayoutInfo_autoSize, - Activator.getImageDescriptor("info/layout/FormLayout/fit_to_size.png")) { + CoreImages.LAYOUT_FIT_TO_SIZE) { @Override protected void runEx() throws Exception { doAutoSize(control); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/CompositeInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/CompositeInfo.java index 2d8fd4756..8b0f6ab82 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/CompositeInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/CompositeInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -17,6 +17,7 @@ package org.eclipse.wb.internal.swt.model.widgets; import org.eclipse.wb.core.editor.IContextMenuConstants; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants; import org.eclipse.wb.core.eval.AstEvaluationEngine; import org.eclipse.wb.core.eval.EvaluationContext; @@ -57,7 +58,6 @@ import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.execution.RunnableEx; import org.eclipse.wb.internal.core.utils.state.EditorState; -import org.eclipse.wb.internal.swt.Activator; import org.eclipse.wb.internal.swt.IExceptionConstants; import org.eclipse.wb.internal.swt.model.ModelMessages; import org.eclipse.wb.internal.swt.model.layout.ImplicitLayoutCreationSupport; @@ -225,7 +225,7 @@ protected void runEx() throws Exception { } }; action.setText(ModelMessages.CompositeInfo_setLayoutAbsolute); - action.setImageDescriptor(Activator.getImageDescriptor("info/layout/absolute/layout.gif")); + action.setImageDescriptor(CoreImages.LAYOUT_ABSOLUTE); layoutsManager.add(action); } // add layout items diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/palette/AbsoluteLayoutEntryInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/palette/AbsoluteLayoutEntryInfo.java index 21d420aaf..842663166 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/palette/AbsoluteLayoutEntryInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/palette/AbsoluteLayoutEntryInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.swt.palette; +import org.eclipse.wb.core.editor.constants.CoreImages; import org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo; import org.eclipse.wb.gef.core.requests.ICreationFactory; import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.internal.core.model.description.ToolkitDescription; -import org.eclipse.wb.internal.swt.Activator; import org.eclipse.wb.internal.swt.model.ModelMessages; import org.eclipse.wb.internal.swt.model.layout.absolute.AbsoluteLayoutCreationSupport; import org.eclipse.wb.internal.swt.model.layout.absolute.AbsoluteLayoutInfo; @@ -31,8 +31,6 @@ * @coverage swt.editor.palette */ public final class AbsoluteLayoutEntryInfo extends ToolEntryInfo { - private static final ImageDescriptor ICON = Activator.getImageDescriptor("info/layout/absolute/layout.gif"); - //////////////////////////////////////////////////////////////////////////// // // Constructor @@ -50,7 +48,7 @@ public AbsoluteLayoutEntryInfo() { //////////////////////////////////////////////////////////////////////////// @Override public ImageDescriptor getIcon() { - return ICON; + return CoreImages.LAYOUT_ABSOLUTE; } ////////////////////////////////////////////////////////////////////////////