/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
26
26
    pass
27
27
 
28
28
import gtk
29
 
from dialog import question_dialog
30
29
 
31
30
import bzrlib.errors as errors
32
31
from bzrlib.workingtree import WorkingTree
33
32
 
34
 
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
35
35
from bzrlib.plugins.gtk.errors import show_bzr_error
36
36
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
37
37
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
60
60
        
61
61
        self.actiongroup = gtk.ActionGroup('context')
62
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _('Add'), None,
64
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
65
65
                                       self.add_file),
66
66
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _('Remove'), None,
68
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
69
69
                                       self.remove_file),
70
70
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
71
 
                                       _('Remove and delete'), None,
72
 
                                       _('Remove the selected file/dir and delete from disk'),
 
71
                                       _i18n('Remove and delete'), None,
 
72
                                       _i18n('Remove the selected file/dir and delete from disk'),
73
73
                                       self.remove_and_delete_file),
74
74
                                      ('rename', None,
75
 
                                       _('Rename'), None,
76
 
                                       _('Rename the selected file'),
 
75
                                       _i18n('Rename'), None,
 
76
                                       _i18n('Rename the selected file'),
77
77
                                       self.rename_file),
78
78
                                      ('open', gtk.STOCK_OPEN,
79
 
                                       _('Open'), None,
80
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
81
81
                                       self.open_file),
82
82
                                      ('revert', None,
83
 
                                       _('Revert'), None,
84
 
                                       _('Revert the changes'),
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
85
85
                                       self.revert),
86
86
                                      ('commit', None,
87
 
                                       _('Commit'), None,
88
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
89
89
                                       self.commit),
90
90
                                      ('annotate', None,
91
 
                                       _('Annotate'), None,
92
 
                                       _('Annotate the selected file'),
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
93
93
                                       self.annotate),
94
94
                                      ('diff', None,
95
 
                                       _('Diff'), None,
96
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
97
97
                                       self.diff),
98
98
                                      ('bookmark', None,
99
 
                                       _('Bookmark'), None,
100
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
101
101
                                       self.bookmark),
102
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _('Edit'), None,
104
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
105
105
                                       self.edit_bookmark),
106
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _('Remove'), None,
108
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
109
109
                                       self.remove_bookmark),
110
110
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _('Open Folder'), None,
112
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
113
113
                                       self.open_folder),
114
114
                                      ('diff_selected', None,
115
 
                                       _('Selected...'), None,
116
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
117
117
                                       self.diff_selected),
118
118
                                      ('diff_all', None,
119
 
                                       _('All...'), None,
120
 
                                       _('Show the differences of all files'),
 
119
                                       _i18n('All...'), None,
 
120
                                       _i18n('Show the differences of all files'),
121
121
                                       self.diff_all),
122
122
                                      ('view_remote', None,
123
 
                                       _('View contents'), None,
124
 
                                       _('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'),
125
125
                                       self.view_remote),
126
126
                                      ('diff_remote', None,
127
 
                                       _('Show differences'), None,
128
 
                                       _('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'),
129
129
                                       self.diff_remote),
130
130
                                      ('revert_remote', None,
131
 
                                       _('Revert to this revision'), None,
132
 
                                       _('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'),
133
133
                                       self.revert_remote)
134
134
                                     ])
135
135
        
175
175
        filename = self.selected
176
176
            
177
177
        if filename is None:
178
 
            error_dialog(_('No file was selected'),
179
 
                         _('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.'))
180
180
            return
181
181
        
182
182
        bzrlib.add.smart_add([os.path.join(directory, filename)])
188
188
        filename = self.selected
189
189
        
190
190
        if filename is None:
191
 
            error_dialog(_('No file was selected'),
192
 
                         _('Please select a file from the list.'))
 
191
            error_dialog(_i18n('No file was selected'),
 
192
                         _i18n('Please select a file from the list.'))
193
193
            return
194
194
        
195
195
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
197
197
        branch = wt.branch
198
198
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
199
199
        
200
 
        window = GAnnotateWindow(all=False, plain=False)
 
200
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
201
201
        window.set_title(os.path.join(directory, filename) + " - Annotate")
202
202
        config = GAnnotateConfig(window)
203
203
        window.show()
215
215
        filename = self.selected
216
216
        
217
217
        if filename is None:
218
 
            error_dialog(_('No file was selected'),
219
 
                         _('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.'))
220
220
            return
221
221
        
222
222
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
225
225
        if delete_on_disk:
226
226
            abs_filename = os.path.join(directory,filename)
227
227
            if os.path.isdir(abs_filename):
228
 
                response = question_dialog(_('Delete directory with all directories below ?'), abs_filename )
 
228
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
229
229
                if response == gtk.RESPONSE_YES:
230
230
                    shutil.rmtree(abs_filename)
231
231
            else:
251
251
        filename = self.selected
252
252
        
253
253
        if filename is None:
254
 
            error_dialog(_('No file was selected'),
255
 
                         _('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.'))
256
256
            return
257
257
 
258
258
        if filename == '..':
272
272
        wt, path = WorkingTree.open_containing(self.path)
273
273
        ret = wt.revert([os.path.join(path, self.selected)])
274
274
        if ret:
275
 
            warning_dialog(_('Conflicts detected'),
276
 
                           _('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.'))
277
277
        else:
278
 
            info_dialog(_('Revert successful'),
279
 
                        _('All files reverted to last revision.'))
 
278
            info_dialog(_i18n('Revert successful'),
 
279
                        _i18n('All files reverted to last revision.'))
280
280
        self.app.refresh_right()       
281
281
    
282
282
    def commit(self, action):
289
289
        except NotBranchError, e:
290
290
            path = e.path
291
291
        
292
 
        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)
293
297
        response = commit.run()
294
298
        if response != gtk.RESPONSE_NONE:
295
299
            commit.hide()
303
307
    def diff(self, action):
304
308
        """ Right context menu -> Diff """
305
309
        wt = WorkingTree.open_containing(self.path)[0]
306
 
        window = DiffWindow()
 
310
        window = DiffWindow(self.app)
307
311
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
308
312
        window.set_diff(wt.branch.nick, wt, parent_tree)
309
313
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
312
316
    def bookmark(self, action):
313
317
        """ Right context menu -> Bookmark """
314
318
        if self.pref.add_bookmark(self.path):
315
 
            info_dialog(_('Bookmark successfully added'),
316
 
                        _('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.'))
317
321
            self.pref.write()
318
322
        else:
319
 
            warning_dialog(_('Location already bookmarked'),
320
 
                           _('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.'))
321
325
        
322
326
        self.app.refresh_left()
323
327