/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:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

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 sys
 
17
import os
18
18
 
19
19
try:
20
20
    import pygtk
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 bzrlib.plugins.gtk import _i18n
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from guifiles import GLADEFILENAME
 
34
 
32
35
 
33
36
class OliveAdd:
34
37
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
38
    def __init__(self, wt, wtpath, selected=[]):
36
39
        """ 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
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
44
41
        
45
42
        self.window = self.glade.get_widget('window_add')
46
43
        
51
48
        # Connect the signals to the handlers
52
49
        self.glade.signal_autoconnect(dic)
53
50
 
 
51
        self.wt = wt
 
52
        self.wtpath = wtpath
 
53
        self.selected = selected
 
54
 
54
55
    def display(self):
55
56
        """ Display the Add file(s) dialog. """
56
57
        self.window.show_all()
59
60
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
60
61
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
61
62
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
63
        if radio_selected.get_active():
66
64
            # Add only the selected file
67
 
            filename = self.comm.get_selected_right()
 
65
            filename = self.selected
68
66
            
69
67
            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)
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
73
70
                return
74
71
            
 
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
73
            
75
74
            try:
76
 
                fileops.add([directory + '/' + filename])
 
75
                bzrlib.add.smart_add([fullpath])
77
76
            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)
 
77
                error_dialog(_i18n('Directory is not a branch'),
 
78
                             _i18n('You can perform this action only in a branch.'))
81
79
                return
82
 
            except:
83
 
                raise
84
80
        elif radio_unknown.get_active():
85
81
            # Add unknown files recursively
 
82
            fullpath = self.wt.abspath(self.wtpath)
 
83
            
86
84
            try:
87
 
                fileops.add([directory], True)
 
85
                bzrlib.add.smart_add([fullpath], 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(_i18n('Directory is not a branch'),
 
88
                             _i18n('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()