We are currently indexing your data, so search results may be incomplete until we finish.
hgqt: remove more HgConfig references
Changeset 0c68a265fa41…
Parent 7bfb178c9612…
by
Changes to 6 files · Browse files at 0c68a265fa41 Showing diff from parent 7bfb178c9612 Diff from another changeset...
|
@@ -28,7 +28,6 @@ SIGNAL = QtCore.SIGNAL
Qt = QtCore.Qt
-from tortoisehg.hgqt.config import HgConfig
from tortoisehg.hgqt import should_rebuild
class HgDialogMixin(object):
@@ -89,22 +88,10 @@ w.hide()
def load_config(self, ui):
- cfg = HgConfig(ui)
- fontstr = cfg.getFont()
- font = QtGui.QFont()
- try:
- if not font.fromString(fontstr):
- raise Exception
- except:
- print "bad font name '%s'" % fontstr
- font.setFamily("Monospace")
- font.setFixedPitch(True)
- font.setPointSize(10)
- self._font = font
-
- self.rowheight = cfg.getRowHeight()
- self.users, self.aliases = cfg.getUsers()
- return cfg
+ # TODO: connect to font changed signal
+ self._font = qtlib.getfont(ui, 'fontlog').font()
+ self.rowheight = 8
+ self.users, self.aliases = [], []
def accept(self):
self.close()
|
||
|
@@ -30,8 +30,6 @@
from tortoisehg.util.util import exec_flag_changed, isbfile, bfilepath
-from tortoisehg.hgqt.config import HgConfig
-
from tortoisehg.hgqt.lexers import get_lexer
from tortoisehg.hgqt.blockmatcher import BlockList
@@ -264,8 +262,7 @@ if flag == '':
return
- cfg = HgConfig(self._model.repo.ui)
- lexer = get_lexer(filename, data, flag, cfg)
+ lexer = get_lexer(filename, data, flag)
if flag == "+":
nlines = data.count('\n')
self.sci.setMarginWidth(1, str(nlines)+'0')
|
||
|
@@ -14,6 +14,7 @@ return self.cfg_lexer(self._lexer(), cfg)
def cfg_lexer(self, lexer, cfg=None):
+ # TODO: get font from qtlib.getfont()
if cfg:
font = QtGui.QFont()
fontstr = cfg.getFont()
@@ -142,12 +143,12 @@lexers = [cls() for clsname, cls in globals().items() if not clsname.startswith('_') and isinstance(cls, type) and \
issubclass(cls, (_LexerSelector, _FilenameLexerSelector, _ScriptLexerSelector))]
-def get_lexer(filename, filedata, fileflag=None, cfg=None):
+def get_lexer(filename, filedata, fileflag=None):
if fileflag == "=":
- return DiffLexerSelector().lexer(cfg)
+ return DiffLexerSelector().lexer(None)
for lselector in lexers:
if lselector.match(filename, filedata):
- return lselector.lexer(cfg)
+ return lselector.lexer(None)
return None
|
||
|
@@ -16,10 +16,9 @@
from tortoisehg.hgqt.i18n import _
-from tortoisehg.hgqt.qtlib import geticon
+from tortoisehg.hgqt.qtlib import geticon, getfont
from tortoisehg.hgqt.repomodel import HgRepoListModel
from tortoisehg.hgqt import cmdui, update, tag, manifestdialog, backout, merge
-from tortoisehg.hgqt.config import HgConfig
from repoview import HgRepoView
from revdetailswidget import RevDetailsWidget
@@ -87,23 +86,10 @@ self.revDetailsWidget = w
def load_config(self):
- cfg = HgConfig(self.repo.ui)
- fontstr = cfg.getFont()
- font = QFont()
- try:
- if not font.fromString(fontstr):
- raise Exception
- except:
- print "bad font name '%s'" % fontstr
- font.setFamily("Monospace")
- font.setFixedPitch(True)
- font.setPointSize(10)
- self._font = font
-
- self.rowheight = cfg.getRowHeight()
- self.users, self.aliases = cfg.getUsers()
- self.hidefinddelay = cfg.getHideFindDelay()
- return cfg
+ self._font = getfont(self.repo.ui, 'fontlog')
+ self.rowheight = 8
+ self.users, self.aliases = [], []
+ self.hidefinddelay = False
def reponame(self):
return os.path.basename(self.repo.root)
|
||
|
@@ -10,15 +10,13 @@
from mercurial import hg
+from tortoisehg.hgqt import qtlib
from tortoisehg.hgqt.i18n import _
-
-from tortoisehg.hgqt.config import HgConfig
from tortoisehg.hgqt.filelistmodel import HgFileListModel
-
-from filelistview import HgFileListView
-from fileview import HgFileView
-from revpanelwidget import RevPanelWidget
-from revmessage import RevMessage
+from tortoisehg.hgqt.filelistview import HgFileListView
+from tortoisehg.hgqt.fileview import HgFileView
+from tortoisehg.hgqt.revpanelwidget import RevPanelWidget
+from tortoisehg.hgqt.revmessage import RevMessage
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -155,23 +153,9 @@ revisiondetails_layout.addWidget(self.filelist_splitter)
def load_config(self):
- cfg = HgConfig(self.repo.ui)
- fontstr = cfg.getFont()
- font = QFont()
- try:
- if not font.fromString(fontstr):
- raise Exception
- except:
- print "bad font name '%s'" % fontstr
- font.setFamily("Monospace")
- font.setFixedPitch(True)
- font.setPointSize(10)
- self._font = font
-
- self.rowheight = cfg.getRowHeight()
- self.users, self.aliases = cfg.getUsers()
- self.hidefinddelay = cfg.getHideFindDelay()
- return cfg
+ self._font = qtlib.getfont(self.repo.ui, 'fontlog').font()
+ self.rowheight = 8
+ self.users, self.aliases = [], []
def revisionLinkClicked_(self, rev):
self.revisionLinkClicked.emit(rev)
|
||
Add a tag
Loading...