/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: Daniel Schierbeck
  • Date: 2007-11-07 14:19:09 UTC
  • mfrom: (330.3.5 trunk)
  • Revision ID: daniel.schierbeck@gmail.com-20071107141909-3zxf7nw5laldvfxi
Merged with mainline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
28
28
import bzrlib.add
29
29
import bzrlib.errors as errors
30
30
 
31
 
from bzrlib.plugins.gtk import _i18n
32
31
from bzrlib.plugins.gtk.dialog import error_dialog
33
32
from guifiles import GLADEFILENAME
34
33
 
65
64
            filename = self.selected
66
65
            
67
66
            if filename is None:
68
 
                error_dialog(_i18n('No file was selected'),
69
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
67
                error_dialog(_('No file was selected'),
 
68
                             _('Please select a file from the list,\nor choose the other option.'))
70
69
                return
71
70
            
 
71
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
72
            
72
73
            try:
73
 
                self.wt.add([filename])
 
74
                bzrlib.add.smart_add([fullpath])
74
75
            except errors.NotBranchError:
75
 
                error_dialog(_i18n('Directory is not a branch'),
76
 
                             _i18n('You can perform this action only in a branch.'))
 
76
                error_dialog(_('Directory is not a branch'),
 
77
                             _('You can perform this action only in a branch.'))
77
78
                return
78
79
        elif radio_unknown.get_active():
79
80
            # Add unknown files recursively
 
81
            fullpath = self.wt.abspath(self.wtpath)
 
82
            
80
83
            try:
81
 
                self.wt.add(self.wt.unknowns())
 
84
                bzrlib.add.smart_add([fullpath], True)
82
85
            except errors.NotBranchError:
83
 
                error_dialog(_i18n('Directory is not a branch'),
84
 
                             _i18n('You can perform this action only in a branch.'))
 
86
                error_dialog(_('Directory is not a branch'),
 
87
                             _('You can perform this action only in a branch.'))
85
88
                return
86
89
        
87
90
        self.close()