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

settings: allow HTML markup in tooltips

Changeset 675348eb3c74…

Parent 98158cb2511b…

by Steve Borho

Changes to one file · Browse files at 675348eb3c74 Showing diff from parent 98158cb2511b Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
20
21
22
23
24
25
26
 
83
84
85
86
 
87
88
89
 
117
118
119
120
 
121
122
123
 
193
194
195
196
197
198
 
 
 
 
199
200
201
 
562
563
564
 
565
566
567
 
660
661
662
663
 
664
665
666
 
20
21
22
 
23
24
25
 
82
83
84
 
85
86
87
88
 
116
117
118
 
119
120
121
122
 
192
193
194
 
 
 
195
196
197
198
199
200
201
 
562
563
564
565
566
567
568
 
661
662
663
 
664
665
666
667
@@ -20,7 +20,6 @@
 from PyQt4.QtGui import *    # Technical Debt -# detect URLs in tooltips, make clickable  # stacked widget or pages need to be scrollable  # add extensions page after THG 1.1 is released  # we need a consistent icon set @@ -83,7 +82,7 @@
  QComboBox.showPopup(self)     def focusInEvent(self, e): - self.opts['descwidget'].setPlainText(self.opts['tooltip']) + self.opts['descwidget'].setHtml(self.opts['tooltip'])   QComboBox.focusInEvent(self, e)     ## common APIs for all edit widgets @@ -117,7 +116,7 @@
  self.setDisabled(opts['readonly'])     def focusInEvent(self, e): - self.opts['descwidget'].setPlainText(self.opts['tooltip']) + self.opts['descwidget'].setHtml(self.opts['tooltip'])   QLineEdit.focusInEvent(self, e)     ## common APIs for all edit widgets @@ -193,9 +192,10 @@
  ' unspecified, TortoiseHg will use the selected merge tool.'   ' Failing that it uses the first applicable tool it finds.')),   (_('Visual Editor'), 'tortoisehg.editor', genEditCombo, - _('Specify the visual editor used to view files. Format:\n' - 'myeditor -flags [$FILE --num=$LINENUM] -moreflags\n\n' - 'See http://bitbucket.org/tortoisehg/thg/wiki/OpenAtLine')), + _('Specify the visual editor used to view files. Format:<br>' + 'myeditor -flags [$FILE --num=$LINENUM] -moreflags<br><br>' + 'See <a href="%s">OpenAtLine</a>' + % 'http://bitbucket.org/tortoisehg/thg/wiki/OpenAtLine')),   (_('CLI Editor'), 'ui.editor', genEditCombo,   _('The editor to use during a commit and other instances where'   ' Mercurial needs multiline input from the user. Used by' @@ -562,6 +562,7 @@
  self.pageList = pageList     desctext = QTextBrowser() + desctext.setOpenExternalLinks(True)   layout.addWidget(desctext)   self.desctext = desctext   @@ -660,7 +661,7 @@
    def eventFilter(self, obj, event):   if event.type() == QEvent.Enter: - self.desctext.setText(obj.tooltip) + self.desctext.setHtml(obj.tooltip)   return False     def addPage(self, name):