r15467 by craig - Return to older icon -> action loading code. hover doesnt work in qt like this :S

[scribus-commit]

Author: craig
Date: Wed Sep  8 22:15:55 2010
New Revision: 15467

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15467
Log:
Return to older icon -> action loading code. hover doesnt work in qt like this :S

Modified:
    trunk/Scribus/scribus/scraction.cpp
    trunk/Scribus/scribus/scraction.h

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15467&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Wed Sep  8 22:15:55 2010
@@ -42,15 +42,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));
-	//connect (this, SIGNAL(hovered()), this, SLOT(hoverIcon()));
+/*
+	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));
+*/
 	_actionType=aType;
 	if (_actionType!=Normal)
 		connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
@@ -110,7 +110,6 @@
 	_actionType=UnicodeChar;
 
 	connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
-	//connect (this, SIGNAL(hovered()), this, SLOT(hoverIcon()));
 	_dataInt=extraInt;
 	_dataQString=extraQString;
 }
@@ -126,12 +125,6 @@
 
 ScrAction::~ScrAction()
 {
-}
-
-void ScrAction::hoverIcon()
-{
-	qDebug("boo");
-	//setIcon(m_icon.pixmap(QSize(16,16), QIcon::Active, QIcon::Off));
 }
 
 void ScrAction::triggeredToTriggeredData()

Modified: trunk/Scribus/scribus/scraction.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15467&path=/trunk/Scribus/scribus/scraction.h
==============================================================================
--- trunk/Scribus/scribus/scraction.h (original)
+++ trunk/Scribus/scribus/scraction.h Wed Sep  8 22:15:55 2010
@@ -218,8 +218,6 @@
 		\param ison true if toggled = on
 	 */
 	void toggledToToggledData(bool ison);
-
-	void hoverIcon();
 };
 
 #endif