/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 18:32:05 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183205-mmj1fnd8t9l80czj
https://launchpad.net/bugs/244027
Fix another use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.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
 
17
import os
18
18
 
19
19
try:
20
20
    import pygtk
28
28
import bzrlib.add
29
29
import bzrlib.errors as errors
30
30
 
31
 
from olive import gladefile
 
31
from bzrlib.plugins.gtk import _i18n
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from guifiles import GLADEFILENAME
 
34
 
32
35
 
33
36
class OliveAdd:
34
37
    """ Display the Add file(s) dialog and perform the needed actions. """
35
38
    def __init__(self, wt, wtpath, selected=[]):
36
39
        """ Initialize the Add file(s) dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
38
41
        
39
42
        self.window = self.glade.get_widget('window_add')
40
43
        
62
65
            filename = self.selected
63
66
            
64
67
            if filename is None:
65
 
                error_dialog(_('No file was selected'),
66
 
                                         _('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.'))
67
70
                return
68
71
            
69
72
            try:
70
 
                bzrlib.add.smart_add([directory + '/' + filename])
 
73
                self.wt.add([filename])
71
74
            except errors.NotBranchError:
72
 
                error_dialog(_('Directory is not a branch'),
73
 
                                         _('You can perform this action only in a branch.'))
 
75
                error_dialog(_i18n('Directory is not a branch'),
 
76
                             _i18n('You can perform this action only in a branch.'))
74
77
                return
75
78
        elif radio_unknown.get_active():
76
79
            # Add unknown files recursively
77
80
            try:
78
 
                bzrlib.add.smart_add([directory], True)
 
81
                self.wt.add(self.wt.unknowns())
79
82
            except errors.NotBranchError:
80
 
                error_dialog(_('Directory is not a branch'),
81
 
                                         _('You can perform this action only in a branch.'))
 
83
                error_dialog(_i18n('Directory is not a branch'),
 
84
                             _i18n('You can perform this action only in a branch.'))
82
85
                return
83
86
        
84
87
        self.close()