[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java,1.25,1.26
Status: Pre-Alpha
Brought to you by:
henryml
From: Nordholt <nor...@us...> - 2006-01-30 11:34:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14617 Modified Files: ToolFactory.java Log Message: made the toolbar buttons into togglebuttons Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ToolFactory.java 27 Jan 2006 11:43:37 -0000 1.25 --- ToolFactory.java 30 Jan 2006 11:34:10 -0000 1.26 *************** *** 19,23 **** import javax.swing.Action; import javax.swing.ImageIcon; ! import javax.swing.JButton; import org.apache.log4j.Logger; --- 19,24 ---- import javax.swing.Action; import javax.swing.ImageIcon; ! import javax.swing.JToggleButton; ! import javax.swing.ButtonGroup; import org.apache.log4j.Logger; *************** *** 93,118 **** Toolkit.getDefaultToolkit().createCustomCursor(walkImage, new Point(7, 8), "Walk"); Toolbar tb = Toolbar.getInstance(); tb.addSeparator(); ! JButton but = tb.registerAction(new SelectAction(glv)); but.setToolTipText("Select"); but = tb.registerAction(new PencilAction(glv)); but.setToolTipText("Pencil"); but = tb.registerAction(new MoveAction(glv)); but.setToolTipText("Move"); but = tb.registerAction(new RotationAction(glv)); but.setToolTipText("Rotate"); but = tb.registerAction(new ExtrudeAction(glv)); but.setToolTipText("Extrude"); but = tb.registerAction(new ClipAction(glv)); but.setToolTipText("Clipping"); but = tb.registerAction(new TapeMeasureAction(glv)); but.setToolTipText("Tape Measure"); tb.addSeparator(); but = tb.registerAction(new CameraAction(glv)); but.setToolTipText("Camera rotation"); but = tb.registerAction(new CameraFlyAction(glv)); but.setToolTipText("Fly mode"); but = tb.registerAction(new CameraWalkAction(glv)); but.setToolTipText("Walk mode"); --- 94,132 ---- Toolkit.getDefaultToolkit().createCustomCursor(walkImage, new Point(7, 8), "Walk"); + ButtonGroup bg = new ButtonGroup(); Toolbar tb = Toolbar.getInstance(); tb.addSeparator(); ! JToggleButton but = tb.registerAction(new SelectAction(glv)); ! bg.add(but); but.setToolTipText("Select"); but = tb.registerAction(new PencilAction(glv)); + bg.add(but); but.setToolTipText("Pencil"); but = tb.registerAction(new MoveAction(glv)); + bg.add(but); but.setToolTipText("Move"); but = tb.registerAction(new RotationAction(glv)); but.setToolTipText("Rotate"); but = tb.registerAction(new ExtrudeAction(glv)); + bg.add(but); but.setToolTipText("Extrude"); but = tb.registerAction(new ClipAction(glv)); + bg.add(but); but.setToolTipText("Clipping"); but = tb.registerAction(new TapeMeasureAction(glv)); + bg.add(but); but.setToolTipText("Tape Measure"); tb.addSeparator(); + but = tb.registerAction(new RotationAction(glv)); + bg.add(but); + but.setToolTipText("Rotation"); but = tb.registerAction(new CameraAction(glv)); + bg.add(but); but.setToolTipText("Camera rotation"); but = tb.registerAction(new CameraFlyAction(glv)); + bg.add(but); but.setToolTipText("Fly mode"); but = tb.registerAction(new CameraWalkAction(glv)); + bg.add(but); but.setToolTipText("Walk mode"); *************** *** 188,191 **** --- 202,206 ---- } else if (i == Tool.TAPE_MEASURE_TOOL) { currentTool = tapeMeasure; + return tapeMeasure; } else { log.error("[get] No such tool " + i); *************** *** 419,423 **** Image image = Toolkit.getDefaultToolkit().getImage(url); cursor = Toolkit.getDefaultToolkit().createCustomCursor(image, new Point(0, 0), "Pencil"); - } --- 434,437 ---- |