28
28
import bzrlib.errors as errors
 
30
 
from dialog import error_dialog, warning_dialog
 
 
30
from bzrlib.plugins.gtk import _i18n
 
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
 
31
32
from guifiles import GLADEFILENAME
 
 
63
65
            filename = self.selected
 
65
67
            if filename is None:
 
66
 
                error_dialog(_('No file was selected'),
 
67
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
 
68
                error_dialog(_i18n('No file was selected'),
 
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
70
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
73
 
                self.wt.remove(fullpath)
 
74
 
            except errors.NotBranchError:
 
75
 
                error_dialog(_('Directory is not a branch'),
 
76
 
                             _('You can perform this action only in a branch.'))
 
78
 
            except errors.NotVersionedError:
 
79
 
                error_dialog(_('File not versioned'),
 
80
 
                             _('The selected file is not versioned.'))
 
 
74
            self.wt.remove(fullpath)
 
82
75
        elif radio_new.get_active():
 
83
76
            # Remove added files recursively
 
84
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
85
78
            file_list = sorted([f[0] for f in added], reverse=True)
 
86
79
            if len(file_list) == 0:
 
87
 
                warning_dialog(_('No matching files'),
 
88
 
                               _('No added files were found in the working tree.'))
 
 
80
                warning_dialog(_i18n('No matching files'),
 
 
81
                               _i18n('No added files were found in the working tree.'))
 
90
83
            self.wt.remove(file_list)
 
 
94
87
    def close(self, widget=None):
 
95
88
        self.window.destroy()
 
 
90
class OliveRemoveDialog(gtk.Dialog):
 
 
91
    """ This class wraps the old Remove window into a gtk.Dialog. """
 
 
93
    def __init__(self, wt, wtpath, selected=[], parent=None):
 
 
94
        """ Initialize the Remove file(s) dialog. """
 
 
95
        gtk.Dialog.__init__(self, title="Remove files - Olive",
 
 
98
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
 
103
        self.selected = selected
 
 
106
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
 
 
107
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected only"), False)
 
 
108
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
 
 
109
        self._button_remove = gtk.Button(_i18n("_Remove"), use_underline=True)
 
 
111
        self._button_remove.connect('clicked', self._on_remove_clicked)
 
 
113
        self.vbox.pack_start(self._label)
 
 
114
        self.vbox.pack_end(self._radio_added)
 
 
115
        self.vbox.pack_end(self._radio_selected)
 
 
117
        self.action_area.pack_end(self._button_remove)
 
 
119
        self.vbox.set_spacing(3)
 
 
123
    def _on_remove_clicked(self, button):
 
 
124
        """ Remove button clicked handler. """
 
 
125
        if self._radio_selected.get_active():
 
 
126
            # Remove only the selected file
 
 
127
            filename = self.selected
 
 
130
                error_dialog(_i18n('No file was selected'),
 
 
131
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
 
134
            self.wt.remove(os.path.join(self.wtpath, filename))
 
 
135
        elif self._radio_added.get_active():
 
 
136
            # Remove added files recursively
 
 
137
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
 
138
            file_list = sorted([f[0] for f in added], reverse=True)
 
 
139
            if len(file_list) == 0:
 
 
140
                warning_dialog(_i18n('No matching files'),
 
 
141
                               _i18n('No added files were found in the working tree.'))
 
 
143
            self.wt.remove(file_list)
 
 
145
        self.response(gtk.RESPONSE_OK)