/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 17:40:05 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927174005-5dfa27de4081ed19
Handle non-bzr unknown errors as well.

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