/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: Javier Derderian
  • Date: 2008-04-11 20:34:06 UTC
  • mto: (465.1.1 gtk.patch)
  • mto: This revision was merged to the branch mainline in revision 466.
  • Revision ID: javierder@gmail.com-20080411203406-ftlwyodw9vr87olv
Updated "Compare with..." (#78765) to use revbrowser.RevisionBrowser.
Also needed to fix #215872 to make it work.

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
19
18
 
20
19
try:
21
20
    import pygtk
29
28
import bzrlib.add
30
29
import bzrlib.errors as errors
31
30
 
32
 
from olive import gladefile
33
 
from dialog import error_dialog
 
31
from bzrlib.plugins.gtk.dialog import error_dialog
 
32
from guifiles import GLADEFILENAME
 
33
 
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(gladefile, 'window_add', 'olive-gtk')
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, '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
 
            if self.wtpath == "":
72
 
                fullpath = self.wt.abspath(filename)
73
 
            else:
74
 
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
 
71
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
75
72
            
76
73
            try:
77
74
                bzrlib.add.smart_add([fullpath])
81
78
                return
82
79
        elif radio_unknown.get_active():
83
80
            # Add unknown files recursively
 
81
            fullpath = self.wt.abspath(self.wtpath)
 
82
            
84
83
            try:
85
 
                bzrlib.add.smart_add([self.wtpath], True)
 
84
                bzrlib.add.smart_add([fullpath], True)
86
85
            except errors.NotBranchError:
87
86
                error_dialog(_('Directory is not a branch'),
88
87
                             _('You can perform this action only in a branch.'))