64
53
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
65
54
self.set_icon(icon)
67
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
69
gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
71
56
self.accel_group = gtk.AccelGroup()
72
57
self.add_accel_group(self.accel_group)
74
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
76
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
77
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
78
self.prev_rev_action.set_accel_group(self.accel_group)
79
self.prev_rev_action.connect("activate", self._back_clicked_cb)
80
self.prev_rev_action.connect_accelerator()
82
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
83
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
84
self.next_rev_action.set_accel_group(self.accel_group)
85
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
86
self.next_rev_action.connect_accelerator()
88
self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
89
self.refresh_action.set_accel_path("<viz>/View/Refresh")
90
self.refresh_action.set_accel_group(self.accel_group)
91
self.refresh_action.connect("activate", self._refresh_clicked)
92
self.refresh_action.connect_accelerator()
96
def set_revision(self, revid):
97
self.treeview.set_revision_id(revid)
99
61
def construct(self):
100
62
"""Construct the window contents."""
101
63
vbox = gtk.VBox(spacing=0)
104
self.paned = gtk.VPaned()
105
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
106
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
109
66
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
67
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
68
vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
112
vbox.pack_start(self.paned, expand=True, fill=True)
113
vbox.set_focus_child(self.paned)
71
paned.pack1(self.construct_top(), resize=True, shrink=False)
72
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
74
vbox.pack_start(paned, expand=True, fill=True)
75
vbox.set_focus_child(paned)
138
95
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
140
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
143
edit_menu_globopts = gtk.MenuItem("Global Settings")
144
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
97
edit_menu_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
98
edit_menu_prefs.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
146
100
edit_menu.add(edit_menu_find)
147
edit_menu.add(edit_menu_branchopts)
148
edit_menu.add(edit_menu_globopts)
150
view_menu = gtk.Menu()
151
view_menuitem = gtk.MenuItem("_View")
152
view_menuitem.set_submenu(view_menu)
154
view_menu_refresh = self.refresh_action.create_menu_item()
155
view_menu_refresh.connect('activate', self._refresh_clicked)
157
view_menu.add(view_menu_refresh)
158
view_menu.add(gtk.SeparatorMenuItem())
160
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
view_menu_toolbar.set_active(True)
162
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
164
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
view_menu_compact.set_active(self.compact_view)
166
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
168
view_menu.add(view_menu_toolbar)
169
view_menu.add(view_menu_compact)
170
view_menu.add(gtk.SeparatorMenuItem())
172
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
175
# Revision numbers are pointless if there are multiple branches
176
if len(self.start_revs) > 1:
177
self.mnu_show_revno_column.set_sensitive(False)
178
self.treeview.set_property('revno-column-visible', False)
180
for (col, name) in [(self.mnu_show_revno_column, "revno"),
181
(self.mnu_show_date_column, "date")]:
182
col.set_active(self.treeview.get_property(name + "-column-visible"))
183
col.connect('toggled', self._col_visibility_changed, name)
101
edit_menu.add(edit_menu_prefs)
186
103
go_menu = gtk.Menu()
187
go_menu.set_accel_group(self.accel_group)
188
104
go_menuitem = gtk.MenuItem("_Go")
189
105
go_menuitem.set_submenu(go_menu)
191
go_menu_next = self.next_rev_action.create_menu_item()
192
go_menu_prev = self.prev_rev_action.create_menu_item()
194
tag_image = gtk.Image()
195
tag_image.set_from_file(icon_path("tag-16.png"))
196
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
self.go_menu_tags.set_image(tag_image)
200
go_menu.add(go_menu_next)
201
go_menu.add(go_menu_prev)
107
go_menu_back = gtk.ImageMenuItem(gtk.STOCK_GO_BACK)
108
go_menu_back.connect("activate", self._back_clicked_cb)
110
go_menu_forward = gtk.ImageMenuItem(gtk.STOCK_GO_FORWARD)
111
go_menu_forward.connect("activate", self._fwd_clicked_cb)
113
tags_menu = gtk.Menu()
114
go_menu_tags = gtk.MenuItem("_Tags")
115
go_menu_tags.set_submenu(tags_menu)
117
for (tag, revid) in self.branch.tags.get_tag_dict().items():
118
tag_item = gtk.MenuItem(tag)
119
tag_item.connect('activate', self._tag_selected_cb, revid)
120
tags_menu.add(tag_item)
122
go_menu.add(go_menu_back)
123
go_menu.add(go_menu_forward)
202
124
go_menu.add(gtk.SeparatorMenuItem())
203
go_menu.add(self.go_menu_tags)
125
go_menu.add(go_menu_tags)
205
127
revision_menu = gtk.Menu()
206
128
revision_menuitem = gtk.MenuItem("_Revision")
207
129
revision_menuitem.set_submenu(revision_menu)
209
revision_menu_diff = gtk.MenuItem("View Changes")
210
revision_menu_diff.connect('activate',
213
revision_menu_compare = gtk.MenuItem("Compare with...")
214
revision_menu_compare.connect('activate',
215
self._compare_with_cb)
217
revision_menu_tag = gtk.MenuItem("Tag Revision")
218
revision_menu_tag.connect('activate', self._tag_revision_cb)
220
revision_menu.add(revision_menu_tag)
221
revision_menu.add(revision_menu_diff)
222
revision_menu.add(revision_menu_compare)
131
revision_menu.add(gtk.MenuItem("Tag Revision"))
132
revision_menu.add(gtk.MenuItem("View Changes"))
224
134
branch_menu = gtk.Menu()
225
135
branch_menuitem = gtk.MenuItem("_Branch")
228
138
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
139
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
help_menu = gtk.Menu()
232
help_menuitem = gtk.MenuItem("_Help")
233
help_menuitem.set_submenu(help_menu)
235
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
236
help_about_menuitem.connect('activate', self._about_dialog_cb)
238
help_menu.add(help_about_menuitem)
240
141
menubar.add(file_menuitem)
241
142
menubar.add(edit_menuitem)
242
menubar.add(view_menuitem)
243
143
menubar.add(go_menuitem)
244
144
menubar.add(revision_menuitem)
245
145
menubar.add(branch_menuitem)
246
menubar.add(help_menuitem)
247
146
menubar.show_all()
150
def construct_loading_msg(self):
151
image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
152
gtk.ICON_SIZE_BUTTON)
155
label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
156
label_loading.set_alignment(0.0, 0.5)
159
self.loading_msg_box = gtk.HBox()
160
self.loading_msg_box.set_spacing(5)
161
self.loading_msg_box.set_border_width(5)
162
self.loading_msg_box.pack_start(image_loading, False, False)
163
self.loading_msg_box.pack_start(label_loading, True, True)
164
self.loading_msg_box.show()
166
return self.loading_msg_box
251
168
def construct_top(self):
252
169
"""Construct the top-half of the window."""
253
170
# FIXME: Make broken_line_length configurable
255
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
257
self.treeview.connect('revision-selected',
171
self.treeview = TreeView(self.branch, self.start, self.maxnum, 32)
173
self.treeview.connect("revision-selected",
258
174
self._treeselection_changed_cb)
259
self.treeview.connect('revision-activated',
260
self._tree_revision_activated)
262
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
264
for col in ["revno", "date"]:
265
option = self.config.get_user_option(col + '-column-visible')
266
if option is not None:
267
self.treeview.set_property(col + '-column-visible', option == 'True')
269
self.treeview.set_property(col + '-column-visible', False)
176
self.treeview.connect('revisions-loaded',
177
lambda x: self.loading_msg_box.hide())
271
179
self.treeview.show()
273
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
align.set_padding(5, 0, 0, 0)
275
align.add(self.treeview)
280
183
def construct_navigation(self):
281
184
"""Construct the navigation buttons."""
282
185
self.toolbar = gtk.Toolbar()
283
186
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
285
self.prev_button = self.prev_rev_action.create_tool_item()
286
self.toolbar.insert(self.prev_button, -1)
288
self.next_button = self.next_rev_action.create_tool_item()
289
self.toolbar.insert(self.next_button, -1)
291
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
293
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
294
refresh_button.connect('clicked', self._refresh_clicked)
295
self.toolbar.insert(refresh_button, -1)
297
self.toolbar.show_all()
188
self.back_button = gtk.ToolButton(stock_id=gtk.STOCK_GO_BACK)
189
self.back_button.set_is_important(True)
190
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
192
self.back_button.connect("clicked", self._back_clicked_cb)
193
self.toolbar.insert(self.back_button, -1)
194
self.back_button.show()
196
self.fwd_button = gtk.ToolButton(stock_id=gtk.STOCK_GO_FORWARD)
197
self.fwd_button.set_is_important(True)
198
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
200
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
201
self.toolbar.insert(self.fwd_button, -1)
202
self.fwd_button.show()
299
206
return self.toolbar
301
208
def construct_bottom(self):
302
209
"""Construct the bottom half of the window."""
303
210
from bzrlib.plugins.gtk.revisionview import RevisionView
304
self.revisionview = RevisionView(branch=self.branch)
211
self.revisionview = RevisionView(None, tags=[], show_children=True, branch=self.branch)
305
212
(width, height) = self.get_size()
306
213
self.revisionview.set_size_request(width, int(height / 2.5))
307
214
self.revisionview.show()
308
215
self.revisionview.set_show_callback(self._show_clicked_cb)
309
self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
216
self.revisionview.set_go_callback(self._go_clicked_cb)
311
217
return self.revisionview
313
219
def _tag_selected_cb(self, menuitem, revid):
314
self.treeview.set_revision_id(revid)
220
self.treeview.set_revision(revid)
316
222
def _treeselection_changed_cb(self, selection, *args):
317
223
"""callback for when the treeview changes."""
319
225
parents = self.treeview.get_parents()
320
226
children = self.treeview.get_children()
322
if revision and revision != NULL_REVISION:
323
prev_menu = gtk.Menu()
325
self.prev_rev_action.set_sensitive(True)
326
for parent_id in parents:
327
if parent_id and parent_id != NULL_REVISION:
328
parent = self.branch.repository.get_revision(parent_id)
330
str = ' (' + parent.properties['branch-nick'] + ')'
334
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
335
item.connect('activate', self._set_revision_cb, parent_id)
339
self.prev_rev_action.set_sensitive(False)
342
self.prev_button.set_menu(prev_menu)
344
next_menu = gtk.Menu()
345
if len(children) > 0:
346
self.next_rev_action.set_sensitive(True)
347
for child_id in children:
348
child = self.branch.repository.get_revision(child_id)
350
str = ' (' + child.properties['branch-nick'] + ')'
354
item = gtk.MenuItem(child.message.split("\n")[0] + str)
355
item.connect('activate', self._set_revision_cb, child_id)
359
self.next_rev_action.set_sensitive(False)
362
self.next_button.set_menu(next_menu)
364
self.revisionview.set_revision(revision)
365
self.revisionview.set_children(children)
367
def _tree_revision_activated(self, widget, path, col):
368
# TODO: more than one parent
369
"""Callback for when a treeview row gets activated."""
370
revision = self.treeview.get_revision()
371
parents = self.treeview.get_parents()
373
if len(parents) == 0:
376
parent_id = parents[0]
378
self.show_diff(revision.revision_id, parent_id)
379
self.treeview.grab_focus()
381
def _menu_diff_cb(self,w):
382
(path, focus) = self.treeview.treeview.get_cursor()
383
revid = self.treeview.model[path][treemodel.REVID]
385
parentids = self.branch.repository.revision_parents(revid)
387
if len(parentids) == 0:
388
parentid = NULL_REVISION
390
parentid = parentids[0]
392
self.show_diff(revid,parentid)
228
if revision is not None:
229
self.back_button.set_sensitive(len(parents) > 0)
230
self.fwd_button.set_sensitive(len(children) > 0)
232
if self.branch.supports_tags():
233
tagdict = self.branch.tags.get_reverse_tag_dict()
234
if tagdict.has_key(revision.revision_id):
235
tags = tagdict[revision.revision_id]
236
self.revisionview.set_revision(revision, tags, children)
394
238
def _back_clicked_cb(self, *args):
395
239
"""Callback for when the back button is clicked."""
399
243
"""Callback for when the forward button is clicked."""
400
244
self.treeview.forward()
402
def _go_clicked_cb(self, w, p):
246
def _go_clicked_cb(self, revid):
403
247
"""Callback for when the go button for a parent is clicked."""
404
if self.revisionview.get_revision() is not None:
405
self.treeview.set_revision(self.revisionview.get_revision())
248
self.treeview.set_revision(revid)
407
250
def _show_clicked_cb(self, revid, parentid):
408
251
"""Callback for when the show button for a parent is clicked."""
409
self.show_diff(revid, parentid)
252
self.treeview.show_diff(self.branch, revid, parentid)
410
253
self.treeview.grab_focus()
412
def _compare_with_cb(self,w):
413
"""Callback for revision 'compare with' menu. Will show a small
414
dialog with branch revisions to compare with selected revision in TreeView"""
416
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
418
rb = RevisionBrowser(self.branch,self)
421
if ret == gtk.RESPONSE_OK:
422
(path, focus) = self.treeview.treeview.get_cursor()
423
revid = self.treeview.model[path][treemodel.REVID]
424
self.show_diff(revid, rb.selected_revid)
428
def _set_revision_cb(self, w, revision_id):
429
self.treeview.set_revision_id(revision_id)
431
def _brokenlines_toggled_cb(self, button):
432
self.compact_view = button.get_active()
434
if self.compact_view:
439
self.config.set_user_option('viz-compact-view', option)
440
self.treeview.set_property('compact', self.compact_view)
441
self.treeview.refresh()
443
def _tag_revision_cb(self, w):
445
self.treeview.set_sensitive(False)
446
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
447
response = dialog.run()
448
if response != gtk.RESPONSE_NONE:
451
if response == gtk.RESPONSE_OK:
452
self.treeview.add_tag(dialog.tagname, dialog._revid)
457
self.treeview.set_sensitive(True)
459
def _about_dialog_cb(self, w):
460
from bzrlib.plugins.gtk.about import AboutDialog
464
def _col_visibility_changed(self, col, property):
465
self.config.set_user_option(property + '-column-visible', col.get_active())
466
self.treeview.set_property(property + '-column-visible', col.get_active())
468
def _toolbar_visibility_changed(self, col):
474
def _show_about_cb(self, w):
475
dialog = AboutDialog()
476
dialog.connect('response', lambda d,r: d.destroy())
479
def _refresh_clicked(self, w):
480
self.treeview.refresh()
482
def _update_tags(self):
485
if self.branch.supports_tags():
486
tags = self.branch.tags.get_tag_dict().items()
489
for tag, revid in tags:
490
tag_image = gtk.Image()
491
tag_image.set_from_file(icon_path('tag-16.png'))
492
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
tag_item.set_image(tag_image)
494
tag_item.connect('activate', self._tag_selected_cb, revid)
496
self.go_menu_tags.set_submenu(menu)
498
self.go_menu_tags.set_sensitive(len(tags) != 0)
500
self.go_menu_tags.set_sensitive(False)
502
self.go_menu_tags.show_all()
504
def show_diff(self, revid=None, parentid=None):
505
"""Open a new window to show a diff between the given revisions."""
506
from bzrlib.plugins.gtk.diff import DiffWindow
507
window = DiffWindow(parent=self)
510
parentid = NULL_REVISION
512
rev_tree = self.branch.repository.revision_tree(revid)
513
parent_tree = self.branch.repository.revision_tree(parentid)
515
description = revid + " - " + self.branch.nick
516
window.set_diff(description, rev_tree, parent_tree)