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

shelve: use built-in qsci context menu

The right and left fileviews have separate configurations.. I'm sure someone
will complain about it.

Changeset 96229f19c372…

Parent c16dced50ce8…

by Steve Borho

Changes to 2 files · Browse files at 96229f19c372 Showing diff from parent c16dced50ce8 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
369
370
371
 
 
 
 
 
 
 
372
373
374
 
444
445
446
447
448
449
450
451
 
 
 
452
453
454
 
471
472
473
 
 
 
 
 
 
 
 
 
 
474
475
476
 
369
370
371
372
373
374
375
376
377
378
379
380
381
 
451
452
453
 
 
 
 
 
454
455
456
457
458
459
 
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
@@ -369,6 +369,13 @@
  ctx = self.repo.changectx(ctx.node())   self.setContext(ctx)   + def loadSettings(self, qs, prefix): + self.diffbrowse.loadSettings(qs, prefix) + + def saveSettings(self, qs, prefix): + self.diffbrowse.saveSettings(qs, prefix) + +  # DO NOT USE. Sadly, this does not work.  class ElideLabel(QLabel):   def __init__(self, text='', parent=None): @@ -444,11 +451,9 @@
  self.sci.setFrameStyle(0)   self.sci.setReadOnly(True)   self.sci.setUtf8(True) - #self.sci.setWrapMode(qsci.WrapCharacter) - - i = qscilib.KeyPressInterceptor(self, None, [QKeySequence.SelectAll, - QKeySequence.New]) - self.sci.installEventFilter(i) + self.sci.installEventFilter(qscilib.KeyPressInterceptor(self)) + self.sci.setContextMenuPolicy(Qt.CustomContextMenu) + self.sci.customContextMenuRequested.connect(self.menuRequested)   self.sci.setCaretLineVisible(False)     self.sci.setMarginType(1, qsci.SymbolMargin) @@ -471,6 +476,16 @@
  self.sci.setLexer(lexer)   self.clearDisplay()   + def menuRequested(self, point): + point = self.sci.mapToGlobal(point) + return self.sci.createStandardContextMenu().exec_(point) + + def loadSettings(self, qs, prefix): + self.sci.loadSettings(qs, prefix) + + def saveSettings(self, qs, prefix): + self.sci.saveSettings(qs, prefix) +   def updateSummary(self):   self.sumlabel.setText(_('Chunks selected: %d / %d') % (   self.countselected, len(self.curchunks[1:])))
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
392
393
394
 
 
395
396
397
 
401
402
403
 
 
404
405
406
 
392
393
394
395
396
397
398
399
 
403
404
405
406
407
408
409
410
@@ -392,6 +392,8 @@
  wb = "shelve/"   s.setValue(wb + 'geometry', self.saveGeometry())   s.setValue(wb + 'filesplitter', self.browsea.splitter.saveState()) + self.browsea.saveSettings(s, wb + 'fileviewa') + self.browseb.saveSettings(s, wb + 'fileviewb')     def restoreSettings(self):   s = QSettings() @@ -401,6 +403,8 @@
  s.value(wb + 'filesplitter').toByteArray())   self.browseb.splitter.restoreState(   s.value(wb + 'filesplitter').toByteArray()) + self.browsea.loadSettings(s, wb + 'fileviewa') + self.browseb.loadSettings(s, wb + 'fileviewb')     def closeEvent(self, event):   self.storeSettings()