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

fileview: use modern QsciScintilla APIs for managing markers

Other parts of thg have used these newer APIs for some time

Changeset 8f9553e2db57…

Parent af39544c55e0…

by Steve Borho

Changes to one file · Browse files at 8f9553e2db57 Showing diff from parent af39544c55e0 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
101
102
103
 
 
 
 
 
 
 
 
 
 
 
 
104
105
106
 
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
 
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
 
128
129
130
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
131
132
133
@@ -101,6 +101,18 @@
  self.sci.customContextMenuRequested.connect(self.menuRequested)   self.sci.setCaretLineVisible(False)   + # define markers for colorize zones of diff + self.markerplus = self.sci.markerDefine(qsci.Background) + self.markerminus = self.sci.markerDefine(qsci.Background) + self.markertriangle = self.sci.markerDefine(qsci.Background) + self.sci.setMarkerBackgroundColor(QColor('#B0FFA0'), self.markerplus) + self.sci.setMarkerBackgroundColor(QColor('#A0A0FF'), self.markerminus) + self.sci.setMarkerBackgroundColor(QColor('#FFA0A0'), self.markertriangle) + + # hide margin 0 (markers) + self.sci.setMarginType(0, qsci.SymbolMargin) + self.sci.setMarginWidth(0, 0) +   if hasattr(self.sci, 'indicatorDefine'):   self.sci.indicatorDefine(qsci.RoundBoxIndicator, 8)   self.sci.setIndicatorDrawUnder(8) @@ -116,21 +128,6 @@
  self.sci.SendScintilla(qsci.SCI_INDICSETUNDER, 9, True)   self.sci.SendScintilla(qsci.SCI_INDICSETFORE, 9, 0x58A8FF)   - # hide margin 0 (markers) - self.sci.SendScintilla(qsci.SCI_SETMARGINTYPEN, 0, 0) - self.sci.SendScintilla(qsci.SCI_SETMARGINWIDTHN, 0, 0) - - # define markers for colorize zones of diff - self.markerplus = self.sci.markerDefine(qsci.Background) - self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markerplus, - 0xB0FFA0) - self.markerminus = self.sci.markerDefine(qsci.Background) - self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markerminus, - 0xA0A0FF) - self.markertriangle = self.sci.markerDefine(qsci.Background) - self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markertriangle, - 0xFFA0A0) -   self._annotate = annotate.AnnotateView(repo, self)   for name in ('searchRequested', 'editSelected', 'grepRequested'):   getattr(self._annotate, name).connect(getattr(self, name))