r15723 by fschmid - Fixed Bug #9437: "in 1.3.9svn - "-" on keyborad in Save dialog box not insert character - zoom out page instead"

[scribus-commit]

Author: fschmid
Date: Tue Nov  2 20:05:12 2010
New Revision: 15723

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15723
Log:
Fixed Bug #9437: "in 1.3.9svn - "-" on keyborad in Save dialog box not insert character - zoom out page instead"

Modified:
    branches/Version135/Scribus/scribus/scribus.cpp
    branches/Version135/Scribus/scribus/scribusview.cpp

Modified: branches/Version135/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15723&path=/branches/Version135/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribus.cpp (original)
+++ branches/Version135/Scribus/scribus/scribus.cpp Tue Nov  2 20:05:12 2010
@@ -1201,7 +1201,8 @@
 // 			scrActions["toolsAlignDistribute"]->toggle();
 // 		else
 		//Edit actions
-		if (currKeySeq == scrActions["editStyles"]->shortcut())
+// commented out to fix Bug #9437
+/*		if (currKeySeq == scrActions["editStyles"]->shortcut())
 			scrActions["editStyles"]->toggle();
 		else
 		if (currKeySeq == scrActions["editUndoAction"]->shortcut() && scrActions["editUndoAction"]->isEnabled())
@@ -1220,7 +1221,7 @@
 		else
 		if (currKeySeq == scrActions["toolsZoomOut"]->shortcut())
 			scrActions["toolsZoomOut"]->activate(QAction::Trigger);
-		else
+		else */
 			retVal=false;
 	}
 	else

Modified: branches/Version135/Scribus/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15723&path=/branches/Version135/Scribus/scribus/scribusview.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribusview.cpp (original)
+++ branches/Version135/Scribus/scribus/scribusview.cpp Tue Nov  2 20:05:12 2010
@@ -258,7 +258,9 @@
 	//zoomDefaultToolbarButton->setText("1:1");
 	zoomDefaultToolbarButton->setIcon(QIcon(loadIcon("16/zoom-original.png")));
 	zoomOutToolbarButton->setIcon(QIcon(loadIcon("16/zoom-out.png")));
+	zoomOutToolbarButton->addAction(m_ScMW->scrActions["toolsZoomOut"]);
 	zoomInToolbarButton->setIcon(QIcon(loadIcon("16/zoom-in.png")));
+	zoomInToolbarButton->addAction(m_ScMW->scrActions["toolsZoomIn"]);
 	pageSelector = new PageSelector(this, Doc->Pages->count());
 	pageSelector->setFont(fo);
 	pageSelector->setFocusPolicy(Qt::ClickFocus);