reuse existing SVG selector widget in QgsSvgMarkerSymbolLayerWidget

qgis · Oct 16, 2020 · 29b76f4 · 29b76f4
1 parent 1763626
commit 29b76f4
Show file tree

Hide file tree

Showing 13 changed files with 177 additions and 479 deletions.
diff --git a/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in b/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in
@@ -59,6 +59,13 @@ Returns the current file source.
 %Docstring
 Sets a specific settings ``key`` to use when storing the last
 used path for the file source.
+%End
+
+    QgsPropertyOverrideButton *fileToolButton() const;
+%Docstring
+Returns the file tool button
+
+.. versionadded:: 3.16
 %End
 
   public slots:

diff --git a/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in b/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in
@@ -84,6 +84,13 @@ Constructor for QgsSvgSelectorWidget
 
     QString currentSvgPath() const;
 
+    QgsSvgSourceLineEdit *sourceLineEdit() const;
+%Docstring
+Returns the source line edit
+
+.. versionadded:: 3.16
+%End
+
   public slots:
     void setSvgPath( const QString &svgPath );
 %Docstring

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -556,7 +556,6 @@ SET(QGIS_GUI_SRCS
   qgsstyleitemslistwidget.cpp
   qgssublayersdialog.cpp
   qgssubstitutionlistwidget.cpp
-  qgssvgbrowserwidget.cpp
   qgssqlcomposerdialog.cpp
   qgsstatusbar.cpp
   qgssymbolbutton.cpp
@@ -796,7 +795,6 @@ SET(QGIS_GUI_HDRS
   qgsstyleitemslistwidget.h
   qgssublayersdialog.h
   qgssubstitutionlistwidget.h
-  qgssvgbrowserwidget.h
   qgssymbolbutton.h
   qgssymbollayerselectionwidget.h
   qgstablewidgetbase.h

diff --git a/src/gui/qgsfilecontentsourcelineedit.cpp b/src/gui/qgsfilecontentsourcelineedit.cpp
@@ -17,6 +17,7 @@
 #include "qgssettings.h"
 #include "qgsmessagebar.h"
 #include "qgsfilterlineedit.h"
+#include "qgspropertyoverridebutton.h"
 #include <QMenu>
 #include <QLineEdit>
 #include <QToolButton>
@@ -35,7 +36,7 @@ QgsAbstractFileContentSourceLineEdit::QgsAbstractFileContentSourceLineEdit( QWid
   layout->setContentsMargins( 0, 0, 0, 0 );
   mFileLineEdit = new QgsFilterLineEdit( this );
   mFileLineEdit->setShowClearButton( true );
-  mFileToolButton = new QToolButton( this );
+  mFileToolButton = new QgsPropertyOverrideButton( this );
   mFileToolButton->setText( QString( QChar( 0x2026 ) ) );
   layout->addWidget( mFileLineEdit, 1 );
   layout->addWidget( mFileToolButton );

diff --git a/src/gui/qgsfilecontentsourcelineedit.h b/src/gui/qgsfilecontentsourcelineedit.h
@@ -24,6 +24,7 @@
 class QgsFilterLineEdit;
 class QToolButton;
 class QgsMessageBar;
+class QgsPropertyOverrideButton;
 
 /**
  * \ingroup gui
@@ -36,13 +37,8 @@ class QgsMessageBar;
  *
  * \since QGIS 3.6
  */
-#ifndef SIP_RUN
-class GUI_EXPORT QgsAbstractFileContentSourceLineEdit : public QWidget
-{
-#else
 class GUI_EXPORT QgsAbstractFileContentSourceLineEdit : public QWidget SIP_ABSTRACT
 {
-#endif
     Q_OBJECT
     Q_PROPERTY( QString source READ source WRITE setSource NOTIFY sourceChanged )
 
@@ -79,6 +75,12 @@ class GUI_EXPORT QgsAbstractFileContentSourceLineEdit : public QWidget SIP_ABSTR
      */
     void setLastPathSettingsKey( const QString &key );
 
+    /**
+     * Returns the file tool button
+     * \since QGIS 3.16
+     */
+    QgsPropertyOverrideButton *fileToolButton() const {return mFileToolButton;}
+
   public slots:
 
     /**
@@ -156,7 +158,7 @@ class GUI_EXPORT QgsAbstractFileContentSourceLineEdit : public QWidget SIP_ABSTR
     Mode mMode = ModeFile;
 
     QgsFilterLineEdit *mFileLineEdit = nullptr;
-    QToolButton *mFileToolButton = nullptr;
+    QgsPropertyOverrideButton *mFileToolButton = nullptr;
     QString mLastPathKey;
     QString mBase64;
     QgsMessageBar *mMessageBar = nullptr;

diff --git a/src/gui/qgssvgbrowserwidget.cpp b/src/gui/qgssvgbrowserwidget.cpp
diff --git a/src/gui/qgssvgbrowserwidget.h b/src/gui/qgssvgbrowserwidget.h
diff --git a/src/gui/symbology/qgssvgselectorwidget.h b/src/gui/symbology/qgssvgselectorwidget.h
@@ -262,6 +262,12 @@ class GUI_EXPORT QgsSvgSelectorWidget : public QWidget, private Ui::WidgetSvgSel
 
     QString currentSvgPath() const;
 
+    /**
+     * Returns the source line edit
+     * \since QGIS 3.16
+     */
+    QgsSvgSourceLineEdit *sourceLineEdit() const {return mSvgSourceLineEdit;}
+
   public slots:
     //! Accepts absolute paths
     void setSvgPath( const QString &svgPath );