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

workbench: rewire annotate button

Changeset 27a3b40cec5a…

Parent 7b28d4754813…

by Adrian Buehlmann

Changes to 3 files · Browse files at 27a3b40cec5a Showing diff from parent 7b28d4754813 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
192
193
194
195
196
 
 
 
197
198
199
 
192
193
194
 
 
195
196
197
198
199
200
@@ -192,8 +192,9 @@
    def setAnnotate(self, ann):   self._annotate = ann - if ann: - self.displayFile() + self.blk.setVisible(self._mode == 'file') + self.ann.setVisible(self._mode == 'file' and self._annotate) + self.displayFile()     def setModel(self, model):   # XXX we really need only the "Graph" instance
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
218
219
220
 
 
 
221
222
223
 
218
219
220
221
222
223
224
225
226
@@ -218,6 +218,9 @@
  def getMode(self):   return self.fileview.getMode()   + def setAnnotate(self, ann): + self.fileview.setAnnotate(ann) +   def nextDiff(self):   notlast = self.fileview.nextDiff()   self.actionNextDiff.setEnabled(self.fileview.fileMode() and notlast and self.fileview.nDiffs())
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
259
260
261
262
263
 
264
265
266
 
374
375
376
 
 
 
 
 
377
378
379
 
259
260
261
 
 
262
263
264
265
 
373
374
375
376
377
378
379
380
381
382
383
@@ -259,8 +259,7 @@
    self.actionAnnMode = QtGui.QAction('Annotate', self)   self.actionAnnMode.setCheckable(True) - #connect(self.actionAnnMode, SIGNAL('toggled(bool)'), - # self.fileview.setAnnotate) + connect(self.actionAnnMode, SIGNAL('toggled(bool)'), self.setAnnotate)     self.actionHelp.setShortcut(Qt.Key_F1)   self.actionHelp.setIcon(geticon('help')) @@ -374,6 +373,11 @@
  self.actionNextDiff.setEnabled(not mode)   self.actionPrevDiff.setEnabled(not mode)   + def setAnnotate(self, ann): + w = self.repoTabsWidget.currentWidget() + if w: + w.setAnnotate(ann) +   def nextDiff(self):   pass