Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

changeset: add expand header tool button

unfortunately, Qt has no built-in expander

TODO:
- GUI update is often slow on hiding
- store expanded state (True/False) in settings and restore it on startup

Changeset aba41810494b…

Parent 0abb436591b4…

by Adrian Buehlmann

Changes to one file · Browse files at aba41810494b Showing diff from parent 0abb436591b4 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​changeset.py Stacked
 
42
43
44
45
46
 
 
 
47
48
49
50
 
51
52
 
 
 
 
 
 
 
 
 
 
 
 
53
54
55
 
57
58
59
 
 
 
 
 
 
 
 
 
60
61
62
 
139
140
141
142
143
144
145
146
147
148
149
 
 
 
 
 
 
 
 
 
150
151
152
153
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
154
155
156
157
158
159
160
161
162
 
 
 
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
 
 
 
 
 
 
 
 
 
186
187
 
 
188
189
190
 
42
43
44
 
 
45
46
47
48
49
50
 
51
52
 
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
 
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
 
160
161
162
 
 
 
 
 
 
 
 
163
164
165
166
167
168
169
170
171
172
 
 
 
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
 
 
 
194
195
196
197
 
 
 
 
 
 
 
 
 
 
 
 
198
 
 
 
 
 
 
 
 
 
199
200
201
202
203
204
205
206
207
208
 
209
210
211
212
213
@@ -42,14 +42,26 @@
  QtGui.QWidget.__init__(self, parent)   self._message = None   - vb = QtGui.QVBoxLayout() - vb.setMargin(0) + hb = QtGui.QHBoxLayout() + hb.setMargin(0) + self.setLayout(hb)     self._header = w = QtGui.QLabel()   w.setTextInteractionFlags(Qt.TextSelectableByMouse | Qt.LinksAccessibleByMouse) - vb.addWidget(w) + hb.addWidget(w)   - self.setLayout(vb) + vb = QtGui.QVBoxLayout() + hb.addLayout(vb) + + # expand header button + self._expander = w = QtGui.QToolButton() + w.setArrowType(Qt.UpArrow) + w.setIconSize(QtCore.QSize(10, 10)) + a = QtGui.QAction(self) + connect(a, SIGNAL("triggered()"), self.expand) + w.setDefaultAction(a) + vb.addWidget(w, 0, Qt.AlignTop) + self._expanded = True     self.descwidth = 80 # number of chars displayed for parent/child descriptions   @@ -57,6 +69,15 @@
  SIGNAL('linkActivated(const QString&)'),   self.anchorClicked)   + def expand(self): + self._expanded = not self._expanded + if self._expanded: + t = Qt.UpArrow + else: + t = Qt.DownArrow + self._expander.setArrowType(t) + self.refreshDisplay() +   def sizeHint(self):   return self.minimumSizeHint()   @@ -139,52 +160,54 @@
  '\n' % ctx.branch()   buf += '</tr></table>\n'   - buf += '<table width=100%>\n' - buf += '<tr><td width=50 align="right"><span class="label">Author&nbsp;</span></td>'\ - '<td colspan=5>%s</td></tr>'\ - '\n' % xml_escape(unicode(ctx.user(), 'utf-8', 'replace')) - d = ctx.date() - buf += '<tr><td width=50 align="right"><span class="label">Date&nbsp;</span></td>'\ - '<td>%s (%s)</td></tr>'\ - '\n' % (hglib.displaytime(d), hglib.age(d)) + if self._expanded: + buf += '<table width=100%>\n' + buf += '<tr><td width=50 align="right"><span class="label">Author&nbsp;</span></td>'\ + '<td colspan=5>%s</td></tr>'\ + '\n' % xml_escape(unicode(ctx.user(), 'utf-8', 'replace')) + d = ctx.date() + buf += '<tr><td width=50 align="right"><span class="label">Date&nbsp;</span></td>'\ + '<td>%s (%s)</td></tr>'\ + '\n' % (hglib.displaytime(d), hglib.age(d))   - parents = [p for p in ctx.parents() if p] - for p in parents: - if p.rev() > -1: + parents = [p for p in ctx.parents() if p] + for p in parents: + if p.rev() > -1: + short = short_hex(p.node()) + desc = format_desc(p.description(), self.descwidth) + p_rev = p.rev() + p_fmt = '<span class="rev_number">%s</span>:'\ + '<a href="%s" class="rev_hash">%s</a>' + p_rev = p_fmt % (p_rev, p_rev, short) + buf += '<tr><td width=50 align="right"><span class="label">Parent&nbsp;</span></td>'\ + '<td>%s'\ + '<span class="short_desc">&nbsp;%s</span></td></tr>'\ + '\n' % (p_rev, desc) + if len(parents) == 2: + p = parents[0].ancestor(parents[1])   short = short_hex(p.node())   desc = format_desc(p.description(), self.descwidth)   p_rev = p.rev()   p_fmt = '<span class="rev_number">%s</span>:'\   '<a href="%s" class="rev_hash">%s</a>'   p_rev = p_fmt % (p_rev, p_rev, short) - buf += '<tr><td width=50 align="right"><span class="label">Parent&nbsp;</span></td>'\ - '<td>%s'\ - '<span class="short_desc">&nbsp;%s</span></td></tr>'\ + buf += '<tr><td width=50 align="right"><span class="label">Ancestor</span></td>'\ + '<td>%s&nbsp;'\ + '<span class="short_desc">%s</span></td></tr>'\   '\n' % (p_rev, desc) - if len(parents) == 2: - p = parents[0].ancestor(parents[1]) - short = short_hex(p.node()) - desc = format_desc(p.description(), self.descwidth) - p_rev = p.rev() - p_fmt = '<span class="rev_number">%s</span>:'\ - '<a href="%s" class="rev_hash">%s</a>' - p_rev = p_fmt % (p_rev, p_rev, short) - buf += '<tr><td width=50 align="right"><span class="label">Ancestor</span></td>'\ - '<td>%s&nbsp;'\ - '<span class="short_desc">%s</span></td></tr>'\ - '\n' % (p_rev, desc)   - for p in ctx.children(): - if p.rev() > -1: - short = short_hex(p.node()) - desc = format_desc(p.description(), self.descwidth) - buf += '<tr><td align="right"><span class="label">Child&nbsp;</span></td>'\ - '<td><span class="rev_number">%d</span>:'\ - '<a href="%s" class="rev_hash">%s</a>&nbsp;'\ - '<span class="short_desc">%s</span></td></tr>'\ - '\n' % (p.rev(), p.rev(), short, desc) + for p in ctx.children(): + if p.rev() > -1: + short = short_hex(p.node()) + desc = format_desc(p.description(), self.descwidth) + buf += '<tr><td align="right"><span class="label">Child&nbsp;</span></td>'\ + '<td><span class="rev_number">%d</span>:'\ + '<a href="%s" class="rev_hash">%s</a>&nbsp;'\ + '<span class="short_desc">%s</span></td></tr>'\ + '\n' % (p.rev(), p.rev(), short, desc)   - buf += "</table>\n" + buf += "</table>\n" +   self._header.setText(buf)     self._message.displayRevision(ctx)