/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: 2007-11-07 14:19:09 UTC
  • mfrom: (330.3.5 trunk)
  • Revision ID: daniel.schierbeck@gmail.com-20071107141909-3zxf7nw5laldvfxi
Merged with mainline.

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