/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 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

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
 
38
 
 
39
from olive import gladefile
36
40
 
37
41
class OliveLog:
38
42
    """ Display Log (bzrk) window and perform the needed actions. """
39
 
    def __init__(self, gladefile, comm, dialog):
 
43
    def __init__(self, comm):
40
44
        """ Initialize the Log (bzrk) window. """
41
 
        self.gladefile = gladefile
42
45
 
43
46
        # Communication object
44
47
        self.comm = comm
45
 
        # Dialog object
46
 
        self.dialog = dialog
47
48
        
48
49
        # Check if current location is a branch
49
50
        self.notbranch = False
60
61
    def display(self):
61
62
        """ Display the Log (bzrk) window. """
62
63
        if self.notbranch:
63
 
            self.dialog.error_dialog(_('Directory is not a branch'),
 
64
            error_dialog(_('Directory is not a branch'),
64
65
                                     _('You can perform this action only in a branch.'))
65
66
        else:
66
 
            self.app = BzrkApp()
67
 
            self.app.show(self.branch, self.revid, None)
 
67
            window = BranchWindow()
 
68
            window.set_branch(self.branch, self.revid, None)
 
69
            window.show()