diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp
index 841df131d..d699e3cc0 100644
--- a/src/meshlab/glarea.cpp
+++ b/src/meshlab/glarea.cpp
@@ -24,6 +24,9 @@
 History
 
 $Log$
+Revision 1.112  2007/02/26 01:20:59  cignoni
+cursor added
+
 Revision 1.111  2007/02/19 06:00:26  cignoni
 Added cast for mac compiling
 
@@ -133,7 +136,7 @@ GLArea::GLArea(QWidget *parent)
 	clipRatioNear = 1;
 	nearPlane = .2f;
 	farPlane = 5.f;
-}
+	}
 
 /*
 	This member returns the information of the Mesh in terms of VC,VQ,FC,FQ,WT
@@ -336,7 +339,7 @@ void GLArea::paintGL()
 	// Finally apply the Trackball for the model
 	trackball.GetView();
   glPushMatrix(); 
-	trackball.Apply(trackBallVisible && !takeSnapTile);
+	trackball.Apply(trackBallVisible && !takeSnapTile && iEdit==0);
 	float d=2.0f/mm->cm.bbox.Diag();
 	glScale(d);
 	
@@ -372,7 +375,7 @@ void GLArea::paintGL()
 
 	  mm->Render(rm.drawMode,rm.colorMode,rm.textureMode);
 
-	  if(iEdit)  iEdit->Decorate(currentEditor,*mm,this);
+	  if(iEdit) iEdit->Decorate(currentEditor,*mm,this);
     
 
 	  if(iRenderer) {
@@ -574,7 +577,7 @@ Trackball::Button QT2VCG(Qt::MouseButton qtbt,  Qt::KeyboardModifiers modifiers)
 	if(qtbt & Qt::LeftButton		) vcgbt |= Trackball::BUTTON_LEFT;
 	if(qtbt & Qt::RightButton		) vcgbt |= Trackball::BUTTON_RIGHT;
 	if(qtbt & Qt::MidButton			) vcgbt |= Trackball::BUTTON_MIDDLE;
-	if(modifiers & Qt::ShiftModifier		)	vcgbt |= Trackball::KEY_SHIFT;
+	if(modifiers & Qt::ShiftModifier   ) vcgbt |= Trackball::KEY_SHIFT;
 	if(modifiers & Qt::ControlModifier ) vcgbt |= Trackball::KEY_CTRL;
 	if(modifiers & Qt::AltModifier     ) vcgbt |= Trackball::KEY_ALT;
 	return Trackball::Button(vcgbt);
@@ -648,21 +651,29 @@ void GLArea::mouseMoveEvent(QMouseEvent*e)
 	{
       if(iEdit) iEdit->mouseMoveEvent(currentEditor,e,*mm,this);
       else {
-		    if (isDefaultTrackBall()) trackball.MouseMove(e->x(),height()-e->y());
+		    if (isDefaultTrackBall()) 
+			{
+			  trackball.MouseMove(e->x(),height()-e->y());
+			  setCursorTrack(trackball.current_mode);
+			}
 		    else trackball_light.MouseMove(e->x(),height()-e->y());
         update();
       }
 	}
 }
-
+// When mouse is released we set the correct mouse curson
 void GLArea::mouseReleaseEvent(QMouseEvent*e)
 {
 	activeDefaultTrackball=true;
 	if(iEdit) iEdit->mouseReleaseEvent(currentEditor,e,*mm,this);
-  else {
-        if (isDefaultTrackBall()) trackball.MouseUp(e->x(),height()-e->y(), QT2VCG(e->button(), e->modifiers() ) );
-	    else trackball_light.MouseUp(e->x(),height()-e->y(), QT2VCG(e->button(),e->modifiers()) );
+    else {
+          if (isDefaultTrackBall()) trackball.MouseUp(e->x(),height()-e->y(), QT2VCG(e->button(), e->modifiers() ) );
+	        else trackball_light.MouseUp(e->x(),height()-e->y(), QT2VCG(e->button(),e->modifiers()) );
+		      setCursorTrack(trackball.current_mode);
         }
+	
+	
+	
 	update();
 }
 
@@ -690,6 +701,20 @@ void GLArea::mouseDoubleClickEvent ( QMouseEvent * e )
 	updateGL();
 }
 
+void GLArea::setCursorTrack(vcg::TrackMode *tm)
+{
+ static QMap<QString,QCursor> curMap;
+ if(curMap.isEmpty())
+ {
+  curMap[QString("")]=QCursor(Qt::ArrowCursor);	
+  curMap["SphereMode"]=QCursor(QPixmap(":/images/cursors/plain_trackball.png"),1,1);	
+  curMap["PlaneMode"]=QCursor(QPixmap(":/images/cursors/plain_pan.png"),1,1);	
+  curMap["ScaleMode"]=QCursor(QPixmap(":/images/cursors/plain_zoom.png"),1,1);	
+ }
+ if(tm) setCursor(curMap[tm->Name()]);
+ else setCursor(curMap[""]);
+
+}
 
 void GLArea::setDrawMode(vcg::GLW::DrawMode mode)
 {
diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h
index c9f45fec5..401750337 100644
--- a/src/meshlab/glarea.h
+++ b/src/meshlab/glarea.h
@@ -24,6 +24,9 @@
   History
 
 $Log$
+Revision 1.65  2007/02/26 01:20:59  cignoni
+cursor added
+
 Revision 1.64  2007/02/05 19:25:05  gfrei
 added float getFov()
 
@@ -203,7 +206,7 @@ public:
 	vcg::Trackball trackball_light;
 	GLLogStream log;
 	short currLogLevel;
-  FilterScript filterHistory;
+    FilterScript filterHistory;
 
 	QSize curSiz;
 	QSize minimumSizeHint() const;
@@ -217,7 +220,7 @@ public:
 
 	QString getFileName()							{return fileName;}
 	void		setFileName(QString name)	
-  {
+    {
     fileName = name; 
     ss.basename=QFileInfo(fileName).baseName().append("Snap");
 	}
@@ -261,10 +264,10 @@ public:
 
 	void setEdit(MeshEditInterface *edit, QAction *editor){	iEdit = edit; currentEditor=editor;}
 	QAction * getEditAction() { return currentEditor; }
-	void endEdit(){	iEdit = 0; currentEditor=0;}///
+	void endEdit(){	iEdit = 0; currentEditor=0; setCursorTrack(0);update();}///
 
 	void closeEvent(QCloseEvent *event);
-  float lastRenderingTime() { return lastTime;}
+    float lastRenderingTime() { return lastTime;}
 
 	float getFov() { return fov; }
 
@@ -284,9 +287,9 @@ protected:
 	void mousePressEvent(QMouseEvent *event);
 	void mouseMoveEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
-  void mouseDoubleClickEvent ( QMouseEvent * event ) ;
+    void mouseDoubleClickEvent ( QMouseEvent * event ) ;
 	void wheelEvent(QWheelEvent*e);
-  bool drawSelection;
+    bool drawSelection;
 
 private:
 
@@ -299,7 +302,7 @@ private:
 	bool	trackBallVisible;		// Draws the trackball ?
 	bool  activeDefaultTrackball; // keep track on active trackball
 	bool  hasToPick;         // has to pick during the next redraw.
-  Point2i pointToPick;
+	Point2i pointToPick;
 
 	//shader support
 	MeshRenderInterface *iRenderer;
@@ -324,7 +327,7 @@ private:
 
 private:
 	float cfps;
-  float lastTime;
+    float lastTime;
 
 	QString fileName;
 	
@@ -336,6 +339,9 @@ private:
   enum AnimMode { AnimNone, AnimSpin, AnimInterp};
   AnimMode animMode; 
 	int tileCol, tileRow, totalCols, totalRows;
+	void GLArea::setCursorTrack(vcg::TrackMode *tm);
+
+	
 };