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

stable resolve: use standard refresh toolbar button

Changeset 28569a2965d3…

Parent f901d4a3aaec…

by Steve Borho

Changes to one file · Browse files at 28569a2965d3 Showing diff from parent f901d4a3aaec Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
26
27
28
29
30
 
 
31
32
33
34
 
 
35
 
 
 
 
36
37
 
 
38
39
40
 
129
130
131
132
133
134
 
135
136
137
138
 
 
 
139
140
141
 
26
27
28
 
 
29
30
31
 
 
 
32
33
34
35
36
37
38
39
 
40
41
42
43
44
 
133
134
135
 
 
 
136
137
138
139
140
141
142
143
144
145
146
@@ -26,15 +26,19 @@
  self.setWindowIcon(qtlib.geticon('hg-merge'))   self.repo = repo   - s = QSettings() - self.restoreGeometry(s.value('resolve/geom').toByteArray()) + self.setLayout(QVBoxLayout()) + self.layout().setSpacing(5)   - box = QVBoxLayout() - box.setSpacing(5) - self.setLayout(box) + hbox = QHBoxLayout() + self.layout().addLayout(hbox)   + self.refreshButton = tb = QToolButton(self) + tb.setIcon(qtlib.geticon('view-refresh')) + tb.setShortcut(QKeySequence.Refresh) + tb.clicked.connect(self.refresh)   self.stlabel = QLabel() - box.addWidget(self.stlabel) + hbox.addWidget(tb) + hbox.addWidget(self.stlabel)     unres = qtlib.LabeledSeparator(_('Unresolved conflicts'))   self.layout().addWidget(unres) @@ -129,13 +133,14 @@
  self.layout().addWidget(self.cmd)     BB = QDialogButtonBox - bbox = QDialogButtonBox(BB.Ok|BB.Close) - bbox.button(BB.Ok).setText('Refresh') - bbox.accepted.connect(self.refresh) + bbox = QDialogButtonBox(BB.Close)   bbox.rejected.connect(self.reject)   self.layout().addWidget(bbox)   self.bbox = bbox   + s = QSettings() + self.restoreGeometry(s.value('resolve/geom').toByteArray()) +   self.refresh()   self.utree.selectAll()   self.utree.setFocus()