/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/menu.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/menu.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 os
17
18
import os.path
 
19
import shutil
18
20
import sys
19
21
 
20
22
try:
28
30
import bzrlib.errors as errors
29
31
from bzrlib.workingtree import WorkingTree
30
32
 
31
 
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
33
from bzrlib.plugins.gtk import _i18n
 
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
32
35
from bzrlib.plugins.gtk.errors import show_bzr_error
33
36
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
34
37
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
57
60
        
58
61
        self.actiongroup = gtk.ActionGroup('context')
59
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
60
 
                                       _('Add'), None,
61
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
62
65
                                       self.add_file),
63
66
                                      ('remove', gtk.STOCK_REMOVE,
64
 
                                       _('Remove'), None,
65
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
66
69
                                       self.remove_file),
 
70
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
 
71
                                       _i18n('Remove and delete'), None,
 
72
                                       _i18n('Remove the selected file/dir and delete from disk'),
 
73
                                       self.remove_and_delete_file),
67
74
                                      ('rename', None,
68
 
                                       _('Rename'), None,
69
 
                                       _('Rename the selected file'),
 
75
                                       _i18n('Rename'), None,
 
76
                                       _i18n('Rename the selected file'),
70
77
                                       self.rename_file),
71
78
                                      ('open', gtk.STOCK_OPEN,
72
 
                                       _('Open'), None,
73
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
74
81
                                       self.open_file),
75
82
                                      ('revert', None,
76
 
                                       _('Revert'), None,
77
 
                                       _('Revert the changes'),
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
78
85
                                       self.revert),
79
86
                                      ('commit', None,
80
 
                                       _('Commit'), None,
81
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
82
89
                                       self.commit),
83
90
                                      ('annotate', None,
84
 
                                       _('Annotate'), None,
85
 
                                       _('Annotate the selected file'),
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
86
93
                                       self.annotate),
87
94
                                      ('diff', None,
88
 
                                       _('Diff'), None,
89
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
90
97
                                       self.diff),
91
98
                                      ('bookmark', None,
92
 
                                       _('Bookmark'), None,
93
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
94
101
                                       self.bookmark),
95
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
96
 
                                       _('Edit'), None,
97
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
98
105
                                       self.edit_bookmark),
99
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
100
 
                                       _('Remove'), None,
101
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
102
109
                                       self.remove_bookmark),
103
110
                                      ('open_folder', gtk.STOCK_OPEN,
104
 
                                       _('Open Folder'), None,
105
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
106
113
                                       self.open_folder),
107
114
                                      ('diff_selected', None,
108
 
                                       _('Selected...'), None,
109
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
110
117
                                       self.diff_selected),
111
118
                                      ('diff_all', None,
112
 
                                       _('All...'), None,
113
 
                                       _('Show the differences of all files'),
 
119
                                       _i18n('All...'), None,
 
120
                                       _i18n('Show the differences of all files'),
114
121
                                       self.diff_all),
115
122
                                      ('view_remote', None,
116
 
                                       _('View contents'), None,
117
 
                                       _('View the contents of the file in a builtin viewer'),
 
123
                                       _i18n('View contents'), None,
 
124
                                       _i18n('View the contents of the file in a builtin viewer'),
118
125
                                       self.view_remote),
119
126
                                      ('diff_remote', None,
120
 
                                       _('Show differences'), None,
121
 
                                       _('Show the differences between two revisions of the file'),
 
127
                                       _i18n('Show differences'), None,
 
128
                                       _i18n('Show the differences between two revisions of the file'),
122
129
                                       self.diff_remote),
123
130
                                      ('revert_remote', None,
124
 
                                       _('Revert to this revision'), None,
125
 
                                       _('Revert the selected file to the selected revision'),
 
131
                                       _i18n('Revert to this revision'), None,
 
132
                                       _i18n('Revert the selected file to the selected revision'),
126
133
                                       self.revert_remote)
127
134
                                     ])
128
135
        
168
175
        filename = self.selected
169
176
            
170
177
        if filename is None:
171
 
            error_dialog(_('No file was selected'),
172
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
178
            error_dialog(_i18n('No file was selected'),
 
179
                         _i18n('Please select a file from the list,\nor choose the other option.'))
173
180
            return
174
181
        
175
182
        bzrlib.add.smart_add([os.path.join(directory, filename)])
181
188
        filename = self.selected
182
189
        
183
190
        if filename is None:
184
 
            error_dialog(_('No file was selected'),
185
 
                         _('Please select a file from the list.'))
 
191
            error_dialog(_i18n('No file was selected'),
 
192
                         _i18n('Please select a file from the list.'))
186
193
            return
187
194
        
188
195
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
190
197
        branch = wt.branch
191
198
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
192
199
        
193
 
        window = GAnnotateWindow(all=False, plain=False)
 
200
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
194
201
        window.set_title(os.path.join(directory, filename) + " - Annotate")
195
202
        config = GAnnotateConfig(window)
196
203
        window.show()
201
208
            branch.unlock()
202
209
    
203
210
    @show_bzr_error
204
 
    def remove_file(self, action):
 
211
    def remove_file(self, action,delete_on_disk=0):
205
212
        """ Right context menu -> Remove """
206
213
        # Remove only the selected file
207
214
        directory = self.path
208
215
        filename = self.selected
209
216
        
210
217
        if filename is None:
211
 
            error_dialog(_('No file was selected'),
212
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
218
            error_dialog(_i18n('No file was selected'),
 
219
                         _i18n('Please select a file from the list,\nor choose the other option.'))
213
220
            return
214
221
        
215
222
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
216
223
        wt.remove(path)
 
224
        
 
225
        if delete_on_disk:
 
226
            abs_filename = os.path.join(directory,filename)
 
227
            if os.path.isdir(abs_filename):
 
228
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
 
229
                if response == gtk.RESPONSE_YES:
 
230
                    shutil.rmtree(abs_filename)
 
231
            else:
 
232
                os.remove(abs_filename)
 
233
                
217
234
        self.app.set_path(self.path)
218
235
        self.app.refresh_right()
 
236
        
 
237
    def remove_and_delete_file(self, action):
 
238
        """ Right context menu -> Remove and delete"""
 
239
        self.remove_file(action,delete_on_disk=1)
219
240
 
220
241
    def rename_file(self, action):
221
242
        """ Right context menu -> Rename """
230
251
        filename = self.selected
231
252
        
232
253
        if filename is None:
233
 
            error_dialog(_('No file was selected'),
234
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
254
            error_dialog(_i18n('No file was selected'),
 
255
                         _i18n('Please select a file from the list,\nor choose the other option.'))
235
256
            return
236
257
 
237
258
        if filename == '..':
251
272
        wt, path = WorkingTree.open_containing(self.path)
252
273
        ret = wt.revert([os.path.join(path, self.selected)])
253
274
        if ret:
254
 
            warning_dialog(_('Conflicts detected'),
255
 
                           _('Please have a look at the working tree before continuing.'))
 
275
            warning_dialog(_i18n('Conflicts detected'),
 
276
                           _i18n('Please have a look at the working tree before continuing.'))
256
277
        else:
257
 
            info_dialog(_('Revert successful'),
258
 
                        _('All files reverted to last revision.'))
 
278
            info_dialog(_i18n('Revert successful'),
 
279
                        _i18n('All files reverted to last revision.'))
259
280
        self.app.refresh_right()       
260
281
    
261
282
    def commit(self, action):
268
289
        except NotBranchError, e:
269
290
            path = e.path
270
291
        
271
 
        commit = CommitDialog(wt, path, not branch, self.selected)
 
292
        if self.selected:
 
293
            selected = os.path.join(path, self.selected)
 
294
        else:
 
295
            selected = None
 
296
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
272
297
        response = commit.run()
273
298
        if response != gtk.RESPONSE_NONE:
274
299
            commit.hide()
282
307
    def diff(self, action):
283
308
        """ Right context menu -> Diff """
284
309
        wt = WorkingTree.open_containing(self.path)[0]
285
 
        window = DiffWindow()
 
310
        window = DiffWindow(self.app)
286
311
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
287
312
        window.set_diff(wt.branch.nick, wt, parent_tree)
288
313
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
291
316
    def bookmark(self, action):
292
317
        """ Right context menu -> Bookmark """
293
318
        if self.pref.add_bookmark(self.path):
294
 
            info_dialog(_('Bookmark successfully added'),
295
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
319
            info_dialog(_i18n('Bookmark successfully added'),
 
320
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
296
321
            self.pref.write()
297
322
        else:
298
 
            warning_dialog(_('Location already bookmarked'),
299
 
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
323
            warning_dialog(_i18n('Location already bookmarked'),
 
324
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
300
325
        
301
326
        self.app.refresh_left()
302
327