/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: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

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)
29
 
 
30
 
import olive.backend.errors as errors
31
 
import olive.backend.fileops as fileops
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
import bzrlib.errors as errors
 
29
 
 
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
 
    def __init__(self, gladefile, comm, dialog):
 
37
    def __init__(self, wt, wtpath, selected=[]):
36
38
        """ 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
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
44
40
        
45
41
        self.window = self.glade.get_widget('window_remove')
46
42
        
50
46
        
51
47
        # Connect the signals to the handlers
52
48
        self.glade.signal_autoconnect(dic)
 
49
        
 
50
        self.wt = wt
 
51
        self.wtpath = wtpath
 
52
        self.selected = selected
53
53
 
54
54
    def display(self):
55
55
        """ Display the Remove file(s) dialog. """
56
56
        self.window.show_all()
57
57
        
 
58
    @show_bzr_error
58
59
    def remove(self, widget):
59
60
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
61
        radio_new = self.glade.get_widget('radiobutton_remove_new')
61
62
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
63
        if radio_selected.get_active():
66
64
            # Remove only the selected file
67
 
            filename = self.comm.get_selected_right()
 
65
            filename = self.selected
68
66
            
69
67
            if filename is None:
70
 
                self.dialog.error_dialog(_('No file was selected'),
71
 
                                         _('Please select a file from the list,\nor choose the other option.'))
72
 
                self.comm.set_busy(self.window, False)
73
 
                return
74
 
            
75
 
            try:
76
 
                fileops.remove([directory + '/' + filename])
77
 
            except errors.NotBranchError:
78
 
                self.dialog.error_dialog(_('Directory is not a branch'),
79
 
                                         _('You can perform this action only in a branch.'))
80
 
                self.comm.set_busy(self.window, False)
81
 
                return
82
 
            except errors.NotVersionedError:
83
 
                self.dialog.error_dialog(_('File not versioned'),
84
 
                                         _('The selected file is not versioned.'))
85
 
                self.comm.set_busy(self.window, False)
86
 
                return
87
 
            except:
88
 
                raise
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
70
                return
 
71
            
 
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
73
            
 
74
            self.wt.remove(fullpath)
89
75
        elif radio_new.get_active():
90
76
            # Remove added files recursively
91
 
            try:
92
 
                fileops.remove([directory], True)
93
 
            except errors.NotBranchError:
94
 
                self.dialog.error_dialog(_('Directory is not a branch'),
95
 
                                         _('You can perform this action only in a branch.'))
96
 
                self.comm.set_busy(self.window, False)
 
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
78
            file_list = sorted([f[0] for f in added], reverse=True)
 
79
            if len(file_list) == 0:
 
80
                warning_dialog(_i18n('No matching files'),
 
81
                               _i18n('No added files were found in the working tree.'))
97
82
                return
98
 
            except errors.NoMatchingFiles:
99
 
                dialog.warning_dialog(_('No matching files'),
100
 
                                      _('No added files were found in the working tree.'))
101
 
                self.comm.set_busy(self.window, False)
102
 
            except:
103
 
                raise
104
 
        else:
105
 
            # This should really never happen.
106
 
            pass
 
83
            self.wt.remove(file_list)
107
84
        
108
85
        self.close()
109
 
        self.comm.refresh_right()
110
86
    
111
87
    def close(self, widget=None):
112
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)