When a style manager dialog is opened in read only mode, still allow

symbols to be double clicked to view their properties. Just disable actually saving any edited symbols instead.
qgis · Jul 18, 2019 · a57d04f · a57d04f
1 parent c715bc1
commit a57d04f
Show file tree

Hide file tree

Showing 26 changed files with 236 additions and 55 deletions.
diff --git a/python/gui/auto_generated/qgscolorbrewercolorrampdialog.sip.in b/python/gui/auto_generated/qgscolorbrewercolorrampdialog.sip.in
@@ -90,6 +90,13 @@ Sets the color ramp to show in the dialog.
 :param ramp: color ramp
 
 .. seealso:: :py:func:`ramp`
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
   signals:

diff --git a/python/gui/auto_generated/qgsgradientcolorrampdialog.sip.in b/python/gui/auto_generated/qgsgradientcolorrampdialog.sip.in
@@ -46,6 +46,13 @@ Sets the color ramp to show in the dialog.
 :param ramp: color ramp
 
 .. seealso:: :py:func:`ramp`
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
   signals:

diff --git a/python/gui/auto_generated/qgslimitedrandomcolorrampdialog.sip.in b/python/gui/auto_generated/qgslimitedrandomcolorrampdialog.sip.in
@@ -8,6 +8,7 @@
 
 
 
+
 class QgsLimitedRandomColorRampWidget : QgsPanelWidget
 {
 %Docstring
@@ -121,6 +122,13 @@ Sets the color ramp to show in the dialog.
 :param ramp: color ramp
 
 .. seealso:: :py:func:`ramp`
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
   signals:

diff --git a/python/gui/auto_generated/qgspresetcolorrampdialog.sip.in b/python/gui/auto_generated/qgspresetcolorrampdialog.sip.in
@@ -8,6 +8,7 @@
 
 
 
+
 class QgsPresetColorRampWidget : QgsPanelWidget
 {
 %Docstring
@@ -89,6 +90,13 @@ Sets the color ramp to show in the dialog.
 :param ramp: color ramp
 
 .. seealso:: :py:func:`ramp`
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
   signals:

diff --git a/python/gui/auto_generated/qgstextformatwidget.sip.in b/python/gui/auto_generated/qgstextformatwidget.sip.in
@@ -200,6 +200,13 @@ Constructor for QgsTextFormatDialog.
     QgsTextFormat format() const;
 %Docstring
 Returns the current formatting settings defined by the widget.
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
 };

diff --git a/python/gui/auto_generated/symbology/qgscptcitycolorrampdialog.sip.in b/python/gui/auto_generated/symbology/qgscptcitycolorrampdialog.sip.in
@@ -57,6 +57,13 @@ Returns the name of the ramp currently selected in the dialog.
     bool saveAsGradientRamp() const;
 %Docstring
 Returns ``True`` if the ramp should be converted to a :py:class:`QgsGradientColorRamp`.
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
     virtual bool eventFilter( QObject *obj, QEvent *event );

diff --git a/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in b/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in
@@ -234,6 +234,13 @@ Returns the context in which the symbol widget is shown, e.g., the associated ma
 Returns the symbol that is currently active in the widget. Can be ``None``.
 
 :return: The active symbol.
+%End
+
+    QDialogButtonBox *buttonBox() const;
+%Docstring
+Returns a reference to the dialog's button box.
+
+.. versionadded:: 3.10
 %End
 
   protected:

diff --git a/src/gui/qgscolorbrewercolorrampdialog.cpp b/src/gui/qgscolorbrewercolorrampdialog.cpp
@@ -128,16 +128,21 @@ QgsColorBrewerColorRampDialog::QgsColorBrewerColorRampDialog( const QgsColorBrew
   QVBoxLayout *vLayout = new QVBoxLayout();
   mWidget = new QgsColorBrewerColorRampWidget( ramp );
   vLayout->addWidget( mWidget );
-  QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
-  connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
-  connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
-  connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsColorBrewerColorRampDialog::showHelp );
-  vLayout->addWidget( bbox );
+  mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
+  connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
+  connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
+  connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsColorBrewerColorRampDialog::showHelp );
+  vLayout->addWidget( mButtonBox );
   setLayout( vLayout );
   setWindowTitle( tr( "ColorBrewer Ramp" ) );
   connect( mWidget, &QgsColorBrewerColorRampWidget::changed, this, &QgsColorBrewerColorRampDialog::changed );
 }
 
+QDialogButtonBox *QgsColorBrewerColorRampDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 void QgsColorBrewerColorRampDialog::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );

diff --git a/src/gui/qgscolorbrewercolorrampdialog.h b/src/gui/qgscolorbrewercolorrampdialog.h
@@ -24,6 +24,7 @@
 #include "qgis_sip.h"
 
 class QgsColorBrewerColorRamp;
+class QDialogButtonBox;
 
 /**
  * \ingroup gui
@@ -109,6 +110,12 @@ class GUI_EXPORT QgsColorBrewerColorRampDialog : public QDialog
      */
     void setRamp( const QgsColorBrewerColorRamp &ramp ) { mWidget->setRamp( ramp ); }
 
+    /**
+     * Returns a reference to the dialog's button box.
+     * \since QGIS 3.10
+     */
+    QDialogButtonBox *buttonBox() const;
+
   signals:
 
     //! Emitted when the dialog settings change
@@ -117,6 +124,7 @@ class GUI_EXPORT QgsColorBrewerColorRampDialog : public QDialog
   private:
 
     QgsColorBrewerColorRampWidget *mWidget = nullptr;
+    QDialogButtonBox *mButtonBox = nullptr;
 
   private slots:
 

diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
@@ -155,7 +155,7 @@ QgsGradientColorRampDialog::QgsGradientColorRampDialog( const QgsGradientColorRa
   connect( mStopEditor, &QgsGradientStopEditor::selectedStopChanged, this, &QgsGradientColorRampDialog::selectedStopChanged );
   mStopEditor->selectStop( 0 );
 
-  connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsGradientColorRampDialog::showHelp );
+  connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsGradientColorRampDialog::showHelp );
 }
 
 QgsGradientColorRampDialog::~QgsGradientColorRampDialog()
@@ -179,6 +179,11 @@ void QgsGradientColorRampDialog::setRamp( const QgsGradientColorRamp &ramp )
   emit changed();
 }
 
+QDialogButtonBox *QgsGradientColorRampDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 void QgsGradientColorRampDialog::cboType_currentIndexChanged( int index )
 {
   if ( ( index == 0 && mRamp.isDiscrete() ) ||

diff --git a/src/gui/qgsgradientcolorrampdialog.h b/src/gui/qgsgradientcolorrampdialog.h
@@ -63,6 +63,12 @@ class GUI_EXPORT QgsGradientColorRampDialog : public QDialog, private Ui::QgsGra
      */
     void setRamp( const QgsGradientColorRamp &ramp );
 
+    /**
+     * Returns a reference to the dialog's button box.
+     * \since QGIS 3.10
+     */
+    QDialogButtonBox *buttonBox() const;
+
   signals:
 
     //! Emitted when the dialog settings change

diff --git a/src/gui/qgslabelinggui.cpp b/src/gui/qgslabelinggui.cpp
@@ -1070,14 +1070,19 @@ QgsLabelSettingsDialog::QgsLabelSettingsDialog( const QgsPalLayerSettings &setti
   QVBoxLayout *vLayout = new QVBoxLayout();
   mWidget = new QgsLabelingGui( layer, mapCanvas, settings, nullptr, geomType );
   vLayout->addWidget( mWidget );
-  QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal );
-  connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
-  connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
-  vLayout->addWidget( bbox );
+  mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal );
+  connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
+  connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
+  vLayout->addWidget( mButtonBox );
   setLayout( vLayout );
   setWindowTitle( tr( "Label Settings" ) );
 }
 
+QDialogButtonBox *QgsLabelSettingsDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 
 
 ///@endcond
diff --git a/src/gui/qgslabelinggui.h b/src/gui/qgslabelinggui.h
@@ -23,6 +23,8 @@
 #include "qgspropertyoverridebutton.h"
 #include "qgis_gui.h"
 
+class QDialogButtonBox;
+
 #define SIP_NO_FILE
 
 ///@cond PRIVATE
@@ -132,9 +134,15 @@ class GUI_EXPORT QgsLabelSettingsDialog : public QDialog
 
     QgsPalLayerSettings settings() const { return mWidget->layerSettings(); }
 
+    /**
+     * Returns a reference to the dialog's button box.
+     */
+    QDialogButtonBox *buttonBox() const;
+
   private:
 
     QgsLabelingGui *mWidget = nullptr;
+    QDialogButtonBox *mButtonBox = nullptr;
 
 };
 

diff --git a/src/gui/qgslimitedrandomcolorrampdialog.cpp b/src/gui/qgslimitedrandomcolorrampdialog.cpp
@@ -122,16 +122,21 @@ QgsLimitedRandomColorRampDialog::QgsLimitedRandomColorRampDialog( const QgsLimit
   QVBoxLayout *vLayout = new QVBoxLayout();
   mWidget = new QgsLimitedRandomColorRampWidget( ramp );
   vLayout->addWidget( mWidget );
-  QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
-  connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
-  connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
-  connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsLimitedRandomColorRampDialog::showHelp );
-  vLayout->addWidget( bbox );
+  mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
+  connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
+  connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
+  connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsLimitedRandomColorRampDialog::showHelp );
+  vLayout->addWidget( mButtonBox );
   setLayout( vLayout );
   setWindowTitle( tr( "Random Color Ramp" ) );
   connect( mWidget, &QgsLimitedRandomColorRampWidget::changed, this, &QgsLimitedRandomColorRampDialog::changed );
 }
 
+QDialogButtonBox *QgsLimitedRandomColorRampDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 void QgsLimitedRandomColorRampDialog::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );

diff --git a/src/gui/qgslimitedrandomcolorrampdialog.h b/src/gui/qgslimitedrandomcolorrampdialog.h
@@ -23,6 +23,8 @@
 #include "ui_qgslimitedrandomcolorrampwidgetbase.h"
 #include "qgis_gui.h"
 
+class QDialogButtonBox;
+
 /**
  * \ingroup gui
  * \class QgsLimitedRandomColorRampWidget
@@ -120,6 +122,12 @@ class GUI_EXPORT QgsLimitedRandomColorRampDialog : public QDialog
      */
     void setRamp( const QgsLimitedRandomColorRamp &ramp ) { mWidget->setRamp( ramp ); }
 
+    /**
+     * Returns a reference to the dialog's button box.
+     * \since QGIS 3.10
+     */
+    QDialogButtonBox *buttonBox() const;
+
   signals:
 
     //! Emitted when the dialog settings change
@@ -128,6 +136,7 @@ class GUI_EXPORT QgsLimitedRandomColorRampDialog : public QDialog
   private:
 
     QgsLimitedRandomColorRampWidget *mWidget = nullptr;
+    QDialogButtonBox *mButtonBox = nullptr;
 
   private slots:
 

diff --git a/src/gui/qgspresetcolorrampdialog.cpp b/src/gui/qgspresetcolorrampdialog.cpp
@@ -112,16 +112,21 @@ QgsPresetColorRampDialog::QgsPresetColorRampDialog( const QgsPresetSchemeColorRa
   QVBoxLayout *vLayout = new QVBoxLayout();
   mWidget = new QgsPresetColorRampWidget( ramp );
   vLayout->addWidget( mWidget );
-  QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
-  connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
-  connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
-  connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsPresetColorRampDialog::showHelp );
-  vLayout->addWidget( bbox );
+  mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
+  connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
+  connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
+  connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsPresetColorRampDialog::showHelp );
+  vLayout->addWidget( mButtonBox );
   setLayout( vLayout );
   setWindowTitle( tr( "Color Presets Ramp" ) );
   connect( mWidget, &QgsPresetColorRampWidget::changed, this, &QgsPresetColorRampDialog::changed );
 }
 
+QDialogButtonBox *QgsPresetColorRampDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 void QgsPresetColorRampDialog::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );

diff --git a/src/gui/qgspresetcolorrampdialog.h b/src/gui/qgspresetcolorrampdialog.h
@@ -23,6 +23,8 @@
 #include "ui_qgspresetcolorrampwidgetbase.h"
 #include "qgis_gui.h"
 
+class QDialogButtonBox;
+
 /**
  * \ingroup gui
  * \class QgsPresetColorRampWidget
@@ -108,6 +110,12 @@ class GUI_EXPORT QgsPresetColorRampDialog : public QDialog
      */
     void setRamp( const QgsPresetSchemeColorRamp &ramp ) { mWidget->setRamp( ramp ); }
 
+    /**
+     * Returns a reference to the dialog's button box.
+     * \since QGIS 3.10
+     */
+    QDialogButtonBox *buttonBox() const;
+
   signals:
 
     //! Emitted when the dialog settings change
@@ -116,6 +124,7 @@ class GUI_EXPORT QgsPresetColorRampDialog : public QDialog
   private:
 
     QgsPresetColorRampWidget *mWidget = nullptr;
+    QDialogButtonBox *mButtonBox = nullptr;
 
   private slots:
 

diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
@@ -1686,21 +1686,26 @@ QgsTextFormatDialog::QgsTextFormatDialog( const QgsTextFormat &format, QgsMapCan
   QVBoxLayout *layout = new QVBoxLayout( this );
   layout->addWidget( mFormatWidget );
 
-  QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this );
-  layout->addWidget( buttonBox );
+  mButtonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this );
+  layout->addWidget( mButtonBox );
 
   setLayout( layout );
   QgsGui::instance()->enableAutoGeometryRestore( this );
 
-  connect( buttonBox->button( QDialogButtonBox::Ok ), &QAbstractButton::clicked, this, &QDialog::accept );
-  connect( buttonBox->button( QDialogButtonBox::Cancel ), &QAbstractButton::clicked, this, &QDialog::reject );
+  connect( mButtonBox->button( QDialogButtonBox::Ok ), &QAbstractButton::clicked, this, &QDialog::accept );
+  connect( mButtonBox->button( QDialogButtonBox::Cancel ), &QAbstractButton::clicked, this, &QDialog::reject );
 }
 
 QgsTextFormat QgsTextFormatDialog::format() const
 {
   return mFormatWidget->format();
 }
 
+QDialogButtonBox *QgsTextFormatDialog::buttonBox() const
+{
+  return mButtonBox;
+}
+
 QgsTextFormatPanelWidget::QgsTextFormatPanelWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent )
   : QgsPanelWidgetWrapper( new QgsTextFormatWidget( format, mapCanvas ), parent )
 {