/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: Adeodato Simó
  • Date: 2007-07-05 19:35:12 UTC
  • mto: This revision was merged to the branch mainline in revision 234.
  • Revision ID: dato@net.com.org.es-20070705193512-23ze1o604e874bd6
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.

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