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 status icons under icons/scalable with thg- prefix

Also added scalable/status to icon search path.
They could be renamed to 'dialog-error' and 'dialog-warning', but there's no
xdg theme icon for 'success'.

Changeset 6281219c3602…

Parent c22cba4fb2df…

by Yuya Nishihara

Changes to 6 files · Browse files at 6281219c3602 Showing diff from parent c22cba4fb2df Diff from another changeset...

Show Entire File icons/​scalable/​status/​thg-error.svg Stacked
renamed from tortoisehg/hgqt/icons/error.svg
(No changes)
Show Entire File icons/​scalable/​status/​thg-success.svg Stacked
renamed from tortoisehg/hgqt/icons/success.svg
(No changes)
Show Entire File icons/​scalable/​status/​thg-warning.svg Stacked
renamed from tortoisehg/hgqt/icons/warning.svg
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
520
521
522
523
 
524
525
526
 
520
521
522
 
523
524
525
526
@@ -520,7 +520,7 @@
  self.groups.set_visible(parents == 2, 'merged')   self.groups.set_visible(parents == 1, 'dirty')   self.wd_status.set_status(_('<b>Uncommitted local changes ' - 'are detected</b>'), 'warning') + 'are detected</b>'), 'thg-warning')   else:   self.groups.set_visible(False, 'dirty')   self.groups.set_visible(False, 'merged')
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
263
264
265
 
266
267
268
 
541
542
543
544
 
545
546
547
 
263
264
265
266
267
268
269
 
542
543
544
 
545
546
547
548
@@ -263,6 +263,7 @@
 # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html  _SCALABLE_ICON_PATHS = [(QSize(), 'scalable/actions', '.svg'),   (QSize(), 'scalable/apps', '.svg'), + (QSize(), 'scalable/status', '.svg'),   (QSize(22, 22), '22x22/actions', '.png'),   (QSize(24, 24), '24x24/actions', '.png')]   @@ -541,7 +542,7 @@
  self.clear_icon()   else:   if isinstance(icon, bool): - icon = geticon(icon and 'success' or 'error') + icon = geticon(icon and 'thg-success' or 'thg-error')   elif isinstance(icon, basestring):   icon = geticon(icon)   elif not isinstance(icon, QIcon):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
63
64
65
66
 
67
68
69
70
 
71
72
73
 
63
64
65
 
66
67
68
69
 
70
71
72
73
@@ -63,11 +63,11 @@
  bvbox = QVBoxLayout()   bvbox.setContentsMargins(2, 2, 2, 2)   self.resolved = tb = QToolButton() - tb.setIcon(qtlib.geticon('success')) + tb.setIcon(qtlib.geticon('thg-success'))   tb.setToolTip(_('Mark this chunk as resolved, goto next unresolved'))   tb.pressed.connect(self.resolveCurrentChunk)   self.unresolved = tb = QToolButton() - tb.setIcon(qtlib.geticon('warning')) + tb.setIcon(qtlib.geticon('thg-warning'))   tb.setToolTip(_('Mark this chunk as unresolved'))   tb.pressed.connect(self.unresolveCurrentChunk)   bvbox.addStretch(1)