r18181 by fschmid - Fixed Bug #11427: Mouse cursor should change when hovering a text field

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 3 19:09:26 UTC 2013


Author: fschmid
Date: Sun Mar  3 19:09:26 2013
New Revision: 18181

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18181
Log:
Fixed Bug #11427: Mouse cursor should change when hovering a text field

Modified:
    trunk/Scribus/scribus/canvasgesture_cellselect.cpp
    trunk/Scribus/scribus/canvasgesture_pan.cpp
    trunk/Scribus/scribus/canvasgesture_pan.h
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_copyproperties.cpp
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/canvasmode_drawbezier.cpp
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_editarc.cpp
    trunk/Scribus/scribus/canvasmode_editgradient.cpp
    trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
    trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
    trunk/Scribus/scribus/canvasmode_editpolygon.cpp
    trunk/Scribus/scribus/canvasmode_editspiral.cpp
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
    trunk/Scribus/scribus/canvasmode_eyedropper.cpp
    trunk/Scribus/scribus/canvasmode_framelinks.cpp
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/canvasmode_magnifier.cpp
    trunk/Scribus/scribus/canvasmode_measurements.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/canvasmode_objimport.cpp
    trunk/Scribus/scribus/canvasmode_panning.cpp
    trunk/Scribus/scribus/canvasmode_rotate.cpp
    trunk/Scribus/scribus/hyphenator.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribuscore.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/ui/AdapterWidget.cpp
    trunk/Scribus/scribus/ui/cmykfw.cpp
    trunk/Scribus/scribus/ui/colorlistbox.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/curvewidget.h
    trunk/Scribus/scribus/ui/dasheditor.cpp
    trunk/Scribus/scribus/ui/gradientpreview.cpp
    trunk/Scribus/scribus/ui/hruler.cpp
    trunk/Scribus/scribus/ui/mergedoc.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
    trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
    trunk/Scribus/scribus/ui/paintmanager.cpp
    trunk/Scribus/scribus/ui/preview.cpp
    trunk/Scribus/scribus/ui/rulermover.cpp
    trunk/Scribus/scribus/ui/scrapbookpalette.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.cpp
    trunk/Scribus/scribus/ui/spiralvectordialog.cpp
    trunk/Scribus/scribus/ui/tabruler.cpp
    trunk/Scribus/scribus/ui/vruler.cpp

Modified: trunk/Scribus/scribus/canvasgesture_cellselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasgesture_cellselect.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_cellselect.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_cellselect.cpp Sun Mar  3 19:09:26 2013
@@ -48,7 +48,7 @@
 	if (event->button() == Qt::RightButton)
 	{
 		// Show the table popup menu.
-		qApp->changeOverrideCursor(Qt::ArrowCursor);
+		m_view->setCursor(Qt::ArrowCursor);
 		m_view->m_ScMW->scrMenuMgr->runMenuAtPos("ItemTable", event->globalPos());
 	}
 	else

Modified: trunk/Scribus/scribus/canvasgesture_pan.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasgesture_pan.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_pan.cpp Sun Mar  3 19:09:26 2013
@@ -25,30 +25,17 @@
 
 PanGesture::PanGesture (CanvasMode* parent) : CanvasGesture(parent)
 {
-	m_haveCursor = false;
 }
 
 void PanGesture::activate(bool fromGesture)
 {
-//	qDebug() << "PanGesture::activate" << flag;
-	m_haveCursor = (qApp->overrideCursor() != NULL);
-	if ( (!fromGesture) && qApp->overrideCursor())
-	{
-		m_haveCursor = true;
-		m_cursor = *(qApp->overrideCursor());
-	}
-	else
-	{
-		m_haveCursor = false;
-	}
-	qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+	m_cursor = m_view->cursor();
+	m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
 }
 
 void PanGesture::deactivate(bool forgesture)
 {
-//	qDebug() << "PanGesture::deactivate" << forgesture;
-	if (m_haveCursor)
-		qApp->changeOverrideCursor(m_cursor);
+	m_view->setCursor(m_cursor);
 }
 
 void PanGesture::drawControls(QPainter* p)

Modified: trunk/Scribus/scribus/canvasgesture_pan.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasgesture_pan.h
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.h (original)
+++ trunk/Scribus/scribus/canvasgesture_pan.h Sun Mar  3 19:09:26 2013
@@ -38,7 +38,6 @@
 	virtual void drawControls(QPainter*);
 	
 private:
-	bool    m_haveCursor;
 	QCursor m_cursor;
 	QPointF m_canvasRefPoint;
 };

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Sun Mar  3 19:09:26 2013
@@ -787,50 +787,50 @@
 		case modeDrawShapes:
 		case modeDrawArc:
 		case modeDrawSpiral:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawFrame.xpm")));
 			break;
 		case modeDrawImage:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
 			break;
 		case modeDrawLatex:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
 			break;
 		case modeDrawText:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
 			break;
 		case modeDrawTable2:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawTable.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawTable.xpm")));
 			break;
 		case modeDrawRegularPolygon:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
-			qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+			m_view->setCursor(QCursor(Qt::CrossCursor));
 			break;
 		case modeDrawFreehandLine:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 31));
+			m_view->setCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 31));
 			break;
 		case modeDrawCalligraphicLine:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawCalligraphy.xpm"), 4, 4));
+			m_view->setCursor(QCursor(loadIcon("DrawCalligraphy.xpm"), 4, 4));
 			break;
 		case modeImportObject:
-			qApp->changeOverrideCursor(QCursor(loadIcon("DragPix.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DragPix.xpm")));
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+				m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 			else
-				qApp->changeOverrideCursor(QCursor(loadIcon("LupeZm.xpm")));
+				m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
 			break;
 		case modePanning:
-			qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+			m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
 			break;
 		case modeEyeDropper:
-			qApp->changeOverrideCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 31));
+			m_view->setCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 31));
 			break;
 		case modeLinkFrames:
-			qApp->changeOverrideCursor(QCursor(loadIcon("LinkTextFrame.png"), 0, 31));
+			m_view->setCursor(QCursor(loadIcon("LinkTextFrame.png"), 0, 31));
 			break;
 		case modeMeasurementTool:
 		case modeEditGradientVectors:
@@ -849,10 +849,10 @@
 		case modeEditArc:
 		case modeEditPolygon:
 		case modeEditSpiral:
-			qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+			m_view->setCursor(QCursor(Qt::CrossCursor));
 			break;
 		default:
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 			break;
 	}
 }
@@ -906,22 +906,22 @@
 	{
 		case 1:
 		case 2:
-			qApp->changeOverrideCursor(ScResizeCursor(135 + rot));// Qt::SizeFDiagCursor
+			m_view->setCursor(ScResizeCursor(135 + rot));// Qt::SizeFDiagCursor
 			break;
 		case 3:
 		case 4:
-			qApp->changeOverrideCursor(ScResizeCursor(45 + rot));// Qt::SizeBDiagCursor
+			m_view->setCursor(ScResizeCursor(45 + rot));// Qt::SizeBDiagCursor
 			break;
 		case 5:
 		case 8:
-			qApp->changeOverrideCursor(ScResizeCursor(0 + rot));// Qt::SizeVerCursor
+			m_view->setCursor(ScResizeCursor(0 + rot));// Qt::SizeVerCursor
 			break;
 		case 6:
 		case 7:
-			qApp->changeOverrideCursor(ScResizeCursor(90 + rot));// Qt::SizeHorCursor
+			m_view->setCursor(ScResizeCursor(90 + rot));// Qt::SizeHorCursor
 			break;
 		default:
-			qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+			m_view->setCursor(QCursor(Qt::SizeAllCursor));
 			break;
 	}
 }
@@ -1150,7 +1150,7 @@
 		if (currKeySeq.matches(scrActions["viewShowContextMenu"]->shortcut()) == QKeySequence::ExactMatch)
 		{
 			ContextMenu* cmen=NULL;
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 			if (m_doc->m_Selection->count() == 0)
 			{
 				//CB We should be able to get this calculated by the canvas.... it is already in m_canvas->globalToCanvas(m->globalPos());
@@ -1676,7 +1676,7 @@
 	if ((m_doc->appMode == modePanning) && (e->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
 		m_view->requestMode(modeNormal);
 	if (m_doc->appMode == modeMagnifier)
-		qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+		m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 	if (e->isAutoRepeat() || !m_arrowKeyDown)
 		return;
 	switch(e->key())

Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp Sun Mar  3 19:09:26 2013
@@ -64,8 +64,6 @@
 
 void CanvasMode_CopyProperties::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -345,11 +343,11 @@
 		{
 			frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem);
 			if ((frameResizeHandle == Canvas::INSIDE) && (!currItem->locked()))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+				m_view->setCursor(QCursor(Qt::SizeAllCursor));
 		}
 		else
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+			m_view->setCursor(QCursor(Qt::SizeAllCursor));
 			m_canvas->m_viewMode.operItemResizing = false;
 		}
 		return true;
@@ -363,7 +361,7 @@
 void CanvasMode_CopyProperties::createContextMenu(PageItem* currItem, double mx, double my)
 {
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	m_view->setCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
 	Mxp = mx;
 	Myp = my;

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Sun Mar  3 19:09:26 2013
@@ -193,8 +193,6 @@
 
 void CreateMode::leaveEvent(QEvent *e)
 {
-	if (!m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -791,7 +789,7 @@
 				break;
 			}
 			// Show table insert dialog.
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			InsertTable *dia = new InsertTable(m_view, static_cast<int>(tableRect.height()/6), static_cast<int>(tableRect.width()/6));
 			if (!dia->exec())
 			{
@@ -876,7 +874,7 @@
 		originPoint = sizes->getInt("OriginL", 0);
 	}
 
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	OneClick *dia = new OneClick(m_view, ScribusView::tr("Enter Object Size"), m_doc->unitIndex(), xSize, ySize, doRemember, originPoint, lmode);
 	if (dia->exec())
 	{

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Sun Mar  3 19:09:26 2013
@@ -116,8 +116,6 @@
 
 void BezierMode::leaveEvent(QEvent *e)
 {
-	if (!m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -298,7 +296,7 @@
 		currItem = m_doc->Items->at(z);
 		m_doc->m_Selection->clear();
 		m_doc->m_Selection->addItem(currItem);
-		qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+		m_view->setCursor(QCursor(Qt::CrossCursor));
 		m_canvas->setRenderModeFillBuffer();
 		inItemCreation = true;
 	}

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Sun Mar  3 19:09:26 2013
@@ -71,8 +71,6 @@
 
 void CalligraphicMode::leaveEvent(QEvent *e)
 {
-	if (!m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 

Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Sun Mar  3 19:09:26 2013
@@ -68,8 +68,6 @@
 
 void FreehandMode::leaveEvent(QEvent *e)
 {
-	if (!m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sun Mar  3 19:09:26 2013
@@ -218,8 +218,6 @@
 
 void CanvasMode_Edit::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void CanvasMode_Edit::activate(bool fromGesture)
@@ -279,7 +277,7 @@
 		//CB if annotation, open the annotation dialog
 		if (currItem->isAnnotation())
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			m_view->requestMode(submodeAnnotProps);
 		}
 		//otherwise, select between the whitespace
@@ -372,7 +370,7 @@
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
 				{
-					qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+					m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
 					QTransform p = currItem->getTransform();
 					p.translate(currItem->imageXOffset()*currItem->imageXScale(), currItem->imageYOffset()*currItem->imageYScale());
 					QPointF rotP = p.map(QPointF(0.0, 0.0));
@@ -382,7 +380,7 @@
 				}
 				else
 				{
-					qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+					m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
 					QTransform ro;
 					ro.rotate(-currItem->rotation());
 					QPointF rota = ro.map(QPointF(newX-Mxp,newY-Myp));
@@ -451,20 +449,20 @@
 					if (hitTest == Canvas::INSIDE)
 					{
 						if (currItem->asTextFrame())
-							qApp->changeOverrideCursor(QCursor(Qt::IBeamCursor));
+							m_view->setCursor(QCursor(Qt::IBeamCursor));
 						if (currItem->asImageFrame())
 						{
 							if (m->modifiers() & Qt::ShiftModifier)
-								qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+								m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
 							else
-								qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+								m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
 						}
 					}
 				}
 				else
 				{
 // 					setModeCursor();
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 			}
 		}
@@ -561,7 +559,7 @@
 					else
 					{
 						m_view->requestMode(submodePaintingDone);
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+						m_view->setCursor(QCursor(Qt::ArrowCursor));
 					}
 					if (currItem->asTextFrame())
 						m_view->slotSetCurs(m->globalPos().x(), m->globalPos().y());
@@ -569,7 +567,7 @@
 				else
 				{
 					m_view->requestMode(submodePaintingDone);
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 				m_doc->m_Selection->delaySignalsOff();
 				if (wantNormal)
@@ -677,13 +675,13 @@
 				else
 				{
 					m_view->requestMode(submodePaintingDone);
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 			}
 			else
 			{
 				m_view->requestMode(submodePaintingDone);
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				m_view->setCursor(QCursor(Qt::ArrowCursor));
 			}
 		}
 	}
@@ -1026,11 +1024,11 @@
 		{
 			frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem);
 			if ((frameResizeHandle == Canvas::INSIDE) && (!currItem->locked()))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+				m_view->setCursor(QCursor(Qt::SizeAllCursor));
 		}
 		else
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+			m_view->setCursor(QCursor(Qt::SizeAllCursor));
 			m_canvas->m_viewMode.operItemResizing = false;
 		}
 		return true;
@@ -1044,7 +1042,7 @@
 void CanvasMode_Edit::createContextMenu(PageItem* currItem, double mx, double my)
 {
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	m_view->setCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
 	Mxp = mx;
 	Myp = my;

Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.cpp Sun Mar  3 19:09:26 2013
@@ -148,8 +148,6 @@
 
 void CanvasMode_EditArc::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -397,7 +395,7 @@
 	else
 		m_arcPoint = noPointDefined;
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-currItem->width() / 2.0, -currItem->height() / 2.0, currItem->width(), currItem->height()));
 }
 

Modified: trunk/Scribus/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editgradient.cpp Sun Mar  3 19:09:26 2013
@@ -238,8 +238,6 @@
 
 void CanvasMode_EditGradient::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -920,7 +918,7 @@
 		OldGrMaskScale = currItem->GrMaskScale;
 		OldGrMaskSkew = currItem->GrMaskSkew;
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 }
 
 void CanvasMode_EditGradient::mouseReleaseEvent(QMouseEvent *m)

Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp Sun Mar  3 19:09:26 2013
@@ -354,8 +354,6 @@
 
 void CanvasMode_EditMeshGradient::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -962,7 +960,7 @@
 	}
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
 	m_ScMW->propertiesPalette->updateColorSpecialGradient();
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-currItem->width() / 2.0, -currItem->height() / 2.0, currItem->width(), currItem->height()));
 }
 

Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp Sun Mar  3 19:09:26 2013
@@ -284,8 +284,6 @@
 
 void CanvasMode_EditMeshPatch::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -962,7 +960,7 @@
 	}
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
 	m_ScMW->propertiesPalette->updateColorSpecialGradient();
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-currItem->width() / 2.0, -currItem->height() / 2.0, currItem->width(), currItem->height()));
 
 }

Modified: trunk/Scribus/scribus/canvasmode_editpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editpolygon.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editpolygon.cpp Sun Mar  3 19:09:26 2013
@@ -139,8 +139,6 @@
 
 void CanvasMode_EditPolygon::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void CanvasMode_EditPolygon::updateFromItem()
@@ -458,7 +456,7 @@
 		m_polygonPoint = noPointDefined;
 	if(m_polygonPoint != noPointDefined && UndoManager::undoEnabled())
 		trans = new UndoTransaction(undoManager->beginTransaction(Um::Polygon,Um::IPolygon,Um::EditPolygon,"",Um::IPolygon));
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	QPainterPath path = itemMatrix.map(RegularPolygonPath(currItem->width(), currItem->height(), polyCorners, polyUseFactor, polyFactor, polyRotation, polyCurvature, polyInnerRot, polyOuterCurvature));
 	m_doc->regionsChanged()->update(path.boundingRect().adjusted(-5, -5, 10, 10));
 }

Modified: trunk/Scribus/scribus/canvasmode_editspiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editspiral.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editspiral.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editspiral.cpp Sun Mar  3 19:09:26 2013
@@ -106,8 +106,6 @@
 
 void CanvasMode_EditSpiral::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -364,7 +362,7 @@
 	if(m_arcPoint != noPointDefined)
 		trans = new UndoTransaction(undoManager->beginTransaction(Um::Polygon,Um::IPolygon,Um::EditSpiral,"",Um::IPolygon));
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-5, -5, 10, 10));
 }
 

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Sun Mar  3 19:09:26 2013
@@ -69,7 +69,7 @@
 	m_table = item->asTable();
 
 	if (fromGesture)
-		qApp->changeOverrideCursor(Qt::ArrowCursor);
+		m_view->setCursor(Qt::ArrowCursor);
 
 	m_lastCursorPos = -1;
 	m_blinkTime.start();
@@ -188,7 +188,7 @@
 				qWarning("Unknown hit target");
 				break;
 		}
-		qApp->changeOverrideCursor(cursor);
+		m_view->setCursor(cursor);
 	}
 }
 
@@ -245,7 +245,6 @@
 	else if (event->button() == Qt::RightButton)
 	{
 		// Show the table popup menu.
-		qApp->changeOverrideCursor(Qt::ArrowCursor);
 		m_view->m_ScMW->scrMenuMgr->runMenuAtPos("ItemTable", event->globalPos());
 	}
 }

Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editweldpoint.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editweldpoint.cpp Sun Mar  3 19:09:26 2013
@@ -119,8 +119,6 @@
 
 void CanvasMode_EditWeldPoint::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -421,7 +419,7 @@
 		}
 	}
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 	m_doc->regionsChanged()->update(getUpdateRect());
 }
 

Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Sun Mar  3 19:09:26 2013
@@ -74,8 +74,6 @@
 
 void CanvasMode_EyeDropper::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -140,7 +138,7 @@
 
 	releaseMouse();
 
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	m_view->setCursor(QCursor(Qt::ArrowCursor));
 
 	QPixmap pm = QPixmap::grabWindow( QApplication::desktop()->winId(), m->globalPos().x(), m->globalPos().y(), 1, 1);
 	QImage i = pm.toImage();

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Sun Mar  3 19:09:26 2013
@@ -78,8 +78,6 @@
 
 void CanvasMode_FrameLinks::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -193,7 +191,6 @@
 				{
 					if (bb->prevInChain() != NULL)
 					{
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 						QMessageBox msgBox(QMessageBox::Question, tr("Linking Text Frames"),
 										   "<qt>" + ScribusView::tr("Do you want to insert the frame into the selected text chain? If so, where would you like to insert it?") + "<qt>");
 						//QMessageBox msgBox;
@@ -462,11 +459,11 @@
 		{
 			frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem);
 			if ((frameResizeHandle == Canvas::INSIDE) && (!currItem->locked()))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+				m_view->setCursor(QCursor(Qt::SizeAllCursor));
 		}
 		else
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+			m_view->setCursor(QCursor(Qt::SizeAllCursor));
 			m_canvas->m_viewMode.operItemResizing = false;
 		}
 		return true;
@@ -480,7 +477,6 @@
 void CanvasMode_FrameLinks::createContextMenu(PageItem* currItem, double mx, double my)
 {
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
 	Mxp = mx;
 	Myp = my;

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp Sun Mar  3 19:09:26 2013
@@ -128,8 +128,6 @@
 
 void CanvasMode_ImageImport::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void CanvasMode_ImageImport::activate(bool fromGesture)
@@ -171,12 +169,12 @@
 	{
 		PageItem_ImageFrame *currItem;
 		if((currItem = item->asImageFrame()) != NULL)
-			qApp->changeOverrideCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
 		else
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-	}
-	else
-		qApp->changeOverrideCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
+	}
+	else
+		m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
 	if (commonMouseMove(m))
 		return;
 }

Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Sun Mar  3 19:09:26 2013
@@ -72,8 +72,6 @@
 
 void CanvasMode_Magnifier::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -171,12 +169,12 @@
 	if ((m->modifiers() == Qt::ShiftModifier) || (m->button() == Qt::RightButton))
 	{
 		m_view->Magnify = false;
-		qApp->changeOverrideCursor(QCursor(loadIcon("LupeZm.xpm")));
+		m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
 	}
 	else
 	{
 		m_view->Magnify = true;
-		qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+		m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 	}
 	Mxp = mousePointDoc.x(); //m->globalPos().x();
 	Myp = mousePointDoc.y(); //m->globalPos().y();
@@ -230,9 +228,9 @@
 			else
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
-					qApp->changeOverrideCursor(QCursor(loadIcon("LupeZm.xpm")));
+					m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
 				else
-					qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+					m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/canvasmode_measurements.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_measurements.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_measurements.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_measurements.cpp Sun Mar  3 19:09:26 2013
@@ -38,12 +38,11 @@
 
 void MeasurementsMode::enterEvent(QEvent *)
 {
-	qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+	m_view->setCursor(QCursor(Qt::CrossCursor));
 }
 
 void MeasurementsMode::leaveEvent(QEvent *)
 {
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void MeasurementsMode::setActive(bool active)

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Sun Mar  3 19:09:26 2013
@@ -252,17 +252,11 @@
 
 void CanvasMode_NodeEdit::enterEvent(QEvent *)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-	{
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-	}
 }
 
 
 void CanvasMode_NodeEdit::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 
@@ -332,9 +326,9 @@
 						MoveGY = true;
 					if (npf.x() < m_doc->currentPage()->xOffset() || 
 						npf.x() >= m_doc->currentPage()->xOffset() + m_doc->currentPage()->width() - 1)
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+						m_view->setCursor(QCursor(Qt::ArrowCursor));
 					else
-						qApp->changeOverrideCursor(QCursor(Qt::SplitVCursor));
+						m_view->setCursor(QCursor(Qt::SplitVCursor));
 					return;
 				}
 			}
@@ -348,13 +342,13 @@
 						MoveGX = true;
 					if (npf.y() < m_doc->currentPage()->yOffset() || 
 						npf.y() >= m_doc->currentPage()->yOffset() + m_doc->currentPage()->height() - 1)
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+						m_view->setCursor(QCursor(Qt::ArrowCursor));
 					else
-						qApp->changeOverrideCursor(QCursor(Qt::SplitHCursor));
+						m_view->setCursor(QCursor(Qt::SplitHCursor));
 					return;
 				}
 			}
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 		}
 	}
 }
@@ -1011,11 +1005,11 @@
 			if (m_canvas->hitsCanvasPoint(m->globalPos(), itemPos.map(point)))
 			{
 				if (m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT)
-					qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+					m_view->setCursor(QCursor(Qt::SizeAllCursor));
 				if (m_doc->nodeEdit.submode == NodeEditContext::DEL_POINT)
-					qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+					m_view->setCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
 				if (m_doc->nodeEdit.submode == NodeEditContext::SPLIT_PATH)
-					qApp->changeOverrideCursor(QCursor(loadIcon("Split.png"), 1, 1));
+					m_view->setCursor(QCursor(loadIcon("Split.png"), 1, 1));
 				return true;
 			}
 		}
@@ -1044,13 +1038,13 @@
 					if (m_canvas->hitsCanvasPoint(m->globalPos(), FPoint(pl.x(), pl.y())))
 					{
 						if (m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT)
-							qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+							m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
 						else if (m_doc->nodeEdit.submode == NodeEditContext::ADD_POINT)
-							qApp->changeOverrideCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+							m_view->setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
 						else if (m_doc->nodeEdit.submode == NodeEditContext::SPLIT_PATH)
-							qApp->changeOverrideCursor(QCursor(loadIcon("Split.png"), 1, 1));
+							m_view->setCursor(QCursor(loadIcon("Split.png"), 1, 1));
 						else
-							qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+							m_view->setCursor(QCursor(Qt::ArrowCursor));
 						m_doc->nodeEdit.ClRe2 = poi;
 						return true;
 					}
@@ -1058,7 +1052,7 @@
 			}
 		}
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	m_view->setCursor(QCursor(Qt::ArrowCursor));
 	return false;
 }
 

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Sun Mar  3 19:09:26 2013
@@ -113,10 +113,6 @@
 
 void CanvasMode_Normal::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-	{
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-	}
 }
 
 
@@ -249,7 +245,6 @@
 			//CB if annotation, open the annotation dialog
 			if (currItem->isAnnotation())
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 				m_view->requestMode(submodeAnnotProps);
 				//mousePressEvent(m);
 			}
@@ -346,28 +341,25 @@
 				switch (guideMoveGesture->getMode())
 				{
 					case RulerGesture::HORIZONTAL:
-						qApp->changeOverrideCursor(QCursor(Qt::SplitVCursor));
+						m_view->setCursor(QCursor(Qt::SplitVCursor));
 						break;
 					case RulerGesture::VERTICAL:
-						qApp->changeOverrideCursor(QCursor(Qt::SplitHCursor));
+						m_view->setCursor(QCursor(Qt::SplitHCursor));
 						break;
 					default:
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+						m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 				return;
 			}
 			// Here removed a bunch of comments which made reading code difficult,
 			// there is svn for tracking changes after all. pm
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 		}
 	}
 	else if (!mouseIsOnPage)
 	{
-		QCursor* cursor = qApp->overrideCursor();
-		if (cursor && ((cursor->shape() == Qt::SplitHCursor) || (cursor->shape() == Qt::SplitVCursor)))
-		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-		}
+		if ((m_view->cursor().shape() == Qt::SplitHCursor) || (m_view->cursor().shape() == Qt::SplitVCursor))
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 	}
 	//<<#10116 Show overflow counter HUD
 	if (!movingOrResizing && mouseIsOnPage)
@@ -398,7 +390,7 @@
 							toolT = QString( tr("Go to URL %1").arg(hoveredItem->annotation().Extern()));
 						else if ((hoveredItem->annotation().ActionType() == Annotation::Action_GoToR_FileAbs) || (hoveredItem->annotation().ActionType() == Annotation::Action_GoToR_FileRel))
 							toolT = QString( tr("Go to Page %1 in File %2").arg(hoveredItem->annotation().Ziel() + 1).arg(hoveredItem->annotation().Extern()));
-						qApp->changeOverrideCursor(QCursor(Qt::PointingHandCursor));
+						m_view->setCursor(QCursor(Qt::PointingHandCursor));
 					}
 					if (toolT.isEmpty())
 						toolT = hoveredItem->itemText.plainText();
@@ -500,7 +492,7 @@
 				m_canvas->m_viewMode.m_MouseButtonPressed = false;
 				m_doc->DraggedElem = 0;
 				m_doc->DragElements.clear();
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				m_view->setCursor(QCursor(Qt::ArrowCursor));
 				m_view->updateContents();
 			}
 			return;
@@ -520,9 +512,9 @@
 				newY = mousePointDoc.y(); //static_cast<int>(m->y()/sc);
 				m_canvas->m_viewMode.operItemMoving = true;
 				if (!(m_doc->drawAsPreview && !m_doc->editOnPreview))
-					qApp->changeOverrideCursor(Qt::ClosedHandCursor);
+					m_view->setCursor(Qt::ClosedHandCursor);
 				else
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					m_view->setCursor(QCursor(Qt::ArrowCursor));
 				erf = false;
 				int dX = qRound(newX - m_mousePressPoint.x()), dY = qRound(newY - m_mousePressPoint.y());
 				if (!m_doc->m_Selection->isMultipleSelection())
@@ -763,7 +755,7 @@
 					}
 					else
 					{
-						qApp->changeOverrideCursor(QCursor(Qt::OpenHandCursor));
+						m_view->setCursor(QCursor(Qt::OpenHandCursor));
 					}
 				}
 				else
@@ -786,7 +778,7 @@
 					QRect tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
 					if ((tx.intersects(mpo)) && (!currItem->locked()))
 					{
-						qApp->changeOverrideCursor(QCursor(Qt::OpenHandCursor));
+						m_view->setCursor(QCursor(Qt::OpenHandCursor));
 						if (!currItem->sizeLocked())
 							m_view->HandleCurs(currItem, mpo);
 					}
@@ -802,7 +794,7 @@
 				if (how > 0)
 				{
 					if(currItem->asLine())
-						qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+						m_view->setCursor(QCursor(Qt::SizeAllCursor));
 					else if(!currItem->locked() && !currItem->sizeLocked())
 					{
 						if ((!currItem->sizeHLocked() && !currItem->sizeVLocked()) || (currItem->sizeHLocked() && (how == 5 || how == 8))
@@ -813,13 +805,13 @@
 				else if (how == 0)
 				{
 					if (!(m_doc->drawAsPreview && !m_doc->editOnPreview))
-						qApp->changeOverrideCursor(QCursor(Qt::OpenHandCursor));
+						m_view->setCursor(QCursor(Qt::OpenHandCursor));
 					else
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+						m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 				else
 				{
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					m_view->setCursor(QCursor(Qt::ArrowCursor));
 				}
 			}
 		}
@@ -900,9 +892,9 @@
 //#7928				return;
 		}
 		if (!(m_doc->drawAsPreview && !m_doc->editOnPreview))
-			qApp->changeOverrideCursor(Qt::ClosedHandCursor);
+			m_view->setCursor(Qt::ClosedHandCursor);
 		else
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			m_view->setCursor(QCursor(Qt::ArrowCursor));
 #if 1				
 		if (m_doc->m_Selection->isMultipleSelection() && (!m_doc->drawAsPreview))
 		{
@@ -1908,7 +1900,7 @@
 void CanvasMode_Normal::createContextMenu(PageItem* currItem, double mx, double my)
 {
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
 	m_mouseCurrentPoint.setXY(mx, my);
 	if(currItem!=NULL)

Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp Sun Mar  3 19:09:26 2013
@@ -83,12 +83,10 @@
 		setModeCursor();
 		return;
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void CanvasMode_ObjImport::leaveEvent(QEvent *e)
 {
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 

Modified: trunk/Scribus/scribus/canvasmode_panning.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_panning.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_panning.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_panning.cpp Sun Mar  3 19:09:26 2013
@@ -53,8 +53,6 @@
 
 void CanvasMode_Panning::leaveEvent(QEvent *e)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 

Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Sun Mar  3 19:09:26 2013
@@ -187,8 +187,6 @@
 
 void CanvasMode_Rotate::leaveEvent(QEvent *)
 {
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void CanvasMode_Rotate::mousePressEvent(QMouseEvent *m)
@@ -409,7 +407,7 @@
 					{
 						setResizeCursor(how);
 					}
-					qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+					m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
 				}
 				else
 				{
@@ -430,7 +428,7 @@
 					tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
 					if ((tx.intersects(mpo)) && (!currItem->locked()))
 					{
-						qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+						m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
 						if (!currItem->sizeLocked())
 							m_view->HandleCurs(currItem, mpo);
 					}
@@ -458,7 +456,6 @@
 void CanvasMode_Rotate::createContextMenu(PageItem* currItem, double mx, double my)
 {
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
 	m_canvasPressCoord.setXY(mx, my);
 	if(currItem!=NULL)

Modified: trunk/Scribus/scribus/hyphenator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/hyphenator.cpp (original)
+++ trunk/Scribus/scribus/hyphenator.cpp Sun Mar  3 19:09:26 2013
@@ -222,7 +222,7 @@
 	QString found2 = "";
 	rememberedWords.clear();
 	//uint maxC = it->itemText.length() - 1;
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QRegExp wordBoundary("\\w");
 	QRegExp whiteSpace("\\s|\\W|\\d|\\n|\\r|\\t");
 	while ((firstC+Ccount < signed(text.length())) && (firstC != -1) && 
@@ -420,7 +420,7 @@
 		if (Ccount == 0)
 			Ccount++;
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	doc->DoDrawing = true;
 	rememberedWords.clear();
 }
@@ -439,6 +439,5 @@
 		uint a = it->itemText.length();
 		it->itemText.hyphenateWord(0, a, NULL);
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	doc->DoDrawing = true;
 }

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Sun Mar  3 19:09:26 2013
@@ -2553,12 +2553,12 @@
 	{
 		if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!(*m_AvailableFonts)[prefsManager->appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 			MissingFont *dia = new MissingFont(0, tmpf, doc);
 			dia->exec();
 			tmpf = dia->getReplacementFont();
 			delete dia;
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->restoreOverrideCursor();
 			prefsManager->appPrefs.fontPrefs.GFontSub[fStr] = tmpf;
 		}
 		else

Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp Sun Mar  3 19:09:26 2013
@@ -44,13 +44,13 @@
 {
 	if (filename.isNull())
 		return;
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	ScCore->primaryMainWindow()->mainWindowProgressBar->reset();
 	PdbIm *im = new PdbIm(filename, encoding, writer);
 	im->write();
 	delete im;
 	ScCore->primaryMainWindow()->mainWindowProgressBar->reset();
-	qApp->changeOverrideCursor(Qt::ArrowCursor);
+	qApp->restoreOverrideCursor();
 }
 
 

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Sun Mar  3 19:09:26 2013
@@ -432,7 +432,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -566,6 +566,7 @@
 	}
 	if (convertedPDF)
 		QFile::remove(fName);
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Sun Mar  3 19:09:26 2013
@@ -260,7 +260,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -346,6 +346,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp Sun Mar  3 19:09:26 2013
@@ -214,7 +214,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -297,6 +297,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Sun Mar  3 19:09:26 2013
@@ -231,7 +231,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -327,6 +327,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Sun Mar  3 19:09:26 2013
@@ -358,7 +358,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -441,6 +441,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp Sun Mar  3 19:09:26 2013
@@ -513,7 +513,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	if (!m_Doc->PageColors.contains("Black"))
 		m_Doc->PageColors.insert("Black", ScColor(0, 0, 0, 255));
 	for( QDomNode drawPag = drawPagePNode.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
@@ -611,6 +611,7 @@
 			m_Doc->view()->updatesOn(true);
 		m_Doc->setLoading(loadF);
 	}
+	qApp->restoreOverrideCursor();
 	return true;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Sun Mar  3 19:09:26 2013
@@ -236,7 +236,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -332,6 +332,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Sun Mar  3 19:09:26 2013
@@ -259,7 +259,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -351,6 +351,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Sun Mar  3 19:09:26 2013
@@ -219,7 +219,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -302,6 +302,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp Sun Mar  3 19:09:26 2013
@@ -215,7 +215,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -298,6 +298,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Sun Mar  3 19:09:26 2013
@@ -397,7 +397,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	gc->FontFamily = m_Doc->itemToolPrefs().textFont;
 	if (!m_Doc->PageColors.contains("Black"))
 		m_Doc->PageColors.insert("Black", ScColor(0, 0, 0, 255));
@@ -557,6 +557,7 @@
 		if (interactive)
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 }
 
 void SVGPlug::addGraphicContext()

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Sun Mar  3 19:09:26 2013
@@ -686,6 +686,7 @@
 			m_Doc->view()->updatesOn(true);
 		m_Doc->setLoading(loadF);
 	}
+	qApp->restoreOverrideCursor();
 	return true;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Sun Mar  3 19:09:26 2013
@@ -577,7 +577,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -659,6 +659,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Sun Mar  3 19:09:26 2013
@@ -324,7 +324,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -422,6 +422,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp Sun Mar  3 19:09:26 2013
@@ -354,7 +354,7 @@
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
 		m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->setScriptRunning(true);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(fi.path());
 	if (convert(fName))
@@ -441,6 +441,7 @@
 		if ((showProgress) && (!interactive))
 			m_Doc->view()->DrawNew();
 	}
+	qApp->restoreOverrideCursor();
 	return success;
 }
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Sun Mar  3 19:09:26 2013
@@ -261,7 +261,7 @@
 		ScCore->primaryMainWindow()->propertiesPalette->unsetDoc();
 		ScCore->primaryMainWindow()->pagePalette->setView(NULL);
 		ScCore->primaryMainWindow()->setScriptRunning(true);
-		qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		// Create the sub-interpreter
 		// FIXME: This calls abort() in a Python debug build. We're doing something wrong.
 		//stateo = PyEval_SaveThread();
@@ -367,7 +367,7 @@
 		Py_EndInterpreter(state);
 		PyThreadState_Swap(global_state);
 		//PyEval_RestoreThread(stateo);
-//		qApp->restoreOverrideCursor();
+		qApp->restoreOverrideCursor();
 		ScCore->primaryMainWindow()->setScriptRunning(false);
 	}
 

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Mar  3 19:09:26 2013
@@ -1410,7 +1410,7 @@
 	{
 		if ((doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift))
 		{
-			qApp->changeOverrideCursor(QCursor(loadIcon("LupeZm.xpm")));
+			view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
 			return;
 		}
 	}
@@ -1512,7 +1512,6 @@
 		if (currKeySeq.matches(scrActions["viewShowContextMenu"]->shortcut()) == QKeySequence::ExactMatch)
 		{
 			ContextMenu* cmen=NULL;
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			if (doc->m_Selection->count() == 0)
 			{
 				//CB We should be able to get this calculated by the canvas.... it is already in m_canvas->globalToCanvas(m->globalPos());
@@ -1701,7 +1700,7 @@
 	if (HaveDoc)
 	{
 		if (doc->appMode == modeMagnifier)
-			qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+			view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 	}
 	if (k->isAutoRepeat() || !_arrowKeyDown)
 		return;
@@ -1812,7 +1811,7 @@
 	PrefsManager::deleteInstance();
 	FormatsManager::deleteInstance();
 	UrlLauncher::deleteInstance();
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	qApp->exit(0);
 }
 
@@ -2124,7 +2123,7 @@
 	{
 		if (nftdia->nftGui->currentDocumentTemplate)
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			if (loadDoc(QDir::cleanPath(nftdia->nftGui->currentDocumentTemplate->file)))
 			{
 				doc->hasName = false;
@@ -2134,7 +2133,7 @@
 				QDir::setCurrent(PrefsManager::instance()->documentDir());
 				removeRecent(QDir::cleanPath(nftdia->nftGui->currentDocumentTemplate->file));
 			}
-			qApp->changeOverrideCursor(Qt::ArrowCursor);
+			qApp->restoreOverrideCursor();
 		}
 	}
 	delete nftdia;
@@ -3791,7 +3790,7 @@
 	if (dia->exec())
 	{
 		mainWindowStatusLabel->setText( tr("Importing Pages..."));
-		qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		std::vector<int> pageNs;
 		parsePagesString(dia->getPageNumbers(), &pageNs, dia->getPageCounter());
 		int startPage=0, nrToImport=pageNs.size();
@@ -3818,7 +3817,7 @@
 			startPage = doc->currentPage()->pageNr() + 1;
 			if (nrToImport > (doc->DocPages.count() - doc->currentPage()->pageNr()))
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 				int scmReturn=ScMessageBox::information(this, tr("Import Page(s)"), "<qt>" +
 				QObject::tr("<p>You are trying to import more pages than there are available in the current document counting from the active page.</p>Choose one of the following:<br>"
 				"<ul><li><b>Create</b> missing pages</li>"
@@ -3842,7 +3841,7 @@
 						mainWindowStatusLabel->setText("");
 						break;
 				}
-				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+				qApp->restoreOverrideCursor();
 			}
 		}
 		if (doIt)
@@ -3869,7 +3868,7 @@
 				doIt = false;
 			}
 		}
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		qApp->restoreOverrideCursor();
 		ret = doIt;
 	}
 	if (activeTransaction)
@@ -3960,7 +3959,7 @@
 		                           CommonStrings::tr_OK);
 		return false;
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	if (HaveDoc)
 		outlinePalette->buildReopenVals();
 	bool ret = false;
@@ -3983,7 +3982,7 @@
 
 		if (docNameUnmodified == platfName)
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			QMessageBox::information(this, tr("Document is already opened"),
 			                         tr("This document is already in use."
 			                            "You'll be switched into its window now."));
@@ -4000,7 +3999,7 @@
 		if (testResult == -1)
 		{
 			delete fileLoader;
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			QString title = tr("Fatal Error") ;
 			QString msg = "<qt>"+ tr("File %1 is not in an acceptable format").arg(FName)+"</qt>";
 			QString infoMsg = "<qt>" + tr("The file may be damaged or may have been produced in a later version of Scribus.") + "</qt>";
@@ -4070,7 +4069,7 @@
 			view=NULL;
 			doc=NULL;
 			setScriptRunning(false);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			mainWindowStatusLabel->setText("");
 			mainWindowProgressBar->reset();
 			ActWin = NULL;
@@ -4334,7 +4333,7 @@
 	}
 	undoManager->switchStack(doc->DocName);
 	pagePalette->Rebuild();
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	undoManager->setUndoEnabled(true);
 	doc->setModified(false);
 	foreach (NotesStyle* NS, doc->m_docNotesStylesList)
@@ -4467,7 +4466,7 @@
 					currItem->UseEmbedded = true;
 					currItem->IProfile = doc->cmsSettings().DefaultImageRGBProfile;
 					currItem->IRender = doc->cmsSettings().DefaultIntentImages;
-					qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
+					qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 					qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 					currItem->tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_XXXXXX.png");
 					currItem->tempImageFile->open();
@@ -4482,6 +4481,7 @@
 					view->DrawNew();
 					emit UpdateRequest(reqColorsUpdate | reqCmsOptionsUpdate);
 					currItem->emitAllToGUI();
+					qApp->restoreOverrideCursor();
 				}
 			}
 		}
@@ -5048,7 +5048,7 @@
 	if (printer->exec())
 	{
 		ReOrderText(doc, view);
-		qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		doc->Print_Options.pageNumbers.clear();
 		if (printer->doPrintCurrentPage())
 			doc->Print_Options.pageNumbers.push_back(doc->currentPage()->pageNr()+1);
@@ -5061,18 +5061,17 @@
 		}
 		PrinterUsed = true;
 		done = doPrint(doc->Print_Options, printError);
+		qApp->restoreOverrideCursor();
 		if (!done)
 		{
 			QString message = tr("Printing failed!");
 			if (!printError.isEmpty())
 				message += QString("\n%1").arg(printError);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			QMessageBox::warning(this, CommonStrings::trWarning, message, CommonStrings::tr_OK);
 		}
 		else
 			doc->Print_Options.firstUse = false;
 		getDefaultPrinter(PDef.Pname, PDef.Pname, PDef.Command);
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	}
 	printDinUse = false;
 	disconnect(printer, SIGNAL(doPreview()), this, SLOT(doPrintPreview()));
@@ -5953,7 +5952,7 @@
 		--wot;
 	else if (where==2)
 		wot=doc->Pages->count();
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	view->updatesOn(false);
 	ScPage* currentPage = doc->currentPage();
 	for (cc = 0; cc < numPages; ++cc)
@@ -5975,7 +5974,7 @@
 	}
 	doc->setCurrentPage(currentPage);
 	view->updatesOn(true);
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	//Use wo, the dialog currently returns a page Index +1 due to old numbering scheme, function now does the -1 as required
 	doc->changed();
 	doc->addPageToSection(wo, where, numPages);
@@ -6889,52 +6888,52 @@
 			case modeDrawSpiral:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawFrame.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawFrame.xpm")));
 				break;
 			case modeDrawImage:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
 				break;
 			case modeDrawLatex:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
 				break;
 			case modeDrawText:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
 				break;
 			case modeDrawTable2:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawTable.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawTable.xpm")));
 				break;
 			case modeDrawRegularPolygon:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
+				view->setCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
 				break;
 			case modeMagnifier:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
 				view->Magnify = true;
-				qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+				view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
 				break;
 			case modePanning:
-				qApp->changeOverrideCursor(QCursor(loadIcon("HandC.xpm")));
+				view->setCursor(QCursor(loadIcon("HandC.xpm")));
 				break;
 			case modeDrawLine:
 			case modeDrawBezierLine:
-				qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+				view->setCursor(QCursor(Qt::CrossCursor));
 				break;
 			case modeDrawCalligraphicLine:
 			case modeDrawFreehandLine:
-				qApp->changeOverrideCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 32));
+				view->setCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 32));
 				break;
 			case modeEyeDropper:
-				qApp->changeOverrideCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 32));
+				view->setCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 32));
 				break;
 			case modeInsertPDFButton:
 			case modeInsertPDFRadioButton:
@@ -6947,7 +6946,7 @@
 			case modeInsertPDF3DAnnotation:
 				if (docSelectionCount!=0)
 					view->Deselect(true);
-				qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+				view->setCursor(QCursor(Qt::CrossCursor));
 				break;
 			case modeMeasurementTool:
 			case modeEditGradientVectors:
@@ -6955,10 +6954,10 @@
 			case modeEditArc:
 			case modeEditPolygon:
 			case modeEditSpiral:
-				qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+				view->setCursor(QCursor(Qt::CrossCursor));
 				break;
 			default:
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				view->setCursor(QCursor(Qt::ArrowCursor));
 			break;
 		}
 		if (mode == modeDrawShapes)
@@ -7821,7 +7820,6 @@
 	{
 		if (ite->isAnnotation())
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			view->requestMode(submodeAnnotProps);
 		}
 		else if (doc->appMode != modeEdit)
@@ -8026,10 +8024,10 @@
 		{
 			setStatusBarInfoText( tr("Updating Images"));
 			mainWindowProgressBar->reset();
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			qApp->processEvents();
 			doc->recalcPicturesRes(true);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			setStatusBarInfoText("");
 			mainWindowProgressBar->reset();
 			view->previewQualitySwitcher->blockSignals(true);
@@ -8229,7 +8227,6 @@
 	QStringList spots;
 	bool return_value = true;
 	ReOrderText(doc, view);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
 	QMap<QString, QMap<uint, FPointArray> > ReallyUsed;
 	ReallyUsed.clear();
 	doc->getUsedFonts(ReallyUsed);
@@ -8262,6 +8259,7 @@
 	PSLib *dd = new PSLib(options, false, prefsManager->appPrefs.fontPrefs.AvailFonts, ReallyUsed, usedColors, false, true);
 	if (dd != NULL)
 	{
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		if (dd->PS_set_file(fn))
 		{
 			int psRet = dd->CreatePS(doc, options);
@@ -8274,7 +8272,7 @@
 		else
 			return_value = false;
 		delete dd;
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		qApp->restoreOverrideCursor();
 	}
 	ScCore->fileWatcher->start();
 	return return_value;
@@ -8447,7 +8445,7 @@
 	PDFExportDialog dia(this, doc->DocName, ReallyUsed, view, doc->pdfOptions(), doc->pdfOptions().PresentVals, ScCore->PDFXProfiles, prefsManager->appPrefs.fontPrefs.AvailFonts, doc->unitRatio(), ScCore->PrinterProfiles);
 	if (dia.exec())
 	{
-		qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		dia.updateDocOptions();
 		doc->pdfOptions().firstUse = false;
 		ReOrderText(doc, view);
@@ -8485,7 +8483,7 @@
 				QString realName = QDir::toNativeSeparators(path+"/"+name+ tr("-Page%1").arg(pageNs[aa], 3, 10, QChar('0'))+"."+ext);
 				if (!getPDFDriver(realName, nam, components, pageNs2, thumbs, errorMsg, &cancelled))
 				{
-					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+					qApp->restoreOverrideCursor();
 					QString message = tr("Cannot write the file: \n%1").arg(doc->pdfOptions().fileName);
 					if (!errorMsg.isEmpty())
 						message = QString("%1\n%2").arg(message).arg(errorMsg);
@@ -8516,7 +8514,7 @@
 		}
 		if (doc->pdfOptions().useDocBleeds)
 			doc->pdfOptions().bleeds = optBleeds;
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		qApp->restoreOverrideCursor();
 		if (errorMsg.isEmpty() && doc->pdfOptions().openAfterExport && !doc->pdfOptions().doMultiFile)
 		{
 			QString pdfViewer(PrefsManager::instance()->appPrefs.extToolPrefs.pdfViewerExecutable);
@@ -10261,7 +10259,7 @@
 				imageItem->IProfile = doc->cmsSettings().DefaultImageRGBProfile;
 				imageItem->IRender  = doc->cmsSettings().DefaultIntentImages;
 				imageItem->effectsInUse = contentsBuffer.effects;
-				qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
+				qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 				qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 				doc->loadPict(contentsBuffer.contentsFileName, imageItem);
 				imageItem->setImageXYScale(contentsBuffer.LocalScX, contentsBuffer.LocalScY);
@@ -10280,6 +10278,7 @@
 				propertiesPalette->updateColorList();
 				emit UpdateRequest(reqCmsOptionsUpdate);
 				currItem->emitAllToGUI();
+				qApp->restoreOverrideCursor();
 			}
 		}
 	}
@@ -10313,12 +10312,12 @@
 			UndoTransaction *trans = NULL;
 			if(UndoManager::undoEnabled())
 				trans = new UndoTransaction(undoManager->beginTransaction(Um::Selection,Um::IPolygon,Um::Transform,"",Um::IMove));
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			int count=td.getCount();
 			QTransform matrix(td.getTransformMatrix());
 			int basepoint=td.getBasepoint();
 			doc->itemSelection_Transform(count, matrix, basepoint);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			if(trans)
 			{
 				trans->commit();

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Sun Mar  3 19:09:26 2013
@@ -133,8 +133,6 @@
 	{
 		scribus->slotRaiseOnlineHelp();
 	}
-
-	qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 
 	// A hook for plugins and scripts to trigger on. Some plugins and scripts
 	// require the app to be fully set up (in particular, the main window to be

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Mar  3 19:09:26 2013
@@ -1042,7 +1042,7 @@
 	m_ScMW->mainWindowProgressBar->reset();
 	int cc = PageColors.count() + MasterItems.count() + DocItems.count() + FrameItems.count();
 	m_ScMW->mainWindowProgressBar->setMaximum(cc);
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	bool oldCM = docPrefsData.colorPrefs.DCMSset.CMSinUse;
 	bool newCM = enable;
 	CloseCMSProfiles();
@@ -1079,7 +1079,7 @@
 		HasCMS = false;
 	}
 	m_ScMW->mainWindowProgressBar->setValue(cc);
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	m_ScMW->setStatusBarInfoText("");
 	m_ScMW->mainWindowProgressBar->reset();
 }
@@ -5553,7 +5553,7 @@
 					currItem->UseEmbedded = true;
 					currItem->IProfile = docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
 					currItem->IRender = docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
-					qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
+					qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 					qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 					loadPict(iafData.source, currItem, false, true);
 					if (iafData.sizeType==3) //Frame is size of imported image
@@ -5565,7 +5565,7 @@
 						currItem->updateClip();
 					}
 					qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-					qApp->changeOverrideCursor(Qt::ArrowCursor);
+					qApp->restoreOverrideCursor();
 				}
 			}
 			if (iafData.frameType==PageItem::TextFrame)
@@ -11539,7 +11539,7 @@
 	}
 	
 	regionsChanged()->update(QRectF());
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	m_View->setCursor(QCursor(Qt::ArrowCursor));
 	//CB FIXME remove this and tree.h too
 //	m_ScMW->outlinePalette->BuildTree();
 
@@ -16416,7 +16416,7 @@
 			m_ScMW->mainWindowProgressBar->reset();
 			int cc = PageColors.count() + MasterItems.count() + DocItems.count() + FrameItems.count();
 			m_ScMW->mainWindowProgressBar->setMaximum(cc);
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			bool newCM  = docPrefsData.colorPrefs.DCMSset.CMSinUse;
 			bool updCol = false;
 			docPrefsData.colorPrefs.DCMSset.CMSinUse = oldPrefsData.colorPrefs.DCMSset.CMSinUse;
@@ -16457,7 +16457,7 @@
 				RecalcPictures(&ScCore->InputProfiles, &ScCore->InputProfilesCMYK, m_ScMW->mainWindowProgressBar);
 			}
 			m_ScMW->mainWindowProgressBar->setValue(cc);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			m_ScMW->setStatusBarInfoText("");
 			m_ScMW->mainWindowProgressBar->reset();
 		}

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Mar  3 19:09:26 2013
@@ -709,8 +709,6 @@
 {
 	m_canvasMode->leaveEvent(e);
 	return;
-	if (!m_canvas->m_viewMode.m_MouseButtonPressed)
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 void ScribusView::contentsDragEnterEvent(QDragEnterEvent *e)
@@ -1149,7 +1147,6 @@
 					if (!Doc->leaveDrag)
 					{
 						QMenu *pmen = new QMenu();
-						qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 						pmen->addAction( tr("Copy Here"));
 						QAction* mov = pmen->addAction( tr("Move Here"));
 						pmen->addAction( tr("Cancel"));
@@ -1742,14 +1739,14 @@
 	if (mpo.contains(tx) || mpo.contains(tx2))
 	{
 		if (Doc->appMode == modeRotation)
-			qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+			setCursor(QCursor(loadIcon("Rotieren2.png")));
 		else
 		{
 			double rr = fabs(currItem->rotation());
 			if (((rr >= 0.0) && (rr < 45.0)) || ((rr >= 135.0) && (rr < 225.0)) || ((rr >=315.0) && (rr <= 360.0)))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeBDiagCursor));
+				setCursor(QCursor(Qt::SizeBDiagCursor));
 			if (((rr >= 45.0) && (rr < 135.0)) || ((rr >= 225.0) && (rr < 315.0)))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeFDiagCursor));
+				setCursor(QCursor(Qt::SizeFDiagCursor));
 		}
 	}
 	tx = ma.map(QPoint(static_cast<int>(currItem->width()), static_cast<int>(currItem->height())/2));
@@ -1758,9 +1755,9 @@
 	{
 		double rr = fabs(currItem->rotation());
 		if (((rr >= 0.0) && (rr < 45.0)) || ((rr >= 135.0) && (rr < 225.0)) || ((rr >= 315.0) && (rr <= 360.0)))
-			qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+			setCursor(QCursor(Qt::SizeHorCursor));
 		if (((rr >= 45.0) && (rr < 135.0)) || ((rr >= 225.0) && (rr < 315.0)))
-			qApp->changeOverrideCursor(QCursor(Qt::SizeVerCursor));
+			setCursor(QCursor(Qt::SizeVerCursor));
 	}
 	tx = ma.map(QPoint(static_cast<int>(currItem->width())/2, 0));
 	tx2 = ma.map(QPoint(static_cast<int>(currItem->width())/2, static_cast<int>(currItem->height())));
@@ -1768,28 +1765,28 @@
 	{
 		double rr = fabs(currItem->rotation());
 		if (((rr >= 0.0) && (rr < 45.0)) || ((rr >= 135.0) && (rr < 225.0)) || ((rr >= 315.0) && (rr <= 360.0)))
-			qApp->changeOverrideCursor(QCursor(Qt::SizeVerCursor));
+			setCursor(QCursor(Qt::SizeVerCursor));
 		if (((rr >= 45.0) && (rr < 135.0)) || ((rr >= 225.0) && (rr < 315.0)))
-			qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+			setCursor(QCursor(Qt::SizeHorCursor));
 	}
 	tx = ma.map(QPoint(static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
 	tx2 = ma.map(QPoint(0, 0));
 	if (mpo.contains(tx) || mpo.contains(tx2))
 	{
 		if (Doc->appMode == modeRotation)
-			qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
+			setCursor(QCursor(loadIcon("Rotieren2.png")));
 		else if (!currItem->sizeHLocked() && ! currItem->sizeVLocked())
 		{
 			double rr = fabs(currItem->rotation());
 			if (((rr >= 0.0) && (rr < 45.0)) || ((rr >= 135.0) && (rr < 225.0)) ||
 			        ((rr >= 315.0) && (rr <= 360.0)))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeFDiagCursor));
+				setCursor(QCursor(Qt::SizeFDiagCursor));
 			if (((rr >= 45.0) && (rr < 135.0)) || ((rr >= 225.0) && (rr < 315.0)))
-				qApp->changeOverrideCursor(QCursor(Qt::SizeBDiagCursor));
+				setCursor(QCursor(Qt::SizeBDiagCursor));
 		}
 	}
 	if (Doc->appMode == modeEditClip)
-		qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+		setCursor(QCursor(Qt::CrossCursor));
 }
 
 void ScribusView::SelectItemNr(uint nr, bool draw, bool single)

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sun Mar  3 19:09:26 2013
@@ -134,7 +134,6 @@
 	{
 		if (m_Doc->isModified() && (m_Doc->viewCount == 1))
 		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			int exit = QMessageBox::information(m_MainWindow, CommonStrings::trWarning, tr("Document:")+" "+
 												QDir::toNativeSeparators(m_Doc->DocName)+"\n"+
 												tr("has been changed since the last save."),

Modified: trunk/Scribus/scribus/ui/AdapterWidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/AdapterWidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/AdapterWidget.cpp (original)
+++ trunk/Scribus/scribus/ui/AdapterWidget.cpp Sun Mar  3 19:09:26 2013
@@ -24,8 +24,8 @@
 #include <iostream>
 #include <iomanip>
 #include <fstream>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 #include <cstdlib>
 #include <cassert>
@@ -61,21 +61,23 @@
 	switch ( event->button() )
 	{
 		case Qt::LeftButton:
-			qApp->changeOverrideCursor(QCursor(Qt::OpenHandCursor));
+			qApp->setOverrideCursor(QCursor(Qt::OpenHandCursor));
 			button = 1;
 			break;
 		case Qt::MidButton:
-			qApp->changeOverrideCursor(QCursor(Qt::SizeAllCursor));
+			qApp->setOverrideCursor(QCursor(Qt::SizeAllCursor));
 			button = 2;
 			break;
 		case Qt::RightButton:
-			qApp->changeOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
+			qApp->setOverrideCursor(QCursor(loadIcon("LupeZ.xpm")));
 			button = 3;
 			break;
 		case Qt::NoButton:
+			qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 			button = 0;
 			break;
 		default:
+			qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 			button = 0;
 			break;
 	}
@@ -92,7 +94,7 @@
 		case ( Qt::NoButton ) : button = 0; break;
 		default: button = 0; break;
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	_gw->getEventQueue()->mouseButtonRelease ( event->x(), event->y(), button );
 }
 

Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Sun Mar  3 19:09:26 2013
@@ -406,7 +406,6 @@
 void CMYKChoose::slotRightClick()
 {
 	QMenu *pmen = new QMenu();
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	QAction* dynAct;
 	if (dynamic)
 		dynAct = pmen->addAction( tr("Static Color Bars"));

Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Sun Mar  3 19:09:26 2013
@@ -247,7 +247,6 @@
 	{
 		QString first = QString();
 		QMenu *pmen = new QMenu();
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		pmen->addAction( tr("Sort by Name"));
 		pmen->addAction( tr("Sort by Color"));
 		pmen->addAction( tr("Sort by Type"));

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp Sun Mar  3 19:09:26 2013
@@ -113,6 +113,7 @@
 			double distance = 1000; // just a big number
 			while(cc < m_points.size())
 			{
+				p = m_points.point(cc);
 				if (fabs (m_grab_point.x() - p.x()) < distance)
 				{
 					distance = fabs(m_grab_point.x() - p.x());
@@ -120,7 +121,6 @@
 					m_pos = pos;
 				}
 				cc++;
-				p = m_points.point(cc);
 				pos++;
 			}
 			FPointArray cli;
@@ -151,6 +151,7 @@
 	int cc = 0;
 	while(cc < m_points.size())
 	{
+		p = m_points.point(cc);
 		if (fabs (x - p.x()) < distance)
 		{
 			distance = fabs(x - p.x());
@@ -158,7 +159,6 @@
 			insert_pos = pos;
 		}
 		cc++;
-		p = m_points.point(cc);
 		pos++;
 	}
 	m_pos = insert_pos;
@@ -188,7 +188,7 @@
 			m_grabOffsetX = m_grab_point.x() - x;
 			m_grabOffsetY = m_grab_point.y() - curveVal;
 			m_grab_point = FPoint(x + m_grabOffsetX, curveVal + m_grabOffsetY);
-			qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+			setCursor(QCursor(Qt::CrossCursor));
 		}
 	}
 	else
@@ -196,15 +196,15 @@
 		if(fabs(y - closest_point.y()) * width() > 5)
 			return;
 		m_dragging = true;
-		qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+		setCursor(QCursor(Qt::CrossCursor));
 	}
 	// Determine the leftmost and rightmost points.
 	m_leftmost = 0;
 	m_rightmost = 1;
-	p = m_points.point(0);
 	cc = 0;
 	while(cc < m_points.size())
 	{
+		p = m_points.point(cc);
 		if (p != m_grab_point)
 		{
 			if(p.x() > m_leftmost && p.x() < x)
@@ -213,7 +213,6 @@
 				m_rightmost = p.x();
 		}
 		cc++;
-		p = m_points.point(cc);
     }
 	repaint();
 	emit modified();
@@ -223,7 +222,7 @@
 {
 	if (e->button() != Qt::LeftButton)
 		return;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	setCursor(QCursor(Qt::ArrowCursor));
 	m_dragging = false;
 	repaint();
 	emit modified();
@@ -238,26 +237,25 @@
 	{
 		double distance = 1000;
 		double ydistance = 1000;
-		FPoint p = m_points.point(0);
 		int cc = 0;
 		while(cc < m_points.size())
 		{
+			FPoint p = m_points.point(cc);
 			if (fabs (x - p.x()) < distance)
 			{
 				distance = fabs(x - p.x());
 				ydistance = fabs(y - p.y());
 			}
 			cc++;
-			p = m_points.point(cc);
 		}
 		if (distance * width() > 5 || ydistance * height() > 5)
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			setCursor(QCursor(Qt::ArrowCursor));
 		else
-			qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+			setCursor(QCursor(Qt::CrossCursor));
 	}
 	else  // Else, drag the selected point
 	{
-		qApp->changeOverrideCursor(QCursor(Qt::CrossCursor));
+		setCursor(QCursor(Qt::CrossCursor));
 		x += m_grabOffsetX;
 		y += m_grabOffsetY;
 		if (x <= m_leftmost)
@@ -312,11 +310,6 @@
 bool KCurve::isLinear()
 {
 	return m_linear;
-}
-
-void KCurve::leaveEvent( QEvent * )
-{
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 }
 
 CurveWidget::CurveWidget( QWidget* parent ) : QWidget( parent )

Modified: trunk/Scribus/scribus/ui/curvewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/curvewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.h (original)
+++ trunk/Scribus/scribus/ui/curvewidget.h Sun Mar  3 19:09:26 2013
@@ -38,7 +38,6 @@
 	void mousePressEvent (QMouseEvent * e);
 	void mouseReleaseEvent ( QMouseEvent * e );
 	void mouseMoveEvent ( QMouseEvent * e );
-	void leaveEvent ( QEvent * );
 
 public:
 	double getCurveValue(double x);

Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp (original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp Sun Mar  3 19:09:26 2013
@@ -114,6 +114,7 @@
 	Mpressed = true;
 	ActStop = -1;
 	m->accept();
+	qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 	for (int yg = 0; yg < StopM.count(); ++yg)
 	{
 		fpo = QRect(static_cast<int>(StopM[yg]) + 6, 16, 8, 13);
@@ -130,6 +131,7 @@
 void DashPreview::mouseReleaseEvent(QMouseEvent *m)
 {
 	m->accept();
+	qApp->restoreOverrideCursor();
 	if ((Mpressed) && (StopM.count() > 2) && (outside || m->y() > 30))
 	{
 		StopM.removeAt(ActStop);
@@ -196,16 +198,15 @@
 {
 	m->accept();
 	QRect fpo;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	if ((!Mpressed) && (m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width()-9) && (DashValues.count() < 10))
 	{
-		qApp->changeOverrideCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+		setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
 		for (int yg = 0; yg < StopM.count(); ++yg)
 		{
 			fpo = QRect(static_cast<int>(StopM[yg])+6, 16, 8, 13);
 			if (fpo.contains(m->pos()))
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+				setCursor(QCursor(Qt::SizeHorCursor));
 				return;
 			}
 		}
@@ -247,10 +248,13 @@
 
 void DashPreview::leaveEvent(QEvent*)
 {
-	if ((Mpressed) && (ActStop >= 0) && (StopM.count() > 2))
-		qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
-	else
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	if (Mpressed)
+	{
+		if ((ActStop >= 0) && (StopM.count() > 2))
+			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+		else
+			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	}
 	outside = true;
 }
 

Modified: trunk/Scribus/scribus/ui/gradientpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp Sun Mar  3 19:09:26 2013
@@ -141,6 +141,7 @@
 {
 	QRect fpo;
 	Mpressed = true;
+	qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 	ActStop = -1;
 	if (isEditable)
 	{
@@ -162,6 +163,7 @@
 
 void GradientPreview::mouseReleaseEvent(QMouseEvent *m)
 {
+	qApp->restoreOverrideCursor();
 	QRect insideRect = QRect(10, 43, width()-20, 13);
 	if (isEditable)
 	{
@@ -218,7 +220,7 @@
 			contextStop = stop;
 			mPos = m->pos();
 			QMenu *pmen = new QMenu();
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			setCursor(QCursor(Qt::ArrowCursor));
 			pmen->addAction( tr("Add Stop"), this, SLOT(addStop()));
 			if (stop != -1)
 				pmen->addAction( tr("Remove Stop"), this, SLOT(removeStop()));
@@ -243,13 +245,13 @@
 		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		if ((!Mpressed) && (m->y() < height()) && (m->y() > 43) && (m->x() > 9) && (m->x() < width()-9))
 		{
-			qApp->changeOverrideCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+			setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
 			for (int yg = 0; yg < static_cast<int>(StopM.count()); ++yg)
 			{
 				fpo = QRect(static_cast<int>(StopM[yg])-4, 43, 8, 13);
 				if (fpo.contains(m->pos()))
 				{
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					return;
 				}
 			}
@@ -287,10 +289,13 @@
 {
 	if (isEditable)
 	{
-		if ((Mpressed) && (ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
-			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
-		else
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		if (Mpressed)
+		{
+			if ((ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
+				qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+			else
+				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		}
 		outside = true;
 	}
 }

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Sun Mar  3 19:09:26 2013
@@ -226,7 +226,7 @@
 			ActTab = 0;
 			RulerCode = rc_tab;
 			UpdateTabList();
-			qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+			qApp->setOverrideCursor(QCursor(Qt::SizeHorCursor));
 			emit DocChanged(false);
 		}
 	}
@@ -234,7 +234,7 @@
 	{
 		if (currDoc->guidesPrefs().guidesShown)
 		{
-			qApp->changeOverrideCursor(QCursor(SPLITHC));
+			qApp->setOverrideCursor(QCursor(SPLITHC));
 			currView->startGesture(rulerGesture);
 		}
 	}
@@ -317,7 +317,6 @@
 				tempSelection.addItem(currItem);
 				currDoc->itemSelection_ApplyParagraphStyle(paraStyle, &tempSelection);
 				emit DocChanged(false);
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			}
 		}
 		RulerCode = rc_none;
@@ -333,6 +332,7 @@
 		}
 	}
 	Mpressed = false;
+	qApp->restoreOverrideCursor();
 }
 
 void Hruler::enterEvent(QEvent *e)
@@ -451,26 +451,26 @@
 		}
 		if ((!Mpressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - 2*currDoc->guidesPrefs().grabRadius) && (m->x() < ColEnd + 2*currDoc->guidesPrefs().grabRadius))
 		{
-			qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
+			setCursor(QCursor(loadIcon("tab.png"), 3));
 			switch(findRulerHandle(m->pos(), currDoc->guidesPrefs().grabRadius))
 			{
 				case rc_leftFrameDist: 
-					qApp->changeOverrideCursor(QCursor(Qt::SplitHCursor));
+					setCursor(QCursor(Qt::SplitHCursor));
 					break;
 				case rc_rightFrameDist:
-					qApp->changeOverrideCursor(QCursor(Qt::SplitHCursor));
+					setCursor(QCursor(Qt::SplitHCursor));
 					break;
 				case rc_indentFirst:
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					break;
 				case rc_leftMargin:
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					break;
 				case rc_rightMargin:
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					break;
 				case rc_tab:
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					break;
 			}
 			Draw(m->x());
@@ -480,10 +480,10 @@
 		}
 		if ((Mpressed) && (RulerCode == rc_tab) && ((m->y() > height()) || (m->y() < 0)))
 		{
-			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+			setCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
 			return;
 		}
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		setCursor(QCursor(Qt::ArrowCursor));
 	}
 	else
 	{
@@ -492,14 +492,7 @@
 			rulerGesture->mouseMoveEvent(m);
 		}
 		else
-		{
-			QCursor* cursor = qApp->overrideCursor();
-			Qt::CursorShape shape = cursor ? cursor->shape() : Qt::ArrowCursor;
-			if ((shape == Qt::SplitHCursor) || (shape == Qt::SplitVCursor))
-			{
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-			}
-		}
+			setCursor(QCursor(Qt::ArrowCursor));
 	}
 }
 

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp (original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp Sun Mar  3 19:09:26 2013
@@ -144,7 +144,7 @@
 		if (!fn.isEmpty())
 		{
 			dirs->set("merge", fn.left(fn.lastIndexOf("/")));
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			FileLoader fl(fn);
 			if (fl.testFile() == -1)
 			//TODO put in nice user warning
@@ -155,7 +155,7 @@
 				ret = fl.readPageCount(&dummy, &count, masterPageNames);
 			else
 				ret = fl.readPageCount(&count, &dummy, masterPageNames);
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			if ((ret) && (count != 0))
 			{
 				fromDocData->setText( QDir::toNativeSeparators(fn) );

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun Mar  3 19:09:26 2013
@@ -536,7 +536,7 @@
 			signalMapper4->setMapping(actLock, item->LayerID);
 			connect(actLock, SIGNAL(triggered()), signalMapper4, SLOT(map()));
 			connect(signalMapper4, SIGNAL(mapped(int)), this, SLOT(setLayerLocked(int)));
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	//		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			pmenu->exec(QCursor::pos());
 			delete pmenu;
 		}
@@ -1400,7 +1400,7 @@
 	if (m_MainWindow==NULL || currDoc==NULL)
 		return;
 	ContextMenu* cmen=NULL;
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	if(currItem!=NULL)
 		cmen = new ContextMenu(*(currDoc->m_Selection), m_MainWindow, currDoc);
 	else

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Sun Mar  3 19:09:26 2013
@@ -372,7 +372,7 @@
 	{
 		if (currentDoc->appMode == modeEditClip)
 			currentView->requestMode(submodeEndNodeEdit);
-		qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+		qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 		int nr = currentDoc->Pages->count();
 
 		QString MasterPageName(dia->getMasterPageNameText());
@@ -392,7 +392,7 @@
 
 		updateMasterPageList(MasterPageName2);
 		currentView->showMasterPage(currentDoc->MasterNames[MasterPageName2]);
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+		qApp->restoreOverrideCursor();
 	}
 	delete dia;
 }

Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Sun Mar  3 19:09:26 2013
@@ -53,7 +53,7 @@
 	if (m->button() == Qt::RightButton)
 	{
 		QMenu *pmen = new QMenu();
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
         QAction *px = pmen->addAction( tr("Show Page Previews"), this, SLOT(toggleThumbnail()));
 		px->setCheckable(true);
 		if (Thumb)

Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Sun Mar  3 19:09:26 2013
@@ -315,7 +315,7 @@
 		if ((it->parent() == colorItems) || (it == colorItems))
 		{
 			QMenu *pmen = new QMenu();
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+//			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			pmen->addAction( tr("Sort by Name"));
 			pmen->addAction( tr("Sort by Color"));
 			pmen->addAction( tr("Sort by Type"));
@@ -1171,7 +1171,7 @@
 				return;
 			if (!fileName.isEmpty())
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+				qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 				PrefsManager::instance()->prefsFile->getContext("dirs")->set("patterns", fileName.left(fileName.lastIndexOf("/")));
 				QFileInfo fi(fileName);
 				if ((fi.suffix().toLower() == "sce") || (!imgFormats.contains(fi.suffix().toLower())))
@@ -1194,7 +1194,7 @@
 				updateGradientList();
 				updatePatternList();
 				itemSelected(0);
-				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+				qApp->restoreOverrideCursor();
 			}
 		}
 	}
@@ -1235,7 +1235,7 @@
 			mainWin->setStatusBarInfoText( tr("Loading Patterns"));
 			mainWin->mainWindowProgressBar->reset();
 			mainWin->mainWindowProgressBar->setMaximum(d.count() * 2);
-			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+			qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 			qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 			for (uint dc = 0; dc < d.count(); ++dc)
 			{
@@ -1271,7 +1271,7 @@
 			}
 			d.cdUp();
 			dirs->set("patterndir", d.absolutePath());
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+			qApp->restoreOverrideCursor();
 			mainWin->setStatusBarInfoText("");
 			mainWin->mainWindowProgressBar->reset();
 		}

Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Sun Mar  3 19:09:26 2013
@@ -932,7 +932,7 @@
 	QPixmap Bild;
 	double b = doc->Pages->at(Seite)->width() * Res / 72.0;
 	double h = doc->Pages->at(Seite)->height() * Res / 72.0;
-	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	if ((Seite != APage) || (EnableCMYK->isChecked() != CMode) || (SMode != scaleBox->currentIndex())
 	        || (AntiAlias->isChecked() != GsAl) || (((AliasTr->isChecked() != Trans) || (EnableGCR->isChecked() != GMode))
 			&& (!EnableCMYK->isChecked()))
@@ -1312,7 +1312,7 @@
 	}
 	else
 		Bild = QPixmap::fromImage(image);
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	getUserSelection(Seite);
 	return Bild;
 }
@@ -1355,7 +1355,7 @@
 void PPreview::imageLoadError(QPixmap &Bild, int page)
 {
 	Bild = QPixmap(1,1);
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	getUserSelection(page);
 }
 

Modified: trunk/Scribus/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/rulermover.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/rulermover.cpp (original)
+++ trunk/Scribus/scribus/ui/rulermover.cpp Sun Mar  3 19:09:26 2013
@@ -64,6 +64,7 @@
 	if (m->button() == Qt::LeftButton)
 	{
 		Mpressed = true;
+		qApp->setOverrideCursor(QCursor(Qt::CrossCursor));
 		currView->startGesture(rulerGesture);
 	}
 	QWidget::mousePressEvent(m);
@@ -71,7 +72,7 @@
 
 void RulerMover::mouseReleaseEvent(QMouseEvent *m)
 {
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	qApp->restoreOverrideCursor();
 	if (Mpressed)
 	{
 		rulerGesture->mouseReleaseEvent(m);
@@ -81,7 +82,6 @@
 	{
 		QMenu *pmen = new QMenu();
 		QMenu *pmen2 = NULL;
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		pmen->addAction( tr("Reset Rulers"), this, SLOT(resetRulers()));
 		pmen->addAction(currView->Doc->scMW()->scrActions["viewRulerMode"]);
 		if (currView->Doc->guidesPrefs().rulerMode)

Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Sun Mar  3 19:09:26 2013
@@ -1026,7 +1026,6 @@
 		pmenu->addMenu(pmenu2);
 		if (activeBView->canWrite)
 			pmenu->addMenu(pmenu3);
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		pmenu->exec(QCursor::pos());
 		delete pmenu;
 		delete pmenu2;
@@ -1047,7 +1046,6 @@
 			connect(delAct, SIGNAL(triggered()), this, SLOT(deleteAllObj()));
 		}
 		connect(closeAct, SIGNAL(triggered()), this, SLOT(closeLib()));
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		pmenu->exec(QCursor::pos());
 		delete pmenu;
 	}
@@ -1380,7 +1378,6 @@
 			if (activeBView->objectMap.contains(nam))
 				nam += "("+ tmp.setNum(tempCount) + ")";
 		}
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 		dia.setValidator(QRegExp("[\\w()]+"));
 		dia.setEditText(nam, true);
@@ -1509,7 +1506,6 @@
 		if (activeBView->objectMap.contains(nam))
 			nam += "("+ tmp.setNum(tempCount) + ")";
 	}
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 	dia.setValidator(QRegExp("[\\w()]+"));
 	dia.setEditText(nam, true);
@@ -1673,7 +1669,6 @@
 		nam = tr("Object") + tmp.setNum(actBView->objectMap.count());
 	if (actBView->objectMap.contains(nam))
 		nam += "("+ tmp.setNum(tempCount) + ")";
-	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 	dia.setValidator(QRegExp("[\\w()]+"));
 	dia.setEditText(nam, true);

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Sun Mar  3 19:09:26 2013
@@ -1139,7 +1139,7 @@
 	if (m_enhanced)
 		return;
 
-	QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
+	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 	m_enhanced = new CharSelectEnhanced(this);
 	m_enhanced->setModal(true);
 	connect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(insertSpecialChars(const QString &)));
@@ -1156,7 +1156,7 @@
 		setCurrentComboItem(m_enhanced->fontSelector, currPStyle->charStyle().font().scName());
 	m_enhanced->newFont(m_enhanced->fontSelector->currentIndex());
 	m_enhanced->show();
-	QApplication::changeOverrideCursor(Qt::ArrowCursor);
+	QApplication::restoreOverrideCursor();
 }
 
 void SMPStyleWidget::closeEnhanced(bool show)

Modified: trunk/Scribus/scribus/ui/spiralvectordialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/spiralvectordialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/spiralvectordialog.cpp (original)
+++ trunk/Scribus/scribus/ui/spiralvectordialog.cpp Sun Mar  3 19:09:26 2013
@@ -35,6 +35,7 @@
 	connect(sweepAngle,   SIGNAL(valueChanged(double)), this, SLOT(changeVectors()));
 	connect(arcFactor,   SIGNAL(valueChanged(double)), this, SLOT(changeVectors()));
 	connect(exitButton, SIGNAL(clicked()), this, SLOT(accept()));
+	connect(exitButton, SIGNAL(clicked()), this, SIGNAL(endEdit()));
 	languageChange();
 	resize(minimumSizeHint());
 }

Modified: trunk/Scribus/scribus/ui/tabruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/tabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/tabruler.cpp Sun Mar  3 19:09:26 2013
@@ -170,6 +170,7 @@
 {
 	QRect fpo;
 	mousePressed = true;
+	qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 	rulerCode = 0;
 	if (haveInd)
 	{
@@ -230,6 +231,7 @@
 void RulerT::mouseReleaseEvent(QMouseEvent *m)
 {
 	mousePressed = false;
+	qApp->restoreOverrideCursor();
 	if ((m->y() < height()) && (m->y() > 0))
 	{
 		if (rulerCode == 3)
@@ -259,7 +261,6 @@
 			else
 				emit noTabs();
 			repaint();
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		}
 	}
 	rulerCode = 0;
@@ -314,19 +315,19 @@
 	}
 	if ((!mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > 0) && (m->x() < width()))
 	{
-		qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
+		setCursor(QCursor(loadIcon("tab.png"), 3));
 		if (haveInd)
 		{
 			fpo = QRect(static_cast<int>(firstLine+leftIndent-offset)-4, 0, 8, 12);
 			if (fpo.contains(m->pos()))
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+				setCursor(QCursor(Qt::SizeHorCursor));
 				return;
 			}
 			fpo = QRect(static_cast<int>(leftIndent-offset)-4, 12, 8, 12);
 			if (fpo.contains(m->pos()))
 			{
-				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+				setCursor(QCursor(Qt::SizeHorCursor));
 				return;
 			}
 		}
@@ -337,7 +338,7 @@
 				fpo = QRect(static_cast<int>(tabValues[yg].tabPosition-offset)-3, 15, 8, 8);
 				if (fpo.contains(m->pos()))
 				{
-					qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
+					setCursor(QCursor(Qt::SizeHorCursor));
 					return;
 				}
 			}
@@ -351,10 +352,13 @@
 
 void RulerT::leaveEvent(QEvent*)
 {
-	if ((mousePressed) && (rulerCode == 3))
-		qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
-	else
-		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	if (mousePressed)
+	{
+		if (rulerCode == 3)
+			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+		else
+			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+	}
 }
 
 void RulerT::updateTabList()

Modified: trunk/Scribus/scribus/ui/vruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18181&path=/trunk/Scribus/scribus/ui/vruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/vruler.cpp (original)
+++ trunk/Scribus/scribus/ui/vruler.cpp Sun Mar  3 19:09:26 2013
@@ -73,7 +73,7 @@
 	Mpressed = true;
 	if (currDoc->guidesPrefs().guidesShown)
 	{
-		qApp->changeOverrideCursor(QCursor(SPLITVC));
+		qApp->setOverrideCursor(QCursor(SPLITVC));
 		currView->startGesture(rulerGesture);
 	}
 }
@@ -83,6 +83,7 @@
 	if (Mpressed)
 	{
 		rulerGesture->mouseReleaseEvent(m);
+		qApp->restoreOverrideCursor();
 		Mpressed = false;
 	}
 }
@@ -90,18 +91,7 @@
 void Vruler::mouseMoveEvent(QMouseEvent *m)
 {
 	if (Mpressed)
-	{
 		rulerGesture->mouseMoveEvent(m);
-	}
-	else
-	{
-		QCursor* cursor = qApp->overrideCursor();
-		Qt::CursorShape shape = cursor ? cursor->shape() : Qt::ArrowCursor;
-		if ((shape == Qt::SplitHCursor) || (shape == Qt::SplitVCursor))
-		{
-			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-		}
-	}
 }
 
 void Vruler::paintEvent(QPaintEvent *e)




More information about the scribus-commit mailing list