To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
« back to all changes in this revision
Viewing changes to viz/branchwin.py
- browse files at revision 153
- compare with another revision
- download diff
- download tarball
- view history from revision 153
- Committer: Jelmer Vernooij
- Date: 2007-02-03 14:19:44 UTC
- Revision ID: jelmer@samba.org-20070203141944-oa6iqhetsy0slqo0
Fix references to dialog.
- files added:
- po/hu.po
- files removed:
- HACKING
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- status.py => olive/status.py
- icons/oliveicon2.png => oliveicon2.png
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.py
- files modified:
- .bzrignore
added
removed
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
16
from bzrlib.plugins.gtk.window import Window
17
from bzrlib.plugins.gtk import icon_path
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
from bzrlib.revision import Revision, NULL_REVISION
22
from bzrlib.config import BranchConfig
23
from bzrlib.config import GlobalConfig
24
25
class BranchWindow(Window):
16
from bzrlib.osutils import format_date
17
18
from graph import distances, graph, same_branch
19
from graphcell import CellRendererGraph
20
21
22
class BranchWindow(gtk.Window):
26
23
"""Branch window.
27
24
28
25
This object represents and manages a single window containing information
29
26
for a particular branch.
30
27
"""
31
28
32
def __init__(self, branch, start_revs, maxnum, parent=None):
33
"""Create a new BranchWindow.
34
35
:param branch: Branch object for branch to show.
36
:param start_revs: Revision ids of top revisions.
37
:param maxnum: Maximum number of revisions to display,
38
None for no limit.
39
"""
40
41
Window.__init__(self, parent=parent)
29
def __init__(self):
30
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
42
31
self.set_border_width(0)
43
44
self.branch = branch
45
self.start_revs = start_revs
46
self.maxnum = maxnum
47
self.config = GlobalConfig()
48
49
if self.config.get_user_option('viz-compact-view') == 'yes':
50
self.compact_view = True
51
else:
52
self.compact_view = False
53
54
self.set_title(branch.nick + " - revision history")
32
self.set_title("bzrk")
55
33
56
34
# Use three-quarters of the screen by default
57
35
screen = self.get_screen()
64
42
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
65
43
self.set_icon(icon)
66
44
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)
70
71
45
self.accel_group = gtk.AccelGroup()
72
46
self.add_accel_group(self.accel_group)
73
47
74
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
75
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()
81
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()
87
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()
93
94
48
self.construct()
95
49
96
def set_revision(self, revid):
97
self.treeview.set_revision_id(revid)
98
99
50
def construct(self):
100
51
"""Construct the window contents."""
101
52
vbox = gtk.VBox(spacing=0)
102
53
self.add(vbox)
103
54
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)
107
self.paned.show()
108
109
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
55
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
111
112
vbox.pack_start(self.paned, expand=True, fill=True)
113
vbox.set_focus_child(self.paned)
56
57
paned = gtk.VPaned()
58
paned.pack1(self.construct_top(), resize=True, shrink=False)
59
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
60
paned.show()
61
vbox.pack_start(paned, expand=True, fill=True)
62
vbox.set_focus_child(paned)
114
63
115
64
vbox.show()
116
65
117
def construct_menubar(self):
118
menubar = gtk.MenuBar()
119
120
file_menu = gtk.Menu()
121
file_menuitem = gtk.MenuItem("_File")
122
file_menuitem.set_submenu(file_menu)
123
124
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
125
file_menu_close.connect('activate', lambda x: self.destroy())
126
127
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
128
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
129
130
if self._parent is not None:
131
file_menu.add(file_menu_close)
132
file_menu.add(file_menu_quit)
133
134
edit_menu = gtk.Menu()
135
edit_menuitem = gtk.MenuItem("_Edit")
136
edit_menuitem.set_submenu(edit_menu)
137
138
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
140
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
143
edit_menu_globopts = gtk.MenuItem("Global Settings")
144
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
146
edit_menu.add(edit_menu_find)
147
edit_menu.add(edit_menu_branchopts)
148
edit_menu.add(edit_menu_globopts)
149
150
view_menu = gtk.Menu()
151
view_menuitem = gtk.MenuItem("_View")
152
view_menuitem.set_submenu(view_menu)
153
154
view_menu_refresh = self.refresh_action.create_menu_item()
155
view_menu_refresh.connect('activate', self._refresh_clicked)
156
157
view_menu.add(view_menu_refresh)
158
view_menu.add(gtk.SeparatorMenuItem())
159
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)
163
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)
167
168
view_menu.add(view_menu_toolbar)
169
view_menu.add(view_menu_compact)
170
view_menu.add(gtk.SeparatorMenuItem())
171
172
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
174
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)
179
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)
184
view_menu.add(col)
185
186
go_menu = gtk.Menu()
187
go_menu.set_accel_group(self.accel_group)
188
go_menuitem = gtk.MenuItem("_Go")
189
go_menuitem.set_submenu(go_menu)
190
191
go_menu_next = self.next_rev_action.create_menu_item()
192
go_menu_prev = self.prev_rev_action.create_menu_item()
193
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)
198
self._update_tags()
199
200
go_menu.add(go_menu_next)
201
go_menu.add(go_menu_prev)
202
go_menu.add(gtk.SeparatorMenuItem())
203
go_menu.add(self.go_menu_tags)
204
205
revision_menu = gtk.Menu()
206
revision_menuitem = gtk.MenuItem("_Revision")
207
revision_menuitem.set_submenu(revision_menu)
208
209
revision_menu_diff = gtk.MenuItem("View Changes")
210
revision_menu_diff.connect('activate',
211
self._menu_diff_cb)
212
213
revision_menu_compare = gtk.MenuItem("Compare with...")
214
revision_menu_compare.connect('activate',
215
self._compare_with_cb)
216
217
revision_menu_tag = gtk.MenuItem("Tag Revision")
218
revision_menu_tag.connect('activate', self._tag_revision_cb)
219
220
revision_menu.add(revision_menu_tag)
221
revision_menu.add(revision_menu_diff)
222
revision_menu.add(revision_menu_compare)
223
224
branch_menu = gtk.Menu()
225
branch_menuitem = gtk.MenuItem("_Branch")
226
branch_menuitem.set_submenu(branch_menu)
227
228
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
231
help_menu = gtk.Menu()
232
help_menuitem = gtk.MenuItem("_Help")
233
help_menuitem.set_submenu(help_menu)
234
235
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
236
help_about_menuitem.connect('activate', self._about_dialog_cb)
237
238
help_menu.add(help_about_menuitem)
239
240
menubar.add(file_menuitem)
241
menubar.add(edit_menuitem)
242
menubar.add(view_menuitem)
243
menubar.add(go_menuitem)
244
menubar.add(revision_menuitem)
245
menubar.add(branch_menuitem)
246
menubar.add(help_menuitem)
247
menubar.show_all()
248
249
return menubar
250
251
66
def construct_top(self):
252
67
"""Construct the top-half of the window."""
253
# FIXME: Make broken_line_length configurable
254
255
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
256
257
self.treeview.connect('revision-selected',
258
self._treeselection_changed_cb)
259
self.treeview.connect('revision-activated',
260
self._tree_revision_activated)
261
262
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
263
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')
268
else:
269
self.treeview.set_property(col + '-column-visible', False)
270
68
scrollwin = gtk.ScrolledWindow()
69
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
scrollwin.set_shadow_type(gtk.SHADOW_IN)
71
scrollwin.show()
72
73
self.treeview = gtk.TreeView()
74
self.treeview.set_rules_hint(True)
75
self.treeview.set_search_column(4)
76
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
scrollwin.add(self.treeview)
271
79
self.treeview.show()
272
80
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)
276
align.show()
277
278
return align
81
cell = CellRendererGraph()
82
column = gtk.TreeViewColumn()
83
column.set_resizable(True)
84
column.pack_start(cell, expand=False)
85
column.add_attribute(cell, "node", 1)
86
column.add_attribute(cell, "in-lines", 2)
87
column.add_attribute(cell, "out-lines", 3)
88
self.treeview.append_column(column)
89
90
cell = gtk.CellRendererText()
91
cell.set_property("width-chars", 40)
92
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
93
column = gtk.TreeViewColumn("Message")
94
column.set_resizable(True)
95
column.pack_start(cell, expand=True)
96
column.add_attribute(cell, "text", 4)
97
self.treeview.append_column(column)
98
99
cell = gtk.CellRendererText()
100
cell.set_property("width-chars", 40)
101
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
102
column = gtk.TreeViewColumn("Committer")
103
column.set_resizable(True)
104
column.pack_start(cell, expand=True)
105
column.add_attribute(cell, "text", 5)
106
self.treeview.append_column(column)
107
108
cell = gtk.CellRendererText()
109
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
110
column = gtk.TreeViewColumn("Date")
111
column.set_resizable(True)
112
column.pack_start(cell, expand=True)
113
column.add_attribute(cell, "text", 6)
114
self.treeview.append_column(column)
115
116
return scrollwin
279
117
280
118
def construct_navigation(self):
281
119
"""Construct the navigation buttons."""
282
self.toolbar = gtk.Toolbar()
283
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
284
285
self.prev_button = self.prev_rev_action.create_tool_item()
286
self.toolbar.insert(self.prev_button, -1)
287
288
self.next_button = self.next_rev_action.create_tool_item()
289
self.toolbar.insert(self.next_button, -1)
290
291
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
292
293
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
294
refresh_button.connect('clicked', self._refresh_clicked)
295
self.toolbar.insert(refresh_button, -1)
296
297
self.toolbar.show_all()
298
299
return self.toolbar
120
frame = gtk.Frame()
121
frame.set_shadow_type(gtk.SHADOW_OUT)
122
frame.show()
123
124
hbox = gtk.HBox(spacing=12)
125
frame.add(hbox)
126
hbox.show()
127
128
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
129
self.back_button.set_relief(gtk.RELIEF_NONE)
130
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
131
0, 0)
132
self.back_button.connect("clicked", self._back_clicked_cb)
133
hbox.pack_start(self.back_button, expand=False, fill=True)
134
self.back_button.show()
135
136
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
137
self.fwd_button.set_relief(gtk.RELIEF_NONE)
138
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
139
0, 0)
140
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
141
hbox.pack_start(self.fwd_button, expand=False, fill=True)
142
self.fwd_button.show()
143
144
return frame
300
145
301
146
def construct_bottom(self):
302
147
"""Construct the bottom half of the window."""
303
from bzrlib.plugins.gtk.revisionview import RevisionView
304
self.revisionview = RevisionView(branch=self.branch)
148
from bzrlib.plugins.gtk.logview import LogView
149
self.logview = LogView()
150
self.logview.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
151
self.logview.set_shadow_type(gtk.SHADOW_NONE)
305
152
(width, height) = self.get_size()
306
self.revisionview.set_size_request(width, int(height / 2.5))
307
self.revisionview.show()
308
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())
311
return self.revisionview
312
313
def _tag_selected_cb(self, menuitem, revid):
314
self.treeview.set_revision_id(revid)
315
316
def _treeselection_changed_cb(self, selection, *args):
317
"""callback for when the treeview changes."""
318
revision = self.treeview.get_revision()
319
parents = self.treeview.get_parents()
320
children = self.treeview.get_children()
321
322
if revision and revision != NULL_REVISION:
323
prev_menu = gtk.Menu()
324
if len(parents) > 0:
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)
329
try:
330
str = ' (' + parent.properties['branch-nick'] + ')'
331
except KeyError:
332
str = ""
333
334
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
335
item.connect('activate', self._set_revision_cb, parent_id)
336
prev_menu.add(item)
337
prev_menu.show_all()
338
else:
339
self.prev_rev_action.set_sensitive(False)
340
prev_menu.hide()
341
342
self.prev_button.set_menu(prev_menu)
343
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)
349
try:
350
str = ' (' + child.properties['branch-nick'] + ')'
351
except KeyError:
352
str = ""
353
354
item = gtk.MenuItem(child.message.split("\n")[0] + str)
355
item.connect('activate', self._set_revision_cb, child_id)
356
next_menu.add(item)
357
next_menu.show_all()
358
else:
359
self.next_rev_action.set_sensitive(False)
360
next_menu.hide()
361
362
self.next_button.set_menu(next_menu)
363
364
self.revisionview.set_revision(revision)
365
self.revisionview.set_children(children)
366
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()
372
373
if len(parents) == 0:
374
parent_id = None
375
else:
376
parent_id = parents[0]
377
378
self.show_diff(revision.revision_id, parent_id)
379
self.treeview.grab_focus()
380
381
def _menu_diff_cb(self,w):
382
(path, focus) = self.treeview.treeview.get_cursor()
383
revid = self.treeview.model[path][treemodel.REVID]
384
385
parentids = self.branch.repository.revision_parents(revid)
386
387
if len(parentids) == 0:
388
parentid = NULL_REVISION
389
else:
390
parentid = parentids[0]
391
392
self.show_diff(revid,parentid)
153
self.logview.set_size_request(width, int(height / 2.5))
154
self.logview.show()
155
self.logview.set_show_callback(self._show_clicked_cb)
156
self.logview.set_go_callback(self._go_clicked_cb)
157
return self.logview
158
159
def set_branch(self, branch, start, maxnum):
160
"""Set the branch and start position for this window.
161
162
Creates a new TreeModel and populates it with information about
163
the new branch before updating the window title and model of the
164
treeview itself.
165
"""
166
self.branch = branch
167
168
# [ revision, node, last_lines, lines, message, committer, timestamp ]
169
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
170
gobject.TYPE_PYOBJECT,
171
gobject.TYPE_PYOBJECT,
172
gobject.TYPE_PYOBJECT,
173
str, str, str)
174
self.index = {}
175
index = 0
176
177
last_lines = []
178
(self.revisions, colours, self.children, self.parent_ids,
179
merge_sorted) = distances(branch, start)
180
for (index, (revision, node, lines)) in enumerate(graph(
181
self.revisions, colours, merge_sorted)):
182
# FIXME: at this point we should be able to show the graph order
183
# and lines with no message or commit data - and then incrementally
184
# fill the timestamp, committer etc data as desired.
185
message = revision.message.split("\n")[0]
186
if revision.committer is not None:
187
timestamp = format_date(revision.timestamp, revision.timezone)
188
else:
189
timestamp = None
190
self.model.append([revision, node, last_lines, lines,
191
message, revision.committer, timestamp])
192
self.index[revision] = index
193
last_lines = lines
194
if maxnum is not None and index > maxnum:
195
break
196
197
self.set_title(branch.nick + " - bzrk")
198
self.treeview.set_model(self.model)
199
200
def _treeview_cursor_cb(self, *args):
201
"""Callback for when the treeview cursor changes."""
202
(path, col) = self.treeview.get_cursor()
203
revision = self.model[path][0]
204
205
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
206
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
207
self.logview.set_revision(revision)
393
208
394
209
def _back_clicked_cb(self, *args):
395
210
"""Callback for when the back button is clicked."""
396
self.treeview.back()
397
211
(path, col) = self.treeview.get_cursor()
212
revision = self.model[path][0]
213
if not len(self.parent_ids[revision]):
214
return
215
216
for parent_id in self.parent_ids[revision]:
217
parent = self.revisions[parent_id]
218
if same_branch(revision, parent):
219
self.treeview.set_cursor(self.index[parent])
220
break
221
else:
222
next = self.revisions[self.parent_ids[revision][0]]
223
self.treeview.set_cursor(self.index[next])
224
self.treeview.grab_focus()
225
398
226
def _fwd_clicked_cb(self, *args):
399
227
"""Callback for when the forward button is clicked."""
400
self.treeview.forward()
401
402
def _go_clicked_cb(self, w, p):
228
(path, col) = self.treeview.get_cursor()
229
revision = self.model[path][0]
230
if not len(self.children[revision]):
231
return
232
233
for child in self.children[revision]:
234
if same_branch(child, revision):
235
self.treeview.set_cursor(self.index[child])
236
break
237
else:
238
prev = list(self.children[revision])[0]
239
self.treeview.set_cursor(self.index[prev])
240
self.treeview.grab_focus()
241
242
def _go_clicked_cb(self, revid):
403
243
"""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())
406
407
def _show_clicked_cb(self, revid, parentid):
408
"""Callback for when the show button for a parent is clicked."""
409
self.show_diff(revid, parentid)
244
self.treeview.set_cursor(self.index[self.revisions[revid]])
410
245
self.treeview.grab_focus()
411
246
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"""
415
416
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
417
418
rb = RevisionBrowser(self.branch,self)
419
ret = rb.run()
420
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)
425
426
rb.destroy()
427
428
def _set_revision_cb(self, w, revision_id):
429
self.treeview.set_revision_id(revision_id)
430
431
def _brokenlines_toggled_cb(self, button):
432
self.compact_view = button.get_active()
433
434
if self.compact_view:
435
option = 'yes'
436
else:
437
option = 'no'
438
439
self.config.set_user_option('viz-compact-view', option)
440
self.treeview.set_property('compact', self.compact_view)
441
self.treeview.refresh()
442
443
def _tag_revision_cb(self, w):
444
try:
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:
449
dialog.hide()
450
451
if response == gtk.RESPONSE_OK:
452
self.treeview.add_tag(dialog.tagname, dialog._revid)
453
454
dialog.destroy()
455
456
finally:
457
self.treeview.set_sensitive(True)
458
459
def _about_dialog_cb(self, w):
460
from bzrlib.plugins.gtk.about import AboutDialog
461
462
AboutDialog().run()
463
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())
467
468
def _toolbar_visibility_changed(self, col):
469
if col.get_active():
470
self.toolbar.show()
471
else:
472
self.toolbar.hide()
473
474
def _show_about_cb(self, w):
475
dialog = AboutDialog()
476
dialog.connect('response', lambda d,r: d.destroy())
477
dialog.run()
478
479
def _refresh_clicked(self, w):
480
self.treeview.refresh()
481
482
def _update_tags(self):
483
menu = gtk.Menu()
484
485
if self.branch.supports_tags():
486
tags = self.branch.tags.get_tag_dict().items()
487
tags.sort()
488
tags.reverse()
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)
495
menu.add(tag_item)
496
self.go_menu_tags.set_submenu(menu)
497
498
self.go_menu_tags.set_sensitive(len(tags) != 0)
499
else:
500
self.go_menu_tags.set_sensitive(False)
501
502
self.go_menu_tags.show_all()
503
504
def show_diff(self, revid=None, parentid=None):
247
def show_diff(self, branch, revid, parentid):
505
248
"""Open a new window to show a diff between the given revisions."""
506
249
from bzrlib.plugins.gtk.diff import DiffWindow
507
window = DiffWindow(parent=self)
508
509
if parentid is None:
510
parentid = NULL_REVISION
511
512
rev_tree = self.branch.repository.revision_tree(revid)
513
parent_tree = self.branch.repository.revision_tree(parentid)
514
515
description = revid + " - " + self.branch.nick
250
window = DiffWindow()
251
rev_tree = branch.repository.revision_tree(revid)
252
parent_tree = branch.repository.revision_tree(parentid)
253
description = revid + " - " + branch.nick
516
254
window.set_diff(description, rev_tree, parent_tree)
517
255
window.show()
518
256
257
def _show_clicked_cb(self, revid, parentid):
258
"""Callback for when the show button for a parent is clicked."""
259
self.show_diff(self.branch, revid, parentid)
260
self.treeview.grab_focus()
519
261
262
def _treeview_row_activated_cb(self, widget, path, col):
263
# TODO: more than one parent
264
"""Callback for when a treeview row gets activated."""
265
revision = self.model[path][0]
266
if len(self.parent_ids[revision]) == 0:
267
# Ignore revisions without parent
268
return
269
parent_id = self.parent_ids[revision][0]
270
self.show_diff(self.branch, revision.revision_id, parent_id)
271
self.treeview.grab_focus()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0