Skip to content

Commit c11319b

Browse files
committed
Fix button box in options dialog not working (fix #11960)
QgsOptionsDialogBase was incorrectly finding the projection selector's buttonBox widget and attaching the connections to that widget, rather than the dialog's widget. Rename projection selector's button box to avoid this conflict.
1 parent 7057af3 commit c11319b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

python/gui/qgsgenericprojectionselector.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsGenericProjectionSelector : QDialog //, private Ui::QgsGenericProjectio
3131
void setSelectedCrsId( long theID );
3232
void setSelectedAuthId( QString authId );
3333

34-
void on_buttonBox_helpRequested();
34+
void on_mButtonBox_helpRequested();
3535

3636
/**
3737
* \brief filters this dialog by the given CRSs

src/gui/qgsgenericprojectionselector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsG
6969
void setSelectedCrsId( long theID );
7070
void setSelectedAuthId( QString authId );
7171

72-
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
72+
void on_mButtonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
7373

7474
/**
7575
* \brief filters this dialog by the given CRSs

src/ui/qgsgenericprojectionselectorbase.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<widget class="QgsProjectionSelector" name="projectionSelector" native="true"/>
5858
</item>
5959
<item row="2" column="0">
60-
<widget class="QDialogButtonBox" name="buttonBox">
60+
<widget class="QDialogButtonBox" name="mButtonBox">
6161
<property name="standardButtons">
6262
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
6363
</property>
@@ -80,7 +80,7 @@
8080
<resources/>
8181
<connections>
8282
<connection>
83-
<sender>buttonBox</sender>
83+
<sender>mButtonBox</sender>
8484
<signal>accepted()</signal>
8585
<receiver>QgsGenericProjectionSelectorBase</receiver>
8686
<slot>accept()</slot>
@@ -96,7 +96,7 @@
9696
</hints>
9797
</connection>
9898
<connection>
99-
<sender>buttonBox</sender>
99+
<sender>mButtonBox</sender>
100100
<signal>rejected()</signal>
101101
<receiver>QgsGenericProjectionSelectorBase</receiver>
102102
<slot>reject()</slot>

0 commit comments

Comments
 (0)