We are currently indexing your data, so search results may be incomplete until we finish.
cmdui: divide Dialog class into Core, Widget and Dialog
Changeset 7e34e7599108…
Parent 5c77ff29acc8…
by
Changes to one file · Browse files at 7e34e7599108 Showing diff from parent 5c77ff29acc8 Diff from another changeset...
|
|
|
@@ -5,9 +5,10 @@ # This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from PyQt4.QtCore import Qt
+from PyQt4.QtCore import Qt, QObject, pyqtSignal
from PyQt4.QtGui import QDialog, QDialogButtonBox, QLabel, QProgressBar
from PyQt4.QtGui import QTextEdit, QHBoxLayout, QGridLayout, QMessageBox
+from PyQt4.QtGui import QWidget, QVBoxLayout
from tortoisehg.util import hglib
from tortoisehg.hgqt.i18n import _, localgettext
@@ -15,107 +16,131 @@
local = localgettext()
-class Dialog(QDialog):
- def __init__(self, cmdline, parent=None):
- super(Dialog, self).__init__(parent, Qt.WindowTitleHint or \
- Qt.WindowSystemMenuHint)
+class ProgressMonitor(QWidget):
- # main layout grid
- grid = QGridLayout()
- grid.setSpacing(6)
- grid.setContentsMargins(*(7,)*4)
+ def __init__(self):
+ super(ProgressMonitor, self).__init__()
- ## hbox for status and progress labels
+ # main layout box
+ vbox = QVBoxLayout()
+ vbox.setContentsMargins(*(0,)*4)
+ self.setLayout(vbox)
+
+ ## status layout box
hbox = QHBoxLayout()
- grid.addLayout(hbox, 0, 0)
+ hbox.setContentsMargins(*(0,)*4)
+ vbox.addLayout(hbox)
- self.status_label = QLabel('')
+ self.status_label = QLabel()
hbox.addWidget(self.status_label, 1)
- self.prog_label = QLabel('')
+ self.prog_label = QLabel()
hbox.addWidget(self.prog_label, 0, Qt.AlignRight)
+ ## progressbar
self.pbar = QProgressBar()
self.pbar.setTextVisible(False)
self.pbar.setMinimum(0)
- grid.addWidget(self.pbar, 1, 0)
+ vbox.addWidget(self.pbar)
- # command output area
- self.log_text = QTextEdit()
- self.log_text.setReadOnly(True)
- self.log_text.document().setDefaultStyleSheet(qtlib.thgstylesheet)
- grid.addWidget(self.log_text, 2, 0, 5, 0)
- grid.setRowStretch(2, 1)
+ # prepare to show
+ self.clear_progress()
- # bottom buttons
- buttons = QDialogButtonBox()
- self.cancel_btn = buttons.addButton(QDialogButtonBox.Cancel)
- self.cancel_btn.clicked.connect(self.cancel_clicked)
- self.close_btn = buttons.addButton(QDialogButtonBox.Close)
- self.close_btn.setHidden(True)
- self.close_btn.clicked.connect(self.reject)
- grid.addWidget(buttons, 7, 0)
+ ### Public Methods ###
- self.setLayout(grid)
- self.setWindowTitle(_('TortoiseHg Command Dialog'))
- self.resize(540, 420)
+ def clear_progress(self):
+ self.pbar.reset()
+ self.pbar.setMaximum(100)
+ self.status_label.setText('')
+ self.prog_label.setText('')
+ self.inprogress = False
- # setup and start command thread
- self.cmd = thread.CmdThread(cmdline)
- self.cmd.outputReceived.connect(self.output_received)
- self.cmd.errorReceived.connect(self.error_received)
- self.cmd.progressReceived.connect(self.progress_received)
- self.cmd.started.connect(self.command_started)
- self.cmd.commandFinished.connect(self.command_finished)
- self.cmd.start()
-
- def reject(self):
- if self.cmd.isRunning():
- ret = QMessageBox.question(self, _('Confirm Exit'), _('Mercurial'
- ' command is still running.\nAre you sure you want'
- ' to terminate?'), QMessageBox.Yes | QMessageBox.No,
- QMessageBox.No)
- if ret == QMessageBox.Yes:
- self.cancel_clicked()
-
- # don't close dialog
- return
-
- # close dialog
- QDialog.reject(self)
-
- def cancel_clicked(self):
- # trigger KeyboardInterrupt
- self.cmd.abort()
-
- # until thread is terminated
- self.cancel_btn.setDisabled(True)
+ def unknown_progress(self):
+ self.pbar.setMinimum(0)
self.pbar.setMaximum(0)
- def command_started(self):
- # use indeterminate mode
- self.pbar.setMaximum(0)
- self.status_label.setText(_('Running...'))
+ def set_text(self, text):
+ self.status_label.setText(text)
- def command_finished(self, wrapper):
- ret = wrapper.data
- if ret is None or self.pbar.maximum() == 0:
- self.clear_progress()
- if ret is None:
- if self.cmd.abortbyuser:
- status = _('Terminated by user')
- else:
- status = _('Terminated')
- else:
- status = _('Finished')
- self.status_label.setText(status)
- self.cancel_btn.setHidden(True)
- self.close_btn.setShown(True)
- self.close_btn.setFocus()
+class Core(QObject):
+ """Core functionality for running Mercurial command.
+ Do not attempt to instantiate and use this directly.
+ """
+
+ commandStarted = pyqtSignal()
+ commandFinished = pyqtSignal(thread.DataWrapper)
+ commandCanceling = pyqtSignal()
+
+ def __init__(self):
+ super(Core, self).__init__()
+
+ self.thread = None
+ self.output_text = QTextEdit()
+ self.output_text.setReadOnly(True)
+ self.output_text.document().setDefaultStyleSheet(qtlib.thgstylesheet)
+ self.pmon = None
+
+ ### Public Methods ###
+
+ def run(self, cmdline):
+ '''Execute Mercurial command'''
+ self.thread = thread.CmdThread(cmdline)
+ self.thread.started.connect(self.command_started)
+ self.thread.commandFinished.connect(self.command_finished)
+ self.thread.outputReceived.connect(self.output_received)
+ self.thread.errorReceived.connect(self.error_received)
+ if hasattr(self, 'pmon'):
+ self.thread.progressReceived.connect(self.progress_received)
+ self.thread.start()
+
+ def cancel(self):
+ '''Cancel running Mercurial command'''
+ self.thread.abort()
+ self.commandCanceling.emit()
+
+ def set_pmon(self, pmon):
+ self.pmon = pmon
+
+ def is_running(self):
+ return self.thread.isRunning()
+
+ ### Private Method ###
def append_output(self, msg, style=''):
msg = msg.replace('\n', '<br />')
- self.log_text.insertHtml('<font style="%s">%s</pre>' % (style, msg))
+ self.output_text.insertHtml('<font style="%s">%s</font>' % (style, msg))
+
+ ### Signal Handlers ###
+
+ def command_started(self):
+ if hasattr(self, 'pmon'):
+ self.pmon.set_text(_('Running...'))
+ self.pmon.unknown_progress()
+
+ self.commandStarted.emit()
+
+ def command_finished(self, wrapper):
+ if hasattr(self, 'pmon'):
+ ret = wrapper.data
+ if ret is None or self.pmon.pbar.maximum() == 0:
+ self.pmon.clear_progress()
+ if ret is None:
+ if self.thread.abortbyuser:
+ status = _('Terminated by user')
+ else:
+ status = _('Terminated')
+ else:
+ status = _('Finished')
+ self.pmon.set_text(status)
+
+ self.commandFinished.emit(wrapper)
+
+ def command_canceling(self):
+ if hasattr(self, 'pmon'):
+ self.pmon.set_text(_('Canceling...'))
+ self.pmon.unknown_progress()
+
+ self.commandCanceling.emit()
def output_received(self, wrapper):
msg, label = wrapper.data
@@ -131,40 +156,156 @@ style = qtlib.geteffect(label)
self.append_output(msg, style)
- def clear_progress(self):
- self.pbar.reset()
- self.pbar.setMaximum(100)
- self.status_label.setText('')
- self.prog_label.setText('')
- self.inprogress = False
-
def progress_received(self, wrapper):
- if self.cmd.isFinished():
- self.clear_progress()
+ if self.thread.isFinished():
+ self.pmon.clear_progress()
return
counting = False
topic, item, pos, total, unit = wrapper.data
if pos is None:
- self.clear_progress()
+ self.pmon.clear_progress()
return
if total is None:
count = '%d' % pos
counting = True
else:
- self.pbar.setMaximum(total)
- self.pbar.setValue(pos)
+ self.pmon.pbar.setMaximum(total)
+ self.pmon.pbar.setValue(pos)
count = '%d / %d' % (pos, total)
if unit:
count += ' ' + unit
- self.prog_label.setText(hglib.tounicode(count))
+ self.pmon.prog_label.setText(hglib.tounicode(count))
if item:
status = '%s: %s' % (topic, item)
else:
status = local._('Status: %s') % topic
- self.status_label.setText(hglib.tounicode(status))
- self.inprogress = True
+ self.pmon.status_label.setText(hglib.tounicode(status))
+ self.pmon.inprogress = True
- if not self.inprogress or counting:
+ if not self.pmon.inprogress or counting:
# use indeterminate mode
- self.pbar.setMinimum(0)
+ self.pmon.pbar.setMinimum(0)
+
+class Widget(QWidget):
+ """An embeddable widget for running Mercurial command"""
+
+ commandStarted = pyqtSignal()
+ commandFinished = pyqtSignal(thread.DataWrapper)
+ commandCanceling = pyqtSignal()
+
+ def __init__(self):
+ super(Widget, self).__init__()
+
+ self.core = Core()
+ self.core.commandStarted.connect(lambda: self.commandStarted.emit())
+ self.core.commandFinished.connect(lambda w: self.commandFinished.emit(w))
+ self.core.commandCanceling.connect(lambda: self.commandCanceling.emit())
+
+ # main layout grid
+ grid = QGridLayout()
+ grid.setSpacing(4)
+ grid.setContentsMargins(*(1,)*4)
+
+ ## status and progress labels
+ self.pmon = ProgressMonitor()
+ self.core.set_pmon(self.pmon)
+ grid.addWidget(self.pmon, 0, 0)
+
+ # command output area
+ grid.addWidget(self.core.output_text, 1, 0, 5, 0)
+ grid.setRowStretch(1, 1)
+
+ # widget setting
+ self.setLayout(grid)
+
+ # prepare to show
+ self.core.output_text.setHidden(True)
+
+ ### Public Methods ###
+
+ def run(self, cmdline):
+ self.core.run(cmdline)
+
+ def cancel(self):
+ self.core.cancel()
+
+ def show_output(self, visible):
+ self.core.output_text.setShown(visible)
+
+class Dialog(QDialog):
+ """A dialog for running random Mercurial command"""
+
+ commandStarted = pyqtSignal()
+ commandFinished = pyqtSignal(thread.DataWrapper)
+ commandCanceling = pyqtSignal()
+
+ def __init__(self, cmdline, parent=None):
+ super(Dialog, self).__init__(parent, Qt.WindowTitleHint or
+ Qt.WindowSystemMenuHint)
+
+ self.core = Core()
+ self.core.commandFinished.connect(self.command_finished)
+ self.core.commandCanceling.connect(lambda: self.commandCanceling.emit())
+
+ # main layout grid
+ grid = QGridLayout()
+ grid.setSpacing(6)
+ grid.setContentsMargins(*(7,)*4)
+
+ ## status and progress labels
+ self.pmon = ProgressMonitor()
+ self.core.set_pmon(self.pmon)
+ grid.addWidget(self.pmon, 0, 0)
+
+ # command output area
+ grid.addWidget(self.core.output_text, 1, 0, 5, 0)
+ grid.setRowStretch(1, 1)
+
+ # bottom buttons
+ buttons = QDialogButtonBox()
+ self.cancel_btn = buttons.addButton(QDialogButtonBox.Cancel)
+ self.cancel_btn.clicked.connect(self.cancel_clicked)
+ self.close_btn = buttons.addButton(QDialogButtonBox.Close)
+ self.close_btn.clicked.connect(self.reject)
+ grid.addWidget(buttons, 7, 0)
+
+ self.setLayout(grid)
+ self.setWindowTitle(_('TortoiseHg Command Dialog'))
+ self.resize(540, 420)
+
+ # prepare to show
+ self.close_btn.setHidden(True)
+
+ # start command
+ self.core.run(cmdline)
+
+ ### Private Method ###
+
+ def reject(self):
+ if self.core.is_running():
+ ret = QMessageBox.question(self, _('Confirm Exit'), _('Mercurial'
+ ' command is still running.\nAre you sure you want'
+ ' to terminate?'), QMessageBox.Yes | QMessageBox.No,
+ QMessageBox.No)
+ if ret == QMessageBox.Yes:
+ self.cancel_clicked()
+
+ # don't close dialog
+ return
+
+ # close dialog
+ QDialog.reject(self)
+
+ ### Signal Handlers ###
+
+ def cancel_clicked(self):
+ self.core.cancel()
+
+ def command_finished(self, wrapper):
+ self.cancel_btn.setHidden(True)
+ self.close_btn.setShown(True)
+ self.close_btn.setFocus()
+
+ def command_canceling(self):
+ self.cancel_btn.setDisabled(True)
|
Add a tag
Loading...