[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.41,1.42 ToolFactory.java,1.21,1.22

[rimestad <rim...@us...>]

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

Modified Files:
	AbstractTool.java ToolFactory.java 
Log Message:
added the new icons and made separators for the toolbar, and enabled the new splash, it may need a transparent panel/frame

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ToolFactory.java	19 Dec 2005 07:51:30 -0000	1.21
--- ToolFactory.java	20 Dec 2005 15:43:36 -0000	1.22
***************
*** 92,95 ****
--- 92,96 ----
  
      Toolbar tb = Toolbar.getInstance();
+     tb.addSeparator();
      JButton but = tb.registerAction(new SelectAction(glv));
      but.setToolTipText("Select");
***************
*** 102,105 ****
--- 103,109 ----
      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 RotationAction(glv));
      but.setToolTipText("Rotation");
***************
*** 108,114 ****
      but = tb.registerAction(new CameraWalkAction(glv));
      but.setToolTipText("Walk mode");
-     but = tb.registerAction(new TapeMeasureAction(glv));
-     but.setToolTipText("Tape Measure");
- 
      
      
--- 112,115 ----
***************
*** 118,123 ****
      extrusion = new ExtrudeTool(glv, pencilcursor);
      clipplane = new ClipplaneTool(glv, pencilcursor);
-     rotation = new CameraTool(glv, rotationCursor);
      tapeMeasure = new TapeMeasureTool(glv, pencilcursor);
      fly = new CameraFlyTool(glv, flyCursor);
      walk = new CameraWalkTool(glv, walkCursor);
--- 119,124 ----
      extrusion = new ExtrudeTool(glv, pencilcursor);
      clipplane = new ClipplaneTool(glv, pencilcursor);
      tapeMeasure = new TapeMeasureTool(glv, pencilcursor);
+     rotation = new CameraTool(glv, rotationCursor);
      fly = new CameraFlyTool(glv, flyCursor);
      walk = new CameraWalkTool(glv, walkCursor);
***************
*** 416,420 ****
        this.glv = glv;
        ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("selecticon.png");
        ImageIcon im = new ImageIcon(url);
        putValue(Action.SMALL_ICON, im);
--- 417,421 ----
        this.glv = glv;
        ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("Biconclipplane.gif");
        ImageIcon im = new ImageIcon(url);
        putValue(Action.SMALL_ICON, im);
***************
*** 446,450 ****
        this.glv = glv;
        ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("selecticon.png");
        ImageIcon im = new ImageIcon(url);
        putValue(Action.SMALL_ICON, im);
--- 447,451 ----
        this.glv = glv;
        ClassLoader cl = Thread.currentThread().getContextClassLoader();
!       URL url = cl.getResource("Bicontapemes.gif");
        ImageIcon im = new ImageIcon(url);
        putValue(Action.SMALL_ICON, im);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** AbstractTool.java	20 Dec 2005 13:55:51 -0000	1.41
--- AbstractTool.java	20 Dec 2005 15:43:36 -0000	1.42
***************
*** 92,96 ****
      this.cursor = cursor;
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
!     URL url = cl.getResource("Bicondrag.gif");
      Image dragImage = Toolkit.getDefaultToolkit().getImage(url);
      dragCursor = 
--- 92,96 ----
      this.cursor = cursor;
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
!     URL url = cl.getResource("Bcursordrag.gif");
      Image dragImage = Toolkit.getDefaultToolkit().getImage(url);
      dragCursor =