Skip to content

Commit 1d6d4be

Browse files
nyalldawsonnyalldawson
committedJun 11, 2017
Correctly reject algorithm dialog
Algorithm dialog was not being rejected when close button was called (only hidden), leading to old dialogs and widgets hanging around forever...
·
ltr-3_40final-3_0_0
1 parent aa544a1 commit 1d6d4be

File tree

4 files changed

+18
-69
lines changed

4 files changed

+18
-69
lines changed
 

‎python/plugins/processing/gui/AlgorithmDialog.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,3 @@ def finish(self, result, context, feedback):
274274
self.setInfo(
275275
self.tr('HTML output has been generated by this algorithm.'
276276
'\nOpen the results dialog to check it.'))
277-
278-
def closeEvent(self, event):
279-
QgsProject.instance().layerWasAdded.disconnect(self.mainWidget.layerRegistryChanged)
280-
QgsProject.instance().layersWillBeRemoved.disconnect(self.mainWidget.layerRegistryChanged)
281-
super(AlgorithmDialog, self).closeEvent(event)

‎python/plugins/processing/gui/AlgorithmDialogBase.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,17 @@ def __init__(self, alg):
107107

108108
self.setWindowTitle(self.alg.displayName())
109109

110+
self.buttonBox.rejected.connect(self.reject)
111+
self.buttonBox.accepted.connect(self.accept)
112+
110113
# Rename OK button to Run
111114
self.btnRun = self.buttonBox.button(QDialogButtonBox.Ok)
112115
self.btnRun.setText(self.tr('Run'))
113116

114117
self.buttonCancel.setEnabled(False)
115118

116119
self.btnClose = self.buttonBox.button(QDialogButtonBox.Close)
120+
117121
self.buttonBox.helpRequested.connect(self.openHelp)
118122

119123
self.btnCollapse.clicked.connect(self.toggleCollapsed)

‎python/plugins/processing/gui/ProcessingToolbox.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ def executeAlgorithm(self):
267267

268268
if alg.countVisibleParameters() > 0:
269269
dlg = alg.createCustomParametersWidget(self)
270+
270271
if not dlg:
271272
dlg = AlgorithmDialog(alg)
272273
canvas = iface.mapCanvas()

‎python/plugins/processing/ui/DlgAlgorithmBase.ui

Lines changed: 13 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
<property name="spacing">
4747
<number>2</number>
4848
</property>
49-
<property name="leftMargin">
50-
<number>0</number>
51-
</property>
52-
<property name="topMargin">
53-
<number>0</number>
54-
</property>
55-
<property name="rightMargin">
56-
<number>0</number>
57-
</property>
58-
<property name="bottomMargin">
49+
<property name="leftMargin">
50+
<number>0</number>
51+
</property>
52+
<property name="topMargin">
53+
<number>0</number>
54+
</property>
55+
<property name="rightMargin">
56+
<number>0</number>
57+
</property>
58+
<property name="bottomMargin">
5959
<number>0</number>
6060
</property>
6161
</layout>
@@ -68,16 +68,7 @@
6868
<property name="spacing">
6969
<number>2</number>
7070
</property>
71-
<property name="leftMargin">
72-
<number>0</number>
73-
</property>
74-
<property name="topMargin">
75-
<number>0</number>
76-
</property>
77-
<property name="rightMargin">
78-
<number>0</number>
79-
</property>
80-
<property name="bottomMargin">
71+
<property name="leftMargin">
8172
<number>0</number>
8273
</property>
8374
<property name="topMargin">
@@ -86,16 +77,7 @@
8677
<property name="rightMargin">
8778
<number>0</number>
8879
</property>
89-
<property name="leftMargin">
90-
<number>0</number>
91-
</property>
92-
<property name="topMargin">
93-
<number>0</number>
94-
</property>
95-
<property name="rightMargin">
96-
<number>0</number>
97-
</property>
98-
<property name="bottomMargin">
80+
<property name="bottomMargin">
9981
<number>0</number>
10082
</property>
10183
<item>
@@ -165,38 +147,5 @@
165147
</layout>
166148
</widget>
167149
<resources/>
168-
<connections>
169-
<connection>
170-
<sender>buttonBox</sender>
171-
<signal>accepted()</signal>
172-
<receiver>Dialog</receiver>
173-
<slot>accept()</slot>
174-
<hints>
175-
<hint type="sourcelabel">
176-
<x>248</x>
177-
<y>254</y>
178-
</hint>
179-
<hint type="destinationlabel">
180-
<x>157</x>
181-
<y>274</y>
182-
</hint>
183-
</hints>
184-
</connection>
185-
<connection>
186-
<sender>buttonBox</sender>
187-
<signal>rejected()</signal>
188-
<receiver>Dialog</receiver>
189-
<slot>reject()</slot>
190-
<hints>
191-
<hint type="sourcelabel">
192-
<x>316</x>
193-
<y>260</y>
194-
</hint>
195-
<hint type="destinationlabel">
196-
<x>286</x>
197-
<y>274</y>
198-
</hint>
199-
</hints>
200-
</connection>
201-
</connections>
150+
<connections/>
202151
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.