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

status: disable Qt.DecorationRole until we get proper icons

Changeset 11eef776263b…

Parent 7013f2db2f2f…

by Steve Borho

Changes to one file · Browse files at 11eef776263b Showing diff from parent 7013f2db2f2f Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
452
453
454
455
456
457
458
459
460
461
462
 
464
465
466
 
 
 
 
 
 
 
467
468
469
 
452
453
454
 
 
 
 
 
455
456
457
 
459
460
461
462
463
464
465
466
467
468
469
470
471
@@ -452,11 +452,6 @@
  return Qt.Unchecked   elif role == Qt.DisplayRole:   return QVariant(self.rows[index.row()][index.column()]) - elif role == Qt.DecorationRole and index.column() == COL_STATUS: - if status in statusTypes: - ico = QIcon() - ico.addPixmap(QPixmap('icons/' + statusTypes[status].icon)) - return QVariant(ico)   elif role == Qt.TextColorRole:   if mst:   return _colors.get(mst.lower(), QColor('black')) @@ -464,6 +459,13 @@
  return _colors.get(status, QColor('black'))   elif role == Qt.ToolTipRole:   return QVariant(statusMessage(status, mst, upath)) + ''' + elif role == Qt.DecorationRole and index.column() == COL_STATUS: + if status in statusTypes: + ico = QIcon() + ico.addPixmap(QPixmap('icons/' + statusTypes[status].icon)) + return QVariant(ico) + '''   return QVariant()     def headerData(self, col, orientation, role):