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 223
- compare with another revision
- download diff
- download tarball
- view history from revision 223
- Committer: Jelmer Vernooij
- Date: 2007-07-15 15:13:34 UTC
- Revision ID: jelmer@samba.org-20070715151334-2t0g8fmpgj6vnqa7
Add icon for Bazaar preferences.
- files added:
- olive.glade
- files removed:
- branchbox.py
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- icons/oliveicon2.png => oliveicon2.png
- preferences/__init__.py => preferences.py
- 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 import icon_path
17
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
from bzrlib.plugins.gtk.window import Window
22
23
from bzrlib.config import BranchConfig, GlobalConfig
24
from bzrlib.revision import Revision, NULL_REVISION
25
from bzrlib.trace import mutter
26
27
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):
28
23
"""Branch window.
29
24
30
25
This object represents and manages a single window containing information
31
26
for a particular branch.
32
27
"""
33
28
34
def __init__(self, branch, start_revs, maxnum, parent=None):
35
"""Create a new BranchWindow.
36
37
:param branch: Branch object for branch to show.
38
:param start_revs: Revision ids of top revisions.
39
:param maxnum: Maximum number of revisions to display,
40
None for no limit.
41
"""
42
43
Window.__init__(self, parent=parent)
29
def __init__(self):
30
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
44
31
self.set_border_width(0)
45
46
self.branch = branch
47
self.start_revs = start_revs
48
self.maxnum = maxnum
49
self.config = GlobalConfig()
50
51
self._sizes = {} # window and widget sizes
52
53
if self.config.get_user_option('viz-compact-view') == 'yes':
54
self.compact_view = True
55
else:
56
self.compact_view = False
57
58
self.set_title(branch._get_nick(local=True) + " - revision history")
59
60
# user-configured window size
61
size = self._load_size('viz-window-size')
62
if size:
63
width, height = size
64
else:
65
# Use three-quarters of the screen by default
66
screen = self.get_screen()
67
monitor = screen.get_monitor_geometry(0)
68
width = int(monitor.width * 0.75)
69
height = int(monitor.height * 0.75)
32
self.set_title("bzrk")
33
34
# Use three-quarters of the screen by default
35
screen = self.get_screen()
36
monitor = screen.get_monitor_geometry(0)
37
width = int(monitor.width * 0.75)
38
height = int(monitor.height * 0.75)
70
39
self.set_default_size(width, height)
71
self.set_size_request(width/3, height/3)
72
self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
73
40
74
41
# FIXME AndyFitz!
75
42
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
76
43
self.set_icon(icon)
77
44
78
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
79
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
80
gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
81
82
45
self.accel_group = gtk.AccelGroup()
83
46
self.add_accel_group(self.accel_group)
84
47
85
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
86
87
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
88
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
89
self.prev_rev_action.set_accel_group(self.accel_group)
90
self.prev_rev_action.connect("activate", self._back_clicked_cb)
91
self.prev_rev_action.connect_accelerator()
92
93
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
94
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
95
self.next_rev_action.set_accel_group(self.accel_group)
96
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
97
self.next_rev_action.connect_accelerator()
98
99
self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
100
self.refresh_action.set_accel_path("<viz>/View/Refresh")
101
self.refresh_action.set_accel_group(self.accel_group)
102
self.refresh_action.connect("activate", self._refresh_clicked)
103
self.refresh_action.connect_accelerator()
104
105
48
self.construct()
106
49
107
def set_revision(self, revid):
108
self.treeview.set_revision_id(revid)
109
110
50
def construct(self):
111
51
"""Construct the window contents."""
112
52
vbox = gtk.VBox(spacing=0)
113
53
self.add(vbox)
114
54
115
self.paned = gtk.VPaned()
116
self.paned.pack1(self.construct_top(), resize=False, shrink=True)
117
self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
118
self.paned.show()
119
120
nav = self.construct_navigation()
121
menubar = self.construct_menubar()
122
vbox.pack_start(menubar, expand=False, fill=True)
123
vbox.pack_start(nav, expand=False, fill=True)
124
125
vbox.pack_start(self.paned, expand=True, fill=True)
126
vbox.set_focus_child(self.paned)
127
128
self.treeview.connect('revision-selected',
129
self._treeselection_changed_cb)
130
self.treeview.connect('revision-activated',
131
self._tree_revision_activated)
132
133
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
55
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
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)
63
134
64
vbox.show()
135
136
def construct_menubar(self):
137
menubar = gtk.MenuBar()
138
139
file_menu = gtk.Menu()
140
file_menuitem = gtk.MenuItem("_File")
141
file_menuitem.set_submenu(file_menu)
142
143
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
144
file_menu_close.connect('activate', lambda x: self.destroy())
145
146
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
147
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
148
149
if self._parent is not None:
150
file_menu.add(file_menu_close)
151
file_menu.add(file_menu_quit)
152
153
edit_menu = gtk.Menu()
154
edit_menuitem = gtk.MenuItem("_Edit")
155
edit_menuitem.set_submenu(edit_menu)
156
157
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
158
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
159
160
edit_menu_globopts = gtk.MenuItem("Global Settings")
161
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
162
163
edit_menu.add(edit_menu_branchopts)
164
edit_menu.add(edit_menu_globopts)
165
166
view_menu = gtk.Menu()
167
view_menuitem = gtk.MenuItem("_View")
168
view_menuitem.set_submenu(view_menu)
169
170
view_menu_refresh = self.refresh_action.create_menu_item()
171
view_menu_refresh.connect('activate', self._refresh_clicked)
172
173
view_menu.add(view_menu_refresh)
174
view_menu.add(gtk.SeparatorMenuItem())
175
176
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
177
view_menu_toolbar.set_active(True)
178
if self.config.get_user_option('viz-toolbar-visible') == 'False':
179
view_menu_toolbar.set_active(False)
180
self.toolbar.hide()
181
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
182
183
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
184
view_menu_compact.set_active(self.compact_view)
185
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
186
187
view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
188
view_menu_diffs.set_active(False)
189
if self.config.get_user_option('viz-show-diffs') == 'True':
190
view_menu_diffs.set_active(True)
191
view_menu_diffs.connect('toggled', self._diff_visibility_changed)
192
193
view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
194
view_menu_wide_diffs.set_active(False)
195
if self.config.get_user_option('viz-wide-diffs') == 'True':
196
view_menu_wide_diffs.set_active(True)
197
view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
198
199
view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
200
view_menu_wrap_diffs.set_active(False)
201
if self.config.get_user_option('viz-wrap-diffs') == 'True':
202
view_menu_wrap_diffs.set_active(True)
203
view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
204
205
view_menu.add(view_menu_toolbar)
206
view_menu.add(view_menu_compact)
207
view_menu.add(gtk.SeparatorMenuItem())
208
view_menu.add(view_menu_diffs)
209
view_menu.add(view_menu_wide_diffs)
210
view_menu.add(view_menu_wrap_diffs)
211
view_menu.add(gtk.SeparatorMenuItem())
212
213
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
214
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
215
216
# Revision numbers are pointless if there are multiple branches
217
if len(self.start_revs) > 1:
218
self.mnu_show_revno_column.set_sensitive(False)
219
self.treeview.set_property('revno-column-visible', False)
220
221
for (col, name) in [(self.mnu_show_revno_column, "revno"),
222
(self.mnu_show_date_column, "date")]:
223
col.set_active(self.treeview.get_property(name + "-column-visible"))
224
col.connect('toggled', self._col_visibility_changed, name)
225
view_menu.add(col)
226
227
go_menu = gtk.Menu()
228
go_menu.set_accel_group(self.accel_group)
229
go_menuitem = gtk.MenuItem("_Go")
230
go_menuitem.set_submenu(go_menu)
231
232
go_menu_next = self.next_rev_action.create_menu_item()
233
go_menu_prev = self.prev_rev_action.create_menu_item()
234
235
tag_image = gtk.Image()
236
tag_image.set_from_file(icon_path("tag-16.png"))
237
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
238
self.go_menu_tags.set_image(tag_image)
239
self.treeview.connect('refreshed', lambda w: self._update_tags())
240
241
go_menu.add(go_menu_next)
242
go_menu.add(go_menu_prev)
243
go_menu.add(gtk.SeparatorMenuItem())
244
go_menu.add(self.go_menu_tags)
245
246
self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
247
revision_menuitem = gtk.MenuItem("_Revision")
248
revision_menuitem.set_submenu(self.revision_menu)
249
250
branch_menu = gtk.Menu()
251
branch_menuitem = gtk.MenuItem("_Branch")
252
branch_menuitem.set_submenu(branch_menu)
253
254
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
255
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
256
257
try:
258
from bzrlib.plugins import search
259
except ImportError:
260
mutter("Didn't find search plugin")
261
else:
262
branch_menu.add(gtk.SeparatorMenuItem())
263
264
branch_index_menuitem = gtk.MenuItem("_Index")
265
branch_index_menuitem.connect('activate', self._branch_index_cb)
266
branch_menu.add(branch_index_menuitem)
267
268
branch_search_menuitem = gtk.MenuItem("_Search")
269
branch_search_menuitem.connect('activate', self._branch_search_cb)
270
branch_menu.add(branch_search_menuitem)
271
272
help_menu = gtk.Menu()
273
help_menuitem = gtk.MenuItem("_Help")
274
help_menuitem.set_submenu(help_menu)
275
276
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
277
help_about_menuitem.connect('activate', self._about_dialog_cb)
278
279
help_menu.add(help_about_menuitem)
280
281
menubar.add(file_menuitem)
282
menubar.add(edit_menuitem)
283
menubar.add(view_menuitem)
284
menubar.add(go_menuitem)
285
menubar.add(revision_menuitem)
286
menubar.add(branch_menuitem)
287
menubar.add(help_menuitem)
288
menubar.show_all()
289
290
return menubar
291
65
292
66
def construct_top(self):
293
67
"""Construct the top-half of the window."""
294
# FIXME: Make broken_line_length configurable
295
296
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
297
298
for col in ["revno", "date"]:
299
option = self.config.get_user_option(col + '-column-visible')
300
if option is not None:
301
self.treeview.set_property(col + '-column-visible', option == 'True')
302
else:
303
self.treeview.set_property(col + '-column-visible', False)
304
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)
305
79
self.treeview.show()
306
80
307
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
308
align.set_padding(5, 0, 0, 0)
309
align.add(self.treeview)
310
# user-configured size
311
size = self._load_size('viz-graph-size')
312
if size:
313
width, height = size
314
align.set_size_request(width, height)
315
else:
316
(width, height) = self.get_size()
317
align.set_size_request(width, int(height / 2.5))
318
align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
319
align.show()
320
321
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
322
117
323
118
def construct_navigation(self):
324
119
"""Construct the navigation buttons."""
325
self.toolbar = gtk.Toolbar()
326
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
327
328
self.prev_button = self.prev_rev_action.create_tool_item()
329
self.toolbar.insert(self.prev_button, -1)
330
331
self.next_button = self.next_rev_action.create_tool_item()
332
self.toolbar.insert(self.next_button, -1)
333
334
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
335
336
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
337
refresh_button.connect('clicked', self._refresh_clicked)
338
self.toolbar.insert(refresh_button, -1)
339
340
self.toolbar.show_all()
341
342
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
343
145
344
146
def construct_bottom(self):
345
147
"""Construct the bottom half of the window."""
346
if self.config.get_user_option('viz-wide-diffs') == 'True':
347
self.diff_paned = gtk.VPaned()
348
else:
349
self.diff_paned = gtk.HPaned()
148
from bzrlib.plugins.gtk.logview import LogView
149
self.logview = LogView()
350
150
(width, height) = self.get_size()
351
self.diff_paned.set_size_request(20, 20) # shrinkable
352
353
from bzrlib.plugins.gtk.revisionview import RevisionView
354
self.revisionview = RevisionView(branch=self.branch)
355
self.revisionview.set_size_request(width/3, int(height / 2.5))
356
# user-configured size
357
size = self._load_size('viz-revisionview-size')
358
if size:
359
width, height = size
360
self.revisionview.set_size_request(width, height)
361
self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
362
self.revisionview.show()
363
self.revisionview.set_show_callback(self._show_clicked_cb)
364
self.revisionview.connect('notify::revision', self._go_clicked_cb)
365
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
366
self.diff_paned.pack1(self.revisionview)
367
368
from bzrlib.plugins.gtk.diff import DiffWidget
369
self.diff = DiffWidget()
370
self.diff_paned.pack2(self.diff)
371
372
self.diff_paned.show_all()
373
if self.config.get_user_option('viz-show-diffs') != 'True':
374
self.diff.hide()
375
376
return self.diff_paned
377
378
def _tag_selected_cb(self, menuitem, revid):
379
self.treeview.set_revision_id(revid)
380
381
def _treeselection_changed_cb(self, selection, *args):
382
"""callback for when the treeview changes."""
383
revision = self.treeview.get_revision()
384
parents = self.treeview.get_parents()
385
children = self.treeview.get_children()
386
387
self.revision_menu.set_revision_ids([revision.revision_id])
388
389
if revision and revision != NULL_REVISION:
390
prev_menu = gtk.Menu()
391
if len(parents) > 0:
392
self.prev_rev_action.set_sensitive(True)
393
for parent_id in parents:
394
if parent_id and parent_id != NULL_REVISION:
395
parent = self.branch.repository.get_revision(parent_id)
396
try:
397
str = ' (' + parent.properties['branch-nick'] + ')'
398
except KeyError:
399
str = ""
400
401
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
402
item.connect('activate', self._set_revision_cb, parent_id)
403
prev_menu.add(item)
404
prev_menu.show_all()
405
else:
406
self.prev_rev_action.set_sensitive(False)
407
prev_menu.hide()
408
409
self.prev_button.set_menu(prev_menu)
410
411
next_menu = gtk.Menu()
412
if len(children) > 0:
413
self.next_rev_action.set_sensitive(True)
414
for child_id in children:
415
child = self.branch.repository.get_revision(child_id)
416
try:
417
str = ' (' + child.properties['branch-nick'] + ')'
418
except KeyError:
419
str = ""
420
421
item = gtk.MenuItem(child.message.split("\n")[0] + str)
422
item.connect('activate', self._set_revision_cb, child_id)
423
next_menu.add(item)
424
next_menu.show_all()
425
else:
426
self.next_rev_action.set_sensitive(False)
427
next_menu.hide()
428
429
self.next_button.set_menu(next_menu)
430
431
self.revisionview.set_revision(revision)
432
self.revisionview.set_children(children)
433
self.update_diff_panel(revision, parents)
434
435
def _tree_revision_activated(self, widget, path, col):
436
# TODO: more than one parent
437
"""Callback for when a treeview row gets activated."""
438
revision = self.treeview.get_revision()
439
parents = self.treeview.get_parents()
440
441
if len(parents) == 0:
442
parent_id = NULL_REVISION
443
else:
444
parent_id = parents[0]
445
446
self.show_diff(revision.revision_id, parent_id)
447
self.treeview.grab_focus()
448
151
self.logview.set_size_request(width, int(height / 2.5))
152
self.logview.show()
153
self.logview.set_show_callback(self._show_clicked_cb)
154
self.logview.set_go_callback(self._go_clicked_cb)
155
return self.logview
156
157
def set_branch(self, branch, start, maxnum):
158
"""Set the branch and start position for this window.
159
160
Creates a new TreeModel and populates it with information about
161
the new branch before updating the window title and model of the
162
treeview itself.
163
"""
164
self.branch = branch
165
166
# [ revision, node, last_lines, lines, message, committer, timestamp ]
167
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
168
gobject.TYPE_PYOBJECT,
169
gobject.TYPE_PYOBJECT,
170
gobject.TYPE_PYOBJECT,
171
str, str, str)
172
self.index = {}
173
index = 0
174
175
last_lines = []
176
(self.revisions, colours, self.children, self.parent_ids,
177
merge_sorted) = distances(branch, start)
178
for (index, (revision, node, lines)) in enumerate(graph(
179
self.revisions, colours, merge_sorted)):
180
# FIXME: at this point we should be able to show the graph order
181
# and lines with no message or commit data - and then incrementally
182
# fill the timestamp, committer etc data as desired.
183
message = revision.message.split("\n")[0]
184
if revision.committer is not None:
185
timestamp = format_date(revision.timestamp, revision.timezone)
186
else:
187
timestamp = None
188
self.model.append([revision, node, last_lines, lines,
189
message, revision.committer, timestamp])
190
self.index[revision] = index
191
last_lines = lines
192
if maxnum is not None and index > maxnum:
193
break
194
195
self.set_title(branch.nick + " - bzrk")
196
self.treeview.set_model(self.model)
197
198
def _treeview_cursor_cb(self, *args):
199
"""Callback for when the treeview cursor changes."""
200
(path, col) = self.treeview.get_cursor()
201
revision = self.model[path][0]
202
203
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
204
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
205
self.logview.set_revision(revision)
206
449
207
def _back_clicked_cb(self, *args):
450
208
"""Callback for when the back button is clicked."""
451
self.treeview.back()
452
209
(path, col) = self.treeview.get_cursor()
210
revision = self.model[path][0]
211
if not len(self.parent_ids[revision]):
212
return
213
214
for parent_id in self.parent_ids[revision]:
215
parent = self.revisions[parent_id]
216
if same_branch(revision, parent):
217
self.treeview.set_cursor(self.index[parent])
218
break
219
else:
220
next = self.revisions[self.parent_ids[revision][0]]
221
self.treeview.set_cursor(self.index[next])
222
self.treeview.grab_focus()
223
453
224
def _fwd_clicked_cb(self, *args):
454
225
"""Callback for when the forward button is clicked."""
455
self.treeview.forward()
456
457
def _go_clicked_cb(self, w, p):
226
(path, col) = self.treeview.get_cursor()
227
revision = self.model[path][0]
228
if not len(self.children[revision]):
229
return
230
231
for child in self.children[revision]:
232
if same_branch(child, revision):
233
self.treeview.set_cursor(self.index[child])
234
break
235
else:
236
prev = list(self.children[revision])[0]
237
self.treeview.set_cursor(self.index[prev])
238
self.treeview.grab_focus()
239
240
def _go_clicked_cb(self, revid):
458
241
"""Callback for when the go button for a parent is clicked."""
459
if self.revisionview.get_revision() is not None:
460
self.treeview.set_revision(self.revisionview.get_revision())
461
462
def _show_clicked_cb(self, revid, parentid):
463
"""Callback for when the show button for a parent is clicked."""
464
self.show_diff(revid, parentid)
242
self.treeview.set_cursor(self.index[self.revisions[revid]])
465
243
self.treeview.grab_focus()
466
244
467
def _set_revision_cb(self, w, revision_id):
468
self.treeview.set_revision_id(revision_id)
469
470
def _brokenlines_toggled_cb(self, button):
471
self.compact_view = button.get_active()
472
473
if self.compact_view:
474
option = 'yes'
475
else:
476
option = 'no'
477
478
self.config.set_user_option('viz-compact-view', option)
479
self.treeview.set_property('compact', self.compact_view)
480
self.treeview.refresh()
481
482
def _branch_index_cb(self, w):
483
from bzrlib.plugins.search import index as _mod_index
484
_mod_index.index_url(self.branch.base)
485
486
def _branch_search_cb(self, w):
487
from bzrlib.plugins.search import index as _mod_index
488
from bzrlib.plugins.gtk.search import SearchDialog
489
from bzrlib.plugins.search import errors as search_errors
490
491
try:
492
index = _mod_index.open_index_url(self.branch.base)
493
except search_errors.NoSearchIndex:
494
dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION,
495
buttons=gtk.BUTTONS_OK_CANCEL,
496
message_format="This branch has not been indexed yet. "
497
"Index now?")
498
if dialog.run() == gtk.RESPONSE_OK:
499
dialog.destroy()
500
index = _mod_index.index_url(self.branch.base)
501
else:
502
dialog.destroy()
503
return
504
505
dialog = SearchDialog(index)
506
507
if dialog.run() == gtk.RESPONSE_OK:
508
self.set_revision(dialog.get_revision())
509
510
dialog.destroy()
511
512
def _about_dialog_cb(self, w):
513
from bzrlib.plugins.gtk.about import AboutDialog
514
515
AboutDialog().run()
516
517
def _col_visibility_changed(self, col, property):
518
self.config.set_user_option(property + '-column-visible', col.get_active())
519
self.treeview.set_property(property + '-column-visible', col.get_active())
520
521
def _toolbar_visibility_changed(self, col):
522
if col.get_active():
523
self.toolbar.show()
524
else:
525
self.toolbar.hide()
526
self.config.set_user_option('viz-toolbar-visible', col.get_active())
527
528
def _make_diff_nonzero_size(self):
529
"""make sure the diff isn't zero-width or zero-height"""
530
alloc = self.diff.get_allocation()
531
if (alloc.width < 10) or (alloc.height < 10):
532
width, height = self.get_size()
533
self.revisionview.set_size_request(width/3, int(height / 2.5))
534
535
def _diff_visibility_changed(self, col):
536
"""Hide or show the diff panel."""
537
if col.get_active():
538
self.diff.show()
539
self._make_diff_nonzero_size()
540
else:
541
self.diff.hide()
542
self.config.set_user_option('viz-show-diffs', str(col.get_active()))
543
self.update_diff_panel()
544
545
def _diff_placement_changed(self, col):
546
"""Toggle the diff panel's position."""
547
self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
548
549
old = self.paned.get_child2()
550
self.paned.remove(old)
551
self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
552
self._make_diff_nonzero_size()
553
554
self.treeview.emit('revision-selected')
555
556
def _diff_wrap_changed(self, widget):
557
"""Toggle word wrap in the diff widget."""
558
self.config.set_user_option('viz-wrap-diffs', widget.get_active())
559
self.diff._on_wraplines_toggled(widget)
560
561
def _show_about_cb(self, w):
562
dialog = AboutDialog()
563
dialog.connect('response', lambda d,r: d.destroy())
564
dialog.run()
565
566
def _refresh_clicked(self, w):
567
self.treeview.refresh()
568
569
def _update_tags(self):
570
menu = gtk.Menu()
571
572
if self.branch.supports_tags():
573
tags = self.branch.tags.get_tag_dict().items()
574
tags.sort(reverse=True)
575
for tag, revid in tags:
576
tag_image = gtk.Image()
577
tag_image.set_from_file(icon_path('tag-16.png'))
578
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
579
tag_item.set_image(tag_image)
580
tag_item.connect('activate', self._tag_selected_cb, revid)
581
tag_item.set_sensitive(self.treeview.has_revision_id(revid))
582
menu.add(tag_item)
583
self.go_menu_tags.set_submenu(menu)
584
585
self.go_menu_tags.set_sensitive(len(tags) != 0)
586
else:
587
self.go_menu_tags.set_sensitive(False)
588
589
self.go_menu_tags.show_all()
590
591
def _load_size(self, name):
592
"""Read and parse 'name' from self.config.
593
The value is a string, formatted as WIDTHxHEIGHT
594
Returns None, or (width, height)
595
"""
596
size = self.config.get_user_option(name)
597
if size:
598
width, height = [int(num) for num in size.split('x')]
599
# avoid writing config every time we start
600
self._sizes[name] = (width, height)
601
return width, height
602
return None
603
604
def _on_size_allocate(self, widget, allocation, name):
605
"""When window has been resized, save the new size."""
606
width, height = 0, 0
607
if name in self._sizes:
608
width, height = self._sizes[name]
609
610
size_changed = (width != allocation.width) or \
611
(height != allocation.height)
612
613
if size_changed:
614
width, height = allocation.width, allocation.height
615
self._sizes[name] = (width, height)
616
value = '%sx%s' % (width, height)
617
self.config.set_user_option(name, value)
618
619
def show_diff(self, revid=None, parentid=NULL_REVISION):
245
def show_diff(self, branch, revid, parentid):
620
246
"""Open a new window to show a diff between the given revisions."""
621
247
from bzrlib.plugins.gtk.diff import DiffWindow
622
window = DiffWindow(parent=self)
623
624
rev_tree = self.branch.repository.revision_tree(revid)
625
parent_tree = self.branch.repository.revision_tree(parentid)
626
627
description = revid + " - " + self.branch._get_nick(local=True)
248
window = DiffWindow()
249
rev_tree = branch.repository.revision_tree(revid)
250
parent_tree = branch.repository.revision_tree(parentid)
251
description = revid + " - " + branch.nick
628
252
window.set_diff(description, rev_tree, parent_tree)
629
253
window.show()
630
254
631
def update_diff_panel(self, revision=None, parents=None):
632
"""Show the current revision in the diff panel."""
633
if self.config.get_user_option('viz-show-diffs') != 'True':
634
return
635
636
if not revision: # default to selected row
637
revision = self.treeview.get_revision()
638
if revision == NULL_REVISION:
639
return
640
641
if not parents: # default to selected row's parents
642
parents = self.treeview.get_parents()
643
if len(parents) == 0:
644
parent_id = NULL_REVISION
645
else:
646
parent_id = parents[0]
647
648
rev_tree = self.branch.repository.revision_tree(revision.revision_id)
649
parent_tree = self.branch.repository.revision_tree(parent_id)
650
651
self.diff.set_diff(rev_tree, parent_tree)
652
if self.config.get_user_option('viz-wrap-diffs') == 'True':
653
self.diff._on_wraplines_toggled(wrap=True)
654
self.diff.show_all()
255
def _show_clicked_cb(self, revid, parentid):
256
"""Callback for when the show button for a parent is clicked."""
257
self.show_diff(self.branch, revid, parentid)
258
self.treeview.grab_focus()
259
260
def _treeview_row_activated_cb(self, widget, path, col):
261
# TODO: more than one parent
262
"""Callback for when a treeview row gets activated."""
263
revision = self.model[path][0]
264
if len(self.parent_ids[revision]) == 0:
265
# Ignore revisions without parent
266
return
267
parent_id = self.parent_ids[revision][0]
268
self.show_diff(self.branch, revision.revision_id, parent_id)
269
self.treeview.grab_focus()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0