Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable merge: Avoid having two "Cancel" buttons in some situations.

It seems like setting one of the Wizard buttons to "hidden" doesn't really work.

Changeset a392e92938c3…

Parent 55f7c0e77873…

by Daniel Atallah

Changes to one file · Browse files at a392e92938c3 Showing diff from parent 55f7c0e77873 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
159
160
161
 
162
163
164
165
166
167
168
 
169
170
171
 
159
160
161
162
163
164
165
166
167
168
 
169
170
171
172
@@ -159,13 +159,14 @@
  self.wizard().button(QWizard.NextButton).setShown(True)   self.wizard().setOption(QWizard.HaveHelpButton, False)   self.wizard().setOption(QWizard.HaveCustomButton1, False) + self.wizard().setOption(QWizard.NoCancelButton, False)   elif pane == PERFORM_PANE:   button = QPushButton(_('Cancel'))   self.wizard().setButton(QWizard.CustomButton1, button)   self.wizard().setOption(QWizard.HaveCustomButton1, True)   button.clicked.connect(self.cancel_clicked)   self.wizard().button(QWizard.NextButton).setHidden(True) - self.wizard().button(QWizard.CancelButton).setHidden(True) + self.wizard().setOption(QWizard.NoCancelButton, True)   else:   raise 'unknown pane: %s' % pane