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 442.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 442.2.1
- Committer: Jelmer Vernooij
- Date: 2008-03-09 13:47:52 UTC
- mto: This revision was merged to the branch mainline in revision 447.
- Revision ID: jelmer@samba.org-20080309134752-syf9kwzy6e919jhj
Add note about python-nautilus requiring a libpythonXX.so symlink.
- files added:
- .bzrignore
- branchview
- icons
- olive
- po
- tests
- files removed:
- .bzrignore
- files renamed:
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- viz/diffwin.py => diff.py
- annotate/logview.py => revisionview.py
- files modified:
- AUTHORS
added
removed
viz/branchwin.py
1
#!/usr/bin/python
2
1
# -*- coding: UTF-8 -*-
3
2
"""Branch window.
4
3
14
13
import gobject
15
14
import pango
16
15
17
from bzrlib.osutils import format_date
18
19
from graph import distances, graph, same_branch
20
from graphcell import CellRendererGraph
21
22
23
class BranchWindow(gtk.Window):
16
from bzrlib.plugins.gtk.window import Window
17
from bzrlib.plugins.gtk.tags import AddTagDialog
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
19
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
20
from bzrlib.revision import Revision
21
from bzrlib.config import BranchConfig
22
from bzrlib.config import GlobalConfig
23
24
class BranchWindow(Window):
24
25
"""Branch window.
25
26
26
27
This object represents and manages a single window containing information
27
28
for a particular branch.
28
29
"""
29
30
30
def __init__(self, app=None):
31
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
31
def __init__(self, branch, start, maxnum, parent=None):
32
"""Create a new BranchWindow.
33
34
:param branch: Branch object for branch to show.
35
:param start: Revision id of top revision.
36
:param maxnum: Maximum number of revisions to display,
37
None for no limit.
38
"""
39
40
Window.__init__(self, parent=parent)
32
41
self.set_border_width(0)
33
self.set_title("bzrk")
34
35
self.app = app
42
43
self.branch = branch
44
self.start = start
45
self.maxnum = maxnum
46
self.config = GlobalConfig()
47
48
if self.config.get_user_option('viz-compact-view') == 'yes':
49
self.compact_view = True
50
else:
51
self.compact_view = False
52
53
self.set_title(branch.nick + " - revision history")
36
54
37
55
# Use three-quarters of the screen by default
38
56
screen = self.get_screen()
45
63
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
46
64
self.set_icon(icon)
47
65
66
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
67
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
68
48
69
self.accel_group = gtk.AccelGroup()
49
70
self.add_accel_group(self.accel_group)
50
71
72
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
73
74
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
75
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
76
self.prev_rev_action.set_accel_group(self.accel_group)
77
self.prev_rev_action.connect("activate", self._back_clicked_cb)
78
self.prev_rev_action.connect_accelerator()
79
80
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
81
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
82
self.next_rev_action.set_accel_group(self.accel_group)
83
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
84
self.next_rev_action.connect_accelerator()
85
51
86
self.construct()
52
87
88
def set_revision(self, revid):
89
self.treeview.set_revision_id(revid)
90
53
91
def construct(self):
54
92
"""Construct the window contents."""
55
93
vbox = gtk.VBox(spacing=0)
56
94
self.add(vbox)
57
95
96
self.paned = gtk.VPaned()
97
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
98
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
99
self.paned.show()
100
101
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
58
102
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
59
60
paned = gtk.VPaned()
61
paned.pack1(self.construct_top(), resize=True, shrink=False)
62
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
63
paned.show()
64
vbox.pack_start(paned, expand=True, fill=True)
65
vbox.set_focus_child(paned)
103
104
vbox.pack_start(self.paned, expand=True, fill=True)
105
vbox.set_focus_child(self.paned)
66
106
67
107
vbox.show()
68
108
109
def construct_menubar(self):
110
menubar = gtk.MenuBar()
111
112
file_menu = gtk.Menu()
113
file_menuitem = gtk.MenuItem("_File")
114
file_menuitem.set_submenu(file_menu)
115
116
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
117
file_menu_close.connect('activate', lambda x: self.destroy())
118
119
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
120
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
121
122
if self._parent is not None:
123
file_menu.add(file_menu_close)
124
file_menu.add(file_menu_quit)
125
126
edit_menu = gtk.Menu()
127
edit_menuitem = gtk.MenuItem("_Edit")
128
edit_menuitem.set_submenu(edit_menu)
129
130
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
131
132
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
133
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
134
135
edit_menu_globopts = gtk.MenuItem("Global Settings")
136
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
137
138
edit_menu.add(edit_menu_find)
139
edit_menu.add(edit_menu_branchopts)
140
edit_menu.add(edit_menu_globopts)
141
142
view_menu = gtk.Menu()
143
view_menuitem = gtk.MenuItem("_View")
144
view_menuitem.set_submenu(view_menu)
145
146
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
147
view_menu_toolbar.set_active(True)
148
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
149
150
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
151
view_menu_compact.set_active(self.compact_view)
152
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
153
154
view_menu.add(view_menu_toolbar)
155
view_menu.add(view_menu_compact)
156
view_menu.add(gtk.SeparatorMenuItem())
157
158
for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
159
col = gtk.CheckMenuItem("Show " + label + " Column")
160
col.set_active(self.treeview.get_property(name + "-column-visible"))
161
col.connect('toggled', self._col_visibility_changed, name)
162
view_menu.add(col)
163
164
go_menu = gtk.Menu()
165
go_menu.set_accel_group(self.accel_group)
166
go_menuitem = gtk.MenuItem("_Go")
167
go_menuitem.set_submenu(go_menu)
168
169
go_menu_next = self.next_rev_action.create_menu_item()
170
go_menu_prev = self.prev_rev_action.create_menu_item()
171
172
self.go_menu_tags = gtk.MenuItem("_Tags")
173
self._update_tags()
174
175
go_menu.add(go_menu_next)
176
go_menu.add(go_menu_prev)
177
go_menu.add(gtk.SeparatorMenuItem())
178
go_menu.add(self.go_menu_tags)
179
180
revision_menu = gtk.Menu()
181
revision_menuitem = gtk.MenuItem("_Revision")
182
revision_menuitem.set_submenu(revision_menu)
183
184
revision_menu_diff = gtk.MenuItem("View Changes")
185
revision_menu_diff.connect('activate',
186
lambda w: self.treeview.show_diff())
187
188
revision_menu_tag = gtk.MenuItem("Tag Revision")
189
revision_menu_tag.connect('activate', self._tag_revision_cb)
190
191
revision_menu.add(revision_menu_tag)
192
revision_menu.add(revision_menu_diff)
193
194
branch_menu = gtk.Menu()
195
branch_menuitem = gtk.MenuItem("_Branch")
196
branch_menuitem.set_submenu(branch_menu)
197
198
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
199
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
200
201
help_menu = gtk.Menu()
202
help_menuitem = gtk.MenuItem("_Help")
203
help_menuitem.set_submenu(help_menu)
204
205
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
206
help_about_menuitem.connect('activate', self._about_dialog_cb)
207
208
help_menu.add(help_about_menuitem)
209
210
menubar.add(file_menuitem)
211
menubar.add(edit_menuitem)
212
menubar.add(view_menuitem)
213
menubar.add(go_menuitem)
214
menubar.add(revision_menuitem)
215
menubar.add(branch_menuitem)
216
menubar.add(help_menuitem)
217
menubar.show_all()
218
219
return menubar
220
69
221
def construct_top(self):
70
222
"""Construct the top-half of the window."""
71
scrollwin = gtk.ScrolledWindow()
72
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
73
scrollwin.set_shadow_type(gtk.SHADOW_IN)
74
scrollwin.show()
75
76
self.treeview = gtk.TreeView()
77
self.treeview.set_rules_hint(True)
78
self.treeview.set_search_column(4)
79
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
80
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
81
scrollwin.add(self.treeview)
223
# FIXME: Make broken_line_length configurable
224
225
self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
226
227
self.treeview.connect('revision-selected',
228
self._treeselection_changed_cb)
229
self.treeview.connect('revision-activated',
230
self._tree_revision_activated)
231
232
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
233
234
for col in ["revno", "date"]:
235
option = self.config.get_user_option(col + '-column-visible')
236
if option is not None:
237
self.treeview.set_property(col + '-column-visible', option == 'True')
238
82
239
self.treeview.show()
83
240
84
cell = CellRendererGraph()
85
column = gtk.TreeViewColumn()
86
column.set_resizable(True)
87
column.pack_start(cell, expand=False)
88
column.add_attribute(cell, "node", 1)
89
column.add_attribute(cell, "in-lines", 2)
90
column.add_attribute(cell, "out-lines", 3)
91
self.treeview.append_column(column)
92
93
cell = gtk.CellRendererText()
94
cell.set_property("width-chars", 40)
95
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
96
column = gtk.TreeViewColumn("Message")
97
column.set_resizable(True)
98
column.pack_start(cell, expand=True)
99
column.add_attribute(cell, "text", 4)
100
self.treeview.append_column(column)
101
102
cell = gtk.CellRendererText()
103
cell.set_property("width-chars", 40)
104
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
105
column = gtk.TreeViewColumn("Committer")
106
column.set_resizable(True)
107
column.pack_start(cell, expand=True)
108
column.add_attribute(cell, "text", 5)
109
self.treeview.append_column(column)
110
111
cell = gtk.CellRendererText()
112
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
113
column = gtk.TreeViewColumn("Date")
114
column.set_resizable(True)
115
column.pack_start(cell, expand=True)
116
column.add_attribute(cell, "text", 6)
117
self.treeview.append_column(column)
118
119
return scrollwin
241
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
242
align.set_padding(5, 0, 0, 0)
243
align.add(self.treeview)
244
align.show()
245
246
return align
120
247
121
248
def construct_navigation(self):
122
249
"""Construct the navigation buttons."""
123
frame = gtk.Frame()
124
frame.set_shadow_type(gtk.SHADOW_OUT)
125
frame.show()
126
127
hbox = gtk.HBox(spacing=12)
128
frame.add(hbox)
129
hbox.show()
130
131
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
132
self.back_button.set_relief(gtk.RELIEF_NONE)
133
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
134
0, 0)
135
self.back_button.connect("clicked", self._back_clicked_cb)
136
hbox.pack_start(self.back_button, expand=False, fill=True)
137
self.back_button.show()
138
139
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
140
self.fwd_button.set_relief(gtk.RELIEF_NONE)
141
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
142
0, 0)
143
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
144
hbox.pack_start(self.fwd_button, expand=False, fill=True)
145
self.fwd_button.show()
146
147
return frame
250
self.toolbar = gtk.Toolbar()
251
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
252
253
self.prev_button = self.prev_rev_action.create_tool_item()
254
self.toolbar.insert(self.prev_button, -1)
255
256
self.next_button = self.next_rev_action.create_tool_item()
257
self.toolbar.insert(self.next_button, -1)
258
259
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
260
261
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
262
refresh_button.connect('clicked', self._refresh_clicked)
263
self.toolbar.insert(refresh_button, -1)
264
265
self.toolbar.show_all()
266
267
return self.toolbar
148
268
149
269
def construct_bottom(self):
150
270
"""Construct the bottom half of the window."""
151
scrollwin = gtk.ScrolledWindow()
152
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
153
scrollwin.set_shadow_type(gtk.SHADOW_NONE)
271
from bzrlib.plugins.gtk.revisionview import RevisionView
272
self.revisionview = RevisionView(branch=self.branch)
154
273
(width, height) = self.get_size()
155
scrollwin.set_size_request(width, int(height / 2.5))
156
scrollwin.show()
157
158
vbox = gtk.VBox(False, spacing=6)
159
vbox.set_border_width(6)
160
scrollwin.add_with_viewport(vbox)
161
vbox.show()
162
163
table = gtk.Table(rows=4, columns=2)
164
table.set_row_spacings(6)
165
table.set_col_spacings(6)
166
vbox.pack_start(table, expand=False, fill=True)
167
table.show()
168
169
align = gtk.Alignment(0.0, 0.5)
170
label = gtk.Label()
171
label.set_markup("<b>Revision:</b>")
172
align.add(label)
173
table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
174
label.show()
175
align.show()
176
177
align = gtk.Alignment(0.0, 0.5)
178
self.revid_label = gtk.Label()
179
self.revid_label.set_selectable(True)
180
align.add(self.revid_label)
181
table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
182
self.revid_label.show()
183
align.show()
184
185
align = gtk.Alignment(0.0, 0.5)
186
label = gtk.Label()
187
label.set_markup("<b>Committer:</b>")
188
align.add(label)
189
table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
190
label.show()
191
align.show()
192
193
align = gtk.Alignment(0.0, 0.5)
194
self.committer_label = gtk.Label()
195
self.committer_label.set_selectable(True)
196
align.add(self.committer_label)
197
table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
198
self.committer_label.show()
199
align.show()
200
201
align = gtk.Alignment(0.0, 0.5)
202
label = gtk.Label()
203
label.set_markup("<b>Branch nick:</b>")
204
align.add(label)
205
table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
206
label.show()
207
align.show()
208
209
align = gtk.Alignment(0.0, 0.5)
210
self.branchnick_label = gtk.Label()
211
self.branchnick_label.set_selectable(True)
212
align.add(self.branchnick_label)
213
table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
214
self.branchnick_label.show()
215
align.show()
216
217
align = gtk.Alignment(0.0, 0.5)
218
label = gtk.Label()
219
label.set_markup("<b>Timestamp:</b>")
220
align.add(label)
221
table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
222
label.show()
223
align.show()
224
225
align = gtk.Alignment(0.0, 0.5)
226
self.timestamp_label = gtk.Label()
227
self.timestamp_label.set_selectable(True)
228
align.add(self.timestamp_label)
229
table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
230
self.timestamp_label.show()
231
align.show()
232
233
self.parents_table = gtk.Table(rows=1, columns=2)
234
self.parents_table.set_row_spacings(3)
235
self.parents_table.set_col_spacings(6)
236
self.parents_table.show()
237
vbox.pack_start(self.parents_table, expand=False, fill=True)
238
self.parents_widgets = []
239
240
label = gtk.Label()
241
label.set_markup("<b>Parents:</b>")
242
align = gtk.Alignment(0.0, 0.5)
243
align.add(label)
244
self.parents_table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
245
label.show()
246
align.show()
247
248
self.message_buffer = gtk.TextBuffer()
249
textview = gtk.TextView(self.message_buffer)
250
textview.set_editable(False)
251
textview.set_wrap_mode(gtk.WRAP_WORD)
252
textview.modify_font(pango.FontDescription("Monospace"))
253
vbox.pack_start(textview, expand=True, fill=True)
254
textview.show()
255
256
return scrollwin
257
258
def set_branch(self, branch, start, maxnum):
259
"""Set the branch and start position for this window.
260
261
Creates a new TreeModel and populates it with information about
262
the new branch before updating the window title and model of the
263
treeview itself.
264
"""
265
self.branch = branch
266
267
# [ revision, node, last_lines, lines, message, committer, timestamp ]
268
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
269
gobject.TYPE_PYOBJECT,
270
gobject.TYPE_PYOBJECT,
271
gobject.TYPE_PYOBJECT,
272
str, str, str)
273
self.index = {}
274
index = 0
275
276
last_lines = []
277
(self.revisions, colours, self.children, self.parent_ids,
278
merge_sorted) = distances(branch, start)
279
for (index, (revision, node, lines)) in enumerate(graph(
280
self.revisions, colours, merge_sorted)):
281
# FIXME: at this point we should be able to show the graph order
282
# and lines with no message or commit data - and then incrementally
283
# fill the timestamp, committer etc data as desired.
284
message = revision.message.split("\n")[0]
285
if revision.committer is not None:
286
timestamp = format_date(revision.timestamp, revision.timezone)
287
else:
288
timestamp = None
289
self.model.append([revision, node, last_lines, lines,
290
message, revision.committer, timestamp])
291
self.index[revision] = index
292
last_lines = lines
293
if maxnum is not None and index > maxnum:
294
break
295
296
self.set_title(branch.nick + " - bzrk")
297
self.treeview.set_model(self.model)
298
299
def _treeview_cursor_cb(self, *args):
300
"""Callback for when the treeview cursor changes."""
301
(path, col) = self.treeview.get_cursor()
302
revision = self.model[path][0]
303
304
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
305
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
306
307
if revision.committer is not None:
308
branchnick = ""
309
committer = revision.committer
310
timestamp = format_date(revision.timestamp, revision.timezone)
311
message = revision.message
312
try:
313
branchnick = revision.properties['branch-nick']
314
except KeyError:
315
pass
316
274
self.revisionview.set_size_request(width, int(height / 2.5))
275
self.revisionview.show()
276
self.revisionview.set_show_callback(self._show_clicked_cb)
277
self.revisionview.connect('notify::revision', self._go_clicked_cb)
278
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
279
return self.revisionview
280
281
def _tag_selected_cb(self, menuitem, revid):
282
self.treeview.set_revision_id(revid)
283
284
def _treeselection_changed_cb(self, selection, *args):
285
"""callback for when the treeview changes."""
286
revision = self.treeview.get_revision()
287
parents = self.treeview.get_parents()
288
children = self.treeview.get_children()
289
290
if revision is not None:
291
prev_menu = gtk.Menu()
292
if len(parents) > 0:
293
self.prev_rev_action.set_sensitive(True)
294
for parent_id in parents:
295
parent = self.branch.repository.get_revision(parent_id)
296
try:
297
str = ' (' + parent.properties['branch-nick'] + ')'
298
except KeyError:
299
str = ""
300
301
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
302
item.connect('activate', self._set_revision_cb, parent_id)
303
prev_menu.add(item)
304
prev_menu.show_all()
305
else:
306
self.prev_rev_action.set_sensitive(False)
307
prev_menu.hide()
308
309
self.prev_button.set_menu(prev_menu)
310
311
next_menu = gtk.Menu()
312
if len(children) > 0:
313
self.next_rev_action.set_sensitive(True)
314
for child_id in children:
315
child = self.branch.repository.get_revision(child_id)
316
try:
317
str = ' (' + child.properties['branch-nick'] + ')'
318
except KeyError:
319
str = ""
320
321
item = gtk.MenuItem(child.message.split("\n")[0] + str)
322
item.connect('activate', self._set_revision_cb, child_id)
323
next_menu.add(item)
324
next_menu.show_all()
325
else:
326
self.next_rev_action.set_sensitive(False)
327
next_menu.hide()
328
329
self.next_button.set_menu(next_menu)
330
331
self.revisionview.set_revision(revision)
332
self.revisionview.set_children(children)
333
334
def _tree_revision_activated(self, widget, path, col):
335
# TODO: more than one parent
336
"""Callback for when a treeview row gets activated."""
337
revision = self.treeview.get_revision()
338
parents = self.treeview.get_parents()
339
340
if len(parents) == 0:
341
parent_id = None
317
342
else:
318
committer = ""
319
timestamp = ""
320
message = ""
321
branchnick = ""
322
323
self.revid_label.set_text(revision.revision_id)
324
self.branchnick_label.set_text(branchnick)
325
326
self.committer_label.set_text(committer)
327
self.timestamp_label.set_text(timestamp)
328
self.message_buffer.set_text(message)
329
330
for widget in self.parents_widgets:
331
self.parents_table.remove(widget)
332
333
self.parents_widgets = []
334
self.parents_table.resize(max(len(self.parent_ids[revision]), 1), 2)
335
336
for idx, parent_id in enumerate(self.parent_ids[revision]):
337
align = gtk.Alignment(0.0, 0.0)
338
self.parents_widgets.append(align)
339
self.parents_table.attach(align, 1, 2, idx, idx + 1,
340
gtk.EXPAND | gtk.FILL, gtk.FILL)
341
align.show()
342
343
hbox = gtk.HBox(False, spacing=6)
344
align.add(hbox)
345
hbox.show()
346
347
image = gtk.Image()
348
image.set_from_stock(
349
gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
350
image.show()
351
352
button = gtk.Button()
353
button.add(image)
354
button.set_sensitive(self.app is not None)
355
button.connect("clicked", self._show_clicked_cb,
356
revision.revision_id, parent_id)
357
hbox.pack_start(button, expand=False, fill=True)
358
button.show()
359
360
button = gtk.Button(parent_id)
361
button.set_use_underline(False)
362
button.connect("clicked", self._go_clicked_cb, parent_id)
363
hbox.pack_start(button, expand=False, fill=True)
364
button.show()
365
343
parent_id = parents[0]
344
345
self.show_diff(revision.revision_id, parent_id)
346
self.treeview.grab_focus()
347
366
348
367
349
def _back_clicked_cb(self, *args):
368
350
"""Callback for when the back button is clicked."""
369
(path, col) = self.treeview.get_cursor()
370
revision = self.model[path][0]
371
if not len(self.parent_ids[revision]):
372
return
373
374
for parent_id in self.parent_ids[revision]:
375
parent = self.revisions[parent_id]
376
if same_branch(revision, parent):
377
self.treeview.set_cursor(self.index[parent])
378
break
379
else:
380
next = self.revisions[self.parent_ids[revision][0]]
381
self.treeview.set_cursor(self.index[next])
382
self.treeview.grab_focus()
383
351
self.treeview.back()
352
384
353
def _fwd_clicked_cb(self, *args):
385
354
"""Callback for when the forward button is clicked."""
386
(path, col) = self.treeview.get_cursor()
387
revision = self.model[path][0]
388
if not len(self.children[revision]):
389
return
390
391
for child in self.children[revision]:
392
if same_branch(child, revision):
393
self.treeview.set_cursor(self.index[child])
394
break
395
else:
396
prev = list(self.children[revision])[0]
397
self.treeview.set_cursor(self.index[prev])
398
self.treeview.grab_focus()
399
400
def _go_clicked_cb(self, widget, revid):
355
self.treeview.forward()
356
357
def _go_clicked_cb(self, w, p):
401
358
"""Callback for when the go button for a parent is clicked."""
402
self.treeview.set_cursor(self.index[self.revisions[revid]])
403
self.treeview.grab_focus()
359
if self.revisionview.get_revision() is not None:
360
self.treeview.set_revision(self.revisionview.get_revision())
404
361
405
def _show_clicked_cb(self, widget, revid, parentid):
362
def _show_clicked_cb(self, revid, parentid):
406
363
"""Callback for when the show button for a parent is clicked."""
407
if self.app is not None:
408
self.app.show_diff(self.branch, revid, parentid)
409
self.treeview.grab_focus()
410
411
def _treeview_row_activated_cb(self, widget, path, col):
412
# TODO: more than one parent
413
"""Callback for when a treeview row gets activated."""
414
revision = self.model[path][0]
415
parent_id = self.parent_ids[revision][0]
416
if self.app is not None:
417
self.app.show_diff(self.branch, revision.revision_id, parent_id)
418
self.treeview.grab_focus()
364
self.show_diff(revid, parentid)
365
self.treeview.grab_focus()
366
367
def _set_revision_cb(self, w, revision_id):
368
self.treeview.set_revision_id(revision_id)
369
370
def _brokenlines_toggled_cb(self, button):
371
self.compact_view = button.get_active()
372
373
if self.compact_view:
374
option = 'yes'
375
else:
376
option = 'no'
377
378
self.config.set_user_option('viz-compact-view', option)
379
self.treeview.set_property('compact', self.compact_view)
380
self.treeview.refresh()
381
382
def _tag_revision_cb(self, w):
383
try:
384
self.treeview.set_sensitive(False)
385
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
386
response = dialog.run()
387
if response != gtk.RESPONSE_NONE:
388
dialog.hide()
389
390
if response == gtk.RESPONSE_OK:
391
self.treeview.add_tag(dialog.tagname, dialog._revid)
392
393
dialog.destroy()
394
395
finally:
396
self.treeview.set_sensitive(True)
397
398
def _about_dialog_cb(self, w):
399
from bzrlib.plugins.gtk.about import AboutDialog
400
401
AboutDialog().run()
402
403
def _col_visibility_changed(self, col, property):
404
self.config.set_user_option(property + '-column-visible', col.get_active())
405
self.treeview.set_property(property + '-column-visible', col.get_active())
406
407
def _toolbar_visibility_changed(self, col):
408
if col.get_active():
409
self.toolbar.show()
410
else:
411
self.toolbar.hide()
412
413
def _show_about_cb(self, w):
414
dialog = AboutDialog()
415
dialog.connect('response', lambda d,r: d.destroy())
416
dialog.run()
417
418
def _refresh_clicked(self, w):
419
self.treeview.refresh()
420
421
def _update_tags(self):
422
menu = gtk.Menu()
423
424
if self.branch.supports_tags():
425
tags = self.branch.tags.get_tag_dict().items()
426
tags.sort()
427
tags.reverse()
428
for tag, revid in tags:
429
tag_item = gtk.MenuItem(tag)
430
tag_item.connect('activate', self._tag_selected_cb, revid)
431
menu.add(tag_item)
432
self.go_menu_tags.set_submenu(menu)
433
434
self.go_menu_tags.set_sensitive(len(tags) != 0)
435
else:
436
self.go_menu_tags.set_sensitive(False)
437
438
self.go_menu_tags.show_all()
439
440
def show_diff(self, revid=None, parentid=None):
441
"""Open a new window to show a diff between the given revisions."""
442
from bzrlib.plugins.gtk.diff import DiffWindow
443
window = DiffWindow(parent=self)
444
445
if parentid is None:
446
parentid = NULL_REVISION
447
448
rev_tree = self.branch.repository.revision_tree(revid)
449
parent_tree = self.branch.repository.revision_tree(parentid)
450
451
description = revid + " - " + self.branch.nick
452
window.set_diff(description, rev_tree, parent_tree)
453
window.show()
454
455
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0