After creating an item with the add item tool, switch immediately to …

…select tool
qgis · Nov 7, 2017 · c0b63a6 · c0b63a6
1 parent 3678f01
commit c0b63a6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/python/gui/layout/qgslayoutviewtooladditem.sip b/python/gui/layout/qgslayoutviewtooladditem.sip
@@ -44,6 +44,13 @@ class QgsLayoutViewToolAddItem : QgsLayoutViewTool
     virtual void deactivate();
 
 
+  signals:
+
+    void createdItem();
+%Docstring
+ Emitted when an item has been created using the tool.
+%End
+
 };
 
 /************************************************************************

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -236,6 +236,8 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
   mSelectTool->setAction( mActionSelectMoveItem );
   mToolsActionGroup->addAction( mActionSelectMoveItem );
   connect( mActionSelectMoveItem, &QAction::triggered, mSelectTool, [ = ] { mView->setTool( mSelectTool ); } );
+  // after creating an item with the add item tool, switch immediately to select tool
+  connect( mAddItemTool, &QgsLayoutViewToolAddItem::createdItem, this, [ = ] { mView->setTool( mSelectTool ); } );
 
   //Ctrl+= should also trigger zoom in
   QShortcut *ctrlEquals = new QShortcut( QKeySequence( QStringLiteral( "Ctrl+=" ) ), this );

diff --git a/src/gui/layout/qgslayoutviewtooladditem.cpp b/src/gui/layout/qgslayoutviewtooladditem.cpp
@@ -119,6 +119,7 @@ void QgsLayoutViewToolAddItem::layoutReleaseEvent( QgsLayoutViewMouseEvent *even
 
   layout()->addLayoutItem( item );
   layout()->setSelectedItem( item );
+  emit createdItem();
 }
 
 void QgsLayoutViewToolAddItem::deactivate()

diff --git a/src/gui/layout/qgslayoutviewtooladditem.h b/src/gui/layout/qgslayoutviewtooladditem.h
@@ -53,6 +53,13 @@ class GUI_EXPORT QgsLayoutViewToolAddItem : public QgsLayoutViewTool
     void layoutReleaseEvent( QgsLayoutViewMouseEvent *event ) override;
     void deactivate() override;
 
+  signals:
+
+    /**
+     * Emitted when an item has been created using the tool.
+     */
+    void createdItem();
+
   private:
 
     bool mDrawing = false;