r19327 by craig - #12488: Fix for zoom and truncate shortcuts not working. Not sure if I like this fix.. canvasmode seems to steal all keystrokes at the moment

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 7 20:51:21 UTC 2014


Author: craig
Date: Mon Jul  7 20:51:21 2014
New Revision: 19327

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19327
Log:
#12488: Fix for zoom and truncate shortcuts not working. Not sure if I like this fix.. canvasmode seems to steal all keystrokes at the moment

Modified:
    trunk/Scribus/scribus/canvasmode.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19327&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Mon Jul  7 20:51:21 2014
@@ -1151,7 +1151,6 @@
 	if (m_keyRepeat)
 		return;
 	m_keyRepeat = true;
-
 	int keyMod=0;
 	if (e->modifiers() & Qt::ShiftModifier)
 		keyMod |= Qt::SHIFT;
@@ -1189,6 +1188,10 @@
 		scrActions["stickyTools"]->setChecked(false);
 		return;
 	}
+	if (m_view->m_ScMW->actionManager->compareKeySeqToShortcut(kk, e->modifiers(), "toolsZoomIn"))
+		scrActions["toolsZoomIn"]->trigger();
+	if (m_view->m_ScMW->actionManager->compareKeySeqToShortcut(kk, e->modifiers(), "toolsZoomOut"))
+		scrActions["toolsZoomOut"]->trigger();
 	/**If we have a doc and we are not changing the page or zoom level in the status bar */
 	if ((!m_view->m_ScMW->zoomSpinBox->hasFocus()) && (!m_view->m_ScMW->pageSelector->hasFocus()))
 	{
@@ -1386,7 +1389,6 @@
 				resizeBy*=-1.0;
 
 			PageItem *currItem = m_doc->m_Selection->itemAt(0);
-
 			switch (kk)
 			{
 			case Qt::Key_Backspace:
@@ -1397,6 +1399,8 @@
 					{
 						if (m_view->m_ScMW->actionManager->compareKeySeqToShortcut(kk, buttonModifiers, "editClearContents"))
 							scrActions["editClearContents"]->trigger();
+						if (m_view->m_ScMW->actionManager->compareKeySeqToShortcut(kk, buttonModifiers, "editTruncateContents"))
+							scrActions["editTruncateContents"]->trigger();
 					}
 				break;
 			case Qt::Key_Left:




More information about the scribus-commit mailing list