/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-28 15:45:39 UTC
  • mfrom: (486.1.1 trunk-matkor)
  • Revision ID: jelmer@samba.org-20080628154539-l5lkvs5qwuf2zx1m
https://launchpad.net/bugs/215872
Merge fix for log button in olive-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 olive import gladefile
31
 
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
 
32
from guifiles import GLADEFILENAME
 
33
 
32
34
 
33
35
class OliveRemove:
34
36
    """ Display the Remove file(s) dialog and perform the needed actions. """
35
37
    def __init__(self, wt, wtpath, selected=[]):
36
38
        """ Initialize the Remove file(s) dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_remove')
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
38
40
        
39
41
        self.window = self.glade.get_widget('window_remove')
40
42
        
53
55
        """ Display the Remove file(s) dialog. """
54
56
        self.window.show_all()
55
57
        
 
58
    @show_bzr_error
56
59
    def remove(self, widget):
57
60
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
58
61
        radio_new = self.glade.get_widget('radiobutton_remove_new')
62
65
            filename = self.selected
63
66
            
64
67
            if filename is None:
65
 
                error_dialog(_('No file was selected'),
66
 
                             _('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.'))
67
70
                return
68
71
            
69
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
70
73
            
71
 
            try:
72
 
                self.wt.remove(fullpath)
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
 
74
            self.wt.remove(fullpath)
81
75
        elif radio_new.get_active():
82
76
            # Remove added files recursively
83
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
84
78
            file_list = sorted([f[0] for f in added], reverse=True)
85
79
            if len(file_list) == 0:
86
 
                warning_dialog(_('No matching files'),
87
 
                               _('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.'))
88
82
                return
89
83
            self.wt.remove(file_list)
90
84
        
92
86
    
93
87
    def close(self, widget=None):
94
88
        self.window.destroy()
 
89
 
 
90
class OliveRemoveDialog(gtk.Dialog):
 
91
    """ This class wraps the old Remove window into a gtk.Dialog. """
 
92
    
 
93
    def __init__(self, wt, wtpath, selected=[], parent=None):
 
94
        """ Initialize the Remove file(s) dialog. """
 
95
        gtk.Dialog.__init__(self, title="Remove files - Olive",
 
96
                                  parent=parent,
 
97
                                  flags=0,
 
98
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
99
        
 
100
        # Get arguments
 
101
        self.wt = wt
 
102
        self.wtpath = wtpath
 
103
        self.selected = selected
 
104
        
 
105
        # 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)
 
110
        
 
111
        self._button_remove.connect('clicked', self._on_remove_clicked)
 
112
        
 
113
        self.vbox.pack_start(self._label)
 
114
        self.vbox.pack_end(self._radio_added)
 
115
        self.vbox.pack_end(self._radio_selected)
 
116
        
 
117
        self.action_area.pack_end(self._button_remove)
 
118
        
 
119
        self.vbox.set_spacing(3)
 
120
        self.vbox.show_all()
 
121
        
 
122
    @show_bzr_error
 
123
    def _on_remove_clicked(self, button):
 
124
        """ Remove button clicked handler. """
 
125
        if self._radio_selected.get_active():
 
126
            # Remove only the selected file
 
127
            filename = self.selected
 
128
            
 
129
            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.'))
 
132
                return
 
133
            
 
134
            self.wt.remove(os.path.join(self.wtpath, filename))
 
135
        elif self._radio_added.get_active():
 
136
            # Remove added files recursively
 
137
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
138
            file_list = sorted([f[0] for f in added], reverse=True)
 
139
            if len(file_list) == 0:
 
140
                warning_dialog(_i18n('No matching files'),
 
141
                               _i18n('No added files were found in the working tree.'))
 
142
                return
 
143
            self.wt.remove(file_list)
 
144
        
 
145
        self.response(gtk.RESPONSE_OK)