r15724 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:58 2010
New Revision: 15724

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

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15724&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Nov  2 20:05:58 2010
@@ -1206,7 +1206,7 @@
 // 			scrActions["toolsAlignDistribute"]->toggle();
 // 		else
 		//Edit actions
-		if (currKeySeq == scrActions["editStyles"]->shortcut())
+/*		if (currKeySeq == scrActions["editStyles"]->shortcut())
 			scrActions["editStyles"]->toggle();
 		else
 		if (currKeySeq == scrActions["editUndoAction"]->shortcut() && scrActions["editUndoAction"]->isEnabled())
@@ -1225,8 +1225,8 @@
 		else
 		if (currKeySeq == scrActions["toolsZoomOut"]->shortcut())
 			scrActions["toolsZoomOut"]->activate(QAction::Trigger);
-		else
-			retVal=false;
+		else */
+		retVal=false;
 	}
 	else
 		retVal=false;

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15724&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Tue Nov  2 20:05:58 2010
@@ -261,7 +261,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);
@@ -308,8 +310,8 @@
 //	m_SnapCounter = 0;
 
 	Doc->regionsChanged()->connectObserver(this);
-	connect(zoomOutToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
-	connect(zoomInToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
+//	connect(zoomOutToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
+//	connect(zoomInToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
 	connect(zoomDefaultToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoom100()));
 	connect(zoomSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setZoom()));
 	connect(pageSelector, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));