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

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
import sys
19
18
 
20
19
try:
21
20
    import pygtk
29
28
import bzrlib.add
30
29
import bzrlib.errors as errors
31
30
 
32
 
from olive import gladefile
33
 
from dialog import error_dialog
 
31
from bzrlib.plugins.gtk import _i18n
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from guifiles import GLADEFILENAME
 
34
 
34
35
 
35
36
class OliveAdd:
36
37
    """ Display the Add file(s) dialog and perform the needed actions. """
37
38
    def __init__(self, wt, wtpath, selected=[]):
38
39
        """ Initialize the Add file(s) dialog. """
39
 
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
40
41
        
41
42
        self.window = self.glade.get_widget('window_add')
42
43
        
64
65
            filename = self.selected
65
66
            
66
67
            if filename is None:
67
 
                error_dialog(_('No file was selected'),
68
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
69
70
                return
70
71
            
71
 
            if self.wtpath == "":
72
 
                fullpath = self.wt.abspath(filename)
73
 
            else:
74
 
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
 
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
75
73
            
76
74
            try:
77
75
                bzrlib.add.smart_add([fullpath])
78
76
            except errors.NotBranchError:
79
 
                error_dialog(_('Directory is not a branch'),
80
 
                             _('You can perform this action only in a branch.'))
 
77
                error_dialog(_i18n('Directory is not a branch'),
 
78
                             _i18n('You can perform this action only in a branch.'))
81
79
                return
82
80
        elif radio_unknown.get_active():
83
81
            # Add unknown files recursively
 
82
            fullpath = self.wt.abspath(self.wtpath)
 
83
            
84
84
            try:
85
 
                bzrlib.add.smart_add([self.wtpath], True)
 
85
                bzrlib.add.smart_add([fullpath], True)
86
86
            except errors.NotBranchError:
87
 
                error_dialog(_('Directory is not a branch'),
88
 
                             _('You can perform this action only in a branch.'))
 
87
                error_dialog(_i18n('Directory is not a branch'),
 
88
                             _i18n('You can perform this action only in a branch.'))
89
89
                return
90
90
        
91
91
        self.close()