/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: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

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 bzrlib.plugins.gtk import _i18n
31
 
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
 
30
from dialog import error_dialog, warning_dialog
32
31
from guifiles import GLADEFILENAME
33
32
 
34
33
 
55
54
        """ Display the Remove file(s) dialog. """
56
55
        self.window.show_all()
57
56
        
58
 
    @show_bzr_error
59
57
    def remove(self, widget):
60
58
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
61
59
        radio_new = self.glade.get_widget('radiobutton_remove_new')
65
63
            filename = self.selected
66
64
            
67
65
            if filename is None:
68
 
                error_dialog(_i18n('No file was selected'),
69
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
66
                error_dialog(_('No file was selected'),
 
67
                             _('Please select a file from the list,\nor choose the other option.'))
70
68
                return
71
69
            
72
70
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
73
71
            
74
 
            self.wt.remove(fullpath)
 
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
75
82
        elif radio_new.get_active():
76
83
            # Remove added files recursively
77
84
            added = self.wt.changes_from(self.wt.basis_tree()).added
78
85
            file_list = sorted([f[0] for f in added], reverse=True)
79
86
            if len(file_list) == 0:
80
 
                warning_dialog(_i18n('No matching files'),
81
 
                               _i18n('No added files were found in the working tree.'))
 
87
                warning_dialog(_('No matching files'),
 
88
                               _('No added files were found in the working tree.'))
82
89
                return
83
90
            self.wt.remove(file_list)
84
91
        
103
110
        self.selected = selected
104
111
        
105
112
        # Create widgets
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)
 
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)
110
117
        
111
118
        self._button_remove.connect('clicked', self._on_remove_clicked)
112
119
        
119
126
        self.vbox.set_spacing(3)
120
127
        self.vbox.show_all()
121
128
        
122
 
    @show_bzr_error
123
129
    def _on_remove_clicked(self, button):
124
130
        """ Remove button clicked handler. """
125
131
        if self._radio_selected.get_active():
127
133
            filename = self.selected
128
134
            
129
135
            if filename is None:
130
 
                error_dialog(_i18n('No file was selected'),
131
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
136
                error_dialog(_('No file was selected'),
 
137
                             _('Please select a file from the list,\nor choose the other option.'))
132
138
                return
133
139
            
134
 
            self.wt.remove(os.path.join(self.wtpath, filename))
 
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
135
150
        elif self._radio_added.get_active():
136
151
            # Remove added files recursively
137
152
            added = self.wt.changes_from(self.wt.basis_tree()).added
138
153
            file_list = sorted([f[0] for f in added], reverse=True)
139
154
            if len(file_list) == 0:
140
 
                warning_dialog(_i18n('No matching files'),
141
 
                               _i18n('No added files were found in the working tree.'))
 
155
                warning_dialog(_('No matching files'),
 
156
                               _('No added files were found in the working tree.'))
142
157
                return
143
158
            self.wt.remove(file_list)
144
159