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

cmdui: rename show_output() to setShowOutput()

Changeset 5c476de947b4

Parent ffd118e1fc4d

by Steve Borho

Changes to 17 files · Browse files at 5c476de947b4 Showing diff from parent ffd118e1fc4d Diff from another changeset...

 
327
328
329
330
 
331
332
 
333
334
335
 
327
328
329
 
330
331
 
332
333
334
335
@@ -327,9 +327,9 @@
    def detail_clicked(self):   if self.cmd.is_show_output(): - self.cmd.show_output(False) + self.cmd.setShowOutput(False)   else: - self.cmd.show_output(True) + self.cmd.setShowOutput(True)     def cancel_clicked():   self.cmd.cancel()
 
171
172
173
174
 
175
176
177
 
171
172
173
 
174
175
176
177
@@ -171,7 +171,7 @@
  self.cmd.cancel()     def detail_toggled(self, checked): - self.cmd.show_output(checked) + self.cmd.setShowOutput(checked)     def command_started(self):   self.cmd.setShown(True)
 
53
54
55
56
 
57
58
59
 
53
54
55
 
56
57
58
59
@@ -53,7 +53,7 @@
    ## command widget   self.cmd = cmdui.Widget() - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   box.addWidget(self.cmd, 1)     hbox = QHBoxLayout()
 
305
306
307
308
 
309
310
311
 
305
306
307
 
308
309
310
311
@@ -305,7 +305,7 @@
  self.reject()     def detail_toggled(self, checked): - self.cmd.show_output(checked) + self.cmd.setShowOutput(checked)     def browse_src(self):   FD = QFileDialog
 
682
683
684
685
 
686
687
688
 
698
699
700
701
 
702
703
704
 
739
740
741
742
 
743
744
745
 
749
750
751
752
 
753
754
755
 
830
831
832
833
 
834
835
836
 
850
851
852
853
 
854
 
682
683
684
 
685
686
687
688
 
698
699
700
 
701
702
703
704
 
739
740
741
 
742
743
744
745
 
749
750
751
 
752
753
754
755
 
830
831
832
 
833
834
835
836
 
850
851
852
 
853
854
@@ -682,7 +682,7 @@
  def cancel(self):   self.core.cancel()   - def show_output(self, visible): + def setShowOutput(self, visible):   if self.internallog:   self.core.output_text.setShown(visible)   @@ -698,7 +698,7 @@
  def onCommandFinished(self, ret):   if ret == -1:   self.makeLogVisible.emit(True) - self.show_output(True) + self.setShowOutput(True)   self.commandFinished.emit(ret)    class Dialog(QDialog): @@ -739,7 +739,7 @@
  self.detailBtn.setAutoDefault(False)   self.detailBtn.setCheckable(True)   self.detailBtn.setChecked(True) - self.detailBtn.toggled.connect(self.show_output) + self.detailBtn.toggled.connect(self.setShowOutput)   vbox.addWidget(buttons)     self.setLayout(vbox) @@ -749,7 +749,7 @@
  # start command   self.core.run(cmdline)   - def show_output(self, visible): + def setShowOutput(self, visible):   """show/hide command output"""   self.core.output_text.setVisible(visible)   self.detailBtn.setChecked(visible) @@ -830,7 +830,7 @@
  def cancel(self):   self.core.cancel()   - def show_output(self, visible=True): + def setShowOutput(self, visible=True):   if not self.internallog:   return   if not hasattr(self, 'dlg'): @@ -850,5 +850,5 @@
  def onCommandFinished(self, ret):   if ret != 0:   self.makeLogVisible.emit(True) - self.show_output() + self.setShowOutput(True)   self.commandFinished.emit(ret)
 
52
53
54
55
 
56
57
58
 
52
53
54
 
55
56
57
58
@@ -52,7 +52,7 @@
    self.cmd = cmdui.Widget()   self.cmd.commandFinished.connect(self.commandFinished) - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   self.showMessage.connect(self.cmd.stbar.showMessage)   self.cmd.stbar.linkActivated.connect(self.linkActivated)   self.layout().addWidget(self.cmd, 2)
 
243
244
245
246
 
247
248
249
 
243
244
245
 
246
247
248
249
@@ -243,7 +243,7 @@
  cmd = cmdui.Dialog(['email'] + cmdargs(opts) + list(map(str, self._revs)),   parent=self)   cmd.setWindowTitle(_('Sending Email')) - cmd.show_output(False) + cmd.setShowOutput(False)   if cmd.exec_():   self._writehistory()   super(EmailDialog, self).accept()
 
118
119
120
121
 
122
123
124
 
118
119
120
 
121
122
123
124
@@ -118,7 +118,7 @@
  ppane = QVBoxLayout()   ppane.addSpacing(4)   self.cmd = cmdui.Widget() - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   self.cmd.commandFinished.connect(self.command_finished)   self.cmd.commandCanceling.connect(self.command_canceling)   ppane.addWidget(self.cmd)
 
338
339
340
341
 
342
343
344
 
338
339
340
 
341
342
343
344
@@ -338,7 +338,7 @@
  self.cmd = cmdui.Dialog(['postreview'] + cmdargs(opts) + [revstr],   self, self.onCompletion)   self.cmd.setWindowTitle(_('Posting Review')) - self.cmd.show_output(False) + self.cmd.setShowOutput(False)     @pyqtSlot()   def onCompletion(self):
 
98
99
100
101
 
102
103
104
 
98
99
100
 
101
102
103
104
@@ -98,7 +98,7 @@
  if self.checkResolve() or not (s or d):   for w in (srcb, destb, sep, self.keepchk, self.detachchk):   w.setHidden(True) - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   else:   self.showMessage.emit(_('Checking...'))   QTimer.singleShot(0, self.checkStatus)
 
304
305
306
307
 
308
309
 
310
311
312
 
304
305
306
 
307
308
 
309
310
311
312
@@ -304,9 +304,9 @@
    def detail_clicked(self):   if self.cmd.is_show_output(): - self.cmd.show_output(False) + self.cmd.setShowOutput(False)   else: - self.cmd.show_output(True) + self.cmd.setShowOutput(True)     def cancel_clicked():   self.cmd.cancel()
 
125
126
127
128
 
129
130
131
 
125
126
127
 
128
129
130
131
@@ -125,7 +125,7 @@
  self.layout().addWidget(out)   self.cmd = cmdui.Widget(True, self)   self.cmd.commandFinished.connect(self.refresh) - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   self.layout().addWidget(self.cmd)     BB = QDialogButtonBox
 
37
38
39
40
 
41
42
43
 
62
63
64
65
 
66
67
68
 
37
38
39
 
40
41
42
43
 
62
63
64
 
65
66
67
68
@@ -37,7 +37,7 @@
  self.layout().addWidget(self.allchk)     self.cmd = cmdui.Widget() - self.cmd.show_output(False) + self.cmd.setShowOutput(False)   self.cmd.stbar.setVisible(False)   self.cmd.commandFinished.connect(self.finished)   self.layout().addWidget(self.cmd, 1) @@ -62,7 +62,7 @@
  else:   cmdline = ['revert', '--repository', self.repo.root, self.wfile]   cmdline += ['--rev', self.rev] - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   self.cmd.stbar.setVisible(True)   self.cmd.run(cmdline)  
 
497
498
499
500
 
501
502
503
 
497
498
499
 
500
501
502
503
@@ -497,7 +497,7 @@
  if b: b.setEnabled(False)   self.stopAction.setEnabled(True)   if not self.embedded: - self.cmd.show_output(True) + self.cmd.setShowOutput(True)   self.cmd.setVisible(True)     def commandFinished(self, ret):
 
294
295
296
297
 
298
299
300
 
294
295
296
 
297
298
299
300
@@ -294,7 +294,7 @@
  self.reject()     def detail_toggled(self, checked): - self.cmd.show_output(checked) + self.cmd.setShowOutput(checked)     def command_started(self):   self.cmd.setShown(True)
 
223
224
225
226
 
227
228
229
 
223
224
225
 
226
227
228
229
@@ -223,7 +223,7 @@
  self.reject()     def detail_toggled(self, checked): - self.cmd.show_output(checked) + self.cmd.setShowOutput(checked)     def show_options(self, visible):   self.nobackup_chk.setShown(visible)
 
271
272
273
274
 
275
276
277
 
271
272
273
 
274
275
276
277
@@ -271,7 +271,7 @@
  self.reject()     def detail_toggled(self, checked): - self.cmd.show_output(checked) + self.cmd.setShowOutput(checked)     def show_options(self, visible):   self.merge_chk.setShown(visible)