Remove action for creating old text annotations

The new Text in Rect annotation item should be used instead
qgis · Aug 19, 2024 · 2738289 · 2738289
1 parent 45be3ee
commit 2738289
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 102 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -104,7 +104,6 @@ set(QGIS_APP_SRCS
   qgsmaptoolsimplify.cpp
   qgsmaptoolsplitfeatures.cpp
   qgsmaptoolsplitparts.cpp
-  qgsmaptooltextannotation.cpp
 
   annotations/qgsannotationitempropertieswidget.cpp
   annotations/qgsannotationlayerproperties.cpp

diff --git a/src/app/maptools/qgsappmaptools.cpp b/src/app/maptools/qgsappmaptools.cpp
@@ -23,7 +23,6 @@
 #include "qgsmaptoolpan.h"
 #include "qgsmaptoolfeatureaction.h"
 #include "qgsmeasuretool.h"
-#include "qgsmaptooltextannotation.h"
 #include "qgsmaptoolhtmlannotation.h"
 #include "qgsmaptoolmeasureangle.h"
 #include "qgsmaptoolmeasurebearing.h"
@@ -70,7 +69,6 @@ QgsAppMapTools::QgsAppMapTools( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockW
   mTools.insert( Tool::MeasureArea, new QgsMeasureTool( canvas, true /* area */ ) );
   mTools.insert( Tool::MeasureAngle, new QgsMapToolMeasureAngle( canvas ) );
   mTools.insert( Tool::MeasureBearing, new QgsMapToolMeasureBearing( canvas ) );
-  mTools.insert( Tool::TextAnnotation, new QgsMapToolTextAnnotation( canvas ) );
   mTools.insert( Tool::FormAnnotation, new QgsMapToolFormAnnotation( canvas ) );
   mTools.insert( Tool::HtmlAnnotation, new QgsMapToolHtmlAnnotation( canvas ) );
   mTools.insert( Tool::AddFeature, new QgsMapToolAddFeature( canvas, cadDock, QgsMapToolCapture::CaptureNone ) );

diff --git a/src/app/maptools/qgsappmaptools.h b/src/app/maptools/qgsappmaptools.h
@@ -68,7 +68,6 @@ class QgsAppMapTools
       Annotation, // Unused
       FormAnnotation,
       HtmlAnnotation,
-      TextAnnotation,
       PinLabels,
       ShowHideLabels,
       MoveLabel,

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3021,7 +3021,6 @@ void QgisApp::createActions()
   connect( mActionMapTips, &QAction::toggled, this, &QgisApp::toggleMapTips );
   connect( mActionNewBookmark, &QAction::triggered, this, [ = ] { newBookmark( true );  } );
   connect( mActionDraw, &QAction::triggered, this, [this] { refreshMapCanvas( true ); } );
-  connect( mActionTextAnnotation, &QAction::triggered, this, &QgisApp::addTextAnnotation );
   connect( mActionFormAnnotation, &QAction::triggered, this, &QgisApp::addFormAnnotation );
   connect( mActionHtmlAnnotation, &QAction::triggered, this, &QgisApp::addHtmlAnnotation );
   connect( mActionLabeling, &QAction::triggered, this, &QgisApp::labeling );
@@ -3966,22 +3965,18 @@ void QgisApp::createToolBars()
 
   bt = new QToolButton();
   bt->setPopupMode( QToolButton::MenuButtonPopup );
-  bt->addAction( mActionTextAnnotation );
   bt->addAction( mActionFormAnnotation );
   bt->addAction( mActionHtmlAnnotation );
 
-  QAction *defAnnotationAction = mActionTextAnnotation;
+  QAction *defAnnotationAction = mActionHtmlAnnotation;
   switch ( settings.value( QStringLiteral( "UI/annotationTool" ), 0 ).toInt() )
   {
     case 0:
-      defAnnotationAction = mActionTextAnnotation;
+      defAnnotationAction = mActionHtmlAnnotation;
       break;
     case 1:
       defAnnotationAction = mActionFormAnnotation;
       break;
-    case 2:
-      defAnnotationAction = mActionHtmlAnnotation;
-      break;
   }
   bt->setDefaultAction( defAnnotationAction );
   QAction *annotationAction = mAnnotationsToolBar->addWidget( bt );
@@ -4359,7 +4354,6 @@ void QgisApp::setTheme( const QString &themeName )
   mActionAddToOverview->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionInOverview.svg" ) ) );
   mActionFormAnnotation->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFormAnnotation.svg" ) ) );
   mActionHtmlAnnotation->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionHtmlAnnotation.svg" ) ) );
-  mActionTextAnnotation->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionTextAnnotation.svg" ) ) );
   mActionLabeling->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionLabeling.svg" ) ) );
   mActionShowPinnedLabels->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowPinnedLabels.svg" ) ) );
   mActionPinLabels->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionPinLabels.svg" ) ) );
@@ -4579,7 +4573,6 @@ void QgisApp::setupCanvasTools()
   mMapTools->mapTool( QgsAppMapTools::MeasureArea )->setAction( mActionMeasureArea );
   mMapTools->mapTool( QgsAppMapTools::MeasureAngle )->setAction( mActionMeasureAngle );
   mMapTools->mapTool( QgsAppMapTools::MeasureBearing )->setAction( mActionMeasureBearing );
-  mMapTools->mapTool( QgsAppMapTools::TextAnnotation )->setAction( mActionTextAnnotation );
   mMapTools->mapTool( QgsAppMapTools::FormAnnotation )->setAction( mActionFormAnnotation );
   mMapTools->mapTool( QgsAppMapTools::HtmlAnnotation )->setAction( mActionHtmlAnnotation );
   mMapTools->mapTool( QgsAppMapTools::AddFeature )->setAction( mActionAddFeature );
@@ -7933,11 +7926,6 @@ void QgisApp::addHtmlAnnotation()
   mMapCanvas->setMapTool( mMapTools->mapTool( QgsAppMapTools::HtmlAnnotation ) );
 }
 
-void QgisApp::addTextAnnotation()
-{
-  mMapCanvas->setMapTool( mMapTools->mapTool( QgsAppMapTools::TextAnnotation ) );
-}
-
 void QgisApp::reprojectAnnotations()
 {
   const auto annotations = annotationItems();
@@ -17015,12 +17003,10 @@ void QgisApp::toolButtonActionTriggered( QAction *action )
     settings.setValue( QStringLiteral( "UI/measureTool" ), 1 );
   else if ( action == mActionMeasureAngle )
     settings.setValue( QStringLiteral( "UI/measureTool" ), 2 );
-  else if ( action == mActionTextAnnotation )
-    settings.setValue( QStringLiteral( "UI/annotationTool" ), 0 );
   else if ( action == mActionFormAnnotation )
     settings.setValue( QStringLiteral( "UI/annotationTool" ), 1 );
   else if ( action == mActionHtmlAnnotation )
-    settings.setValue( QStringLiteral( "UI/annotationTool" ), 2 );
+    settings.setValue( QStringLiteral( "UI/annotationTool" ), 0 );
   else if ( action == mActionNewSpatiaLiteLayer )
     settings.setValue( QStringLiteral( "UI/defaultNewLayer" ), 0 );
   else if ( action == mActionNewVectorLayer )

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1947,7 +1947,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     //annotations
     void addFormAnnotation();
-    void addTextAnnotation();
     void addHtmlAnnotation();
     void reprojectAnnotations();
 

diff --git a/src/app/qgsmaptooltextannotation.cpp b/src/app/qgsmaptooltextannotation.cpp
diff --git a/src/app/qgsmaptooltextannotation.h b/src/app/qgsmaptooltextannotation.h
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -349,7 +349,6 @@
      <property name="title">
       <string>Add Annotation</string>
      </property>
-     <addaction name="mActionTextAnnotation"/>
      <addaction name="mActionFormAnnotation"/>
      <addaction name="mActionHtmlAnnotation"/>
     </widget>
@@ -1506,18 +1505,6 @@ Shift+O to turn segments into straight or curve lines.</string>
     <string>F5</string>
    </property>
   </action>
-  <action name="mActionTextAnnotation">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionTextAnnotation.svg</normaloff>:/images/themes/default/mActionTextAnnotation.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Text Annotation</string>
-   </property>
-  </action>
   <action name="mActionFormAnnotation">
    <property name="checkable">
     <bool>true</bool>