/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-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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