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

fileview: recover user selected mode when content allows

Changeset bfcaed94e6f7…

Parent 7b9d43baaf79…

by Steve Borho

Changes to one file · Browse files at bfcaed94e6f7 Showing diff from parent 7b9d43baaf79 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
207
208
209
 
 
210
211
212
 
274
275
276
 
 
277
278
279
 
379
380
381
 
 
 
 
 
 
 
 
382
383
384
 
207
208
209
210
211
212
213
214
 
276
277
278
279
280
281
282
283
 
383
384
385
386
387
388
389
390
391
392
393
394
395
396
@@ -207,6 +207,8 @@
  self._filename = None   self._status = None   self._find_text = None + self._mode = None + self._lostMode = None     self.actionDiffMode = QAction('Diff', self)   self.actionDiffMode.setCheckable(True) @@ -274,6 +276,8 @@
  def forceMode(self, mode):   'Force into file or diff mode, based on content constaints'   assert mode in ('diff', 'file') + if self._lostMode is None: + self._lostMode = self._mode   self._mode = mode   if mode == 'diff':   self.actionDiffMode.setChecked(True) @@ -379,6 +383,14 @@
  self.actionDiffMode.setEnabled(True)   self.actionFileMode.setEnabled(True)   self.actionAnnMode.setEnabled(True) + if self._lostMode: + if self._lostMode == 'diff': + self.actionDiffMode.trigger() + elif self._lostMode == 'file': + self.actionFileMode.trigger() + elif self._lostMode == 'ann': + self.actionAnnMode.trigger() + self._lostMode = None     if self._mode == 'diff':   lexer = get_diff_lexer(self)