/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

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