/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-13 20:19:31 UTC
  • mfrom: (0.8.79 main)
  • mto: (0.8.83 merge)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060913201931-23adba246d4d6529
Merge main branch.

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
 
 
25
 
import gtk
26
 
import gtk.glade
27
 
 
28
 
import bzrlib.add
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
except:
 
28
    sys.exit(1)
 
29
 
 
30
import bzrlib
29
31
import bzrlib.errors as errors
30
32
 
31
 
from olive import gladefile
32
 
 
33
33
class OliveAdd:
34
34
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, wt, wtpath, selected=[]):
 
35
    def __init__(self, gladefile, comm, dialog):
36
36
        """ Initialize the Add file(s) dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
 
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
38
44
        
39
45
        self.window = self.glade.get_widget('window_add')
40
46
        
45
51
        # Connect the signals to the handlers
46
52
        self.glade.signal_autoconnect(dic)
47
53
 
48
 
        self.wt = wt
49
 
        self.wtpath = wtpath
50
 
        self.selected = selected
51
 
 
52
54
    def display(self):
53
55
        """ Display the Add file(s) dialog. """
54
56
        self.window.show_all()
57
59
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
58
60
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
59
61
        
 
62
        directory = self.comm.get_path()
 
63
        
 
64
        self.comm.set_busy(self.window)
60
65
        if radio_selected.get_active():
61
66
            # Add only the selected file
62
 
            filename = self.selected
 
67
            filename = self.comm.get_selected_right()
63
68
            
64
69
            if filename is None:
65
 
                error_dialog(_('No file was selected'),
 
70
                self.dialog.error_dialog(_('No file was selected'),
66
71
                                         _('Please select a file from the list,\nor choose the other option.'))
 
72
                self.comm.set_busy(self.window, False)
67
73
                return
68
74
            
69
75
            try:
70
76
                bzrlib.add.smart_add([directory + '/' + filename])
71
77
            except errors.NotBranchError:
72
 
                error_dialog(_('Directory is not a branch'),
 
78
                self.dialog.error_dialog(_('Directory is not a branch'),
73
79
                                         _('You can perform this action only in a branch.'))
 
80
                self.comm.set_busy(self.window, False)
74
81
                return
 
82
            except:
 
83
                raise
75
84
        elif radio_unknown.get_active():
76
85
            # Add unknown files recursively
77
86
            try:
78
87
                bzrlib.add.smart_add([directory], True)
79
88
            except errors.NotBranchError:
80
 
                error_dialog(_('Directory is not a branch'),
 
89
                self.dialog.error_dialog(_('Directory is not a branch'),
81
90
                                         _('You can perform this action only in a branch.'))
 
91
                self.comm.set_busy(self.window, False)
82
92
                return
 
93
            except:
 
94
                raise
 
95
        else:
 
96
            # This should really never happen.
 
97
            pass
83
98
        
84
99
        self.close()
 
100
        self.comm.refresh_right()
85
101
    
86
102
    def close(self, widget=None):
87
103
        self.window.destroy()