/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/remove.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:24:24 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629162424-48a6rrjmmpejfcyr
Stop emitting no longer used revisions-loaded message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
27
27
 
28
28
import bzrlib.errors as errors
29
29
 
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
32
33
 
33
34
 
54
55
        """ Display the Remove file(s) dialog. """
55
56
        self.window.show_all()
56
57
        
 
58
    @show_bzr_error
57
59
    def remove(self, widget):
58
60
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
59
61
        radio_new = self.glade.get_widget('radiobutton_remove_new')
63
65
            filename = self.selected
64
66
            
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.'))
68
70
                return
69
71
            
70
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
71
73
            
72
 
            try:
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.'))
77
 
                return
78
 
            except errors.NotVersionedError:
79
 
                error_dialog(_('File not versioned'),
80
 
                             _('The selected file is not versioned.'))
81
 
                return
 
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.'))
89
82
                return
90
83
            self.wt.remove(file_list)
91
84
        
110
103
        self.selected = selected
111
104
        
112
105
        # Create widgets
113
 
        self._label = gtk.Label(_("Which file(s) do you want to remove?"))
114
 
        self._radio_selected = gtk.RadioButton(None, _("Selected only"), False)
115
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _("All files with status 'added'"), False)
116
 
        self._button_remove = gtk.Button(_("_Remove"), use_underline=True)
 
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)
117
110
        
118
111
        self._button_remove.connect('clicked', self._on_remove_clicked)
119
112
        
126
119
        self.vbox.set_spacing(3)
127
120
        self.vbox.show_all()
128
121
        
 
122
    @show_bzr_error
129
123
    def _on_remove_clicked(self, button):
130
124
        """ Remove button clicked handler. """
131
125
        if self._radio_selected.get_active():
133
127
            filename = self.selected
134
128
            
135
129
            if filename is None:
136
 
                error_dialog(_('No file was selected'),
137
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
130
                error_dialog(_i18n('No file was selected'),
 
131
                             _i18n('Please select a file from the list,\nor choose the other option.'))
138
132
                return
139
133
            
140
 
            try:
141
 
                self.wt.remove(os.path.join(self.wtpath, filename))
142
 
            except errors.NotBranchError:
143
 
                error_dialog(_('Directory is not a branch'),
144
 
                             _('You can perform this action only in a branch.'))
145
 
                return
146
 
            except errors.NotVersionedError:
147
 
                error_dialog(_('File not versioned'),
148
 
                             _('The selected file is not versioned.'))
149
 
                return
 
134
            self.wt.remove(os.path.join(self.wtpath, filename))
150
135
        elif self._radio_added.get_active():
151
136
            # Remove added files recursively
152
137
            added = self.wt.changes_from(self.wt.basis_tree()).added
153
138
            file_list = sorted([f[0] for f in added], reverse=True)
154
139
            if len(file_list) == 0:
155
 
                warning_dialog(_('No matching files'),
156
 
                               _('No added files were found in the working tree.'))
 
140
                warning_dialog(_i18n('No matching files'),
 
141
                               _i18n('No added files were found in the working tree.'))
157
142
                return
158
143
            self.wt.remove(file_list)
159
144