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

stable pbranch: Fetch icons using qtlib.geticon

Changeset da50220ff5f9…

Parent cd361b176945…

by Peer Sommerlund

Changes to one file · Browse files at da50220ff5f9 Showing diff from parent cd361b176945 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​pbranch.py Stacked
 
12
13
14
 
15
16
17
 
54
55
56
57
 
58
59
60
61
62
63
 
64
65
66
67
68
69
 
70
71
72
73
74
75
 
76
77
78
79
80
81
 
82
83
84
 
12
13
14
15
16
17
18
 
55
56
57
 
58
59
60
61
62
63
 
64
65
66
67
68
69
 
70
71
72
73
74
75
 
76
77
78
79
80
81
 
82
83
84
85
@@ -12,6 +12,7 @@
   from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui +from tortoisehg.hgqt.qtlib import geticon  from tortoisehg.util import hglib    from PyQt4.QtCore import * @@ -54,31 +55,31 @@
  tb.setFloatable(False)     self.actionPMerge = a = QWidgetAction(self) - a.setIcon(QIcon(QPixmap(":/icons/merge.svg"))) + a.setIcon(geticon("merge"))   a.setToolTip(_('Merge all pending dependencies'))   tb.addAction(self.actionPMerge)   self.actionPMerge.triggered.connect(self.pmerge_clicked)     self.actionBackport = a = QWidgetAction(self) - a.setIcon(QIcon(QPixmap(":/icons/back.svg"))) + a.setIcon(geticon("go-previous"))   a.setToolTip(_('Backout current patch branch'))   tb.addAction(self.actionBackport)   #self.actionBackport.triggered.connect(self.pbackout_clicked)     self.actionReapply = a = QWidgetAction(self) - a.setIcon(QIcon(QPixmap(":/icons/forward.svg"))) + a.setIcon(geticon("go-next"))   a.setToolTip(_('Backport part of a changeset to a dependency'))   tb.addAction(self.actionReapply)   #self.actionReapply.triggered.connect(self.reapply_clicked)     self.actionPNew = a = QWidgetAction(self) - a.setIcon(QIcon(QPixmap(":/icons/fileadd.ico"))) #STOCK_NEW + a.setIcon(geticon("fileadd")) #STOCK_NEW   a.setToolTip(_('Start a new patch branch'))   tb.addAction(self.actionPNew)   self.actionPNew.triggered.connect(self.pnew_clicked)     self.actionEditPGraph = a = QWidgetAction(self) - a.setIcon(QIcon(QPixmap(":/icons/log.svg"))) #STOCK_EDIT + a.setIcon(geticon("log")) #STOCK_EDIT   a.setToolTip(_('Edit patch dependency graph'))   tb.addAction(self.actionEditPGraph)   #self.actionEditPGraph.triggered.connect(self.pbackout_clicked)