/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 nautilus-bzr.py

  • Committer: Curtis Hovey
  • Date: 2012-03-11 21:41:49 UTC
  • mfrom: (785 trunk)
  • mto: This revision was merged to the branch mainline in revision 788.
  • Revision ID: sinzui.is@verizon.net-20120311214149-5r8750zihn80nk2r
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
124
124
        dialog.display()
125
125
        Gtk.main()
126
126
 
 
127
    def push_cb(self, menu, controldir, path=None):
 
128
        from bzrlib.plugins.gtk.push import PushDialog
 
129
        dialog = PushDialog(branch=controldir.open_workingtree().branch)
 
130
        dialog.display()
 
131
        Gtk.main()
 
132
 
127
133
    def merge_cb(self, menu, tree, path=None):
128
134
        from bzrlib.plugins.gtk.merge import MergeDialog
129
135
        dialog = MergeDialog(tree, path)
239
245
            item.connect('activate', self.unignore_cb, tree, path)
240
246
            yield item
241
247
        else:
 
248
            kind = tree.kind(file_id)
242
249
            item = Nautilus.MenuItem(name='BzrNautilus::log',
243
250
                             label='History ...',
244
251
                             tip='List changes',
268
275
            item.connect('activate', self.remove_cb, tree, path)
269
276
            yield item
270
277
 
271
 
            item = Nautilus.MenuItem(name='BzrNautilus::annotate',
272
 
                         label='Annotate ...',
273
 
                         tip='Annotate File Data',
274
 
                         icon='')
275
 
            item.connect('activate', self.annotate_cb, tree, path, file_id)
276
 
            yield item
 
278
            if kind == 'file':
 
279
                item = Nautilus.MenuItem(name='BzrNautilus::annotate',
 
280
                             label='Annotate ...',
 
281
                             tip='Annotate File Data',
 
282
                             icon='')
 
283
                item.connect('activate', self.annotate_cb, tree, path, file_id)
 
284
                yield item
277
285
 
278
286
    def get_file_items(self, window, files):
279
287
        items = []