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 371.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 371.1.1
- Committer: Daniel Schierbeck
- Date: 2007-11-07 20:24:52 UTC
- mto: This revision was merged to the branch mainline in revision 372.
- Revision ID: daniel.schierbeck@gmail.com-20071107202452-yzz9g2wpvkrc8g6r
Added About dialog to the viz.
- 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)
77
78
self.accel_group = Gtk.AccelGroup()
67
self.accel_group = gtk.AccelGroup()
79
68
self.add_accel_group(self.accel_group)
80
69
81
self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
82
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
83
self.prev_rev_action.set_accel_group(self.accel_group)
84
self.prev_rev_action.connect("activate", self._back_clicked_cb)
85
self.prev_rev_action.connect_accelerator()
86
87
self.next_rev_action = Gtk.Action("next-rev", "_Next Revision", "Go to the next revision", Gtk.STOCK_GO_UP)
88
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
89
self.next_rev_action.set_accel_group(self.accel_group)
90
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
91
self.next_rev_action.connect_accelerator()
92
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)
70
self.construct()
110
71
111
72
def set_revision(self, revid):
112
73
self.treeview.set_revision_id(revid)
113
74
114
75
def construct(self):
115
76
"""Construct the window contents."""
116
vbox = Gtk.VBox(spacing=0)
77
vbox = gtk.VBox(spacing=0)
117
78
self.add(vbox)
118
79
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
80
top = self.construct_top()
81
82
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
83
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
84
vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
85
86
self.paned = gtk.VPaned()
87
self.paned.pack1(top, resize=True, shrink=False)
88
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
89
self.paned.show()
90
vbox.pack_start(self.paned, expand=True, fill=True)
91
vbox.set_focus_child(self.paned)
129
92
130
93
vbox.show()
131
94
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
95
def construct_menubar(self):
148
menubar = Gtk.MenuBar()
96
menubar = gtk.MenuBar()
149
97
150
file_menu = Gtk.Menu()
151
file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
98
file_menu = gtk.Menu()
99
file_menuitem = gtk.MenuItem("_File")
152
100
file_menuitem.set_submenu(file_menu)
153
101
154
file_menu_close = Gtk.ImageMenuItem.new_from_stock(
155
Gtk.STOCK_CLOSE, self.accel_group)
102
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
156
103
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
162
if self._parent is not None:
163
file_menu.add(file_menu_close)
104
105
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
106
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
107
108
file_menu.add(file_menu_close)
164
109
file_menu.add(file_menu_quit)
165
110
166
edit_menu = Gtk.Menu()
167
edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
111
edit_menu = gtk.Menu()
112
edit_menuitem = gtk.MenuItem("_Edit")
168
113
edit_menuitem.set_submenu(edit_menu)
169
114
170
edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
115
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
116
117
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
171
118
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
172
119
173
edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
174
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
120
edit_menu_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
121
edit_menu_prefs.connect('activate', lambda x: PreferencesWindow().show())
175
122
123
edit_menu.add(edit_menu_find)
176
124
edit_menu.add(edit_menu_branchopts)
177
edit_menu.add(edit_menu_globopts)
125
edit_menu.add(edit_menu_prefs)
178
126
179
view_menu = Gtk.Menu()
180
view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
127
view_menu = gtk.Menu()
128
view_menuitem = gtk.MenuItem("_View")
181
129
view_menuitem.set_submenu(view_menu)
182
130
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")
131
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
190
132
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
133
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
195
134
196
view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
135
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
197
136
view_menu_compact.set_active(self.compact_view)
198
137
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
199
138
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
139
view_menu.add(view_menu_toolbar)
226
140
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")]:
141
view_menu.add(gtk.SeparatorMenuItem())
142
143
for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
144
col = gtk.CheckMenuItem("Show " + label + " Column")
246
145
col.set_active(self.treeview.get_property(name + "-column-visible"))
247
146
col.connect('toggled', self._col_visibility_changed, name)
248
147
view_menu.add(col)
249
148
250
go_menu = Gtk.Menu()
251
go_menu.set_accel_group(self.accel_group)
252
go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
149
go_menu = gtk.Menu()
150
go_menuitem = gtk.MenuItem("_Go")
253
151
go_menuitem.set_submenu(go_menu)
254
255
go_menu_next = self.next_rev_action.create_menu_item()
256
go_menu_prev = self.prev_rev_action.create_menu_item()
257
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())
263
264
go_menu.add(go_menu_next)
265
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")
152
153
go_menu_back = gtk.ImageMenuItem(gtk.STOCK_GO_DOWN)
154
go_menu_back.connect("activate", self._back_clicked_cb)
155
156
go_menu_forward = gtk.ImageMenuItem(gtk.STOCK_GO_UP)
157
go_menu_forward.connect("activate", self._fwd_clicked_cb)
158
159
tags_menu = gtk.Menu()
160
go_menu_tags = gtk.MenuItem("_Tags")
161
go_menu_tags.set_submenu(tags_menu)
162
163
if self.branch.supports_tags():
164
for (tag, revid) in self.branch.tags.get_tag_dict().items():
165
tag_item = gtk.MenuItem(tag)
166
tag_item.connect('activate', self._tag_selected_cb, revid)
167
tags_menu.add(tag_item)
168
169
go_menu.add(go_menu_back)
170
go_menu.add(go_menu_forward)
171
go_menu.add(gtk.SeparatorMenuItem())
172
go_menu.add(go_menu_tags)
173
174
revision_menu = gtk.Menu()
175
revision_menuitem = gtk.MenuItem("_Revision")
176
revision_menuitem.set_submenu(revision_menu)
177
178
revision_menu_diff = gtk.MenuItem("View Changes")
179
revision_menu_diff.connect('activate',
180
lambda w: self.treeview.show_diff())
181
182
revision_menu_tag = gtk.MenuItem("Tag Revision")
183
revision_menu_tag.connect('activate', self._tag_revision_cb)
184
185
revision_menu.add(revision_menu_tag)
186
revision_menu.add(revision_menu_diff)
187
188
branch_menu = gtk.Menu()
189
branch_menuitem = gtk.MenuItem("_Branch")
276
190
branch_menuitem.set_submenu(branch_menu)
277
191
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")
192
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
193
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
194
195
help_menu = gtk.Menu()
196
help_menuitem = gtk.MenuItem("_Help")
298
197
help_menuitem.set_submenu(help_menu)
299
198
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)
305
199
help_menu_about = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
200
help_menu_about.connect('activate', self._show_about_cb)
201
202
help_menu.add(help_menu_about)
203
306
204
menubar.add(file_menuitem)
307
205
menubar.add(edit_menuitem)
308
206
menubar.add(view_menuitem)
313
211
menubar.show_all()
314
212
315
213
return menubar
214
215
def construct_loading_msg(self):
216
image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
217
gtk.ICON_SIZE_BUTTON)
218
image_loading.show()
219
220
label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
221
label_loading.set_alignment(0.0, 0.5)
222
label_loading.show()
223
224
self.loading_msg_box = gtk.HBox()
225
self.loading_msg_box.set_spacing(5)
226
self.loading_msg_box.set_border_width(5)
227
self.loading_msg_box.pack_start(image_loading, False, False)
228
self.loading_msg_box.pack_start(label_loading, True, True)
229
self.loading_msg_box.show()
230
231
return self.loading_msg_box
316
232
317
233
def construct_top(self):
318
234
"""Construct the top-half of the window."""
319
235
# FIXME: Make broken_line_length configurable
320
321
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
322
self.compact_view)
323
324
for col in ["revno", "date"]:
325
option = self.config.get_user_option(col + '-column-visible')
326
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)
236
if self.compact_view:
237
brokenlines = 32
238
else:
239
brokenlines = None
240
241
self.treeview = TreeView(self.branch, self.start, self.maxnum, brokenlines)
242
243
self.treeview.connect("revision-selected",
244
self._treeselection_changed_cb)
245
246
self.treeview.connect('revisions-loaded',
247
lambda x: self.loading_msg_box.hide())
331
248
332
249
self.treeview.show()
333
250
334
align = Gtk.Alignment.new(0.0, 0.0, 1.0, 1.0)
335
align.set_padding(5, 0, 0, 0)
336
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
align.show()
347
348
return align
251
return self.treeview
349
252
350
253
def construct_navigation(self):
351
254
"""Construct the navigation buttons."""
352
self.toolbar = Gtk.Toolbar()
353
self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
354
355
self.prev_button = self.prev_rev_action.create_tool_item()
356
self.toolbar.insert(self.prev_button, -1)
357
358
self.next_button = self.next_rev_action.create_tool_item()
359
self.toolbar.insert(self.next_button, -1)
360
361
self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
362
363
refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
364
refresh_button.connect('clicked', self._refresh_clicked)
365
self.toolbar.insert(refresh_button, -1)
255
self.toolbar = gtk.Toolbar()
256
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
257
258
self.back_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_DOWN)
259
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
260
0, 0)
261
self.back_button.connect("clicked", self._back_clicked_cb)
262
self.toolbar.insert(self.back_button, -1)
263
264
self.fwd_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_UP)
265
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
266
0, 0)
267
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
268
self.toolbar.insert(self.fwd_button, -1)
366
269
367
270
self.toolbar.show_all()
368
271
370
273
371
274
def construct_bottom(self):
372
275
"""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)
276
from bzrlib.plugins.gtk.revisionview import RevisionView
277
self.revisionview = RevisionView(None, tags=[], show_children=True, branch=self.branch)
377
278
(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')
279
self.revisionview.set_size_request(width, int(height / 2.5))
389
280
self.revisionview.show()
390
281
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
282
self.revisionview.set_go_callback(self._go_clicked_cb)
283
return self.revisionview
409
284
410
285
def _tag_selected_cb(self, menuitem, revid):
411
286
self.treeview.set_revision_id(revid)
416
291
parents = self.treeview.get_parents()
417
292
children = self.treeview.get_children()
418
293
419
if revision and revision.revision_id != NULL_REVISION:
420
self.revision_menu.set_revision_ids([revision.revision_id])
421
prev_menu = Gtk.Menu()
294
if revision is not None:
295
back_menu = gtk.Menu()
422
296
if len(parents) > 0:
423
self.prev_rev_action.set_sensitive(True)
297
self.back_button.set_sensitive(True)
424
298
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 = ""
299
parent = self.branch.repository.get_revision(parent_id)
300
try:
301
str = ' (' + parent.properties['branch-nick'] + ')'
302
except KeyError:
303
str = ""
431
304
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)
436
prev_menu.show_all()
305
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
306
item.connect('activate', self._set_revision_cb, parent_id)
307
back_menu.add(item)
308
back_menu.show_all()
437
309
else:
438
self.prev_rev_action.set_sensitive(False)
439
prev_menu.hide()
440
441
if getattr(self.prev_button, 'set_menu', None) is not None:
442
self.prev_button.set_menu(prev_menu)
443
444
next_menu = Gtk.Menu()
310
self.back_button.set_sensitive(False)
311
back_menu.hide()
312
313
self.back_button.set_menu(back_menu)
314
315
fwd_menu = gtk.Menu()
445
316
if len(children) > 0:
446
self.next_rev_action.set_sensitive(True)
317
self.fwd_button.set_sensitive(True)
447
318
for child_id in children:
448
319
child = self.branch.repository.get_revision(child_id)
449
320
try:
450
str = ' (%s)' % child.properties['branch-nick']
321
str = ' (' + child.properties['branch-nick'] + ')'
451
322
except KeyError:
452
323
str = ""
453
324
454
item = Gtk.MenuItem(
455
label=child.message.split("\n")[0] + str)
325
item = gtk.MenuItem(child.message.split("\n")[0] + str)
456
326
item.connect('activate', self._set_revision_cb, child_id)
457
next_menu.add(item)
458
next_menu.show_all()
327
fwd_menu.add(item)
328
fwd_menu.show_all()
459
329
else:
460
self.next_rev_action.set_sensitive(False)
461
next_menu.hide()
462
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()
330
self.fwd_button.set_sensitive(False)
331
fwd_menu.hide()
332
333
self.fwd_button.set_menu(fwd_menu)
334
335
tags = []
336
if self.branch.supports_tags():
337
tagdict = self.branch.tags.get_reverse_tag_dict()
338
if tagdict.has_key(revision.revision_id):
339
tags = tagdict[revision.revision_id]
340
self.revisionview.set_revision(revision, tags, children)
486
341
487
342
def _back_clicked_cb(self, *args):
488
343
"""Callback for when the back button is clicked."""
489
344
self.treeview.back()
490
345
491
346
def _fwd_clicked_cb(self, *args):
492
347
"""Callback for when the forward button is clicked."""
493
348
self.treeview.forward()
494
349
495
def _go_clicked_cb(self, w, p):
350
def _go_clicked_cb(self, revid):
496
351
"""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())
352
self.treeview.set_revision_id(revid)
499
353
500
354
def _show_clicked_cb(self, revid, parentid):
501
355
"""Callback for when the show button for a parent is clicked."""
502
self.show_diff(revid, parentid)
356
self.treeview.show_diff(revid, parentid)
503
357
self.treeview.grab_focus()
504
358
505
359
def _set_revision_cb(self, w, revision_id):
514
368
option = 'no'
515
369
516
370
self.config.set_user_option('viz-compact-view', option)
517
self.treeview.set_property('compact', self.compact_view)
518
self.treeview.refresh()
519
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
531
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()
371
372
revision = self.treeview.get_revision()
373
374
self.treeview.destroy()
375
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
376
377
gobject.idle_add(self.set_revision, revision.revision_id)
378
379
def _tag_revision_cb(self, w):
380
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
381
response = dialog.run()
382
if response != gtk.RESPONSE_NONE:
383
dialog.hide()
384
385
if response == gtk.RESPONSE_OK:
386
try:
387
self.branch.lock_write()
388
self.branch.tags.set_tag(dialog.tagname, dialog._revid)
389
finally:
390
self.branch.unlock()
391
392
dialog.destroy()
557
393
558
394
def _col_visibility_changed(self, col, property):
559
self.config.set_user_option(property + '-column-visible', col.get_active())
560
395
self.treeview.set_property(property + '-column-visible', col.get_active())
561
396
562
397
def _toolbar_visibility_changed(self, col):
563
398
if col.get_active():
564
self.toolbar.show()
399
self.toolbar.show()
565
400
else:
566
401
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)
621
622
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()
402
403
def _show_about_cb(self, w):
404
dialog = AboutDialog()
405
dialog.connect('response', lambda d,r: d.destroy())
406
dialog.run()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0