/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
30
30
import bzrlib.errors as errors
31
31
from bzrlib.workingtree import WorkingTree
32
32
 
 
33
from bzrlib.plugins.gtk import _i18n
33
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
34
35
from bzrlib.plugins.gtk.errors import show_bzr_error
35
36
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
36
37
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
37
38
from bzrlib.plugins.gtk.diff import DiffWindow
38
 
from launch import launch
39
 
from olive import Preferences
 
39
from bzrlib.plugins.gtk.olive import Preferences, launch
40
40
 
41
41
class OliveMenu:
42
42
    """ This class is responsible for building the context menus. """
59
59
        
60
60
        self.actiongroup = gtk.ActionGroup('context')
61
61
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
62
 
                                       _('Add'), None,
63
 
                                       _('Add the selected file'),
 
62
                                       _i18n('Add'), None,
 
63
                                       _i18n('Add the selected file'),
64
64
                                       self.add_file),
65
65
                                      ('remove', gtk.STOCK_REMOVE,
66
 
                                       _('Remove'), None,
67
 
                                       _('Remove the selected file'),
 
66
                                       _i18n('Remove'), None,
 
67
                                       _i18n('Remove the selected file'),
68
68
                                       self.remove_file),
69
69
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
70
 
                                       _('Remove and delete'), None,
71
 
                                       _('Remove the selected file/dir and delete from disk'),
 
70
                                       _i18n('Remove and delete'), None,
 
71
                                       _i18n('Remove the selected file/dir and delete from disk'),
72
72
                                       self.remove_and_delete_file),
73
73
                                      ('rename', None,
74
 
                                       _('Rename'), None,
75
 
                                       _('Rename the selected file'),
 
74
                                       _i18n('Rename'), None,
 
75
                                       _i18n('Rename the selected file'),
76
76
                                       self.rename_file),
77
77
                                      ('open', gtk.STOCK_OPEN,
78
 
                                       _('Open'), None,
79
 
                                       _('Open the selected file'),
 
78
                                       _i18n('Open'), None,
 
79
                                       _i18n('Open the selected file'),
80
80
                                       self.open_file),
81
81
                                      ('revert', None,
82
 
                                       _('Revert'), None,
83
 
                                       _('Revert the changes'),
 
82
                                       _i18n('Revert'), None,
 
83
                                       _i18n('Revert the changes'),
84
84
                                       self.revert),
85
85
                                      ('commit', None,
86
 
                                       _('Commit'), None,
87
 
                                       _('Commit the changes'),
 
86
                                       _i18n('Commit'), None,
 
87
                                       _i18n('Commit the changes'),
88
88
                                       self.commit),
89
89
                                      ('annotate', None,
90
 
                                       _('Annotate'), None,
91
 
                                       _('Annotate the selected file'),
 
90
                                       _i18n('Annotate'), None,
 
91
                                       _i18n('Annotate the selected file'),
92
92
                                       self.annotate),
93
93
                                      ('diff', None,
94
 
                                       _('Diff'), None,
95
 
                                       _('Show the diff of the file'),
 
94
                                       _i18n('Diff'), None,
 
95
                                       _i18n('Show the diff of the file'),
96
96
                                       self.diff),
97
97
                                      ('bookmark', None,
98
 
                                       _('Bookmark'), None,
99
 
                                       _('Bookmark current location'),
 
98
                                       _i18n('Bookmark'), None,
 
99
                                       _i18n('Bookmark current location'),
100
100
                                       self.bookmark),
101
101
                                      ('edit_bookmark', gtk.STOCK_EDIT,
102
 
                                       _('Edit'), None,
103
 
                                       _('Edit the selected bookmark'),
 
102
                                       _i18n('Edit'), None,
 
103
                                       _i18n('Edit the selected bookmark'),
104
104
                                       self.edit_bookmark),
105
105
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
106
 
                                       _('Remove'), None,
107
 
                                       _('Remove the selected bookmark'),
 
106
                                       _i18n('Remove'), None,
 
107
                                       _i18n('Remove the selected bookmark'),
108
108
                                       self.remove_bookmark),
109
109
                                      ('open_folder', gtk.STOCK_OPEN,
110
 
                                       _('Open Folder'), None,
111
 
                                       _('Open bookmark folder in Nautilus'),
 
110
                                       _i18n('Open Folder'), None,
 
111
                                       _i18n('Open bookmark folder in Nautilus'),
112
112
                                       self.open_folder),
113
113
                                      ('diff_selected', None,
114
 
                                       _('Selected...'), None,
115
 
                                       _('Show the differences of the selected file'),
 
114
                                       _i18n('Selected...'), None,
 
115
                                       _i18n('Show the differences of the selected file'),
116
116
                                       self.diff_selected),
117
117
                                      ('diff_all', None,
118
 
                                       _('All...'), None,
119
 
                                       _('Show the differences of all files'),
 
118
                                       _i18n('All...'), None,
 
119
                                       _i18n('Show the differences of all files'),
120
120
                                       self.diff_all),
121
121
                                      ('view_remote', None,
122
 
                                       _('View contents'), None,
123
 
                                       _('View the contents of the file in a builtin viewer'),
 
122
                                       _i18n('View contents'), None,
 
123
                                       _i18n('View the contents of the file in a builtin viewer'),
124
124
                                       self.view_remote),
125
125
                                      ('diff_remote', None,
126
 
                                       _('Show differences'), None,
127
 
                                       _('Show the differences between two revisions of the file'),
 
126
                                       _i18n('Show differences'), None,
 
127
                                       _i18n('Show the differences between two revisions of the file'),
128
128
                                       self.diff_remote),
129
129
                                      ('revert_remote', None,
130
 
                                       _('Revert to this revision'), None,
131
 
                                       _('Revert the selected file to the selected revision'),
 
130
                                       _i18n('Revert to this revision'), None,
 
131
                                       _i18n('Revert the selected file to the selected revision'),
132
132
                                       self.revert_remote)
133
133
                                     ])
134
134
        
174
174
        filename = self.selected
175
175
            
176
176
        if filename is None:
177
 
            error_dialog(_('No file was selected'),
178
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
177
            error_dialog(_i18n('No file was selected'),
 
178
                         _i18n('Please select a file from the list,\nor choose the other option.'))
179
179
            return
180
180
        
181
 
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
181
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
182
        wt.add([path])
 
183
        
 
184
        self.app.refresh_right()
182
185
    
183
186
    @show_bzr_error
184
187
    def annotate(self, action):
187
190
        filename = self.selected
188
191
        
189
192
        if filename is None:
190
 
            error_dialog(_('No file was selected'),
191
 
                         _('Please select a file from the list.'))
 
193
            error_dialog(_i18n('No file was selected'),
 
194
                         _i18n('Please select a file from the list.'))
192
195
            return
193
196
        
194
197
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
195
198
        
196
199
        branch = wt.branch
197
200
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
198
 
        
199
 
        window = GAnnotateWindow(all=False, plain=False)
 
201
        if file_id is None:
 
202
            raise errors.NotVersionedError(filename)
 
203
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
200
204
        window.set_title(os.path.join(directory, filename) + " - Annotate")
201
205
        config = GAnnotateConfig(window)
202
206
        window.show()
207
211
            branch.unlock()
208
212
    
209
213
    @show_bzr_error
210
 
    def remove_file(self, action,delete_on_disk=0):
 
214
    def remove_file(self, action, delete_on_disk=False):
211
215
        """ Right context menu -> Remove """
212
216
        # Remove only the selected file
213
217
        directory = self.path
214
218
        filename = self.selected
215
219
        
216
220
        if filename is None:
217
 
            error_dialog(_('No file was selected'),
218
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
221
            error_dialog(_i18n('No file was selected'),
 
222
                         _i18n('Please select a file from the list,\nor choose the other option.'))
219
223
            return
220
224
        
221
225
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
224
228
        if delete_on_disk:
225
229
            abs_filename = os.path.join(directory,filename)
226
230
            if os.path.isdir(abs_filename):
227
 
                response = question_dialog(_('Delete directory with all directories below ?'), abs_filename )
 
231
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
228
232
                if response == gtk.RESPONSE_YES:
229
233
                    shutil.rmtree(abs_filename)
230
234
            else:
235
239
        
236
240
    def remove_and_delete_file(self, action):
237
241
        """ Right context menu -> Remove and delete"""
238
 
        self.remove_file(action,delete_on_disk=1)
 
242
        self.remove_file(action, delete_on_disk=True)
239
243
 
240
244
    def rename_file(self, action):
241
245
        """ Right context menu -> Rename """
242
 
        from rename import OliveRename
243
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
244
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
245
 
        rename.display()
 
246
        from bzrlib.plugins.gtk.olive.rename import RenameDialog
 
247
        wt = WorkingTree.open_containing(os.path.join(self.path, self.selected))[0]
 
248
        rename = RenameDialog(wt, wt.relpath(self.path), self.selected)
 
249
        response = rename.run()
 
250
        rename.destroy()
 
251
        if response == gtk.RESPONSE_OK:
 
252
            self.app.refresh_right()
246
253
    
247
254
    def open_file(self, action):
248
255
        """ Right context menu -> Open """
250
257
        filename = self.selected
251
258
        
252
259
        if filename is None:
253
 
            error_dialog(_('No file was selected'),
254
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
260
            error_dialog(_i18n('No file was selected'),
 
261
                         _i18n('Please select a file from the list,\nor choose the other option.'))
255
262
            return
256
263
 
257
264
        if filename == '..':
258
265
            # TODO: how to enter a directory?
259
266
            return
260
267
        else:
261
 
            fullpath = self.path + os.sep + filename
262
 
            if os.path.isdir(fullpath):
263
 
                # selected item is an existant directory
264
 
                # TODO: how to enter a directory?
265
 
                return
266
 
            else:
267
 
                launch(fullpath) 
 
268
            fullpath = os.path.join(self.path, filename)
 
269
            launch.launch(fullpath) 
268
270
 
269
271
    def revert(self, action):
270
272
        """ Right context menu -> Revert """
271
273
        wt, path = WorkingTree.open_containing(self.path)
272
274
        ret = wt.revert([os.path.join(path, self.selected)])
273
275
        if ret:
274
 
            warning_dialog(_('Conflicts detected'),
275
 
                           _('Please have a look at the working tree before continuing.'))
 
276
            warning_dialog(_i18n('Conflicts detected'),
 
277
                           _i18n('Please have a look at the working tree before continuing.'))
276
278
        else:
277
 
            info_dialog(_('Revert successful'),
278
 
                        _('All files reverted to last revision.'))
 
279
            info_dialog(_i18n('Revert successful'),
 
280
                        _i18n('Selected file reverted to last revision.'))
279
281
        self.app.refresh_right()       
280
282
    
281
283
    def commit(self, action):
288
290
        except NotBranchError, e:
289
291
            path = e.path
290
292
        
291
 
        commit = CommitDialog(wt, path, not branch, self.selected)
 
293
        if self.selected:
 
294
            selected = os.path.join(path, self.selected)
 
295
        else:
 
296
            selected = None
 
297
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
292
298
        response = commit.run()
293
299
        if response != gtk.RESPONSE_NONE:
294
300
            commit.hide()
302
308
    def diff(self, action):
303
309
        """ Right context menu -> Diff """
304
310
        wt = WorkingTree.open_containing(self.path)[0]
305
 
        window = DiffWindow()
 
311
        window = DiffWindow(self.app)
306
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
307
313
        window.set_diff(wt.branch.nick, wt, parent_tree)
308
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
311
317
    def bookmark(self, action):
312
318
        """ Right context menu -> Bookmark """
313
319
        if self.pref.add_bookmark(self.path):
314
 
            info_dialog(_('Bookmark successfully added'),
315
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
320
            info_dialog(_i18n('Bookmark successfully added'),
 
321
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
316
322
            self.pref.write()
317
323
        else:
318
 
            warning_dialog(_('Location already bookmarked'),
319
 
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
324
            warning_dialog(_i18n('Location already bookmarked'),
 
325
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
320
326
        
321
327
        self.app.refresh_left()
322
328
 
350
356
        path = self.selected
351
357
 
352
358
        if path != None:
353
 
            launch(path)
 
359
            launch.launch(path)
354
360
    
355
361
    def diff_selected(self, action):
356
362
        """ Diff toolbutton -> Selected... """
358
364
    
359
365
    def diff_all(self, action):
360
366
        """ Diff toolbutton -> All... """
361
 
        from diff import OliveDiff
362
 
        diff = OliveDiff(self.comm)
363
 
        diff.display()
 
367
        wt = WorkingTree.open_containing(self.path)[0]
 
368
        window = DiffWindow(self.app)
 
369
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
370
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
371
        window.show()
364
372
    
365
373
    def view_remote(self, action):
366
374
        """ Remote context menu -> View contents """