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

qtlib: use wildcard import for Qsci

Changeset 4cde752ff8ef…

Parent 63e1abb497d5…

by Yuya Nishihara

Changes to one file · Browse files at 4cde752ff8ef Showing diff from parent 63e1abb497d5 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
12
13
14
15
 
16
17
18
19
20
21
22
23
24
25
26
 
455
456
457
458
459
 
 
460
461
462
 
465
466
467
468
 
469
470
471
 
12
13
14
 
15
16
17
18
19
20
21
 
 
22
23
24
 
453
454
455
 
 
456
457
458
459
460
 
463
464
465
 
466
467
468
469
@@ -12,15 +12,13 @@
   from PyQt4.QtCore import *  from PyQt4.QtGui import * -from PyQt4 import Qsci +from PyQt4.Qsci import *  from mercurial import extensions, util    from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from hgext.color import _styles   -qsci = Qsci.QsciScintilla -  tmproot = None  def gettempdir():   global tmproot @@ -455,8 +453,8 @@
  dialog.setWindowFlags(dialog.windowFlags() & ~Qt.WindowContextHelpButtonHint)   vbox = QVBoxLayout()   dialog.setLayout(vbox) - editor = qsci() - editor.setBraceMatching(qsci.SloppyBraceMatch) + editor = QsciScintilla() + editor.setBraceMatching(QsciScintilla.SloppyBraceMatch)   vbox.addWidget(editor)   BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Save|BB.Cancel) @@ -465,7 +463,7 @@
  dialog.connect(bb, SIGNAL('rejected()'),   dialog, SLOT('reject()'))   vbox.addWidget(bb) - lexer = Qsci.QsciLexerProperties() + lexer = QsciLexerProperties()   editor.setLexer(lexer)   s = QSettings()   ret = QDialog.Rejected