r15286 by cbradney - #9114: Add back missing accelerators, Qt3->Qt4 behaviour change gone unnoticed

[scribus-commit]

Revision: 15286
Author: cbradney
Date: 2010-06-28T20:38:38.133157Z
Commit message: #9114: Add back missing accelerators, Qt3->Qt4 behaviour change gone unnoticed

Changeset: 
M  /branches/Version135/Scribus/scribus/scraction.h
M  /branches/Version135/Scribus/scribus/scraction.cpp

Diffs:
Index: scribus/scraction.h
===================================================================
--- scribus/scraction.h	(revision 15285)
+++ scribus/scraction.h	(revision 15286)
@@ -164,7 +164,7 @@
 	void setActionQString(const QString &);
 	
 	/*! \brief Set up text and menuText at the same time */
-	void setTexts(const QString &newText, bool setTextToo = true);
+	void setTexts(const QString &newText);//#9114, qt3-qt4 change of behaviour bug: , bool setTextToo = true);
 	
 public slots:
 	void toggle();
Index: scribus/scraction.cpp
===================================================================
--- scribus/scraction.cpp	(revision 15285)
+++ scribus/scraction.cpp	(revision 15286)
@@ -256,11 +256,11 @@
 	return _dataQString;
 }
 
-void ScrAction::setTexts(const QString &newText, bool setTextToo)
+void ScrAction::setTexts(const QString &newText)//#9114, qt3 to qt4 change of behaviour bug: , bool setTextToo)
 {
 	QAction::setText(newText);
-	if (setTextToo)
-		QAction::setText(cleanMenuText());
+//	if (setTextToo)
+	QAction::setIconText(cleanMenuText());
 }
 
 void ScrAction::toggle()