Skip to content

Commit 46559fe

Browse files
TraumlosTraumlos
committed
add first images to the toolings and ignore not working tests
- image folder is no duplicated - note that refactoring image paths to be reusable was not feasable(crashed intellij) - maybe configure gwt to copy files from original source later on
1 parent 3dbbdea commit 46559fe

261 files changed

Lines changed: 256 additions & 25 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/webapp/client/JGEXWebApp.java‎

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package webapp.client;
22

33
import com.google.gwt.core.client.EntryPoint;
4+
import com.google.gwt.core.client.GWT;
45
import com.google.gwt.dom.client.Style;
56
import com.google.gwt.event.dom.client.ClickEvent;
67
import com.google.gwt.event.dom.client.ClickHandler;
8+
import com.google.gwt.safehtml.shared.SafeHtml;
9+
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
710
import com.google.gwt.user.client.Command;
811
import com.google.gwt.user.client.Window;
912
import com.google.gwt.user.client.ui.*;
1013
import core.ui.GExpertUI;
1114
import webapp.client.GExpertCore;
1215
import webapp.client.tools.ToolManager;
16+
import webapp.client.tools.Tool;
1317

1418
import java.util.ArrayList;
1519
import java.util.List;
@@ -39,6 +43,37 @@ private void updateToolButtonStyles(Button activeButton, Button... otherButtons)
3943
}
4044
}
4145

46+
/**
47+
* Creates a button with an icon for a tool.
48+
* @param toolId The tool ID
49+
* @param label The button label
50+
* @return The created button
51+
*/
52+
private Button createToolButton(String toolId, String label) {
53+
Button button = new Button();
54+
Tool tool = toolManager.getTool(toolId);
55+
56+
if (tool != null && tool.getIconPath() != null && !tool.getIconPath().isEmpty()) {
57+
// Build an <img> + label safely:
58+
String iconUrl = GWT.getModuleBaseURL() + tool.getIconPath();
59+
String safeLabel = SafeHtmlUtils.htmlEscape(label);
60+
String imgTag =
61+
"<img src=\"" + iconUrl + "\""
62+
+ " width=\"16\" height=\"16\""
63+
+ " style=\"vertical-align:middle; margin-right:4px;\"/>";
64+
SafeHtml html = SafeHtmlUtils.fromTrustedString(imgTag + safeLabel);
65+
button.setHTML(html);
66+
} else {
67+
button.setText(label);
68+
}
69+
// Tooltip (if available)
70+
if (tool != null && tool.getDescription() != null) {
71+
button.setTitle(tool.getDescription());
72+
}
73+
74+
return button;
75+
}
76+
4277
@Override
4378
public void onModuleLoad() {
4479
// Initialize UI and core components
@@ -113,24 +148,24 @@ public void onModuleLoad() {
113148
toolbar.getElement().getStyle().setProperty("borderBottomColor", "#CCCCCC");
114149

115150
// Add tool buttons
116-
Button selectButton = new Button("Select");
117-
Button pointButton = new Button("Point");
118-
Button lineButton = new Button("Line");
119-
Button parallelButton = new Button("Parallel");
120-
Button perpButton = new Button("Perpendicular");
121-
Button footButton = new Button("Foot");
122-
Button circleButton = new Button("Circle");
123-
Button circle3pButton = new Button("Circle 3P");
124-
Button compassButton = new Button("Compass");
125-
Button angleButton = new Button("Angle");
126-
Button polygonButton = new Button("Polygon");
127-
Button textButton = new Button("Text");
128-
Button midpointButton = new Button("Midpoint");
129-
Button intersectButton = new Button("Intersect");
130-
Button mirrorButton = new Button("Mirror");
131-
Button isoscelesButton = new Button("Isosceles");
132-
Button squareButton = new Button("Square");
133-
Button triangleButton = new Button("Triangle");
151+
Button selectButton = createToolButton("select", "Select");
152+
Button pointButton = createToolButton("point", "Point");
153+
Button lineButton = createToolButton("line", "Line");
154+
Button parallelButton = createToolButton("parallel", "Parallel");
155+
Button perpButton = createToolButton("perp", "Perpendicular");
156+
Button footButton = createToolButton("foot", "Foot");
157+
Button circleButton = createToolButton("circle", "Circle");
158+
Button circle3pButton = createToolButton("circle3p", "Circle 3P");
159+
Button compassButton = createToolButton("circler", "Compass");
160+
Button angleButton = createToolButton("angle", "Angle");
161+
Button polygonButton = createToolButton("polygon", "Polygon");
162+
Button textButton = createToolButton("text", "Text");
163+
Button midpointButton = createToolButton("midpoint", "Midpoint");
164+
Button intersectButton = createToolButton("intersect", "Intersect");
165+
Button mirrorButton = createToolButton("mirror", "Mirror");
166+
Button isoscelesButton = createToolButton("iso", "Isosceles");
167+
Button squareButton = createToolButton("square", "Square");
168+
Button triangleButton = createToolButton("triangle", "Triangle");
134169

135170
// Set button styles
136171
Style selectStyle = selectButton.getElement().getStyle();

‎src/main/java/webapp/client/tools/CircleTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class CircleTool extends AbstractTool {
1919
* @param core The GExpertCore instance
2020
*/
2121
public CircleTool(GExpertCore core) {
22-
super(core, "Circle", "Create a circle");
22+
super(core, "Circle", "Create a circle", "images/circle.gif");
2323
setCursorType(1); // Crosshair cursor
2424
}
2525

‎src/main/java/webapp/client/tools/LineTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class LineTool extends AbstractTool {
2020
* @param core The GExpertCore instance
2121
*/
2222
public LineTool(GExpertCore core) {
23-
super(core, "Line", "Create a line");
23+
super(core, "Line", "Create a line", "images/line.gif");
2424
setCursorType(1); // Crosshair cursor
2525
}
2626

‎src/main/java/webapp/client/tools/ParallelTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ParallelTool extends AbstractTool {
2020
* @param core The GExpertCore instance
2121
*/
2222
public ParallelTool(GExpertCore core) {
23-
super(core, "Parallel", "Create a line parallel to another line");
23+
super(core, "Parallel", "Create a line parallel to another line", "images/parallel.gif");
2424
setCursorType(1); // Crosshair cursor
2525
}
2626

‎src/main/java/webapp/client/tools/PointTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class PointTool extends AbstractTool {
1313
* @param core The GExpertCore instance
1414
*/
1515
public PointTool(GExpertCore core) {
16-
super(core, "Point", "Create a point");
16+
super(core, "Point", "Create a point", "images/point.gif");
1717
setCursorType(1); // Crosshair cursor
1818
}
1919

‎src/main/java/webapp/client/tools/SelectionTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class SelectionTool extends AbstractTool {
1818
* @param core The GExpertCore instance
1919
*/
2020
public SelectionTool(GExpertCore core) {
21-
super(core, "Select", "Select and manipulate objects");
21+
super(core, "Select", "Select and manipulate objects", "images/select.gif");
2222
setCursorType(0); // Default cursor
2323
}
2424

‎src/main/java/webapp/public/images/Cursor/zoom_in.gif‎

552 Bytes

‎src/main/java/webapp/public/images/Cursor/zoom_out.gif‎

550 Bytes

‎src/main/java/webapp/public/images/abline.gif‎

454 Bytes

‎src/main/java/webapp/public/images/about/headline.jpg‎

27.3 KB

0 commit comments

Comments
 (0)