bprocessor-commit

[Michael L. <he...@us...>]

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

Modified Files:
	ToolFactory.java 
Log Message:
Rearranged buttons in the toolbar

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ToolFactory.java	12 Jun 2006 12:14:23 -0000	1.47
--- ToolFactory.java	13 Jun 2006 09:42:40 -0000	1.48
***************
*** 192,214 ****
      
      Toolbar tb = Toolbar.getInstance();
-     tb.addSeparator();
      
      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.ARC_TOOL, arc, "Barc.gif", "Arc");
      this.registerTool(Tool.RECT_TOOL, rect, "Brect.gif", "Rectangle");
      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");
!     extrudBut = this.registerTool(Tool.EXTRUSION_TOOL, extrusion, 
!       "Biconextrudetool.gif", "Extrude");
!     clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
!       "Bclip.gif", "Clipping");
      tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 
!       "Bicontapemes.gif", "Tape Measure");
      this.registerTool(Tool.PROTRACTOR_TOOL, protractor, "Bprotrac.gif", "Protractor");
      
!     tb.addSeparator();
      
      cRotBut = this.registerTool(Tool.CAMERA_TOOL, camera, "Biconrotcam.gif", "Orbit");
--- 192,218 ----
      
      Toolbar tb = Toolbar.getInstance();
      
      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.RECT_TOOL, rect, "Brect.gif", "Rectangle");
+     this.registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
+     
+     tb.addSeparator(3);
+     extrudBut = this.registerTool(Tool.EXTRUSION_TOOL, extrusion, 
+         "Biconextrudetool.gif", "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, 
!         "Bicontapemes.gif", "Tape Measure");
      this.registerTool(Tool.PROTRACTOR_TOOL, protractor, "Bprotrac.gif", "Protractor");
+     clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
+       "Bclip.gif", "Clipping");
      
!     
!     tb.addSeparator(3);
      
      cRotBut = this.registerTool(Tool.CAMERA_TOOL, camera, "Biconrotcam.gif", "Orbit");
***************
*** 216,227 ****
      walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
      
-     tb.addSeparator();     
-     
      Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") {
!         public void actionPerformed(ActionEvent agr0) {
!           Project.getInstance().getCurrentCamera().viewEntireModel();
!           this.glv.repaint();
!         }
!       };
      
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
--- 220,234 ----
      walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
      
      Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") {
!       public void actionPerformed(ActionEvent agr0) {
!         Project.getInstance().getCurrentCamera().viewEntireModel();
!         this.glv.repaint();
!       }
!     };
!     
!     
!     Toolbar.getInstance().registerPushButtonAction(zoomAction);
!     
!     tb.addSeparator(10);     
      
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
***************
*** 239,246 ****
        };
      
!     Toolbar.getInstance().registerPushButtonAction(zoomAction);
      ButtonGroup viewGroup = new ButtonGroup();
      viewGroup.add(Toolbar.getInstance().registerAction(orthoAction));
!     viewGroup.add(Toolbar.getInstance().registerAction(perspAction));    
    }
    
--- 246,255 ----
        };
      
!     
      ButtonGroup viewGroup = new ButtonGroup();
+     JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
+     viewGroup.add(perspBut);
      viewGroup.add(Toolbar.getInstance().registerAction(orthoAction));
!     perspBut.setSelected(true);
    }