Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable icons: move icons for merge changeset under icons/scalable

Changeset 5e826e79e3e0…

Parent 0493752e7f49…

by Yuya Nishihara

Changes to 4 files · Browse files at 5e826e79e3e0 Showing diff from parent 0493752e7f49 Diff from another changeset...

Show Entire File icons/​scalable/​status/​thg-file-merged.svg Stacked
renamed from tortoisehg/hgqt/icons/leftright.svg
(No changes)
Show Entire File icons/​scalable/​status/​thg-file-p0.svg Stacked
renamed from tortoisehg/hgqt/icons/left.svg
(No changes)
Show Entire File icons/​scalable/​status/​thg-file-p1.svg Stacked
renamed from tortoisehg/hgqt/icons/right.svg
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
146
147
148
149
 
150
151
 
152
153
 
154
155
156
 
146
147
148
 
149
150
 
151
152
 
153
154
155
156
@@ -146,11 +146,11 @@
  elif role == Qt.DecorationRole:   if self._fulllist and bool(self._ctx.p2()):   if current_file_desc['wasmerged']: - icn = geticon('leftright') + icn = geticon('thg-file-merged')   elif current_file_desc['parent'] == 0: - icn = geticon('left') + icn = geticon('thg-file-p0')   elif current_file_desc['parent'] == 1: - icn = geticon('right') + icn = geticon('thg-file-p1')   return QVariant(icn.pixmap(20,20))   elif current_file_desc['status'] == 'A':   return QVariant(geticon('fileadd'))