/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: Jelmer Vernooij
  • Date: 2008-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/info.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
24
22
 
25
23
import gtk
26
24
import gtk.glade
27
 
import gobject
28
 
import pango
29
25
 
30
26
import bzrlib.errors as errors
31
27
 
32
 
from olive import gladefile
 
28
from bzrlib.plugins.gtk import _i18n
 
29
from bzrlib.plugins.gtk.dialog import error_dialog
 
30
from guifiles import GLADEFILENAME
 
31
 
33
32
 
34
33
def info(location):
35
34
    """ Get info about branch, working tree, and repository
81
80
    try:
82
81
        a_bzrdir = bzrdir.BzrDir.open_containing(location)[0]
83
82
    except errors.NotBranchError:
84
 
        raise NotBranchError(location)
 
83
        raise errors.NotBranchError(location)
85
84
 
86
85
    try:
87
86
        working = a_bzrdir.open_workingtree()
110
109
 
111
110
    try:
112
111
        branch = a_bzrdir.open_branch()
 
112
        repository = branch.repository
 
113
        control = a_bzrdir
113
114
        branch.lock_read()
114
115
        try:
115
116
            ret['location'] = info_helper.get_location_info(repository, branch)
144
145
 
145
146
class OliveInfo:
146
147
    """ Display Informations window and perform the needed actions. """
147
 
    def __init__(self, wt):
 
148
    def __init__(self, branch):
148
149
        """ Initialize the Informations window. """
149
 
        self.glade = gtk.glade.XML(gladefile, 'window_info', 'olive-gtk')
 
150
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_info', 'olive-gtk')
150
151
        
151
152
        # Get the Informations window widget
152
153
        self.window = self.glade.get_widget('window_info')
154
155
        # Check if current location is a branch
155
156
        self.notbranch = False
156
157
        try:
157
 
            self.ret = info(wt.basedir)
 
158
            self.ret = info(branch.base)
158
159
        except errors.NotBranchError:
159
160
            self.notbranch = True
160
161
            return
553
554
    def display(self):
554
555
        """ Display the Informations window. """
555
556
        if self.notbranch:
556
 
            error_dialog(_('Directory is not a branch'),
557
 
                                     _('You can perform this action only in a branch.'))
 
557
            error_dialog(_i18n('Directory is not a branch'),
 
558
                         _i18n('You can perform this action only in a branch.'))
558
559
            self.close()
559
560
        else:
560
561
            self.window.show()