/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
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
 
24
 
 
25
import gtk
 
26
import gtk.glade
29
27
 
30
28
import bzrlib.add
31
29
import bzrlib.errors as errors
32
30
 
 
31
from bzrlib.plugins.gtk import _i18n
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from guifiles import GLADEFILENAME
 
34
 
 
35
 
33
36
class OliveAdd:
34
37
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, wt, wtpath, selected=[]):
 
38
    def __init__(self, wt, wtpath, selected=[]):
36
39
        """ Initialize the Add file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_add', 'olive-gtk')
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
39
41
        
40
42
        self.window = self.glade.get_widget('window_add')
41
43
        
63
65
            filename = self.selected
64
66
            
65
67
            if filename is None:
66
 
                error_dialog(_('No file was selected'),
67
 
                                         _('Please select a file from the list,\nor choose the other option.'))
68
 
                self.comm.set_busy(self.window, False)
 
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
72
            try:
72
 
                bzrlib.add.smart_add([directory + '/' + filename])
 
73
                self.wt.add([filename])
73
74
            except errors.NotBranchError:
74
 
                error_dialog(_('Directory is not a branch'),
75
 
                                         _('You can perform this action only in a branch.'))
76
 
                self.comm.set_busy(self.window, False)
 
75
                error_dialog(_i18n('Directory is not a branch'),
 
76
                             _i18n('You can perform this action only in a branch.'))
77
77
                return
78
 
            except:
79
 
                raise
80
78
        elif radio_unknown.get_active():
81
79
            # Add unknown files recursively
82
80
            try:
83
 
                bzrlib.add.smart_add([directory], True)
 
81
                self.wt.add(self.wt.unknowns())
84
82
            except errors.NotBranchError:
85
 
                error_dialog(_('Directory is not a branch'),
86
 
                                         _('You can perform this action only in a branch.'))
87
 
                self.comm.set_busy(self.window, False)
 
83
                error_dialog(_i18n('Directory is not a branch'),
 
84
                             _i18n('You can perform this action only in a branch.'))
88
85
                return
89
 
            except:
90
 
                raise
91
 
        else:
92
 
            # This should really never happen.
93
 
            pass
94
86
        
95
87
        self.close()
96
 
        self.comm.refresh_right()
97
88
    
98
89
    def close(self, widget=None):
99
90
        self.window.destroy()