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

repomodel: new PyQt signals

Changeset 608650649436…

Parent ac4640826bd0…

by Steve Borho

Changes to 2 files · Browse files at 608650649436 Showing diff from parent ac4640826bd0 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
78
79
80
 
 
 
 
81
82
83
 
130
131
132
133
134
 
 
135
136
137
 
193
194
195
196
 
197
198
199
200
201
 
 
202
203
204
 
206
207
208
209
210
 
 
211
212
213
 
78
79
80
81
82
83
84
85
86
87
 
134
135
136
 
 
137
138
139
140
141
 
197
198
199
 
200
201
202
203
 
 
204
205
206
207
208
 
210
211
212
 
 
213
214
215
216
217
@@ -78,6 +78,10 @@
  """   Model used for displaying the revisions of a Hg *local* repository   """ + showMessage = pyqtSignal(str) + filled = pyqtSignal() + loaded = pyqtSignal() +   _columns = ('Graph', 'ID', 'Branch', 'Log', 'Author', 'Age', 'Tags',)   _stretchs = {'Log': 1, }   @@ -130,8 +134,8 @@
  self.rowcount = 0   self.emit(SIGNAL('layoutChanged()'))   self.ensureBuilt(row=self.fill_step) - self.emit(SIGNAL('showMessage'), '') - QTimer.singleShot(0, lambda: self.emit(SIGNAL('filled'))) + self.showMessage.emit('') + QTimer.singleShot(0, lambda: self.filled.emit())     def reloadConfig(self):   _ui = self.repo.ui @@ -193,12 +197,12 @@
    def timerEvent(self, event):   if event.timerId() == self.timerHandle: - self.emit(SIGNAL('showMessage'), 'filling (%s)'%(len(self.graph))) + self.showMessage.emit('filling (%d)'%(len(self.graph)))   if self.graph.isfilled():   self.killTimer(self.timerHandle)   self.timerHandle = None - self.emit(SIGNAL('showMessage'), '') - self.emit(SIGNAL('loaded')) + self.showMessage.emit('') + self.loaded.emit()   # we only fill the graph data structures without telling   # views until the model is loaded, to keep maximal GUI   # reactivity @@ -206,8 +210,8 @@
  self.killTimer(self.timerHandle)   self.timerHandle = None   self.updateRowCount() - self.emit(SIGNAL('showMessage'), '') - self.emit(SIGNAL('loaded')) + self.showMessage.emit('') + self.loaded.emit()     def updateRowCount(self):   currentlen = self.rowcount
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
186
187
188
189
190
 
191
192
193
 
326
327
328
329
330
331
332
 
 
 
333
334
335
 
359
360
361
362
 
363
364
365
 
369
370
371
372
 
373
374
375
 
186
187
188
 
 
189
190
191
192
 
325
326
327
 
 
 
 
328
329
330
331
332
333
 
357
358
359
 
360
361
362
363
 
367
368
369
 
370
371
372
373
@@ -186,8 +186,7 @@
  self.actionActivateRev = QAction('Activate rev.', self)   self.actionActivateRev.setShortcuts([Qt.SHIFT+Qt.Key_Return,   Qt.SHIFT+Qt.Key_Enter]) - connect(self.actionActivateRev, SIGNAL('triggered()'), - self.revision_activated) + self.actionActivateRev.triggered.connect(self.revision_activated)   self.addAction(self.actionActivateRev)   self.disab_shortcuts.append(self.actionActivateRev)   @@ -326,10 +325,9 @@
    def create_models(self):   self.repomodel = HgRepoListModel(self.repo) - connect(self.repomodel, SIGNAL('filled'), self.on_filled) - connect(self.repomodel, SIGNAL('loaded'), self.loaded) - connect(self.repomodel, SIGNAL('showMessage'), - self.showMessage, Qt.QueuedConnection) + self.repomodel.filled.connect(self.modelFilled) + self.repomodel.loaded.connect(self.modelLoaded) + self.repomodel.showMessage.connect(self.showMessage)     def setupModels(self):   self.create_models() @@ -359,7 +357,7 @@
  gotoaction.setIcon(geticon('goto'))   #self.toolBar_edit.addAction(gotoaction)   - def on_filled(self): + def modelFilled(self):   'initial batch of revisions loaded'   self.repoview.resizeColumns()   if self._reload_rev is not None: @@ -369,7 +367,7 @@
  except IndexError:   pass   - def loaded(self): + def modelLoaded(self):   'all revisions loaded (graph generator completed)'   # Perhaps we can update a GUI element later, to indicate full load   pass