/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: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
import sys
18
19
 
19
20
try:
20
21
    import pygtk
28
29
import bzrlib.add
29
30
import bzrlib.errors as errors
30
31
 
31
 
from bzrlib.plugins.gtk import _i18n
32
 
from bzrlib.plugins.gtk.dialog import error_dialog
33
 
from guifiles import GLADEFILENAME
34
 
 
 
32
from olive import gladefile
 
33
from dialog import error_dialog
35
34
 
36
35
class OliveAdd:
37
36
    """ Display the Add file(s) dialog and perform the needed actions. """
38
37
    def __init__(self, wt, wtpath, selected=[]):
39
38
        """ Initialize the Add file(s) dialog. """
40
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
 
39
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
41
40
        
42
41
        self.window = self.glade.get_widget('window_add')
43
42
        
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
            
72
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
71
            if self.wtpath == "":
 
72
                fullpath = self.wt.abspath(filename)
 
73
            else:
 
74
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
73
75
            
74
76
            try:
75
77
                bzrlib.add.smart_add([fullpath])
76
78
            except errors.NotBranchError:
77
 
                error_dialog(_i18n('Directory is not a branch'),
78
 
                             _i18n('You can perform this action only in a branch.'))
 
79
                error_dialog(_('Directory is not a branch'),
 
80
                             _('You can perform this action only in a branch.'))
79
81
                return
80
82
        elif radio_unknown.get_active():
81
83
            # Add unknown files recursively
82
 
            fullpath = self.wt.abspath(self.wtpath)
83
 
            
84
84
            try:
85
 
                bzrlib.add.smart_add([fullpath], True)
 
85
                bzrlib.add.smart_add([self.wtpath], True)
86
86
            except errors.NotBranchError:
87
 
                error_dialog(_i18n('Directory is not a branch'),
88
 
                             _i18n('You can perform this action only in a branch.'))
 
87
                error_dialog(_('Directory is not a branch'),
 
88
                             _('You can perform this action only in a branch.'))
89
89
                return
90
90
        
91
91
        self.close()