/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/log.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 17:56:26 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927175626-4462e9dc20d422b1
Bunch of random cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/log.py
32
32
from bzrlib.branch import Branch
33
33
import bzrlib.errors as errors
34
34
 
35
 
from viz.bzrkapp import BzrkApp
 
35
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
 
36
 
 
37
from dialog import error_dialog
36
38
 
37
39
class OliveLog:
38
40
    """ Display Log (bzrk) window and perform the needed actions. """
39
 
    def __init__(self, gladefile, comm, dialog):
 
41
    def __init__(self, gladefile, comm):
40
42
        """ Initialize the Log (bzrk) window. """
41
43
        self.gladefile = gladefile
42
44
 
43
45
        # Communication object
44
46
        self.comm = comm
45
 
        # Dialog object
46
 
        self.dialog = dialog
47
47
        
48
48
        # Check if current location is a branch
49
49
        self.notbranch = False
60
60
    def display(self):
61
61
        """ Display the Log (bzrk) window. """
62
62
        if self.notbranch:
63
 
            self.dialog.error_dialog(_('Directory is not a branch'),
 
63
            error_dialog(_('Directory is not a branch'),
64
64
                                     _('You can perform this action only in a branch.'))
65
65
        else:
66
 
            self.app = BzrkApp()
67
 
            self.app.show(self.branch, self.revid, None)
 
66
            window = BranchWindow()
 
67
            window.set_branch(self.branch, self.revid, None)
 
68
            window.show()