50
64
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
51
65
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)
53
70
self.accel_group = gtk.AccelGroup()
54
71
self.add_accel_group(self.accel_group)
73
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
75
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
76
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
77
self.prev_rev_action.set_accel_group(self.accel_group)
78
self.prev_rev_action.connect("activate", self._back_clicked_cb)
79
self.prev_rev_action.connect_accelerator()
81
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
82
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
83
self.next_rev_action.set_accel_group(self.accel_group)
84
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
85
self.next_rev_action.connect_accelerator()
89
def set_revision(self, revid):
90
self.treeview.set_revision_id(revid)
58
92
def construct(self):
59
93
"""Construct the window contents."""
60
94
vbox = gtk.VBox(spacing=0)
97
self.paned = gtk.VPaned()
98
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
99
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
102
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
63
103
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
64
vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
67
paned.pack1(self.construct_top(), resize=True, shrink=False)
68
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
70
vbox.pack_start(paned, expand=True, fill=True)
71
vbox.set_focus_child(paned)
105
vbox.pack_start(self.paned, expand=True, fill=True)
106
vbox.set_focus_child(self.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
110
def construct_menubar(self):
111
menubar = gtk.MenuBar()
113
file_menu = gtk.Menu()
114
file_menuitem = gtk.MenuItem("_File")
115
file_menuitem.set_submenu(file_menu)
117
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
118
file_menu_close.connect('activate', lambda x: self.destroy())
120
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
121
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
123
if self._parent is not None:
124
file_menu.add(file_menu_close)
125
file_menu.add(file_menu_quit)
127
edit_menu = gtk.Menu()
128
edit_menuitem = gtk.MenuItem("_Edit")
129
edit_menuitem.set_submenu(edit_menu)
131
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
133
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
134
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
136
edit_menu_globopts = gtk.MenuItem("Global Settings")
137
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
139
edit_menu.add(edit_menu_find)
140
edit_menu.add(edit_menu_branchopts)
141
edit_menu.add(edit_menu_globopts)
143
view_menu = gtk.Menu()
144
view_menuitem = gtk.MenuItem("_View")
145
view_menuitem.set_submenu(view_menu)
147
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
148
view_menu_toolbar.set_active(True)
149
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
151
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
152
view_menu_compact.set_active(self.compact_view)
153
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
155
view_menu.add(view_menu_toolbar)
156
view_menu.add(view_menu_compact)
157
view_menu.add(gtk.SeparatorMenuItem())
159
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
160
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
162
# Revision numbers are pointless if there are multiple branches
163
if len(self.start_revs) > 1:
164
self.mnu_show_revno_column.set_sensitive(False)
165
self.treeview.set_property('revno-column-visible', False)
167
for (col, name) in [(self.mnu_show_revno_column, "revno"),
168
(self.mnu_show_date_column, "date")]:
169
col.set_active(self.treeview.get_property(name + "-column-visible"))
170
col.connect('toggled', self._col_visibility_changed, name)
174
go_menu.set_accel_group(self.accel_group)
175
go_menuitem = gtk.MenuItem("_Go")
176
go_menuitem.set_submenu(go_menu)
178
go_menu_next = self.next_rev_action.create_menu_item()
179
go_menu_prev = self.prev_rev_action.create_menu_item()
181
tag_image = gtk.Image()
182
tag_image.set_from_file(icon_path("tag-16.png"))
183
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
184
self.go_menu_tags.set_image(tag_image)
187
go_menu.add(go_menu_next)
188
go_menu.add(go_menu_prev)
189
go_menu.add(gtk.SeparatorMenuItem())
190
go_menu.add(self.go_menu_tags)
192
revision_menu = gtk.Menu()
193
revision_menuitem = gtk.MenuItem("_Revision")
194
revision_menuitem.set_submenu(revision_menu)
196
revision_menu_diff = gtk.MenuItem("View Changes")
197
revision_menu_diff.connect('activate',
198
lambda w: self.treeview.show_diff())
200
revision_menu_tag = gtk.MenuItem("Tag Revision")
201
revision_menu_tag.connect('activate', self._tag_revision_cb)
203
revision_menu.add(revision_menu_tag)
204
revision_menu.add(revision_menu_diff)
206
branch_menu = gtk.Menu()
207
branch_menuitem = gtk.MenuItem("_Branch")
208
branch_menuitem.set_submenu(branch_menu)
210
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
211
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
213
help_menu = gtk.Menu()
214
help_menuitem = gtk.MenuItem("_Help")
215
help_menuitem.set_submenu(help_menu)
217
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
218
help_about_menuitem.connect('activate', self._about_dialog_cb)
220
help_menu.add(help_about_menuitem)
222
menubar.add(file_menuitem)
223
menubar.add(edit_menuitem)
224
menubar.add(view_menuitem)
225
menubar.add(go_menuitem)
226
menubar.add(revision_menuitem)
227
menubar.add(branch_menuitem)
228
menubar.add(help_menuitem)
93
233
def construct_top(self):
94
234
"""Construct the top-half of the window."""
95
self.treeview = TreeView(self.branch, self.start, self.maxnum)
97
self.treeview.connect("revision-selected",
235
# FIXME: Make broken_line_length configurable
237
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
239
self.treeview.connect('revision-selected',
98
240
self._treeselection_changed_cb)
100
self.treeview.connect('revisions-loaded',
101
lambda x: self.loading_msg_box.hide())
241
self.treeview.connect('revision-activated',
242
self._tree_revision_activated)
244
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
246
for col in ["revno", "date"]:
247
option = self.config.get_user_option(col + '-column-visible')
248
if option is not None:
249
self.treeview.set_property(col + '-column-visible', option == 'True')
251
self.treeview.set_property(col + '-column-visible', False)
103
252
self.treeview.show()
254
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
255
align.set_padding(5, 0, 0, 0)
256
align.add(self.treeview)
107
261
def construct_navigation(self):
108
262
"""Construct the navigation buttons."""
110
frame.set_shadow_type(gtk.SHADOW_OUT)
113
hbox = gtk.HBox(spacing=12)
117
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
118
self.back_button.set_relief(gtk.RELIEF_NONE)
119
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
121
self.back_button.connect("clicked", self._back_clicked_cb)
122
hbox.pack_start(self.back_button, expand=False, fill=True)
123
self.back_button.show()
125
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
126
self.fwd_button.set_relief(gtk.RELIEF_NONE)
127
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
129
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
130
hbox.pack_start(self.fwd_button, expand=False, fill=True)
131
self.fwd_button.show()
263
self.toolbar = gtk.Toolbar()
264
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
266
self.prev_button = self.prev_rev_action.create_tool_item()
267
self.toolbar.insert(self.prev_button, -1)
269
self.next_button = self.next_rev_action.create_tool_item()
270
self.toolbar.insert(self.next_button, -1)
272
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
274
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
275
refresh_button.connect('clicked', self._refresh_clicked)
276
self.toolbar.insert(refresh_button, -1)
278
self.toolbar.show_all()
135
282
def construct_bottom(self):
136
283
"""Construct the bottom half of the window."""
137
from bzrlib.plugins.gtk.logview import LogView
138
self.logview = LogView(None, True, [], True)
284
from bzrlib.plugins.gtk.revisionview import RevisionView
285
self.revisionview = RevisionView(branch=self.branch)
139
286
(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)
287
self.revisionview.set_size_request(width, int(height / 2.5))
288
self.revisionview.show()
289
self.revisionview.set_show_callback(self._show_clicked_cb)
290
self.revisionview.connect('notify::revision', self._go_clicked_cb)
291
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
292
return self.revisionview
294
def _tag_selected_cb(self, menuitem, revid):
295
self.treeview.set_revision_id(revid)
146
297
def _treeselection_changed_cb(self, selection, *args):
147
298
"""callback for when the treeview changes."""
148
299
revision = self.treeview.get_revision()
167
367
"""Callback for when the forward button is clicked."""
168
368
self.treeview.forward()
170
def _go_clicked_cb(self, revid):
370
def _go_clicked_cb(self, w, p):
171
371
"""Callback for when the go button for a parent is clicked."""
172
self.treeview.set_revision(revid)
372
if self.revisionview.get_revision() is not None:
373
self.treeview.set_revision(self.revisionview.get_revision())
174
375
def _show_clicked_cb(self, revid, parentid):
175
376
"""Callback for when the show button for a parent is clicked."""
176
self.treeview.show_diff(self.branch, revid, parentid)
377
self.show_diff(revid, parentid)
177
378
self.treeview.grab_focus()
380
def _set_revision_cb(self, w, revision_id):
381
self.treeview.set_revision_id(revision_id)
383
def _brokenlines_toggled_cb(self, button):
384
self.compact_view = button.get_active()
386
if self.compact_view:
391
self.config.set_user_option('viz-compact-view', option)
392
self.treeview.set_property('compact', self.compact_view)
393
self.treeview.refresh()
395
def _tag_revision_cb(self, w):
397
self.treeview.set_sensitive(False)
398
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
399
response = dialog.run()
400
if response != gtk.RESPONSE_NONE:
403
if response == gtk.RESPONSE_OK:
404
self.treeview.add_tag(dialog.tagname, dialog._revid)
409
self.treeview.set_sensitive(True)
411
def _about_dialog_cb(self, w):
412
from bzrlib.plugins.gtk.about import AboutDialog
416
def _col_visibility_changed(self, col, property):
417
self.config.set_user_option(property + '-column-visible', col.get_active())
418
self.treeview.set_property(property + '-column-visible', col.get_active())
420
def _toolbar_visibility_changed(self, col):
426
def _show_about_cb(self, w):
427
dialog = AboutDialog()
428
dialog.connect('response', lambda d,r: d.destroy())
431
def _refresh_clicked(self, w):
432
self.treeview.refresh()
434
def _update_tags(self):
437
if self.branch.supports_tags():
438
tags = self.branch.tags.get_tag_dict().items()
441
for tag, revid in tags:
442
tag_image = gtk.Image()
443
tag_image.set_from_file(icon_path('tag-16.png'))
444
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
445
tag_item.set_image(tag_image)
446
tag_item.connect('activate', self._tag_selected_cb, revid)
448
self.go_menu_tags.set_submenu(menu)
450
self.go_menu_tags.set_sensitive(len(tags) != 0)
452
self.go_menu_tags.set_sensitive(False)
454
self.go_menu_tags.show_all()
456
def show_diff(self, revid=None, parentid=None):
457
"""Open a new window to show a diff between the given revisions."""
458
from bzrlib.plugins.gtk.diff import DiffWindow
459
window = DiffWindow(parent=self)
462
parentid = NULL_REVISION
464
rev_tree = self.branch.repository.revision_tree(revid)
465
parent_tree = self.branch.repository.revision_tree(parentid)
467
description = revid + " - " + self.branch.nick
468
window.set_diff(description, rev_tree, parent_tree)