71
64
vbox.set_focus_child(paned)
75
def construct_loading_msg(self):
76
image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
80
label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
81
label_loading.set_alignment(0.0, 0.5)
84
self.loading_msg_box = gtk.HBox()
85
self.loading_msg_box.set_spacing(5)
86
self.loading_msg_box.set_border_width(5)
87
self.loading_msg_box.pack_start(image_loading, False, False)
88
self.loading_msg_box.pack_start(label_loading, True, True)
89
self.loading_msg_box.show()
91
return self.loading_msg_box
93
68
def construct_top(self):
94
69
"""Construct the top-half of the window."""
95
self.treeview = TreeView(self.branch, self.start, self.maxnum)
97
self.treeview.connect("revision-selected",
98
self._treeselection_changed_cb)
100
self.treeview.connect('revisions-loaded',
101
lambda x: self.loading_msg_box.hide())
70
scrollwin = gtk.ScrolledWindow()
71
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
72
scrollwin.set_shadow_type(gtk.SHADOW_IN)
75
self.treeview = gtk.TreeView()
76
self.treeview.set_rules_hint(True)
77
self.treeview.set_search_column(4)
78
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
79
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
80
scrollwin.add(self.treeview)
103
81
self.treeview.show()
83
cell = CellRendererGraph()
84
column = gtk.TreeViewColumn()
85
column.set_resizable(True)
86
column.pack_start(cell, expand=False)
87
column.add_attribute(cell, "node", 1)
88
column.add_attribute(cell, "in-lines", 2)
89
column.add_attribute(cell, "out-lines", 3)
90
self.treeview.append_column(column)
92
cell = gtk.CellRendererText()
93
cell.set_property("width-chars", 40)
94
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
95
column = gtk.TreeViewColumn("Message")
96
column.set_resizable(True)
97
column.pack_start(cell, expand=True)
98
column.add_attribute(cell, "text", 4)
99
self.treeview.append_column(column)
101
cell = gtk.CellRendererText()
102
cell.set_property("width-chars", 40)
103
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
104
column = gtk.TreeViewColumn("Committer")
105
column.set_resizable(True)
106
column.pack_start(cell, expand=True)
107
column.add_attribute(cell, "text", 5)
108
self.treeview.append_column(column)
110
cell = gtk.CellRendererText()
111
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
112
column = gtk.TreeViewColumn("Date")
113
column.set_resizable(True)
114
column.pack_start(cell, expand=True)
115
column.add_attribute(cell, "text", 6)
116
self.treeview.append_column(column)
107
120
def construct_navigation(self):
108
121
"""Construct the navigation buttons."""
135
148
def construct_bottom(self):
136
149
"""Construct the bottom half of the window."""
137
from bzrlib.plugins.gtk.logview import LogView
138
self.logview = LogView(None, True, [], True)
150
scrollwin = gtk.ScrolledWindow()
151
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
152
scrollwin.set_shadow_type(gtk.SHADOW_NONE)
139
153
(width, height) = self.get_size()
140
self.logview.set_size_request(width, int(height / 2.5))
142
self.logview.set_show_callback(self._show_clicked_cb)
143
self.logview.set_go_callback(self._go_clicked_cb)
146
def _treeselection_changed_cb(self, selection, *args):
147
"""callback for when the treeview changes."""
148
revision = self.treeview.get_revision()
149
parents = self.treeview.get_parents()
150
children = self.treeview.get_children()
152
if revision is not None:
153
self.back_button.set_sensitive(len(parents) > 0)
154
self.fwd_button.set_sensitive(len(children) > 0)
156
if self.branch.supports_tags():
157
tagdict = self.branch.tags.get_reverse_tag_dict()
158
if tagdict.has_key(revision.revision_id):
159
tags = tagdict[revision.revision_id]
160
self.logview.set_revision(revision, tags, children)
154
scrollwin.set_size_request(width, int(height / 2.5))
157
vbox = gtk.VBox(False, spacing=6)
158
vbox.set_border_width(6)
159
scrollwin.add_with_viewport(vbox)
162
table = gtk.Table(rows=4, columns=2)
163
table.set_row_spacings(6)
164
table.set_col_spacings(6)
165
vbox.pack_start(table, expand=False, fill=True)
168
align = gtk.Alignment(0.0, 0.5)
170
label.set_markup("<b>Revision:</b>")
172
table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
176
align = gtk.Alignment(0.0, 0.5)
177
self.revid_label = gtk.Label()
178
self.revid_label.set_selectable(True)
179
align.add(self.revid_label)
180
table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
181
self.revid_label.show()
184
align = gtk.Alignment(0.0, 0.5)
186
label.set_markup("<b>Committer:</b>")
188
table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
192
align = gtk.Alignment(0.0, 0.5)
193
self.committer_label = gtk.Label()
194
self.committer_label.set_selectable(True)
195
align.add(self.committer_label)
196
table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
197
self.committer_label.show()
200
align = gtk.Alignment(0.0, 0.5)
202
label.set_markup("<b>Branch nick:</b>")
204
table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
208
align = gtk.Alignment(0.0, 0.5)
209
self.branchnick_label = gtk.Label()
210
self.branchnick_label.set_selectable(True)
211
align.add(self.branchnick_label)
212
table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
213
self.branchnick_label.show()
216
align = gtk.Alignment(0.0, 0.5)
218
label.set_markup("<b>Timestamp:</b>")
220
table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
224
align = gtk.Alignment(0.0, 0.5)
225
self.timestamp_label = gtk.Label()
226
self.timestamp_label.set_selectable(True)
227
align.add(self.timestamp_label)
228
table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
229
self.timestamp_label.show()
232
self.parents_table = gtk.Table(rows=1, columns=2)
233
self.parents_table.set_row_spacings(3)
234
self.parents_table.set_col_spacings(6)
235
self.parents_table.show()
236
vbox.pack_start(self.parents_table, expand=False, fill=True)
237
self.parents_widgets = []
240
label.set_markup("<b>Parents:</b>")
241
align = gtk.Alignment(0.0, 0.5)
243
self.parents_table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
247
self.message_buffer = gtk.TextBuffer()
248
textview = gtk.TextView(self.message_buffer)
249
textview.set_editable(False)
250
textview.set_wrap_mode(gtk.WRAP_WORD)
251
textview.modify_font(pango.FontDescription("Monospace"))
252
vbox.pack_start(textview, expand=True, fill=True)
257
def set_branch(self, branch, start, maxnum):
258
"""Set the branch and start position for this window.
260
Creates a new TreeModel and populates it with information about
261
the new branch before updating the window title and model of the
266
# [ revision, node, last_lines, lines, message, committer, timestamp ]
267
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
268
gobject.TYPE_PYOBJECT,
269
gobject.TYPE_PYOBJECT,
270
gobject.TYPE_PYOBJECT,
276
(self.revisions, colours, self.children, self.parent_ids,
277
merge_sorted) = distances(branch, start)
278
for (index, (revision, node, lines)) in enumerate(graph(
279
self.revisions, colours, merge_sorted)):
280
# FIXME: at this point we should be able to show the graph order
281
# and lines with no message or commit data - and then incrementally
282
# fill the timestamp, committer etc data as desired.
283
message = revision.message.split("\n")[0]
284
if revision.committer is not None:
285
timestamp = format_date(revision.timestamp, revision.timezone)
288
self.model.append([revision, node, last_lines, lines,
289
message, revision.committer, timestamp])
290
self.index[revision] = index
292
if maxnum is not None and index > maxnum:
295
self.set_title(branch.nick + " - bzrk")
296
self.treeview.set_model(self.model)
298
def _treeview_cursor_cb(self, *args):
299
"""Callback for when the treeview cursor changes."""
300
(path, col) = self.treeview.get_cursor()
301
revision = self.model[path][0]
303
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
304
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
306
if revision.committer is not None:
308
committer = revision.committer
309
timestamp = format_date(revision.timestamp, revision.timezone)
310
message = revision.message
312
branchnick = revision.properties['branch-nick']
322
self.revid_label.set_text(revision.revision_id)
323
self.branchnick_label.set_text(branchnick)
325
self.committer_label.set_text(committer)
326
self.timestamp_label.set_text(timestamp)
327
self.message_buffer.set_text(message)
329
for widget in self.parents_widgets:
330
self.parents_table.remove(widget)
332
self.parents_widgets = []
333
self.parents_table.resize(max(len(self.parent_ids[revision]), 1), 2)
335
for idx, parent_id in enumerate(self.parent_ids[revision]):
336
align = gtk.Alignment(0.0, 0.0)
337
self.parents_widgets.append(align)
338
self.parents_table.attach(align, 1, 2, idx, idx + 1,
339
gtk.EXPAND | gtk.FILL, gtk.FILL)
342
hbox = gtk.HBox(False, spacing=6)
347
image.set_from_stock(
348
gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
351
button = gtk.Button()
353
button.set_sensitive(self.app is not None)
354
button.connect("clicked", self._show_clicked_cb,
355
revision.revision_id, parent_id)
356
hbox.pack_start(button, expand=False, fill=True)
359
button = gtk.Button(parent_id)
360
button.set_use_underline(False)
361
button.connect("clicked", self._go_clicked_cb, parent_id)
362
hbox.pack_start(button, expand=False, fill=True)
162
366
def _back_clicked_cb(self, *args):
163
367
"""Callback for when the back button is clicked."""
368
(path, col) = self.treeview.get_cursor()
369
revision = self.model[path][0]
370
if not len(self.parent_ids[revision]):
373
for parent_id in self.parent_ids[revision]:
374
parent = self.revisions[parent_id]
375
if same_branch(revision, parent):
376
self.treeview.set_cursor(self.index[parent])
379
next = self.revisions[self.parent_ids[revision][0]]
380
self.treeview.set_cursor(self.index[next])
381
self.treeview.grab_focus()
166
383
def _fwd_clicked_cb(self, *args):
167
384
"""Callback for when the forward button is clicked."""
168
self.treeview.forward()
170
def _go_clicked_cb(self, revid):
385
(path, col) = self.treeview.get_cursor()
386
revision = self.model[path][0]
387
if not len(self.children[revision]):
390
for child in self.children[revision]:
391
if same_branch(child, revision):
392
self.treeview.set_cursor(self.index[child])
395
prev = list(self.children[revision])[0]
396
self.treeview.set_cursor(self.index[prev])
397
self.treeview.grab_focus()
399
def _go_clicked_cb(self, widget, revid):
171
400
"""Callback for when the go button for a parent is clicked."""
172
self.treeview.set_revision(revid)
401
self.treeview.set_cursor(self.index[self.revisions[revid]])
402
self.treeview.grab_focus()
174
def _show_clicked_cb(self, revid, parentid):
404
def _show_clicked_cb(self, widget, revid, parentid):
175
405
"""Callback for when the show button for a parent is clicked."""
176
self.treeview.show_diff(self.branch, revid, parentid)
406
if self.app is not None:
407
self.app.show_diff(self.branch, revid, parentid)
177
408
self.treeview.grab_focus()
410
def _treeview_row_activated_cb(self, widget, path, col):
411
# TODO: more than one parent
412
"""Callback for when a treeview row gets activated."""
413
revision = self.model[path][0]
414
if len(self.parent_ids[revision]) == 0:
415
# Ignore revisions without parent
417
parent_id = self.parent_ids[revision][0]
418
if self.app is not None:
419
self.app.show_diff(self.branch, revision.revision_id, parent_id)
420
self.treeview.grab_focus()