/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-30 13:04:15 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930130415-aba4100709e11f0a
Loads of fixes. Pyflakes cleanup.

Show diffs side-by-side

added added

removed removed

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