r15303 by cbradney - #6724: Re-enabled toggle all guides action

[scribus-commit]

Revision: 15303
Author: cbradney
Date: 2010-07-02T22:14:00.065633Z
Commit message: #6724: Re-enabled toggle all guides action

Changeset: 
M  /branches/Version135/Scribus/scribus/actionmanager.cpp
M  /branches/Version135/Scribus/scribus/scribus.cpp

Diffs:
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 15302)
+++ scribus/scribus.cpp	(revision 15303)
@@ -1163,6 +1163,9 @@
 		if (currKeySeq == scrActions["specialToggleAllPalettes"]->shortcut())
 			scrActions["specialToggleAllPalettes"]->activate(QAction::Trigger);
 		else
+		if (currKeySeq == scrActions["specialToggleAllGuides"]->shortcut())
+			scrActions["specialToggleAllGuides"]->activate(QAction::Trigger);
+		else
 // CB These were moved to ActionManager via the setShortcutContext(Qt::ApplicationShortcut) calls, leaving for notes for now
 // 		if (currKeySeq == scrActions["toolsProperties"]->accel())
 // 			scrActions["toolsProperties"]->toggle();
Index: scribus/actionmanager.cpp
===================================================================
--- scribus/actionmanager.cpp	(revision 15302)
+++ scribus/actionmanager.cpp	(revision 15303)
@@ -1006,9 +1006,11 @@
 	QString name;
 	//GUI
 	name="specialToggleAllPalettes";
-	scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0,0.0,name));
+//	scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0,0.0,name));
+	scrActions->insert(name, new ScrAction( "", defaultKey(name), mainWindow));
 	name="specialToggleAllGuides";
-	scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0,0.0,name));
+//	scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0,0.0,name));
+	scrActions->insert(name, new ScrAction( "", defaultKey(name), mainWindow));
 	name="specialUnicodeSequenceBegin";
 	scrActions->insert(name, new ScrAction( "", defaultKey(name), mainWindow));