/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: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

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.dialog import error_dialog, warning_dialog
31
 
from guifiles import GLADEFILENAME
32
 
 
 
30
from olive import gladefile
 
31
from dialog import error_dialog, warning_dialog
33
32
 
34
33
class OliveRemove:
35
34
    """ Display the Remove file(s) dialog and perform the needed actions. """
36
35
    def __init__(self, wt, wtpath, selected=[]):
37
36
        """ Initialize the Remove file(s) dialog. """
38
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_remove')
39
38
        
40
39
        self.window = self.glade.get_widget('window_remove')
41
40
        
54
53
        """ Display the Remove file(s) dialog. """
55
54
        self.window.show_all()
56
55
        
57
 
    @show_bzr_error
58
56
    def remove(self, widget):
59
57
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
58
        radio_new = self.glade.get_widget('radiobutton_remove_new')
68
66
                             _('Please select a file from the list,\nor choose the other option.'))
69
67
                return
70
68
            
71
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
69
            if self.wtpath == "":
 
70
                fullpath = self.wt.abspath(filename)
 
71
            else:
 
72
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
72
73
            
73
 
            self.wt.remove(fullpath)
 
74
            try:
 
75
                self.wt.remove(fullpath)
 
76
            except errors.NotBranchError:
 
77
                error_dialog(_('Directory is not a branch'),
 
78
                             _('You can perform this action only in a branch.'))
 
79
                return
 
80
            except errors.NotVersionedError:
 
81
                error_dialog(_('File not versioned'),
 
82
                             _('The selected file is not versioned.'))
 
83
                return
74
84
        elif radio_new.get_active():
75
85
            # Remove added files recursively
76
86
            added = self.wt.changes_from(self.wt.basis_tree()).added
85
95
    
86
96
    def close(self, widget=None):
87
97
        self.window.destroy()
88
 
 
89
 
class OliveRemoveDialog(gtk.Dialog):
90
 
    """ This class wraps the old Remove window into a gtk.Dialog. """
91
 
    
92
 
    def __init__(self, wt, wtpath, selected=[], parent=None):
93
 
        """ Initialize the Remove file(s) dialog. """
94
 
        gtk.Dialog.__init__(self, title="Remove files - Olive",
95
 
                                  parent=parent,
96
 
                                  flags=0,
97
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
98
 
        
99
 
        # Get arguments
100
 
        self.wt = wt
101
 
        self.wtpath = wtpath
102
 
        self.selected = selected
103
 
        
104
 
        # Create widgets
105
 
        self._label = gtk.Label(_("Which file(s) do you want to remove?"))
106
 
        self._radio_selected = gtk.RadioButton(None, _("Selected only"), False)
107
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _("All files with status 'added'"), False)
108
 
        self._button_remove = gtk.Button(_("_Remove"), use_underline=True)
109
 
        
110
 
        self._button_remove.connect('clicked', self._on_remove_clicked)
111
 
        
112
 
        self.vbox.pack_start(self._label)
113
 
        self.vbox.pack_end(self._radio_added)
114
 
        self.vbox.pack_end(self._radio_selected)
115
 
        
116
 
        self.action_area.pack_end(self._button_remove)
117
 
        
118
 
        self.vbox.set_spacing(3)
119
 
        self.vbox.show_all()
120
 
        
121
 
    @show_bzr_error
122
 
    def _on_remove_clicked(self, button):
123
 
        """ Remove button clicked handler. """
124
 
        if self._radio_selected.get_active():
125
 
            # Remove only the selected file
126
 
            filename = self.selected
127
 
            
128
 
            if filename is None:
129
 
                error_dialog(_('No file was selected'),
130
 
                             _('Please select a file from the list,\nor choose the other option.'))
131
 
                return
132
 
            
133
 
            self.wt.remove(os.path.join(self.wtpath, filename))
134
 
        elif self._radio_added.get_active():
135
 
            # Remove added files recursively
136
 
            added = self.wt.changes_from(self.wt.basis_tree()).added
137
 
            file_list = sorted([f[0] for f in added], reverse=True)
138
 
            if len(file_list) == 0:
139
 
                warning_dialog(_('No matching files'),
140
 
                               _('No added files were found in the working tree.'))
141
 
                return
142
 
            self.wt.remove(file_list)
143
 
        
144
 
        self.response(gtk.RESPONSE_OK)