/b-gtk/fix-viz

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

  • 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.

Show diffs side-by-side

added added

removed removed

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