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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-02-03 17:19:29 UTC
  • mto: (157.1.2 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 160.
  • Revision ID: szilveszter.farkas@gmail.com-20070203171929-6egi16ulzmkg9g1g
Implemented Conflicts dialog. Added gconflicts command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/info.py
25
25
 
26
26
import bzrlib.errors as errors
27
27
 
28
 
from bzrlib.plugins.gtk import _i18n
29
28
from bzrlib.plugins.gtk.dialog import error_dialog
30
29
from guifiles import GLADEFILENAME
31
30
 
109
108
 
110
109
    try:
111
110
        branch = a_bzrdir.open_branch()
112
 
        repository = branch.repository
113
 
        control = a_bzrdir
114
111
        branch.lock_read()
115
112
        try:
116
113
            ret['location'] = info_helper.get_location_info(repository, branch)
145
142
 
146
143
class OliveInfo:
147
144
    """ Display Informations window and perform the needed actions. """
148
 
    def __init__(self, branch):
 
145
    def __init__(self, wt):
149
146
        """ Initialize the Informations window. """
150
147
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_info', 'olive-gtk')
151
148
        
155
152
        # Check if current location is a branch
156
153
        self.notbranch = False
157
154
        try:
158
 
            self.ret = info(branch.base)
 
155
            self.ret = info(wt.basedir)
159
156
        except errors.NotBranchError:
160
157
            self.notbranch = True
161
158
            return
554
551
    def display(self):
555
552
        """ Display the Informations window. """
556
553
        if self.notbranch:
557
 
            error_dialog(_i18n('Directory is not a branch'),
558
 
                         _i18n('You can perform this action only in a branch.'))
 
554
            error_dialog(_('Directory is not a branch'),
 
555
                         _('You can perform this action only in a branch.'))
559
556
            self.close()
560
557
        else:
561
558
            self.window.show()