/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 18:08:35 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927180835-4c295d9bb936623a
Turn some windows into dialogs.
Remove the diffwindow code from olive, 
switched to using the one from bzr-gtk instead.

Show diffs side-by-side

added added

removed removed

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