Move map view crs setting to menu

Author: nyalldawson

src/app/qgsmapcanvasdockwidget.cpp

@@ -43,7 +43,6 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
 
   mMainWidget->layout()->addWidget( mMapCanvas );
 
-  connect( mActionSetCrs, &QAction::triggered, this, &QgsMapCanvasDockWidget::setMapCrs );
   connect( mActionSyncView, &QAction::toggled, this, &QgsMapCanvasDockWidget::syncView );
 
   QMenu *menu = new QMenu();
@@ -54,6 +53,11 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
   toolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionMapSettings.svg" ) ) );
   mToolbar->addWidget( toolButton );
 
+  connect( mActionSetCrs, &QAction::triggered, this, &QgsMapCanvasDockWidget::setMapCrs );
+  connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsMapCanvasDockWidget::mapCrsChanged );
+  mapCrsChanged();
+  menu->addAction( mActionSetCrs );
+
   QgsMapSettingsAction *settingsAction = new QgsMapSettingsAction( menu );
   menu->addAction( settingsAction );
   mScaleCombo = settingsAction->scaleCombo();
@@ -188,6 +192,13 @@ void QgsMapCanvasDockWidget::mapExtentChanged()
   syncView( true );
 }
 
+void QgsMapCanvasDockWidget::mapCrsChanged()
+{
+  mActionSetCrs->setText( tr( "Change Map CRS (%1)" ).arg( mMapCanvas->mapSettings().destinationCrs().isValid() ?
+                          mMapCanvas->mapSettings().destinationCrs().authid() :
+                          tr( "No projection" ) ) );
+}
+
 QgsMapSettingsAction::QgsMapSettingsAction( QWidget *parent )
   : QWidgetAction( parent )
 {

src/app/qgsmapcanvasdockwidget.h

@@ -61,6 +61,7 @@ class APP_EXPORT QgsMapCanvasDockWidget : public QgsDockWidget, private Ui::QgsM
     void setMapCrs();
     void syncView( bool enabled );
     void mapExtentChanged();
+    void mapCrsChanged();
 
   private:
 

src/ui/qgsmapcanvasdockwidgetbase.ui

@@ -41,7 +41,6 @@
       <property name="floatable">
        <bool>false</bool>
       </property>
-      <addaction name="mActionSetCrs"/>
       <addaction name="mActionSyncView"/>
      </widget>
     </item>