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