/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-27 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
29
 
 
30
 
import olive.backend.errors as errors
31
 
import olive.backend.fileops as fileops
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
import bzrlib.add
 
29
import bzrlib.errors as errors
 
30
 
 
31
from olive import gladefile
32
32
 
33
33
class OliveAdd:
34
34
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self, wt, wtpath, selected=[]):
36
36
        """ Initialize the Add file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_add', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
44
38
        
45
39
        self.window = self.glade.get_widget('window_add')
46
40
        
51
45
        # Connect the signals to the handlers
52
46
        self.glade.signal_autoconnect(dic)
53
47
 
 
48
        self.wt = wt
 
49
        self.wtpath = wtpath
 
50
        self.selected = selected
 
51
 
54
52
    def display(self):
55
53
        """ Display the Add file(s) dialog. """
56
54
        self.window.show_all()
59
57
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
60
58
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
61
59
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
60
        if radio_selected.get_active():
66
61
            # Add only the selected file
67
 
            filename = self.comm.get_selected_right()
 
62
            filename = self.selected
68
63
            
69
64
            if filename is None:
70
 
                self.dialog.error_dialog(_('No file was selected'),
 
65
                error_dialog(_('No file was selected'),
71
66
                                         _('Please select a file from the list,\nor choose the other option.'))
72
67
                self.comm.set_busy(self.window, False)
73
68
                return
74
69
            
75
70
            try:
76
 
                fileops.add([directory + '/' + filename])
 
71
                bzrlib.add.smart_add([directory + '/' + filename])
77
72
            except errors.NotBranchError:
78
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
73
                error_dialog(_('Directory is not a branch'),
79
74
                                         _('You can perform this action only in a branch.'))
80
75
                self.comm.set_busy(self.window, False)
81
76
                return
84
79
        elif radio_unknown.get_active():
85
80
            # Add unknown files recursively
86
81
            try:
87
 
                fileops.add([directory], True)
 
82
                bzrlib.add.smart_add([directory], True)
88
83
            except errors.NotBranchError:
89
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
84
                error_dialog(_('Directory is not a branch'),
90
85
                                         _('You can perform this action only in a branch.'))
91
86
                self.comm.set_busy(self.window, False)
92
87
                return