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

stable cmdui: rename output_log to outputLog

Changeset 5d191b8321bb…

Parent 78660f611adf…

by Steve Borho

Changes to 3 files · Browse files at 5d191b8321bb Showing diff from parent 78660f611adf Diff from another changeset...

Change 1 of 9 Show Entire File tortoisehg/​hgqt/​cmdui.py Stacked
 
153
154
155
156
157
158
 
 
159
160
161
 
278
279
280
281
 
282
283
284
 
287
288
289
290
 
291
292
293
 
662
663
664
665
666
 
 
667
668
669
 
684
685
686
687
 
688
689
690
691
 
692
693
694
 
716
717
718
719
 
720
721
722
 
751
752
753
754
 
755
756
757
 
820
821
822
823
 
824
825
826
 
843
844
845
846
 
847
848
849
 
153
154
155
 
 
 
156
157
158
159
160
 
277
278
279
 
280
281
282
283
 
286
287
288
 
289
290
291
292
 
661
662
663
 
 
664
665
666
667
668
 
683
684
685
 
686
687
688
689
 
690
691
692
693
 
715
716
717
 
718
719
720
721
 
750
751
752
 
753
754
755
756
 
819
820
821
 
822
823
824
825
 
842
843
844
 
845
846
847
848
@@ -153,9 +153,8 @@
  self.useproc = False   self.internallog = useInternal   if useInternal: - self.output_text = LogWidget() - self.output_text.installEventFilter( - qscilib.KeyPressInterceptor(self)) + self.outputLog = LogWidget() + self.outputLog.installEventFilter(qscilib.KeyPressInterceptor(self))     ### Public Methods ###   @@ -278,7 +277,7 @@
  self.thread.progressReceived.connect(self.progress)     if self.internallog: - self.thread.outputReceived.connect(self.output_text.appendLog) + self.thread.outputReceived.connect(self.outputLog.appendLog)   if self.stbar:   self.thread.progressReceived.connect(self.stbar.progress)   @@ -287,7 +286,7 @@
    def clearOutput(self):   if self.internallog: - self.output_text.clear() + self.outputLog.clear()     ### Signal Handlers ###   @@ -662,8 +661,8 @@
  vbox.setContentsMargins(*(1,)*4)     # command output area - self.core.output_text.setHidden(True) - vbox.addWidget(self.core.output_text, 1) + self.core.outputLog.setHidden(True) + vbox.addWidget(self.core.outputLog, 1)     ## status and progress labels   self.stbar = ThgStatusBar() @@ -684,11 +683,11 @@
    def setShowOutput(self, visible):   if self.internallog: - self.core.output_text.setShown(visible) + self.core.outputLog.setShown(visible)     def outputShown(self):   if self.internallog: - return self.core.output_text.isVisible() + return self.core.outputLog.isVisible()   else:   return False   @@ -716,7 +715,7 @@
  vbox.setContentsMargins(*(1,)*4)     # command output area - vbox.addWidget(self.core.output_text, 1) + vbox.addWidget(self.core.outputLog, 1)     ## status and progress labels   self.stbar = ThgStatusBar() @@ -751,7 +750,7 @@
    def setShowOutput(self, visible):   """show/hide command output""" - self.core.output_text.setVisible(visible) + self.core.outputLog.setVisible(visible)   self.detailBtn.setChecked(visible)     # workaround to adjust only window height @@ -820,7 +819,7 @@
  self.core.progress.connect(self.progress)     if useInternal: - self.core.output_text.setMinimumSize(460, 320) + self.core.outputLog.setMinimumSize(460, 320)     ### Public Methods ###   @@ -843,7 +842,7 @@
  self.dlg.setWindowFlags(flags)   box = QVBoxLayout()   box.setContentsMargins(*(0,)*4) - box.addWidget(self.core.output_text) + box.addWidget(self.core.outputLog)   self.dlg.setLayout(box)   self.dlg.setVisible(visible)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
392
393
394
395
 
396
397
398
 
392
393
394
 
395
396
397
398
@@ -392,7 +392,7 @@
  (QMessageBox.No, _('Cancel')))   if qtlib.QuestionMsgBox(_('Confirm Clean Up'), main, text,   labels=labels, parent=self): - o = self.cmd.output_text + o = self.cmd.outputLog   o.appendLog(_('Canceling merge...\n'), 'control')   o.appendLog(_('(Please close any running merge tool)\n'), 'control')   self.cmd.cancel()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​serve.py Stacked
 
36
37
38
39
 
40
41
42
 
36
37
38
 
39
40
41
42
@@ -36,7 +36,7 @@
  def _initcmd(self):   self._cmd = cmdui.Widget()   # TODO: forget old logs? - self._log_edit = self._cmd.core.output_text + self._log_edit = self._cmd.core.outputLog   self._qui.details_tabs.addTab(self._log_edit, _('Log'))   self._cmd.hide()   self._cmd.commandStarted.connect(self._updateform)