r21915 by craig - #14744: Fix icon name for polygon cursor. Disable duplicate code in scribusview for icon loading. Hide icon loading warning behind debug check

[scribus-commit]

Author: craig
Date: Sun Apr 16 12:06:40 2017
New Revision: 21915

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21915
Log:
#14744: Fix icon name for polygon cursor. Disable duplicate code in scribusview for icon loading. Hide icon loading warning behind debug check

Modified:
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/iconmanager.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribusview.h

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21915&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Sun Apr 16 12:06:40 2017
@@ -795,7 +795,7 @@
 			cursor = im->loadCursor("drawtable.png");
 			break;
 		case modeDrawRegularPolygon:
-			cursor = im->loadCursor("drawpolylineframe.png");
+			cursor = im->loadCursor("drawpolyline.png");
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -875,7 +875,7 @@
 			m_view->setCursor(im->loadCursor("drawtable.png"));
 			break;
 		case modeDrawRegularPolygon:
-			m_view->setCursor(im->loadCursor("drawpolylineframe.png"));
+			m_view->setCursor(im->loadCursor("drawpolyline.png"));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:

Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21915&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp	(original)
+++ trunk/Scribus/scribus/iconmanager.cpp	Sun Apr 16 12:06:40 2017
@@ -287,8 +287,9 @@
 		//qDebug()<<iconFilePath;
 		return iconFilePath;
 	}
-
+#ifdef WANT_DEBUG
 	qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
+#endif
 	return "";
 }
 

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21915&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Sun Apr 16 12:06:40 2017
@@ -502,9 +502,10 @@
 	}
 	if (updateNecessary)
 		updateCanvas();
-	setCursorBasedOnAppMode(appMode);
-}
-
+	//setCursorBasedOnAppMode(appMode);
+}
+
+/*
 void ScribusView::setCursorBasedOnAppMode(int appMode)
 {
 	IconManager* im=IconManager::instance();
@@ -541,7 +542,7 @@
 		case modeDrawRegularPolygon:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("drawpolylineframe.png"));
+			setCursor(im->loadCursor("drawpolyline.png"));
 			break;
 		case modeMagnifier:
 			if (docSelectionCount!=0)
@@ -592,7 +593,7 @@
 		break;
 	}
 }
-
+*/
 
 
 /*

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21915&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h	(original)
+++ trunk/Scribus/scribus/scribusview.h	Sun Apr 16 12:06:40 2017
@@ -111,7 +111,7 @@
 	friend class CanvasMode_Rotate;
 	
 	void requestMode(int appMode);
-	void setCursorBasedOnAppMode(int appMode);
+//	void setCursorBasedOnAppMode(int appMode);
 	void startGesture(CanvasGesture*);
 	void stopGesture();