/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-03-09 13:47:52 UTC
  • mto: This revision was merged to the branch mainline in revision 447.
  • Revision ID: jelmer@samba.org-20080309134752-syf9kwzy6e919jhj
Add note about python-nautilus requiring a libpythonXX.so symlink.

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