Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- changeset 7492
- 39e3ed0bc0c6
- parent 7360
- 9190402e4505
- child 7533
- 88261c96484b
equal
deleted
inserted
replaced
| 7491:afb9771fcb82 | 7492:39e3ed0bc0c6 |
|---|---|
| 357 | 357 |
| 358 if status in self.ConflictStates: | 358 if status in self.ConflictStates: |
| 359 itm.setIcon(self.__statusWorkColumn, | 359 itm.setIcon(self.__statusWorkColumn, |
| 360 UI.PixmapCache.getIcon( | 360 UI.PixmapCache.getIcon( |
| 361 os.path.join("VcsPlugins", "vcsGit", "icons", | 361 os.path.join("VcsPlugins", "vcsGit", "icons", |
| 362 "conflict.png"))) | 362 "conflict.svg"))) |
| 363 itm.setData(0, self.ConflictRole, status in self.ConflictStates) | 363 itm.setData(0, self.ConflictRole, status in self.ConflictStates) |
| 364 | 364 |
| 365 def start(self, fn): | 365 def start(self, fn): |
| 366 """ | 366 """ |
| 367 Public slot to start the git status command. | 367 Public slot to start the git status command. |
