r21889 by jghali - #13549: Show correct icon for Spiral/Arc items in Outline Palette <FirasH>

[scribus-commit]

Author: jghali
Date: Thu Apr 13 11:52:14 2017
New Revision: 21889

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21889
Log:
#13549: Show correct icon for Spiral/Arc items in Outline Palette <FirasH>

Modified:
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/outlinepalette.h

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21889&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Thu Apr 13 11:52:14 2017
@@ -472,6 +472,8 @@
 	textIcon = im->loadPixmap("22/insert-text-frame.png");
 	polylineIcon = im->loadPixmap("22/draw-path.png");
 	polygonIcon = im->loadPixmap("22/draw-polygon.png");
+	arcIcon = im->loadPixmap("22/draw-arc.png");
+	spiralIcon = im->loadPixmap("22/draw-spiral.png");
 	tableIcon = im->loadPixmap("22/insert-table.png");
 	groupIcon = im->loadPixmap("u_group.png");
 	buttonIcon = im->loadPixmap("22/insert-button.png");
@@ -850,12 +852,16 @@
 		item->setIcon( 0, lineIcon );
 		break;
 	case PageItem::Arc:
+		item->setIcon( 0, arcIcon );
+		break;
+	case PageItem::Spiral:
+		item->setIcon( 0, spiralIcon );
+		break;
 	case PageItem::Polygon:
 	case PageItem::RegularPolygon:
 		item->setIcon( 0, polygonIcon );
 		break;
 	case PageItem::PolyLine:
-	case PageItem::Spiral:
 		item->setIcon( 0, polylineIcon );
 		break;
 	case PageItem::PathText:

Modified: trunk/Scribus/scribus/ui/outlinepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21889&path=/trunk/Scribus/scribus/ui/outlinepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.h	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.h	Thu Apr 13 11:52:14 2017
@@ -109,14 +109,15 @@
 	QLabel* filterLabel;
 	QLineEdit* filterEdit;
 	ScribusMainWindow* m_MainWindow;
+	QPixmap textIcon;
 	QPixmap imageIcon;
 	QPixmap latexIcon;
-	QPixmap textIcon;
+	QPixmap tableIcon;
 	QPixmap lineIcon;
 	QPixmap polygonIcon;
+	QPixmap arcIcon;
+	QPixmap spiralIcon;
 	QPixmap polylineIcon;
-	QPixmap groupIcon;
-	QPixmap tableIcon;
 	QPixmap buttonIcon;
 	QPixmap radiobuttonIcon;
 	QPixmap textFieldIcon;
@@ -126,6 +127,7 @@
 	QPixmap annotTextIcon;
 	QPixmap annotLinkIcon;
 	QPixmap annot3DIcon;
+	QPixmap groupIcon;
 	bool selectionTriggered;
 	ScribusDoc *currDoc;
 };