r15462 by craig - Fix oops commit

[scribus-commit]

Author: craig
Date: Tue Aug 31 20:18:31 2010
New Revision: 15462

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15462
Log:
Fix oops commit

Modified:
    trunk/Scribus/scribus/scraction.cpp

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15462&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Tue Aug 31 20:18:31 2010
@@ -41,15 +41,15 @@
 {
 	setShortcut(accel);
 	initScrAction();
-	//icon().addPixmap(icon22, QIcon::Normal, QIcon::On);
-
-	QPixmap gray_icon16(icon16);
-	iconToGrayscale(&gray_icon16);
-	m_icon.addPixmap(icon16, QIcon::Active, QIcon::On);
-	m_icon.addPixmap(icon16, QIcon::Active, QIcon::Off);
-	m_icon.addPixmap(gray_icon16, QIcon::Normal, QIcon::On);
-	m_icon.addPixmap(gray_icon16, QIcon::Normal, QIcon::Off);
-	setIcon(m_icon.pixmap(QSize(16,16), QIcon::Normal, QIcon::Off));
+	icon().addPixmap(icon22, QIcon::Normal, QIcon::On);
+
+//	QPixmap gray_icon16(icon16);
+//	iconToGrayscale(&gray_icon16);
+//	m_icon.addPixmap(icon16, QIcon::Active, QIcon::On);
+//	m_icon.addPixmap(icon16, QIcon::Active, QIcon::Off);
+//	m_icon.addPixmap(gray_icon16, QIcon::Normal, QIcon::On);
+//	m_icon.addPixmap(gray_icon16, QIcon::Normal, QIcon::Off);
+//	setIcon(m_icon.pixmap(QSize(16,16), QIcon::Normal, QIcon::Off));
 	//connect (this, SIGNAL(hovered()), this, SLOT(hoverIcon()));
 	_actionType=aType;
 	if (_actionType!=Normal)