We are currently indexing your data, so search results may be incomplete until we finish.
hgqt: more pyqt signal cleanups
And bug fixes for rename guess dialog, though it is still
not finding renames for some reason inside Mercurial itself.
Changeset 09a9e2798934…
Parent 4faad5f451e2…
by
Changes to 6 files · Browse files at 09a9e2798934 Showing diff from parent 4faad5f451e2 Diff from another changeset...
|
|
|
@@ -147,7 +147,7 @@ QTimer.singleShot(0, self.refresh)
def refresh(self):
- repo.thginvalidate()
+ self.repo.thginvalidate()
wctx = self.repo[None]
wctx.status(unknown=True)
self.unrevlist.clear()
@@ -180,6 +180,7 @@ _('Select one or more rows for search'))
return
+ self.repo.thginvalidate()
pct = self.simslider.value() / 100.0
copies = not self.copycheck.isChecked()
self.findbtn.setEnabled(False)
@@ -187,9 +188,9 @@
self.matchtv.model().clear()
self.thread = RenameSearchThread(self.repo, ulist, pct, copies)
- self.connect(self.thread, SIGNAL('match'), self.rowReceived)
- self.connect(self.thread, SIGNAL('progress'), self.progressReceived)
- self.connect(self.thread, SIGNAL('error'), self.errorReceived)
+ self.thread.match.connect(self.rowReceived)
+ self.thread.progress.connect(self.progressReceived)
+ self.thread.error.connect(self.errorReceived)
self.thread.searchComplete.connect(self.finished)
self.thread.start()
@@ -353,13 +354,13 @@ self.beginInsertRows(QModelIndex(), len(self.rows), len(self.rows))
self.rows.append(args)
self.endInsertRows()
- self.emit(SIGNAL("dataChanged()"))
+ self.layoutChanged.emit()
def clear(self):
self.beginRemoveRows(QModelIndex(), 0, len(self.rows)-1)
self.rows = []
self.endRemoveRows()
- self.emit(SIGNAL("dataChanged()"))
+ self.layoutChanged.emit()
def remove(self, dest):
i = 0
@@ -370,14 +371,14 @@ self.endRemoveRows()
else:
i += 1
- self.emit(SIGNAL("dataChanged()"))
+ self.layoutChanged.emit()
def sort(self, col, order):
- self.emit(SIGNAL("layoutAboutToBeChanged()"))
+ self.layoutAboutToBeChanged.emit()
self.rows.sort(lambda x, y: cmp(x[col], y[col]))
if order == Qt.DescendingOrder:
self.rows.reverse()
- self.emit(SIGNAL("layoutChanged()"))
+ self.layoutChanged.emit()
self.reset()
def isEmpty(self):
@@ -386,6 +387,9 @@class RenameSearchThread(QThread):
'''Background thread for searching repository history'''
searchComplete = pyqtSignal()
+ match = pyqtSignal(object)
+ progress = pyqtSignal(object)
+ error = pyqtSignal(object)
def __init__(self, repo, ufiles, minpct, copies):
super(RenameSearchThread, self).__init__()
@@ -406,25 +410,23 @@ else:
self.sig = QObject() # dummy object to emit signals
def progress(self, topic, pos, item='', unit='', total=None):
- self.sig.emit(SIGNAL('progress'),
- [topic, item, pos, total, unit])
+ self.sig.emit("SIGNAL(progress)", [topic, item, pos, total, unit])
progui = ProgUi()
- self.connect(progui.sig, SIGNAL('progress'), self.progress)
+ self.connect(progui.sig, SIGNAL('progress'), self.progressRecvd)
storeui = self.repo.ui
self.progui = progui
self.repo.ui = progui
try:
self.search(self.repo)
except Exception, e:
- self.emit(SIGNAL('error'), hglib.tounicode(str(e)))
+ self.error.emit(hglib.tounicode(str(e)))
self.repo.ui = storeui
self.searchComplete.emit()
- def progress(self, wr):
- self.emit(SIGNAL('progress'), wr)
+ def progressRecvd(self, wr):
+ self.progress.emit(wr)
def search(self, repo):
- repo.thginvalidate()
wctx = repo[None]
pctx = repo['.']
if self.copies:
@@ -443,14 +445,14 @@ for o, n in gen:
old, new = o.path(), n.path()
exacts.append(old)
- self.emit(SIGNAL('match'), [old, new, '100%'])
+ self.match.emit([old, new, '100%'])
if self.minpct == 1.0:
return
removed = [r for r in removed if r.path() not in exacts]
gen = similar._findsimilarmatches(repo, added, removed, self.minpct)
for o, n, s in gen:
old, new, sim = o.path(), n.path(), '%d%%' % (s*100)
- self.emit(SIGNAL('match'), [old, new, sim])
+ self.match.emit([old, new, sim])
def run(ui, *pats, **opts):
return DetectRenameDialog(None, None, *pats)
|
|
@@ -102,17 +102,15 @@ uvbox.addWidget(unknownlist)
unknownlist.currentTextChanged.connect(self.setGlobFilter)
unknownlist.setContextMenuPolicy(Qt.CustomContextMenu)
- self.connect(unknownlist,
- SIGNAL('customContextMenuRequested(const QPoint &)'),
- self.customContextMenuRequested)
+ unknownlist.customContextMenuRequested.connect(self.menuRequest)
lbl = QLabel(_('Backspace or Del to remove a row'))
ivbox.addWidget(lbl)
# layer 4 - dialog buttons
BB = QDialogButtonBox
bb = QDialogButtonBox(BB.Close)
- self.connect(bb, SIGNAL("accepted()"), self, SLOT("accept()"))
- self.connect(bb, SIGNAL("rejected()"), self, SLOT("reject()"))
+ bb.accepted.connect(self.accept)
+ bb.rejected.connect(self.reject)
vbox.addWidget(bb)
self.bb = bb
@@ -140,7 +138,7 @@ self.refresh()
return True
- def customContextMenuRequested(self, point):
+ def menuRequest(self, point):
'context menu request for unknown list'
point = self.unknownlist.mapToGlobal(point)
row = self.unknownlist.currentRow()
@@ -159,9 +157,9 @@ dirname = os.path.dirname(dirname)
for f in filters:
action = menu.addAction(_('Ignore ') + hglib.tounicode(f))
- action.localtext = f
- action.wrapper = lambda f=f: self.insertFilter(f, False)
- self.connect(action, SIGNAL('triggered()'), action.wrapper)
+ action.args = (f,False)
+ action.run = lambda: self.insertFilter(*action.args)
+ action.triggered.connect(action.run)
menu.exec_(point)
def insertFilter(self, pat, isregexp):
@@ -260,7 +258,7 @@ f.write(out)
f.rename()
shlib.shell_notify([self.ignorefile])
- self.emit(SIGNAL('ignoreFilterUpdated'))
+ self.ignoreFilterUpdated.emit()
except IOError, e:
qtlib.WarningMsgBox(_('Unable to write .hgignore file'),
hglib.tounicode(str(e)), parent=self)
|
||
|
@@ -61,8 +61,8 @@ BB = QDialogButtonBox
bb = QDialogButtonBox(BB.Ok|BB.Cancel)
self.apply_button = bb.button(BB.Apply)
- self.connect(bb, SIGNAL("accepted()"), self, SLOT("accept()"))
- self.connect(bb, SIGNAL("rejected()"), self, SLOT("reject()"))
+ bb.accepted.connect(self.accept)
+ bb.rejected.connect(self.reject)
bb.button(BB.Ok).setDefault(True)
layout.addWidget(bb)
|
||
|
@@ -254,7 +254,7 @@ def keyPressEvent(self, event):
for k, btn in self.hotkeys.iteritems():
if event.text() == k:
- btn.emit(SIGNAL('clicked()'))
+ btn.clicked.emit()
super(CustomPrompt, self).keyPressEvent(event)
def setup_font_substitutions():
@@ -466,10 +466,8 @@ vbox.addWidget(editor)
BB = QDialogButtonBox
bb = QDialogButtonBox(BB.Save|BB.Cancel)
- dialog.connect(bb, SIGNAL('accepted()'),
- dialog, SLOT('accept()'))
- dialog.connect(bb, SIGNAL('rejected()'),
- dialog, SLOT('reject()'))
+ bb.accepted.connect(dialog.accept)
+ bb.rejected.connect(dialog.reject)
vbox.addWidget(bb)
lexer = QsciLexerProperties()
editor.setLexer(lexer)
|
||
|
@@ -132,7 +132,7 @@ branch=branch, allparents=allparents)
self.graph = Graph(self.repo, grapher, self.max_file_size, include_mq=True)
self.rowcount = 0
- self.emit(SIGNAL('layoutChanged()'))
+ self.layoutChanged.emit()
self.ensureBuilt(row=self.fill_step)
self.showMessage.emit('')
QTimer.singleShot(0, lambda: self.filled.emit())
@@ -152,12 +152,12 @@ if validcols:
self._columns = tuple(validcols)
self.datacache = {}
- self.emit(SIGNAL("layoutChanged()"))
+ self.layoutChanged.emit()
def invalidate(self):
self.reloadConfig()
self.datacache = {}
- self.emit(SIGNAL("layoutChanged()"))
+ self.layoutChanged.emit()
def branch(self):
return self.filterbranch
@@ -423,7 +423,7 @@ 'empty the list'
self.graph = None
self.datacache = {}
- self.emit(SIGNAL("layoutChanged()"))
+ self.layoutChanged.emit()
def gettags(self, ctx, gnode):
if ctx.rev() is None:
|
||
|
@@ -533,8 +533,8 @@
BB = QDialogButtonBox
bb = QDialogButtonBox(BB.Ok|BB.Cancel)
- self.connect(bb, SIGNAL("accepted()"), self, SLOT("accept()"))
- self.connect(bb, SIGNAL("rejected()"), self, SLOT("reject()"))
+ bb.accepted.connect(self.accept)
+ bb.rejected.connect(self.reject)
layout.addWidget(bb)
self.bb = bb
|
||
Add a tag
Loading...