29
28
import bzrlib.errors as errors
 
31
30
from bzrlib.plugins.gtk import _i18n
 
32
31
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
 
from guifiles import GLADEFILENAME
 
37
 
    """ Display the Add file(s) dialog and perform the needed actions. """
 
38
 
    def __init__(self, wt, wtpath, selected=[]):
 
39
 
        """ Initialize the Add file(s) dialog. """
 
40
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
 
42
 
        self.window = self.glade.get_widget('window_add')
 
44
 
        # Dictionary for signal_autoconnect
 
45
 
        dic = { "on_button_add_add_clicked": self.add,
 
46
 
                "on_button_add_cancel_clicked": self.close }
 
48
 
        # Connect the signals to the handlers
 
49
 
        self.glade.signal_autoconnect(dic)
 
 
32
from bzrlib.plugins.gtk.errors import show_bzr_error
 
 
35
class AddDialog(gtk.Dialog):
 
 
36
    """ Dialog for adding selected file or recursively all unknown files/folders in branch """
 
 
38
    def __init__(self, wt, wtpath, selected, parent=None):
 
 
39
        """ Initialize the Add dialog. """
 
 
40
        gtk.Dialog.__init__(self, title="Olive - Add file(s)",
 
 
43
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
52
47
        self.wtpath = wtpath
 
53
48
        self.selected = selected
 
56
 
        """ Display the Add file(s) dialog. """
 
57
 
        self.window.show_all()
 
59
 
    def add(self, widget):
 
60
 
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
 
61
 
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
 
63
 
        if radio_selected.get_active():
 
 
51
        self._label_add_question = gtk.Label(_i18n("Which file(s) do you want to add?"))
 
 
52
        self._radiobutton_add_selected = gtk.RadioButton(None,_i18n("Selected: %s"%self.selected))
 
 
53
        self._radiobutton_add_unknown = gtk.RadioButton(self._radiobutton_add_selected, 
 
 
54
                                                        _i18n("All unknowns recursively"))
 
 
55
        self._button_add = gtk.Button(stock=gtk.STOCK_ADD)        
 
 
57
        self._button_add.connect('clicked', self._on_add_clicked)
 
 
59
        # Add widgets to dialog window and decorate
 
 
60
        self.vbox.add(self._label_add_question)
 
 
61
        self.vbox.add(self._radiobutton_add_selected)
 
 
62
        self.vbox.add(self._radiobutton_add_unknown)
 
 
63
        self.vbox.set_spacing(3)
 
 
64
        self.action_area.pack_end(self._button_add)
 
 
69
    def _on_add_clicked(self, button):
 
 
71
        if self._radiobutton_add_selected.get_active():
 
64
72
            # Add only the selected file
 
65
73
            filename = self.selected
 
 
69
77
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
72
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
75
 
                bzrlib.add.smart_add([fullpath])
 
 
81
                self.wt.add([filename])
 
76
82
            except errors.NotBranchError:
 
77
83
                error_dialog(_i18n('Directory is not a branch'),
 
78
84
                             _i18n('You can perform this action only in a branch.'))
 
80
 
        elif radio_unknown.get_active():
 
 
86
        elif self._radiobutton_add_unknown.get_active():
 
81
87
            # Add unknown files recursively
 
82
 
            fullpath = self.wt.abspath(self.wtpath)
 
85
 
                bzrlib.add.smart_add([fullpath], True)
 
 
89
                self.wt.add(self.wt.unknowns())
 
86
90
            except errors.NotBranchError:
 
87
91
                error_dialog(_i18n('Directory is not a branch'),
 
88
92
                             _i18n('You can perform this action only in a branch.'))
 
93
 
    def close(self, widget=None):
 
 
95
        self.response(gtk.RESPONSE_OK)