/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
 
17
import os
18
18
 
19
19
try:
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
 
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
29
27
 
30
28
import bzrlib.errors as errors
31
 
from bzrlib.workingtree import WorkingTree
 
29
 
 
30
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
 
31
from guifiles import GLADEFILENAME
 
32
 
32
33
 
33
34
class OliveRemove:
34
35
    """ Display the Remove file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm):
 
36
    def __init__(self, wt, wtpath, selected=[]):
36
37
        """ Initialize the Remove file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_remove')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
 
38
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
42
39
        
43
40
        self.window = self.glade.get_widget('window_remove')
44
41
        
48
45
        
49
46
        # Connect the signals to the handlers
50
47
        self.glade.signal_autoconnect(dic)
 
48
        
 
49
        self.wt = wt
 
50
        self.wtpath = wtpath
 
51
        self.selected = selected
51
52
 
52
53
    def display(self):
53
54
        """ Display the Remove file(s) dialog. """
54
55
        self.window.show_all()
55
56
        
 
57
    @show_bzr_error
56
58
    def remove(self, widget):
57
59
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
58
60
        radio_new = self.glade.get_widget('radiobutton_remove_new')
59
61
        
60
 
        directory = self.comm.get_path()
61
 
        
62
 
        self.comm.set_busy(self.window)
63
62
        if radio_selected.get_active():
64
63
            # Remove only the selected file
65
 
            filename = self.comm.get_selected_right()
 
64
            filename = self.selected
66
65
            
67
66
            if filename is None:
68
67
                error_dialog(_('No file was selected'),
69
 
                                         _('Please select a file from the list,\nor choose the other option.'))
70
 
                self.comm.set_busy(self.window, False)
71
 
                return
72
 
            
73
 
            try:
74
 
                wt, path = WorkingTree.open_containing(directory + '/' + filename)
75
 
                wt.remove(path)
76
 
            except errors.NotBranchError:
77
 
                error_dialog(_('Directory is not a branch'),
78
 
                                         _('You can perform this action only in a branch.'))
79
 
                self.comm.set_busy(self.window, False)
80
 
                return
81
 
            except errors.NotVersionedError:
82
 
                error_dialog(_('File not versioned'),
83
 
                                         _('The selected file is not versioned.'))
84
 
                self.comm.set_busy(self.window, False)
85
 
                return
86
 
            except:
87
 
                raise
 
68
                             _('Please select a file from the list,\nor choose the other option.'))
 
69
                return
 
70
            
 
71
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
72
            
 
73
            self.wt.remove(fullpath)
88
74
        elif radio_new.get_active():
89
75
            # Remove added files recursively
90
 
            try:
91
 
                wt, path = WorkingTree.open_containing(directory)
92
 
            except errors.NotBranchError:
93
 
                error_dialog(_('Directory is not a branch'),
94
 
                                         _('You can perform this action only in a branch.'))
95
 
                self.comm.set_busy(self.window, False)
96
 
                return
97
 
            
98
 
            added = wt.changes_from(wt.basis_tree()).added
 
76
            added = self.wt.changes_from(self.wt.basis_tree()).added
99
77
            file_list = sorted([f[0] for f in added], reverse=True)
100
78
            if len(file_list) == 0:
101
 
                dialog.warning_dialog(_('No matching files'),
102
 
                                      _('No added files were found in the working tree.'))
103
 
                self.comm.set_busy(self.window, False)
 
79
                warning_dialog(_('No matching files'),
 
80
                               _('No added files were found in the working tree.'))
104
81
                return
105
 
            wt.remove(file_list)
106
 
        else:
107
 
            # This should really never happen.
108
 
            pass
 
82
            self.wt.remove(file_list)
109
83
        
110
84
        self.close()
111
 
        self.comm.refresh_right()
112
85
    
113
86
    def close(self, widget=None):
114
87
        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)