change "paste in place" shortcut to ctrl+shift+V

olivierdalang · mhugent · commit 0a25aadcf0f2 · 2013-03-07T08:28:32.000+01:00
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -493,7 +493,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
   }
 
   //TODO : "Ctrl+Shift+V" is one way to paste, but on some platefoms you can use Shift+Ins and F18 
-  if ( e->matches( QKeySequence::Paste ) || (e->key() == Qt::Key_V && e->modifiers() & Qt::ControlModifier && e->modifiers() & Qt::AltModifier) )
+  if ( e->matches( QKeySequence::Paste ) || (e->key() == Qt::Key_V && e->modifiers() & Qt::ControlModifier && e->modifiers() & Qt::ShiftModifier) )
   {
     QDomDocument doc;
     QClipboard *clipboard = QApplication::clipboard();
@@ -505,7 +505,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
         if ( composition() )
         {
           QPointF pt = mapToScene( mapFromGlobal( QCursor::pos() ) );
-          bool pasteInPlace = (e->modifiers() & Qt::AltModifier);
+          bool pasteInPlace = (e->modifiers() & Qt::ShiftModifier);
           composition()->addItemsFromXML( docElem, doc, 0, true, &pt, pasteInPlace );
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`//TODO : "Ctrl+Shift+V" is one way to paste, but on some platefoms you can use Shift+Ins and F18`
`496`		`- if ( e->matches( QKeySequence::Paste ) \|\| (e->key() == Qt::Key_V && e->modifiers() & Qt::ControlModifier && e->modifiers() & Qt::AltModifier) )`
	`496`	`+ if ( e->matches( QKeySequence::Paste ) \|\| (e->key() == Qt::Key_V && e->modifiers() & Qt::ControlModifier && e->modifiers() & Qt::ShiftModifier) )`
`497`	`497`	`{`
`498`	`498`	`QDomDocument doc;`
`499`	`499`	`QClipboard *clipboard = QApplication::clipboard();`
`@@ -505,7 +505,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`505`	`505`	`if ( composition() )`
`506`	`506`	`{`
`507`	`507`	`QPointF pt = mapToScene( mapFromGlobal( QCursor::pos() ) );`
`508`		`- bool pasteInPlace = (e->modifiers() & Qt::AltModifier);`
	`508`	`+ bool pasteInPlace = (e->modifiers() & Qt::ShiftModifier);`
`509`	`509`	`composition()->addItemsFromXML( docElem, doc, 0, true, &pt, pasteInPlace );`
`510`	`510`	`}`
`511`	`511`	`}`