/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 olive/menu.py

  • Committer: Daniel Schierbeck
  • Date: 2007-12-06 23:37:06 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: daniel.schierbeck@gmail.com-20071206233706-eeinks66w86r3gfm
Fixed bug in gmissing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
196
196
        branch = wt.branch
197
197
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
198
198
        
199
 
        window = GAnnotateWindow(all=False, plain=False)
 
199
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
200
200
        window.set_title(os.path.join(directory, filename) + " - Annotate")
201
201
        config = GAnnotateConfig(window)
202
202
        window.show()
288
288
        except NotBranchError, e:
289
289
            path = e.path
290
290
        
291
 
        commit = CommitDialog(wt, path, not branch, self.selected)
 
291
        if self.selected:
 
292
            selected = os.path.join(path, self.selected)
 
293
        else:
 
294
            selected = None
 
295
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
292
296
        response = commit.run()
293
297
        if response != gtk.RESPONSE_NONE:
294
298
            commit.hide()
302
306
    def diff(self, action):
303
307
        """ Right context menu -> Diff """
304
308
        wt = WorkingTree.open_containing(self.path)[0]
305
 
        window = DiffWindow()
 
309
        window = DiffWindow(self.app)
306
310
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
307
311
        window.set_diff(wt.branch.nick, wt, parent_tree)
308
312
        window.set_file(wt.relpath(self.path + os.sep + self.selected))