/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

Merged an approved request (single clicking bookmark).

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
19
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
66
65
 
67
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
67
        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
68
 
71
69
        self.accel_group = gtk.AccelGroup()
72
70
        self.add_accel_group(self.accel_group)
85
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
86
84
        self.next_rev_action.connect_accelerator()
87
85
 
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
86
        self.construct()
95
87
 
96
88
    def set_revision(self, revid):
151
143
        view_menuitem = gtk.MenuItem("_View")
152
144
        view_menuitem.set_submenu(view_menu)
153
145
 
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
146
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
147
        view_menu_toolbar.set_active(True)
162
148
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
191
177
        go_menu_next = self.next_rev_action.create_menu_item()
192
178
        go_menu_prev = self.prev_rev_action.create_menu_item()
193
179
 
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)
 
180
        self.go_menu_tags = gtk.MenuItem("_Tags")
198
181
        self._update_tags()
199
182
 
200
183
        go_menu.add(go_menu_next)
208
191
 
209
192
        revision_menu_diff = gtk.MenuItem("View Changes")
210
193
        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)
 
194
                lambda w: self.treeview.show_diff())
216
195
 
217
196
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
197
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
198
 
220
199
        revision_menu.add(revision_menu_tag)
221
200
        revision_menu.add(revision_menu_diff)
222
 
        revision_menu.add(revision_menu_compare)
223
201
 
224
202
        branch_menu = gtk.Menu()
225
203
        branch_menuitem = gtk.MenuItem("_Branch")
265
243
            option = self.config.get_user_option(col + '-column-visible')
266
244
            if option is not None:
267
245
                self.treeview.set_property(col + '-column-visible', option == 'True')
268
 
            else:
269
 
                self.treeview.set_property(col + '-column-visible', False)
270
246
 
 
247
        self.treeview.set_property(col + '-column-visible', False)
271
248
        self.treeview.show()
272
249
 
273
250
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
319
296
        parents  = self.treeview.get_parents()
320
297
        children = self.treeview.get_children()
321
298
 
322
 
        if revision and revision != NULL_REVISION:
 
299
        if revision is not None:
323
300
            prev_menu = gtk.Menu()
324
301
            if len(parents) > 0:
325
302
                self.prev_rev_action.set_sensitive(True)
326
303
                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 = ""
 
304
                    parent = self.branch.repository.get_revision(parent_id)
 
305
                    try:
 
306
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
307
                    except KeyError:
 
308
                        str = ""
333
309
 
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)
 
310
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
311
                    item.connect('activate', self._set_revision_cb, parent_id)
 
312
                    prev_menu.add(item)
337
313
                prev_menu.show_all()
338
314
            else:
339
315
                self.prev_rev_action.set_sensitive(False)
377
353
 
378
354
        self.show_diff(revision.revision_id, parent_id)
379
355
        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)    
 
356
    
393
357
 
394
358
    def _back_clicked_cb(self, *args):
395
359
        """Callback for when the back button is clicked."""
409
373
        self.show_diff(revid, parentid)
410
374
        self.treeview.grab_focus()
411
375
 
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
376
    def _set_revision_cb(self, w, revision_id):
429
377
        self.treeview.set_revision_id(revision_id)
430
378
 
487
435
            tags.sort()
488
436
            tags.reverse()
489
437
            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)
 
438
                tag_item = gtk.MenuItem(tag, use_underline=False)
494
439
                tag_item.connect('activate', self._tag_selected_cb, revid)
495
440
                menu.add(tag_item)
496
441
            self.go_menu_tags.set_submenu(menu)