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

repotreeitem: use wildcard import for Qt things

Changeset 14628c79d3f5

Parent 69222862b75f

by Adrian Buehlmann

Changes to one file · Browse files at 14628c79d3f5 Showing diff from parent 69222862b75f Diff from another changeset...

 
10
11
12
13
14
15
16
17
18
19
20
21
 
 
 
22
23
24
 
285
286
287
288
289
 
 
290
291
292
 
323
324
325
326
327
 
 
328
329
330
 
10
11
12
 
 
 
 
13
14
15
16
17
18
19
20
21
22
23
 
284
285
286
 
 
287
288
289
290
291
 
322
323
324
 
 
325
326
327
328
329
@@ -10,15 +10,14 @@
   from mercurial import hg, url   -from PyQt4 import QtCore, QtGui - -from PyQt4.QtCore import Qt, QVariant, QString -  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.qtlib import geticon    from tortoisehg.hgqt.settings import SettingsDialog   +from PyQt4.QtCore import * +from PyQt4.QtGui import * +    xmlClassMap = {   'allgroup': 'AllRepoGroupItem', @@ -285,8 +284,8 @@
  def data(self, column, role):   if role == Qt.DecorationRole:   if column == 0: - s = QtGui.QApplication.style() - ico = s.standardIcon(QtGui.QStyle.SP_DirIcon) + s = QApplication.style() + ico = s.standardIcon(QStyle.SP_DirIcon)   return QVariant(ico)   return QVariant()   if column == 0: @@ -323,8 +322,8 @@
  def data(self, column, role):   if role == Qt.DecorationRole:   if column == 0: - s = QtGui.QApplication.style() - ico = s.standardIcon(QtGui.QStyle.SP_DirIcon) + s = QApplication.style() + ico = s.standardIcon(QStyle.SP_DirIcon)   return QVariant(ico)   return QVariant()   if column == 0: