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