/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 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/log.py
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
 
24
import gtk
 
25
import gtk.glade
 
26
import gobject
 
27
import pango
31
28
 
32
29
from bzrlib.branch import Branch
33
30
import bzrlib.errors as errors
34
31
 
35
 
from viz.bzrkapp import BzrkApp
 
32
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
 
33
 
 
34
from dialog import error_dialog
 
35
 
 
36
from olive import gladefile
36
37
 
37
38
class OliveLog:
38
39
    """ Display Log (bzrk) window and perform the needed actions. """
39
 
    def __init__(self, gladefile, comm, dialog):
 
40
    def __init__(self, comm):
40
41
        """ Initialize the Log (bzrk) window. """
41
 
        self.gladefile = gladefile
42
42
 
43
43
        # Communication object
44
44
        self.comm = comm
45
 
        # Dialog object
46
 
        self.dialog = dialog
47
45
        
48
46
        # Check if current location is a branch
49
47
        self.notbranch = False
52
50
        except errors.NotBranchError:
53
51
            self.notbranch = True
54
52
            return
55
 
        except:
56
 
            raise
57
53
        
58
54
        self.revid = self.branch.last_revision()
59
55
 
60
56
    def display(self):
61
 
        """ Display the Log (bzrk) window. """
62
 
        if self.notbranch:
63
 
            self.dialog.error_dialog(_('Directory is not a branch'),
64
 
                                     _('You can perform this action only in a branch.'))
65
 
        else:
66
 
            self.app = BzrkApp()
67
 
            self.app.show(self.branch, self.revid, None)
 
57
                """ Display the Log (bzrk) window. """
 
58
                window = BranchWindow()
 
59
                window.set_branch(self.branch, self.revid, None)
 
60
                window.show()