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

stable filelistview: keep show all and second parent actions visible

now that the filelist toolbar is always visible, it doesn't make sense to make
these two invisible.

Changeset 2a530f3002c4…

Parent 09c7b40467ab…

by Adrian Buehlmann

Changes to one file · Browse files at 2a530f3002c4 Showing diff from parent 09c7b40467ab Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
71
72
73
74
75
 
 
76
77
78
 
 
79
80
81
 
216
217
218
219
220
221
222
223
224
225
226
227
228
 
71
72
73
 
 
74
75
76
 
 
77
78
79
80
81
 
216
217
218
 
219
220
221
222
223
 
224
225
226
@@ -71,11 +71,11 @@
  for act in ['diff', 'revert']:   self._actions[act].setEnabled(real or wd)   if len(ctx.parents()) == 2: - self.actionShowAllMerge.setVisible(True) - self.actionSecondParent.setVisible(True) + self.actionShowAllMerge.setEnabled(True) + self.actionSecondParent.setEnabled(True)   else: - self.actionShowAllMerge.setVisible(False) - self.actionSecondParent.setVisible(False) + self.actionShowAllMerge.setEnabled(False) + self.actionSecondParent.setEnabled(False)     def currentFile(self):   index = self.currentIndex() @@ -216,13 +216,11 @@
  _('Toggle display of all files and the direction they were merged'))   self.actionShowAllMerge.setCheckable(True)   self.actionShowAllMerge.setChecked(False) - self.actionShowAllMerge.setVisible(False)   self.actionSecondParent = QAction(_('Other'), self)   self.actionSecondParent.setToolTip(   _('Toggle display of diffs to second (other) parent'))   self.actionSecondParent.setCheckable(True)   self.actionSecondParent.setChecked(False) - self.actionSecondParent.setVisible(False)   self.actionSecondParent.setEnabled(False)     self._actions = {}