/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-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

Show diffs side-by-side

added added

removed removed

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