/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: Jelmer Vernooij
  • Author(s): Chris Lamb
  • Date: 2008-05-01 13:00:15 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: jelmer@samba.org-20080501130015-lmn22j03044vqngp
Set suitable FDO categories in .desktop files

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
 
17
from bzrlib.plugins.gtk import icon_path
17
18
from bzrlib.plugins.gtk.tags import AddTagDialog
18
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
19
 
from bzrlib.revision import Revision
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
21
from bzrlib.revision import Revision, NULL_REVISION
20
22
from bzrlib.config import BranchConfig
21
23
from bzrlib.config import GlobalConfig
22
 
from treeview import TreeView
23
24
 
24
25
class BranchWindow(Window):
25
26
    """Branch window.
28
29
    for a particular branch.
29
30
    """
30
31
 
31
 
    def __init__(self, branch, start, maxnum, parent=None):
 
32
    def __init__(self, branch, start_revs, maxnum, parent=None):
32
33
        """Create a new BranchWindow.
33
34
 
34
35
        :param branch: Branch object for branch to show.
35
 
        :param start: Revision id of top revision.
 
36
        :param start_revs: Revision ids of top revisions.
36
37
        :param maxnum: Maximum number of revisions to display, 
37
38
                       None for no limit.
38
39
        """
41
42
        self.set_border_width(0)
42
43
 
43
44
        self.branch      = branch
44
 
        self.start       = start
 
45
        self.start_revs  = start_revs
45
46
        self.maxnum      = maxnum
46
47
        self.config      = GlobalConfig()
47
48
 
63
64
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
64
65
        self.set_icon(icon)
65
66
 
 
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
 
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
 
69
 
66
70
        self.accel_group = gtk.AccelGroup()
67
71
        self.add_accel_group(self.accel_group)
68
72
 
 
73
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
 
74
 
 
75
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
 
76
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
 
77
        self.prev_rev_action.set_accel_group(self.accel_group)
 
78
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
 
79
        self.prev_rev_action.connect_accelerator()
 
80
 
 
81
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
 
82
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
 
83
        self.next_rev_action.set_accel_group(self.accel_group)
 
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
 
85
        self.next_rev_action.connect_accelerator()
 
86
 
69
87
        self.construct()
70
88
 
71
 
    def set_revision(self, revision):
72
 
        self.treeview.set_revision(revision)
 
89
    def set_revision(self, revid):
 
90
        self.treeview.set_revision_id(revid)
73
91
 
74
92
    def construct(self):
75
93
        """Construct the window contents."""
76
94
        vbox = gtk.VBox(spacing=0)
77
95
        self.add(vbox)
78
96
 
79
 
        top = self.construct_top()
 
97
        self.paned = gtk.VPaned()
 
98
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
99
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
100
        self.paned.show()
80
101
 
81
102
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
82
103
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
83
 
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
84
104
        
85
 
        paned = gtk.VPaned()
86
 
        paned.pack1(top, resize=True, shrink=False)
87
 
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
88
 
        paned.show()
89
 
        vbox.pack_start(paned, expand=True, fill=True)
90
 
        vbox.set_focus_child(paned)
 
105
        vbox.pack_start(self.paned, expand=True, fill=True)
 
106
        vbox.set_focus_child(self.paned)
91
107
 
92
108
        vbox.show()
93
109
 
104
120
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
105
121
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
106
122
        
107
 
        file_menu.add(file_menu_close)
 
123
        if self._parent is not None:
 
124
            file_menu.add(file_menu_close)
108
125
        file_menu.add(file_menu_quit)
109
126
 
110
127
        edit_menu = gtk.Menu()
116
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
117
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
118
135
 
119
 
        edit_menu_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
120
 
        edit_menu_prefs.connect('activate', lambda x: PreferencesWindow().show())
 
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
121
138
 
122
139
        edit_menu.add(edit_menu_find)
123
140
        edit_menu.add(edit_menu_branchopts)
124
 
        edit_menu.add(edit_menu_prefs)
 
141
        edit_menu.add(edit_menu_globopts)
125
142
 
126
143
        view_menu = gtk.Menu()
127
144
        view_menuitem = gtk.MenuItem("_View")
131
148
        view_menu_toolbar.set_active(True)
132
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
133
150
 
 
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
152
        view_menu_compact.set_active(self.compact_view)
 
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
154
 
134
155
        view_menu.add(view_menu_toolbar)
 
156
        view_menu.add(view_menu_compact)
135
157
        view_menu.add(gtk.SeparatorMenuItem())
136
158
 
137
 
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
138
 
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
159
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
 
160
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
 
161
 
 
162
        # Revision numbers are pointless if there are multiple branches
 
163
        if len(self.start_revs) > 1:
 
164
            self.mnu_show_revno_column.set_sensitive(False)
 
165
            self.treeview.set_property('revno-column-visible', False)
 
166
 
 
167
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
 
168
                            (self.mnu_show_date_column, "date")]:
139
169
            col.set_active(self.treeview.get_property(name + "-column-visible"))
140
170
            col.connect('toggled', self._col_visibility_changed, name)
141
171
            view_menu.add(col)
142
172
 
143
173
        go_menu = gtk.Menu()
 
174
        go_menu.set_accel_group(self.accel_group)
144
175
        go_menuitem = gtk.MenuItem("_Go")
145
176
        go_menuitem.set_submenu(go_menu)
146
177
        
147
 
        go_menu_back = gtk.ImageMenuItem(gtk.STOCK_GO_DOWN)
148
 
        go_menu_back.connect("activate", self._back_clicked_cb)
149
 
 
150
 
        go_menu_forward = gtk.ImageMenuItem(gtk.STOCK_GO_UP)
151
 
        go_menu_forward.connect("activate", self._fwd_clicked_cb)
152
 
 
153
 
        tags_menu = gtk.Menu()
154
 
        go_menu_tags = gtk.MenuItem("_Tags")
155
 
        go_menu_tags.set_submenu(tags_menu)
156
 
 
157
 
        if self.branch.supports_tags():
158
 
            for (tag, revid) in self.branch.tags.get_tag_dict().items():
159
 
                tag_item = gtk.MenuItem(tag)
160
 
                tag_item.connect('activate', self._tag_selected_cb, revid)
161
 
                tags_menu.add(tag_item)
162
 
 
163
 
        go_menu.add(go_menu_back)
164
 
        go_menu.add(go_menu_forward)
 
178
        go_menu_next = self.next_rev_action.create_menu_item()
 
179
        go_menu_prev = self.prev_rev_action.create_menu_item()
 
180
 
 
181
        tag_image = gtk.Image()
 
182
        tag_image.set_from_file(icon_path("tag-16.png"))
 
183
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
 
184
        self.go_menu_tags.set_image(tag_image)
 
185
        self._update_tags()
 
186
 
 
187
        go_menu.add(go_menu_next)
 
188
        go_menu.add(go_menu_prev)
165
189
        go_menu.add(gtk.SeparatorMenuItem())
166
 
        go_menu.add(go_menu_tags)
 
190
        go_menu.add(self.go_menu_tags)
167
191
 
168
192
        revision_menu = gtk.Menu()
169
193
        revision_menuitem = gtk.MenuItem("_Revision")
171
195
 
172
196
        revision_menu_diff = gtk.MenuItem("View Changes")
173
197
        revision_menu_diff.connect('activate', 
174
 
                lambda w: self.treeview.show_diff())
 
198
                self._menu_diff_cb)
 
199
        
 
200
        revision_menu_compare = gtk.MenuItem("Compare with...")
 
201
        revision_menu_compare.connect('activate',
 
202
                self._compare_with_cb)
175
203
 
176
204
        revision_menu_tag = gtk.MenuItem("Tag Revision")
177
205
        revision_menu_tag.connect('activate', self._tag_revision_cb)
178
206
 
179
207
        revision_menu.add(revision_menu_tag)
180
208
        revision_menu.add(revision_menu_diff)
 
209
        revision_menu.add(revision_menu_compare)
181
210
 
182
211
        branch_menu = gtk.Menu()
183
212
        branch_menuitem = gtk.MenuItem("_Branch")
185
214
 
186
215
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
187
216
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
188
 
       
 
217
 
 
218
        help_menu = gtk.Menu()
 
219
        help_menuitem = gtk.MenuItem("_Help")
 
220
        help_menuitem.set_submenu(help_menu)
 
221
 
 
222
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
 
223
        help_about_menuitem.connect('activate', self._about_dialog_cb)
 
224
 
 
225
        help_menu.add(help_about_menuitem)
 
226
 
189
227
        menubar.add(file_menuitem)
190
228
        menubar.add(edit_menuitem)
191
229
        menubar.add(view_menuitem)
192
230
        menubar.add(go_menuitem)
193
231
        menubar.add(revision_menuitem)
194
232
        menubar.add(branch_menuitem)
 
233
        menubar.add(help_menuitem)
195
234
        menubar.show_all()
196
235
 
197
236
        return menubar
198
 
    
199
 
    def construct_loading_msg(self):
200
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
201
 
                                                 gtk.ICON_SIZE_BUTTON)
202
 
        image_loading.show()
203
 
        
204
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
205
 
        label_loading.set_alignment(0.0, 0.5)
206
 
        label_loading.show()
207
 
        
208
 
        self.loading_msg_box = gtk.HBox()
209
 
        self.loading_msg_box.set_spacing(5)
210
 
        self.loading_msg_box.set_border_width(5)        
211
 
        self.loading_msg_box.pack_start(image_loading, False, False)
212
 
        self.loading_msg_box.pack_start(label_loading, True, True)
213
 
        self.loading_msg_box.show()
214
 
        
215
 
        return self.loading_msg_box
216
237
 
217
238
    def construct_top(self):
218
239
        """Construct the top-half of the window."""
219
240
        # FIXME: Make broken_line_length configurable
220
 
        if self.compact_view:
221
 
            brokenlines = 32
222
 
        else:
223
 
            brokenlines = None
224
 
 
225
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum, brokenlines)
226
 
 
227
 
        self.treeview.connect("revision-selected",
 
241
 
 
242
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
243
 
 
244
        self.treeview.connect('revision-selected',
228
245
                self._treeselection_changed_cb)
229
 
 
230
 
        self.treeview.connect('revisions-loaded', 
231
 
                lambda x: self.loading_msg_box.hide())
 
246
        self.treeview.connect('revision-activated',
 
247
                self._tree_revision_activated)
 
248
 
 
249
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
250
 
 
251
        for col in ["revno", "date"]:
 
252
            option = self.config.get_user_option(col + '-column-visible')
 
253
            if option is not None:
 
254
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
255
            else:
 
256
                self.treeview.set_property(col + '-column-visible', False)
232
257
 
233
258
        self.treeview.show()
234
259
 
235
 
        return self.treeview
 
260
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
261
        align.set_padding(5, 0, 0, 0)
 
262
        align.add(self.treeview)
 
263
        align.show()
 
264
 
 
265
        return align
236
266
 
237
267
    def construct_navigation(self):
238
268
        """Construct the navigation buttons."""
239
269
        self.toolbar = gtk.Toolbar()
240
270
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
241
271
 
242
 
        self.back_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_DOWN)
243
 
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
244
 
                                         0, 0)
245
 
        self.back_button.connect("clicked", self._back_clicked_cb)
246
 
        self.toolbar.insert(self.back_button, -1)
 
272
        self.prev_button = self.prev_rev_action.create_tool_item()
 
273
        self.toolbar.insert(self.prev_button, -1)
247
274
 
248
 
        self.fwd_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_UP)
249
 
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
250
 
                                        0, 0)
251
 
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
252
 
        self.toolbar.insert(self.fwd_button, -1)
 
275
        self.next_button = self.next_rev_action.create_tool_item()
 
276
        self.toolbar.insert(self.next_button, -1)
253
277
 
254
278
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
255
279
 
256
 
        brokenlines_button = gtk.ToggleToolButton()
257
 
        brokenlines_button.set_label("Compact View")
258
 
        brokenlines_button.set_active(self.compact_view)
259
 
        brokenlines_button.set_is_important(True)
260
 
        brokenlines_button.connect('toggled', self._brokenlines_toggled_cb)
261
 
        self.toolbar.insert(brokenlines_button, -1)
 
280
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
281
        refresh_button.connect('clicked', self._refresh_clicked)
 
282
        self.toolbar.insert(refresh_button, -1)
262
283
 
263
284
        self.toolbar.show_all()
264
285
 
267
288
    def construct_bottom(self):
268
289
        """Construct the bottom half of the window."""
269
290
        from bzrlib.plugins.gtk.revisionview import RevisionView
270
 
        self.revisionview = RevisionView(None, tags=[], show_children=True, branch=self.branch)
 
291
        self.revisionview = RevisionView(branch=self.branch)
271
292
        (width, height) = self.get_size()
272
293
        self.revisionview.set_size_request(width, int(height / 2.5))
273
294
        self.revisionview.show()
274
295
        self.revisionview.set_show_callback(self._show_clicked_cb)
275
 
        self.revisionview.set_go_callback(self._go_clicked_cb)
 
296
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
297
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
276
298
        return self.revisionview
277
299
 
278
300
    def _tag_selected_cb(self, menuitem, revid):
284
306
        parents  = self.treeview.get_parents()
285
307
        children = self.treeview.get_children()
286
308
 
287
 
        if revision is not None:
288
 
            back_menu = gtk.Menu()
 
309
        if revision and revision != NULL_REVISION:
 
310
            prev_menu = gtk.Menu()
289
311
            if len(parents) > 0:
290
 
                self.back_button.set_sensitive(True)
 
312
                self.prev_rev_action.set_sensitive(True)
291
313
                for parent_id in parents:
292
 
                    parent = self.branch.repository.get_revision(parent_id)
293
 
                    try:
294
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
295
 
                    except KeyError:
296
 
                        str = ""
 
314
                    if parent_id and parent_id != NULL_REVISION:
 
315
                        parent = self.branch.repository.get_revision(parent_id)
 
316
                        try:
 
317
                            str = ' (' + parent.properties['branch-nick'] + ')'
 
318
                        except KeyError:
 
319
                            str = ""
297
320
 
298
 
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
299
 
                    item.connect('activate', self._set_revision_cb, parent_id)
300
 
                    back_menu.add(item)
301
 
                back_menu.show_all()
 
321
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
322
                        item.connect('activate', self._set_revision_cb, parent_id)
 
323
                        prev_menu.add(item)
 
324
                prev_menu.show_all()
302
325
            else:
303
 
                self.back_button.set_sensitive(False)
304
 
                back_menu.hide()
305
 
 
306
 
            self.back_button.set_menu(back_menu)
307
 
 
308
 
            fwd_menu = gtk.Menu()
 
326
                self.prev_rev_action.set_sensitive(False)
 
327
                prev_menu.hide()
 
328
 
 
329
            self.prev_button.set_menu(prev_menu)
 
330
 
 
331
            next_menu = gtk.Menu()
309
332
            if len(children) > 0:
310
 
                self.fwd_button.set_sensitive(True)
 
333
                self.next_rev_action.set_sensitive(True)
311
334
                for child_id in children:
312
335
                    child = self.branch.repository.get_revision(child_id)
313
336
                    try:
317
340
 
318
341
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
319
342
                    item.connect('activate', self._set_revision_cb, child_id)
320
 
                    fwd_menu.add(item)
321
 
                fwd_menu.show_all()
 
343
                    next_menu.add(item)
 
344
                next_menu.show_all()
322
345
            else:
323
 
                self.fwd_button.set_sensitive(False)
324
 
                fwd_menu.hide()
325
 
 
326
 
            self.fwd_button.set_menu(fwd_menu)
327
 
 
328
 
            tags = []
329
 
            if self.branch.supports_tags():
330
 
                tagdict = self.branch.tags.get_reverse_tag_dict()
331
 
                if tagdict.has_key(revision.revision_id):
332
 
                    tags = tagdict[revision.revision_id]
333
 
            self.revisionview.set_revision(revision, tags, children)
 
346
                self.next_rev_action.set_sensitive(False)
 
347
                next_menu.hide()
 
348
 
 
349
            self.next_button.set_menu(next_menu)
 
350
 
 
351
            self.revisionview.set_revision(revision)
 
352
            self.revisionview.set_children(children)
 
353
    
 
354
    def _tree_revision_activated(self, widget, path, col):
 
355
        # TODO: more than one parent
 
356
        """Callback for when a treeview row gets activated."""
 
357
        revision = self.treeview.get_revision()
 
358
        parents  = self.treeview.get_parents()
 
359
 
 
360
        if len(parents) == 0:
 
361
            parent_id = None
 
362
        else:
 
363
            parent_id = parents[0]
 
364
 
 
365
        self.show_diff(revision.revision_id, parent_id)
 
366
        self.treeview.grab_focus()
 
367
        
 
368
    def _menu_diff_cb(self,w):
 
369
        (path, focus) = self.treeview.treeview.get_cursor()
 
370
        revid = self.treeview.model[path][treemodel.REVID]
 
371
        
 
372
        parentids = self.branch.repository.revision_parents(revid)
 
373
 
 
374
        if len(parentids) == 0:
 
375
            parentid = NULL_REVISION
 
376
        else:
 
377
            parentid = parentids[0]
 
378
        
 
379
        self.show_diff(revid,parentid)    
334
380
 
335
381
    def _back_clicked_cb(self, *args):
336
382
        """Callback for when the back button is clicked."""
340
386
        """Callback for when the forward button is clicked."""
341
387
        self.treeview.forward()
342
388
 
343
 
    def _go_clicked_cb(self, revid):
 
389
    def _go_clicked_cb(self, w, p):
344
390
        """Callback for when the go button for a parent is clicked."""
345
 
        self.treeview.set_revision_id(revid)
 
391
        if self.revisionview.get_revision() is not None:
 
392
            self.treeview.set_revision(self.revisionview.get_revision())
346
393
 
347
394
    def _show_clicked_cb(self, revid, parentid):
348
395
        """Callback for when the show button for a parent is clicked."""
349
 
        self.treeview.show_diff(revid, parentid)
 
396
        self.show_diff(revid, parentid)
350
397
        self.treeview.grab_focus()
351
398
 
 
399
    def _compare_with_cb(self,w):
 
400
        """Callback for revision 'compare with' menu. Will show a small
 
401
            dialog with branch revisions to compare with selected revision in TreeView"""
 
402
        
 
403
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
 
404
        
 
405
        rb = RevisionBrowser(self.branch,self)
 
406
        ret = rb.run()
 
407
        
 
408
        if ret == gtk.RESPONSE_OK:          
 
409
            (path, focus) = self.treeview.treeview.get_cursor()
 
410
            revid = self.treeview.model[path][treemodel.REVID]
 
411
            self.show_diff(revid, rb.selected_revid)
 
412
            
 
413
        rb.destroy()
 
414
            
352
415
    def _set_revision_cb(self, w, revision_id):
353
416
        self.treeview.set_revision_id(revision_id)
354
417
 
361
424
            option = 'no'
362
425
 
363
426
        self.config.set_user_option('viz-compact-view', option)
364
 
 
365
 
        revision = self.treeview.get_revision()
366
 
 
367
 
        self.treeview.destroy()
368
 
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
369
 
 
370
 
        gobject.idle_add(self.set_revision, revision.revision_id)
 
427
        self.treeview.set_property('compact', self.compact_view)
 
428
        self.treeview.refresh()
371
429
 
372
430
    def _tag_revision_cb(self, w):
373
 
        dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
374
 
        response = dialog.run()
375
 
        if response != gtk.RESPONSE_NONE:
376
 
            dialog.hide()
377
 
        
378
 
            if response == gtk.RESPONSE_OK:
379
 
                try:
380
 
                    self.branch.lock_write()
381
 
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
382
 
                finally:
383
 
                    self.branch.unlock()
 
431
        try:
 
432
            self.treeview.set_sensitive(False)
 
433
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
434
            response = dialog.run()
 
435
            if response != gtk.RESPONSE_NONE:
 
436
                dialog.hide()
384
437
            
385
 
            dialog.destroy()
 
438
                if response == gtk.RESPONSE_OK:
 
439
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
440
                
 
441
                dialog.destroy()
 
442
 
 
443
        finally:
 
444
            self.treeview.set_sensitive(True)
 
445
 
 
446
    def _about_dialog_cb(self, w):
 
447
        from bzrlib.plugins.gtk.about import AboutDialog
 
448
 
 
449
        AboutDialog().run()
386
450
 
387
451
    def _col_visibility_changed(self, col, property):
 
452
        self.config.set_user_option(property + '-column-visible', col.get_active())
388
453
        self.treeview.set_property(property + '-column-visible', col.get_active())
389
454
 
390
455
    def _toolbar_visibility_changed(self, col):
392
457
            self.toolbar.show() 
393
458
        else:
394
459
            self.toolbar.hide()
 
460
 
 
461
    def _show_about_cb(self, w):
 
462
        dialog = AboutDialog()
 
463
        dialog.connect('response', lambda d,r: d.destroy())
 
464
        dialog.run()
 
465
 
 
466
    def _refresh_clicked(self, w):
 
467
        self.treeview.refresh()
 
468
 
 
469
    def _update_tags(self):
 
470
        menu = gtk.Menu()
 
471
 
 
472
        if self.branch.supports_tags():
 
473
            tags = self.branch.tags.get_tag_dict().items()
 
474
            tags.sort()
 
475
            tags.reverse()
 
476
            for tag, revid in tags:
 
477
                tag_image = gtk.Image()
 
478
                tag_image.set_from_file(icon_path('tag-16.png'))
 
479
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
 
480
                tag_item.set_image(tag_image)
 
481
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
482
                menu.add(tag_item)
 
483
            self.go_menu_tags.set_submenu(menu)
 
484
 
 
485
            self.go_menu_tags.set_sensitive(len(tags) != 0)
 
486
        else:
 
487
            self.go_menu_tags.set_sensitive(False)
 
488
 
 
489
        self.go_menu_tags.show_all()
 
490
 
 
491
    def show_diff(self, revid=None, parentid=None):
 
492
        """Open a new window to show a diff between the given revisions."""
 
493
        from bzrlib.plugins.gtk.diff import DiffWindow
 
494
        window = DiffWindow(parent=self)
 
495
 
 
496
        if parentid is None:
 
497
            parentid = NULL_REVISION
 
498
 
 
499
        rev_tree    = self.branch.repository.revision_tree(revid)
 
500
        parent_tree = self.branch.repository.revision_tree(parentid)
 
501
 
 
502
        description = revid + " - " + self.branch.nick
 
503
        window.set_diff(description, rev_tree, parent_tree)
 
504
        window.show()
 
505
 
 
506