/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-10-15 17:47:36 UTC
  • Revision ID: Szilveszter.Farkas@gmail.com-20061015174736-d75646de89d5670c
Added pending merges to Commit dialog. Fixed bug #66091.

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
 
from bzrlib.plugins.gtk.dialog import error_dialog
33
 
from guifiles import GLADEFILENAME
34
 
 
 
31
from olive import gladefile
 
32
from dialog import error_dialog
35
33
 
36
34
class OliveAdd:
37
35
    """ Display the Add file(s) dialog and perform the needed actions. """
38
36
    def __init__(self, wt, wtpath, selected=[]):
39
37
        """ Initialize the Add file(s) dialog. """
40
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
 
38
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
41
39
        
42
40
        self.window = self.glade.get_widget('window_add')
43
41
        
65
63
            filename = self.selected
66
64
            
67
65
            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.'))
 
66
                error_dialog(_('No file was selected'),
 
67
                             _('Please select a file from the list,\nor choose the other option.'))
70
68
                return
71
69
            
 
70
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
71
            
72
72
            try:
73
 
                self.wt.add([filename])
 
73
                bzrlib.add.smart_add([fullpath])
74
74
            except errors.NotBranchError:
75
 
                error_dialog(_i18n('Directory is not a branch'),
76
 
                             _i18n('You can perform this action only in a branch.'))
 
75
                error_dialog(_('Directory is not a branch'),
 
76
                             _('You can perform this action only in a branch.'))
77
77
                return
78
78
        elif radio_unknown.get_active():
79
79
            # Add unknown files recursively
 
80
            fullpath = self.wt.abspath(self.wtpath)
 
81
            
80
82
            try:
81
 
                self.wt.add(self.wt.unknowns())
 
83
                bzrlib.add.smart_add([fullpath], True)
82
84
            except errors.NotBranchError:
83
 
                error_dialog(_i18n('Directory is not a branch'),
84
 
                             _i18n('You can perform this action only in a branch.'))
 
85
                error_dialog(_('Directory is not a branch'),
 
86
                             _('You can perform this action only in a branch.'))
85
87
                return
86
88
        
87
89
        self.close()