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

revmessage: use QTextBrowser directly instead of wrapping by RevMessage

Because RevMessage widget doesn't have much work, it can simply be merged to
RevDetailsWidget.

Changeset 4a9be9b34d56…

Parent f3299fe61f77…

by Yuya Nishihara

Changes to one file · Browse files at 4a9be9b34d56 Showing diff from parent f3299fe61f77 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
28
29
30
 
 
31
32
33
 
127
128
129
130
131
 
 
 
 
 
 
132
133
134
 
136
137
138
139
 
 
 
140
141
142
 
288
289
290
291
 
 
292
293
294
 
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
 
28
29
30
31
32
33
34
35
 
129
130
131
 
 
132
133
134
135
136
137
138
139
140
 
142
143
144
 
145
146
147
148
149
150
 
296
297
298
 
299
300
301
302
303
 
344
345
346
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -28,6 +28,8 @@
  self.repo = repo   self.splitternames = []   + self._deschtmlize = descriptionhtmlizer(repo.ui) +   # these are used to know where to go after a reload   self._last_rev = None   self._reload_file = None @@ -127,8 +129,12 @@
  self.message_splitter.setMidLineWidth(0)   self.message_splitter.setOrientation(Qt.Vertical)   self.message_splitter.setOpaqueResize(True) - self.message = RevMessage(self.repo.ui, self.message_splitter) - self.message.linkActivated.connect(self.linkActivated) + self.message = QTextBrowser(self.message_splitter, + lineWrapMode=QTextEdit.NoWrap, + openLinks=False) + self.message.minimumSizeHint = lambda: QSize(0, 25) + self.message.anchorClicked.connect( + lambda url: self.linkActivated.emit(url.toString()))     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0) @@ -136,7 +142,9 @@
  sp.setHeightForWidth(self.message.sizePolicy().hasHeightForWidth())   self.message.setSizePolicy(sp)   self.message.setMinimumSize(QSize(0, 0)) - self.message.setFont(getfont('fontcomment').font()) + f = getfont('fontcomment') + self.message.setFont(f.font()) + f.changed.connect(lambda font: self.message.setFont(font))     self.fileview = HgFileView(self.message_splitter)   sp = SP(SP.Expanding, SP.Expanding) @@ -288,7 +296,8 @@
  ctx = self.repo.changectx(rev)   self.revpanel.set_revision(rev)   self.revpanel.update(repo = self.repo) - self.message.displayRevision(ctx) + self.message.setHtml('<pre>%s</pre>' + % self._deschtmlize(ctx.description()))   if type(ctx.rev()) == str:   self.actionDiffMode.setChecked(True)   self.actionDiffMode.setEnabled(False) @@ -335,36 +344,3 @@
  getattr(self, n).restoreState(s.value(wb + n).toByteArray())   expanded = s.value(wb + 'revpanel.expanded', False).toBool()   self.revpanel.set_expanded(expanded) - -class RevMessage(QWidget): - linkActivated = pyqtSignal(unicode) - - def __init__(self, ui, parent): - QWidget.__init__(self, parent) - - vb = QVBoxLayout() - vb.setMargin(0) - - self._message = w = QTextBrowser() - w.setLineWrapMode(QTextEdit.NoWrap) - #w.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - f = getfont('fontcomment') - f.changed.connect(lambda newfont: w.setFont(newfont)) - w.setFont(f.font()) - w.setOpenLinks(False) - vb.addWidget(w) - - self.setLayout(vb) - - self._htmlize = descriptionhtmlizer(ui) - - self._message.anchorClicked.connect( - lambda url: self.linkActivated.emit(url.toString())) - - def displayRevision(self, ctx): - self.ctx = ctx - self._message.setHtml('<pre>%s</pre>' - % self._htmlize(ctx.description())) - - def minimumSizeHint(self): - return QSize(0, 25)