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

[scribus-commit]

Revision: 15302
Author: cbradney
Date: 2010-07-02T22:13:58.952642Z
Commit message: #6724: Re-enabled toggle all guides action

Changeset: 
M  /trunk/Scribus/scribus/actionmanager.cpp
M  /trunk/Scribus/scribus/scribus.cpp

Diffs:
Index: scribus/actionmanager.cpp
===================================================================
--- scribus/actionmanager.cpp	(revision 15301)
+++ scribus/actionmanager.cpp	(revision 15302)
@@ -1024,12 +1024,13 @@
 	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));
-
 	connect( (*scrActions)["specialToggleAllPalettes"], SIGNAL(triggered()), mainWindow, SLOT(ToggleAllPalettes()) );
 	connect( (*scrActions)["specialToggleAllGuides"], SIGNAL(triggered()), mainWindow, SLOT(ToggleAllGuides()) );
 }
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 15301)
+++ scribus/scribus.cpp	(revision 15302)
@@ -1149,6 +1149,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();