Thread: [Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.87, 1.88 ToolFac

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29791/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java ToolFactory.java 
Log Message:
Added mnemonics to most buttons, the only twist is that alt have to be pressed now to activate buttons, but all tooltip include mnemonic info, which look good. Added tooltip to all buttons.

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** ToolFactory.java	21 Jul 2006 08:58:58 -0000	1.54
--- ToolFactory.java	21 Jul 2006 15:14:57 -0000	1.55
***************
*** 21,24 ****
--- 21,25 ----
  import java.awt.Toolkit;
  import java.awt.event.ActionEvent;
+ import java.awt.event.KeyEvent;
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
***************
*** 49,53 ****
    
    /** buttons */
!   private Map buttons;
    
    /** button group */
--- 50,54 ----
    
    /** buttons */
!   protected Map buttons;
    
    /** button group */
***************
*** 219,236 ****
      
      selBut = this.registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
      pencilBut = this.registerTool(Tool.PENCIL_TOOL, pencil, "Biconpentool.gif", "Pencil");
      eraserBut = this.registerTool(Tool.ERASER_TOOL, eraser, "Biconeraser.gif", "Eraser");
!     this.registerTool(Tool.ALT_RECT_TOOL, altRect, "Biconaltrect.gif", "Rectangle");
!     this.registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
!     
      tb.addSeparator(3);
      extrudeBut = this.registerTool(Tool.EXTRUSION_TOOL, extrusion, 
          "Biconextrudetool.gif", "Extrude");
      mulextrudeBut = this.registerTool(Tool.MULTI_EXTRUDE_TOOL, mulextrusion, 
          "Biconextrudetool2.gif", "Controlled Extrude");
      moveBut = this.registerTool(Tool.MOVE_TOOL, move, "Biconmovetool.gif", "Move");
      moveBut.addMouseListener(new MoveButtonMouseListener(moveBut));
      rotBut = this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotobj.gif", "Rotation");
!    
      tb.addSeparator(3);
      tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 
--- 220,245 ----
      
      selBut = this.registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
+     selBut.setMnemonic(KeyEvent.VK_Q);
      pencilBut = this.registerTool(Tool.PENCIL_TOOL, pencil, "Biconpentool.gif", "Pencil");
+     pencilBut.setMnemonic(KeyEvent.VK_W);
      eraserBut = this.registerTool(Tool.ERASER_TOOL, eraser, "Biconeraser.gif", "Eraser");
!     eraserBut.setMnemonic(KeyEvent.VK_A);
!     JToggleButton rect = 
!       this.registerTool(Tool.ALT_RECT_TOOL, altRect, "Biconaltrect.gif", "Rectangle");
!     rect.setMnemonic(KeyEvent.VK_S);
!     JToggleButton arcb = this.registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
!     arcb.setMnemonic(KeyEvent.VK_Z);
      tb.addSeparator(3);
      extrudeBut = this.registerTool(Tool.EXTRUSION_TOOL, extrusion, 
          "Biconextrudetool.gif", "Extrude");
+     extrudeBut.setMnemonic(KeyEvent.VK_V);
      mulextrudeBut = this.registerTool(Tool.MULTI_EXTRUDE_TOOL, mulextrusion, 
          "Biconextrudetool2.gif", "Controlled Extrude");
+     mulextrudeBut.setMnemonic(KeyEvent.VK_B);
      moveBut = this.registerTool(Tool.MOVE_TOOL, move, "Biconmovetool.gif", "Move");
+     moveBut.setMnemonic(KeyEvent.VK_M);
      moveBut.addMouseListener(new MoveButtonMouseListener(moveBut));
      rotBut = this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotobj.gif", "Rotation");
!     rotBut.setMnemonic(KeyEvent.VK_R);
      tb.addSeparator(3);
      tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 
***************
*** 244,248 ****
      tb.addSeparator(3);
      
!     cRotBut = this.registerTool(Tool.CAMERA_TOOL, camera, "Biconrotcam.gif", "Orbit");
      flyBut = this.registerTool(Tool.FLY_TOOL, fly, "Biconfly.gif", "Fly");
      walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
--- 253,257 ----
      tb.addSeparator(3);
      
!     cRotBut = this.registerTool(Tool.CAMERA_TOOL, camera, "Biconrotcam.gif", "Orbit (Space)");
      flyBut = this.registerTool(Tool.FLY_TOOL, fly, "Biconfly.gif", "Fly");
      walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
***************
*** 256,264 ****
        };
  
!     Toolbar.getInstance().registerPushButtonAction(zoomAction);
      
      tb.addSeparator(10);     
  
-     
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
          public void actionPerformed(ActionEvent agr0) {
--- 265,272 ----
        };
  
!     Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All");
      
      tb.addSeparator(10);     
  
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
          public void actionPerformed(ActionEvent agr0) {
***************
*** 267,271 ****
          }
        };
!     
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
          public void actionPerformed(ActionEvent agr0) {
--- 275,279 ----
          }
        };
! 
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
          public void actionPerformed(ActionEvent agr0) {
***************
*** 275,283 ****
        };
      
-     
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
      viewGroup.add(perspBut);
!     viewGroup.add(Toolbar.getInstance().registerAction(orthoAction));
      perspBut.setSelected(true);
    }
--- 283,295 ----
        };
      
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
+     perspBut.setToolTipText("Perspective");
+     perspBut.setMnemonic(KeyEvent.VK_J);
      viewGroup.add(perspBut);
!     JToggleButton orthoBut = Toolbar.getInstance().registerAction(orthoAction);
!     orthoBut.setToolTipText("Orthographic");
!     orthoBut.setMnemonic(KeyEvent.VK_K);
!     viewGroup.add(orthoBut);
      perspBut.setSelected(true);
    }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** AbstractTool.java	20 Jul 2006 13:01:56 -0000	1.87
--- AbstractTool.java	21 Jul 2006 15:14:57 -0000	1.88
***************
*** 259,278 ****
        } else if (e.getKeyCode() == KeyEvent.VK_X) {
          c.zoomin();
-       } else if (e.getKeyCode() == KeyEvent.VK_Q) {
-         glv.changeTool(Tool.SELECT_TOOL);
-       } else if (e.getKeyCode() == KeyEvent.VK_W) {
-         glv.changeTool(Tool.PENCIL_TOOL);
-       } else if (e.getKeyCode() == KeyEvent.VK_M) {
-         glv.changeTool(Tool.MOVE_TOOL);
-       } else if (e.getKeyCode() == KeyEvent.VK_R) {
-         glv.changeTool(Tool.CAMERA_TOOL);
-       } else if (e.getKeyCode() == KeyEvent.VK_E) {
-         glv.changeTool(Tool.EXTRUSION_TOOL);
-       } else if (e.getKeyCode() == KeyEvent.VK_F5) {
-         glv.getView().changeDrawMode(View.WIREFRAME_MODE);
-       } else if (e.getKeyCode() == KeyEvent.VK_F6) {
-         glv.getView().changeDrawMode(View.SOLID_MODE);
-       } else if (e.getKeyCode() == KeyEvent.VK_F7) {
-         glv.getView().changeDrawMode(View.LIGHTING_MODE);
        } else {
          key(e);
--- 259,262 ----

Thread: [Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.87, 1.88 ToolFac

bprocessor-commit