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