/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-27 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 os
 
17
import sys
18
18
 
19
19
try:
20
20
    import pygtk
23
23
        pass
24
24
 
25
25
import gtk
 
26
import gtk.glade
26
27
 
27
28
import bzrlib.errors as errors
28
 
 
29
 
from bzrlib.plugins.gtk import _i18n
30
 
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
31
 
from bzrlib.plugins.gtk.errors import show_bzr_error
32
 
 
33
 
 
34
 
class RemoveDialog(gtk.Dialog):
35
 
    """ This class wraps the old Remove window into a gtk.Dialog. """
36
 
    
37
 
    def __init__(self, wt, wtpath, selected='', parent=None):
 
29
from bzrlib.workingtree import WorkingTree
 
30
 
 
31
from olive import gladefile
 
32
 
 
33
class OliveRemove:
 
34
    """ Display the Remove file(s) dialog and perform the needed actions. """
 
35
    def __init__(self):
38
36
        """ Initialize the Remove file(s) dialog. """
39
 
        gtk.Dialog.__init__(self, title="Olive - Remove files",
40
 
                                  parent=parent,
41
 
                                  flags=0,
42
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
43
 
        
44
 
        # Get arguments
45
 
        self.wt = wt
46
 
        self.wtpath = wtpath
47
 
        self.selected = selected
48
 
        
49
 
        # Create widgets
50
 
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
51
 
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected: %s"%self.selected), False)
52
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
53
 
        self._button_remove = gtk.Button(stock=gtk.STOCK_REMOVE)
54
 
        
55
 
        self._button_remove.connect('clicked', self._on_remove_clicked)
56
 
        
57
 
        self.vbox.add(self._label)
58
 
        self.vbox.add(self._radio_selected)
59
 
        self.vbox.add(self._radio_added)
60
 
        self.vbox.set_spacing(3)
61
 
        self.action_area.pack_end(self._button_remove)
62
 
        
63
 
        self.vbox.show_all()
64
 
        
65
 
    @show_bzr_error
66
 
    def _on_remove_clicked(self, button):
67
 
        """ Remove button clicked handler. """
68
 
        if self._radio_selected.get_active():
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_remove')
 
38
        
 
39
        # Communication object
 
40
        self.comm = comm
 
41
        
 
42
        self.window = self.glade.get_widget('window_remove')
 
43
        
 
44
        # Dictionary for signal_autoconnect
 
45
        dic = { "on_button_remove_remove_clicked": self.remove,
 
46
                "on_button_remove_cancel_clicked": self.close }
 
47
        
 
48
        # Connect the signals to the handlers
 
49
        self.glade.signal_autoconnect(dic)
 
50
 
 
51
    def display(self):
 
52
        """ Display the Remove file(s) dialog. """
 
53
        self.window.show_all()
 
54
        
 
55
    def remove(self, widget):
 
56
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
 
57
        radio_new = self.glade.get_widget('radiobutton_remove_new')
 
58
        
 
59
        directory = self.comm.get_path()
 
60
        
 
61
        if radio_selected.get_active():
69
62
            # Remove only the selected file
70
 
            filename = self.selected
 
63
            filename = self.comm.get_selected_right()
71
64
            
72
65
            if filename is None:
73
 
                error_dialog(_i18n('No file was selected'),
74
 
                             _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.'))
75
68
                return
76
69
            
77
 
            self.wt.remove(os.path.join(self.wtpath, filename))
78
 
        elif self._radio_added.get_active():
 
70
            try:
 
71
                wt, path = WorkingTree.open_containing(directory + '/' + filename)
 
72
                wt.remove(path)
 
73
            except errors.NotBranchError:
 
74
                error_dialog(_('Directory is not a branch'),
 
75
                                         _('You can perform this action only in a branch.'))
 
76
                return
 
77
            except errors.NotVersionedError:
 
78
                error_dialog(_('File not versioned'),
 
79
                                         _('The selected file is not versioned.'))
 
80
                return
 
81
        elif radio_new.get_active():
79
82
            # Remove added files recursively
80
 
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
83
            try:
 
84
                wt, path = WorkingTree.open_containing(directory)
 
85
            except errors.NotBranchError:
 
86
                error_dialog(_('Directory is not a branch'),
 
87
                                         _('You can perform this action only in a branch.'))
 
88
                self.comm.set_busy(self.window, False)
 
89
                return
 
90
            
 
91
            added = wt.changes_from(wt.basis_tree()).added
81
92
            file_list = sorted([f[0] for f in added], reverse=True)
82
93
            if len(file_list) == 0:
83
 
                warning_dialog(_i18n('No matching files'),
84
 
                               _i18n('No added files were found in the working tree.'))
 
94
                dialog.warning_dialog(_('No matching files'),
 
95
                                      _('No added files were found in the working tree.'))
 
96
                self.comm.set_busy(self.window, False)
85
97
                return
86
 
            self.wt.remove(file_list)
 
98
            wt.remove(file_list)
87
99
        
88
 
        self.response(gtk.RESPONSE_OK)
 
100
        self.close()
 
101
        self.comm.refresh_right()
 
102
    
 
103
    def close(self, widget=None):
 
104
        self.window.destroy()