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