avoid adding unclear API

qgis · May 11, 2021 · c8c534d · c8c534d
1 parent f29fbd9
commit c8c534d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 47 deletions.
diff --git a/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in b/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in
@@ -119,7 +119,7 @@ Initialize the parameters model so the context and the layer are referenced.
 
     QString currentSvgPath() const;
 
-    QgsAbstractFileContentSourceLineEdit *sourceLineEdit() const;
+    QgsPictureSourceLineEditBase *sourceLineEdit() const;
 %Docstring
 Returns the source line edit
 
@@ -151,22 +151,6 @@ Defines if the SVG browser should be visible
 %Docstring
 Returns if the SVG browser should be visible
 
-.. versionadded:: 3.20
-%End
-
-    void setAllowAnyImage( bool allowAnyImage );
-%Docstring
-Defines if the widget should allow any raster or SVG image
-or if the file chooser will be limited to open SVG files
-
-.. versionadded:: 3.20
-%End
-
-    bool allowAnyImage() const;
-%Docstring
-Returns if the widget should allow any raster or SVG image
-or if the file chooser will be limited to open SVG files
-
 .. versionadded:: 3.20
 %End
 

diff --git a/src/gui/layout/qgslayoutpicturewidget.cpp b/src/gui/layout/qgslayoutpicturewidget.cpp
@@ -450,7 +450,11 @@ void QgsLayoutPictureWidget::modeChanged( bool checked )
   bool svg = mRadioSVG->isChecked();
   const QgsLayoutItemPicture::Format newFormat = svg ? QgsLayoutItemPicture::FormatSVG : QgsLayoutItemPicture::FormatRaster;
 
-  mSvgSelectorWidget->setAllowAnyImage( !svg );
+  if ( svg )
+    mSvgSelectorWidget->sourceLineEdit()->setMode( QgsPictureSourceLineEditBase::Svg );
+  else
+    mSvgSelectorWidget->sourceLineEdit()->setMode( QgsPictureSourceLineEditBase::Image );
+
   mSvgSelectorWidget->setBrowserVisible( svg );
   mSvgSelectorWidget->setAllowParameters( svg );
   mSVGParamsGroupBox->setVisible( svg );

diff --git a/src/gui/symbology/qgssvgselectorwidget.cpp b/src/gui/symbology/qgssvgselectorwidget.cpp
@@ -393,8 +393,6 @@ QgsSvgSelectorWidget::QgsSvgSelectorWidget( QWidget *parent )
   // TODO: in-code gui setup with option to vertically or horizontally stack SVG groups/images widgets
   setupUi( this );
 
-  setAllowAnyImage( mAllowAnyImage );
-
   mIconSize = std::max( 30, static_cast< int >( std::round( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 3 ) ) );
   mImagesListView->setGridSize( QSize( mIconSize * 1.2, mIconSize * 1.2 ) );
   mImagesListView->setUniformItemSizes( false );
@@ -494,16 +492,6 @@ void QgsSvgSelectorWidget::setBrowserVisible( bool visible )
   mSvgBrowserGroupBox->setVisible( visible );
 }
 
-void QgsSvgSelectorWidget::setAllowAnyImage( bool allowAnyImage )
-{
-  mAllowAnyImage = allowAnyImage;
-
-  if ( allowAnyImage )
-    mSourceLineEdit->setMode( QgsPictureSourceLineEditBase::Image );
-  else
-    mSourceLineEdit->setMode( QgsPictureSourceLineEditBase::Svg );
-}
-
 QgsPropertyOverrideButton *QgsSvgSelectorWidget::propertyOverrideToolButton() const
 {
   return mSourceLineEdit->propertyOverrideToolButton();

diff --git a/src/gui/symbology/qgssvgselectorwidget.h b/src/gui/symbology/qgssvgselectorwidget.h
@@ -44,7 +44,6 @@ class QTreeView;
 
 class QgsExpressionContextGenerator;
 class QgsSvgSelectorListModel;
-class QgsAbstractFileContentSourceLineEdit;
 class QgsPropertyOverrideButton;
 
 
@@ -398,7 +397,7 @@ class GUI_EXPORT QgsSvgSelectorWidget : public QWidget, private Ui::WidgetSvgSel
      * Returns the source line edit
      * \since QGIS 3.16
      */
-    QgsAbstractFileContentSourceLineEdit *sourceLineEdit() const {return mSourceLineEdit;}
+    QgsPictureSourceLineEditBase *sourceLineEdit() const {return mSourceLineEdit;}
 
     /**
      * Defines if the group box to fill parameters is visible
@@ -424,20 +423,6 @@ class GUI_EXPORT QgsSvgSelectorWidget : public QWidget, private Ui::WidgetSvgSel
      */
     bool browserVisible() const {return mBrowserVisible;}
 
-    /**
-     * Defines if the widget should allow any raster or SVG image
-     * or if the file chooser will be limited to open SVG files
-     * \since QGIS 3.20
-     */
-    void setAllowAnyImage( bool allowAnyImage );
-
-    /**
-     * Returns if the widget should allow any raster or SVG image
-     * or if the file chooser will be limited to open SVG files
-     * \since QGIS 3.20
-     */
-    bool allowAnyImage() const {return mAllowAnyImage;}
-
     /**
      * Returns the property override tool button of the file line edit
      * \since QGIS 3.20
@@ -474,7 +459,6 @@ class GUI_EXPORT QgsSvgSelectorWidget : public QWidget, private Ui::WidgetSvgSel
 
   private:
     int mIconSize = 30;
-    bool mAllowAnyImage = false;
     QString mCurrentSvgPath; //!< Always stored as absolute path
     bool mAllowParameters = false;
     bool mBrowserVisible = true;