We are currently indexing your data, so search results may be incomplete until we finish.
qtlib, etc: remove ui arguments from getfont() and get*_lexer
Fonts and colors are not, cannot be, repository specific
Changeset 80029362c3d4…
Parent 7bc379cf4015…
by
Changes to 16 files · Browse files at 80029362c3d4 Showing diff from parent 7bc379cf4015 Diff from another changeset...
-
tortoisehg/hgqt/annotate.py
-
tortoisehg/hgqt/cmdui.py
-
tortoisehg/hgqt/commit.py
-
tortoisehg/hgqt/dialogmixin.py
-
tortoisehg/hgqt/filedialogs.py
-
tortoisehg/hgqt/fileview.py
-
tortoisehg/hgqt/hgemail.py
-
tortoisehg/hgqt/lexers.py
-
tortoisehg/hgqt/manifestdialog.py
-
tortoisehg/hgqt/qtlib.py
-
tortoisehg/hgqt/repowidget.py
-
tortoisehg/hgqt/revdetails.py
-
tortoisehg/hgqt/revmessage.py
-
tortoisehg/hgqt/run.py
-
tortoisehg/hgqt/settings.py
-
tortoisehg/hgqt/workbench.py
|
@@ -44,7 +44,7 @@ self.setMarginLineNumbers(1, True)
self.setMarginType(2, QsciScintilla.TextMarginRightJustified)
self.setMouseTracking(True)
- self.setFont(qtlib.getfont(ui.ui(), 'fontlog').font())
+ self.setFont(qtlib.getfont('fontlog').font())
self.setContextMenuPolicy(Qt.CustomContextMenu)
self.customContextMenuRequested.connect(self.menuRequest)
self._revs = [] # by line
@@ -201,8 +201,7 @@
def _updatelexer(self, fctx):
"""Update the lexer according to the given file"""
- lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()),
- ui=self.repo.ui)
+ lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()))
if lex:
self.setLexer(lex)
|
||
|
@@ -254,8 +254,7 @@ self._initmarkers()
def _initfont(self):
- from mercurial import ui # XXX workaround to pass fake ui obj
- tf = qtlib.getfont(ui.ui(), 'fontlog')
+ tf = qtlib.getfont('fontlog')
tf.changed.connect(lambda f: self.setFont(f))
self.setFont(tf.font())
|
||
|
@@ -95,7 +95,7 @@
msgte = QPlainTextEdit()
msgte.setLineWrapMode(QPlainTextEdit.NoWrap)
- msgfont = qtlib.getfont(self.repo.ui, 'fontcomment')
+ msgfont = qtlib.getfont('fontcomment')
msgte.setFont(msgfont.font())
msgfont.changed.connect(lambda fnt: msgte.setFont(fnt))
msgte.textChanged.connect(self.msgChanged)
|
||
|
@@ -36,7 +36,7 @@
def load_config(self, ui):
# TODO: connect to font changed signal
- self._font = qtlib.getfont(ui, 'fontlog').font()
+ self._font = qtlib.getfont('fontlog').font()
self.rowheight = 8
self.users, self.aliases = [], []
|
||
|
@@ -75,7 +75,7 @@ data = f.read(head)
else:
data = '' # too big
- lexer = get_lexer(self.filename, data, self.repo.ui)
+ lexer = get_lexer(self.filename, data)
if lexer:
lexer.setDefaultFont(self._font)
lexer.setFont(self._font)
|
||
|
@@ -334,12 +334,12 @@ return
if self._mode == 'diff' and fd.diff:
- lexer = get_diff_lexer(repo.ui)
+ lexer = get_diff_lexer()
self._cur_lexer = lexer # SJB - holding refcount?
self.sci.setLexer(lexer)
self.sci.setText(fd.diff)
else:
- lexer = get_lexer(filename, fd.contents, repo.ui)
+ lexer = get_lexer(filename, fd.contents)
self._cur_lexer = lexer # SJB - holding refcount?
self.sci.setLexer(lexer)
nlines = fd.contents.count('\n')
|
||
|
@@ -255,8 +255,8 @@ w.setUtf8(True)
w.setReadOnly(True)
w.setMarginWidth(1, 0) # hide area for line numbers
- lex = lexers.get_diff_lexer(self._ui)
- fh = qtlib.getfont(self._ui, 'fontdiff')
+ lex = lexers.get_diff_lexer()
+ fh = qtlib.getfont('fontdiff')
fh.changed.connect(lambda f: lex.setFont(f))
# TODO: why cannot we connect directly, without lambda?
lex.setFont(fh.font())
|
||
|
@@ -17,14 +17,14 @@ def match(self, filename, filedata):
return False
- def lexer(self, ui):
+ def lexer(self):
"""
Return a configured instance of the lexer
"""
- return self.cfg_lexer(self._lexer(), ui)
+ return self.cfg_lexer(self._lexer())
- def cfg_lexer(self, lexer, ui):
- font = qtlib.getfont(ui, 'fontlog').font()
+ def cfg_lexer(self, lexer):
+ font = qtlib.getfont('fontlog').font()
lexer.setFont(font, -1)
return lexer
@@ -128,7 +128,7 @@ extensions = ()
_lexer = Qsci.QsciLexerDiff
regex = re.compile(r'^@@ [-]\d+,\d+ [+]\d+,\d+ @@$')
- def cfg_lexer(self, lexer, ui):
+ def cfg_lexer(self, lexer):
#lexer.setDefaultPaper(QtGui.QColor(cfg.getDiffBGColor()))
#lexer.setColor(QtGui.QColor(cfg.getDiffFGColor()), -1)
for label, i in (('diff.inserted', 6),
@@ -138,7 +138,7 @@ for e in effect.split(';'):
if e.startswith('color:'):
lexer.setColor(QColor(e[7:]), i)
- font = qtlib.getfont(ui, 'fontdiff').font()
+ font = qtlib.getfont('fontdiff').font()
lexer.setFont(font, -1)
return lexer
@@ -151,11 +151,11 @@ #print clsname
lexers.append(cls())
-def get_diff_lexer(ui=None):
- return DiffLexerSelector().lexer(ui)
+def get_diff_lexer():
+ return DiffLexerSelector().lexer()
-def get_lexer(filename, filedata, ui=None):
+def get_lexer(filename, filedata):
for lselector in lexers:
if lselector.match(filename, filedata):
- return lselector.lexer(ui)
+ return lselector.lexer()
return None
|
||
|
@@ -81,7 +81,7 @@ self.setMarginLineNumbers(1, True)
self.setMarginWidth(1, '000')
self.setReadOnly(True)
- self.setFont(qtlib.getfont(self._ui, 'fontlog').font())
+ self.setFont(qtlib.getfont('fontlog').font())
self.setUtf8(True)
self.SendScintilla(QsciScintilla.SCI_SETSELEOLFILLED, True)
@@ -105,7 +105,7 @@ data = _("binary file")
else:
data = tounicode(data)
- lexer = get_lexer(path, data, ui=self._ui)
+ lexer = get_lexer(path, data)
if lexer:
self.setLexer(lexer)
nlines = data.count('\n')
|
||
|
@@ -202,11 +202,14 @@ 'fontlog': 'monospace,10'
}
_fontcache = {}
-def getfont(ui, name):
- assert name in _fontdefaults
- if name not in _fontcache:
+
+def initfontcache(ui):
+ for name in _fontdefaults:
fname = ui.config('tortoisehg', name, _fontdefaults[name])
_fontcache[name] = ThgFont(fname)
+
+def getfont(name):
+ assert name in _fontdefaults
return _fontcache[name]
def CommonMsgBox(icon, title, main, text='', buttons=QMessageBox.Close,
|
||
|
@@ -193,7 +193,7 @@ return gw
def load_config(self):
- self._font = getfont(self.repo.ui, 'fontlog')
+ self._font = getfont('fontlog').font()
self.rowheight = 8
self.users, self.aliases = [], []
self.hidefinddelay = False
|
||
|
@@ -160,7 +160,7 @@ revisiondetails_layout.addWidget(self.filelist_splitter)
def load_config(self):
- self._font = getfont(self.repo.ui, 'fontlog').font()
+ self._font = getfont('fontlog').font()
self.rowheight = 8
self.users, self.aliases = [], []
|
||
|
@@ -46,7 +46,7 @@ self._message = w = QTextBrowser()
w.setLineWrapMode(QTextEdit.NoWrap)
#w.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
- f = qtlib.getfont(ui, 'fontcomment')
+ f = qtlib.getfont('fontcomment')
f.changed.connect(lambda newfont: w.setFont(newfont))
w.setFont(f.font())
w.setOpenLinks(False)
|
||
|
@@ -407,6 +407,7 @@ self._mainapp.setApplicationVersion(thgversion.version())
qtlib.setup_font_substitutions()
qtlib.configstyles(ui)
+ qtlib.initfontcache(ui)
self._mainapp.setStyleSheet(qtlib.appstylesheet)
self._mainapp.setWindowIcon(qtlib.geticon('thg_logo'))
dlg = dlgfunc(ui, *args, **opts)
|
||
|
@@ -156,7 +156,7 @@ QPushButton.focusInEvent(self, e)
def on_clicked(self, checked):
- thgf = qtlib.getfont(ui.ui(), self.fname)
+ thgf = qtlib.getfont(self.fname)
dlg = QFontDialog(self)
dlg.setCurrentFont(self.currentFont() or thgf.font())
if dlg.exec_() == QDialog.Accepted:
|
||
Add a tag
Loading...