/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
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
35
38
from bzrlib.plugins.gtk.diff import DiffWindow
36
 
from launch import launch
37
 
from olive import Preferences
 
39
from bzrlib.plugins.gtk.olive import Preferences, launch
38
40
 
39
41
class OliveMenu:
40
42
    """ This class is responsible for building the context menus. """
57
59
        
58
60
        self.actiongroup = gtk.ActionGroup('context')
59
61
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
60
 
                                       _('Add'), None,
61
 
                                       _('Add the selected file'),
 
62
                                       _i18n('Add'), None,
 
63
                                       _i18n('Add the selected file'),
62
64
                                       self.add_file),
63
65
                                      ('remove', gtk.STOCK_REMOVE,
64
 
                                       _('Remove'), None,
65
 
                                       _('Remove the selected file'),
 
66
                                       _i18n('Remove'), None,
 
67
                                       _i18n('Remove the selected file'),
66
68
                                       self.remove_file),
 
69
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
 
70
                                       _i18n('Remove and delete'), None,
 
71
                                       _i18n('Remove the selected file/dir and delete from disk'),
 
72
                                       self.remove_and_delete_file),
67
73
                                      ('rename', None,
68
 
                                       _('Rename'), None,
69
 
                                       _('Rename the selected file'),
 
74
                                       _i18n('Rename'), None,
 
75
                                       _i18n('Rename the selected file'),
70
76
                                       self.rename_file),
71
77
                                      ('open', gtk.STOCK_OPEN,
72
 
                                       _('Open'), None,
73
 
                                       _('Open the selected file'),
 
78
                                       _i18n('Open'), None,
 
79
                                       _i18n('Open the selected file'),
74
80
                                       self.open_file),
75
81
                                      ('revert', None,
76
 
                                       _('Revert'), None,
77
 
                                       _('Revert the changes'),
 
82
                                       _i18n('Revert'), None,
 
83
                                       _i18n('Revert the changes'),
78
84
                                       self.revert),
79
85
                                      ('commit', None,
80
 
                                       _('Commit'), None,
81
 
                                       _('Commit the changes'),
 
86
                                       _i18n('Commit'), None,
 
87
                                       _i18n('Commit the changes'),
82
88
                                       self.commit),
83
89
                                      ('annotate', None,
84
 
                                       _('Annotate'), None,
85
 
                                       _('Annotate the selected file'),
 
90
                                       _i18n('Annotate'), None,
 
91
                                       _i18n('Annotate the selected file'),
86
92
                                       self.annotate),
87
93
                                      ('diff', None,
88
 
                                       _('Diff'), None,
89
 
                                       _('Show the diff of the file'),
 
94
                                       _i18n('Diff'), None,
 
95
                                       _i18n('Show the diff of the file'),
90
96
                                       self.diff),
91
97
                                      ('bookmark', None,
92
 
                                       _('Bookmark'), None,
93
 
                                       _('Bookmark current location'),
 
98
                                       _i18n('Bookmark'), None,
 
99
                                       _i18n('Bookmark current location'),
94
100
                                       self.bookmark),
95
101
                                      ('edit_bookmark', gtk.STOCK_EDIT,
96
 
                                       _('Edit'), None,
97
 
                                       _('Edit the selected bookmark'),
 
102
                                       _i18n('Edit'), None,
 
103
                                       _i18n('Edit the selected bookmark'),
98
104
                                       self.edit_bookmark),
99
105
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
100
 
                                       _('Remove'), None,
101
 
                                       _('Remove the selected bookmark'),
 
106
                                       _i18n('Remove'), None,
 
107
                                       _i18n('Remove the selected bookmark'),
102
108
                                       self.remove_bookmark),
103
109
                                      ('open_folder', gtk.STOCK_OPEN,
104
 
                                       _('Open Folder'), None,
105
 
                                       _('Open bookmark folder in Nautilus'),
 
110
                                       _i18n('Open Folder'), None,
 
111
                                       _i18n('Open bookmark folder in Nautilus'),
106
112
                                       self.open_folder),
107
113
                                      ('diff_selected', None,
108
 
                                       _('Selected...'), None,
109
 
                                       _('Show the differences of the selected file'),
 
114
                                       _i18n('Selected...'), None,
 
115
                                       _i18n('Show the differences of the selected file'),
110
116
                                       self.diff_selected),
111
117
                                      ('diff_all', None,
112
 
                                       _('All...'), None,
113
 
                                       _('Show the differences of all files'),
 
118
                                       _i18n('All...'), None,
 
119
                                       _i18n('Show the differences of all files'),
114
120
                                       self.diff_all),
115
121
                                      ('view_remote', None,
116
 
                                       _('View contents'), None,
117
 
                                       _('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'),
118
124
                                       self.view_remote),
119
125
                                      ('diff_remote', None,
120
 
                                       _('Show differences'), None,
121
 
                                       _('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'),
122
128
                                       self.diff_remote),
123
129
                                      ('revert_remote', None,
124
 
                                       _('Revert to this revision'), None,
125
 
                                       _('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'),
126
132
                                       self.revert_remote)
127
133
                                     ])
128
134
        
168
174
        filename = self.selected
169
175
            
170
176
        if filename is None:
171
 
            error_dialog(_('No file was selected'),
172
 
                         _('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.'))
173
179
            return
174
180
        
175
 
        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()
176
185
    
177
186
    @show_bzr_error
178
187
    def annotate(self, action):
181
190
        filename = self.selected
182
191
        
183
192
        if filename is None:
184
 
            error_dialog(_('No file was selected'),
185
 
                         _('Please select a file from the list.'))
 
193
            error_dialog(_i18n('No file was selected'),
 
194
                         _i18n('Please select a file from the list.'))
186
195
            return
187
196
        
188
197
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
189
198
        
190
199
        branch = wt.branch
191
200
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
192
 
        
193
 
        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)
194
204
        window.set_title(os.path.join(directory, filename) + " - Annotate")
195
205
        config = GAnnotateConfig(window)
196
206
        window.show()
201
211
            branch.unlock()
202
212
    
203
213
    @show_bzr_error
204
 
    def remove_file(self, action):
 
214
    def remove_file(self, action, delete_on_disk=False):
205
215
        """ Right context menu -> Remove """
206
216
        # Remove only the selected file
207
217
        directory = self.path
208
218
        filename = self.selected
209
219
        
210
220
        if filename is None:
211
 
            error_dialog(_('No file was selected'),
212
 
                         _('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.'))
213
223
            return
214
224
        
215
225
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
216
226
        wt.remove(path)
 
227
        
 
228
        if delete_on_disk:
 
229
            abs_filename = os.path.join(directory,filename)
 
230
            if os.path.isdir(abs_filename):
 
231
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
 
232
                if response == gtk.RESPONSE_YES:
 
233
                    shutil.rmtree(abs_filename)
 
234
            else:
 
235
                os.remove(abs_filename)
 
236
                
217
237
        self.app.set_path(self.path)
218
238
        self.app.refresh_right()
 
239
        
 
240
    def remove_and_delete_file(self, action):
 
241
        """ Right context menu -> Remove and delete"""
 
242
        self.remove_file(action, delete_on_disk=True)
219
243
 
220
244
    def rename_file(self, action):
221
245
        """ Right context menu -> Rename """
222
 
        from rename import OliveRename
223
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
224
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
225
 
        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()
226
253
    
227
254
    def open_file(self, action):
228
255
        """ Right context menu -> Open """
230
257
        filename = self.selected
231
258
        
232
259
        if filename is None:
233
 
            error_dialog(_('No file was selected'),
234
 
                         _('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.'))
235
262
            return
236
263
 
237
264
        if filename == '..':
238
265
            # TODO: how to enter a directory?
239
266
            return
240
267
        else:
241
 
            fullpath = self.path + os.sep + filename
242
 
            if os.path.isdir(fullpath):
243
 
                # selected item is an existant directory
244
 
                # TODO: how to enter a directory?
245
 
                return
246
 
            else:
247
 
                launch(fullpath) 
 
268
            fullpath = os.path.join(self.path, filename)
 
269
            launch.launch(fullpath) 
248
270
 
249
271
    def revert(self, action):
250
272
        """ Right context menu -> Revert """
251
273
        wt, path = WorkingTree.open_containing(self.path)
252
274
        ret = wt.revert([os.path.join(path, self.selected)])
253
275
        if ret:
254
 
            warning_dialog(_('Conflicts detected'),
255
 
                           _('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.'))
256
278
        else:
257
 
            info_dialog(_('Revert successful'),
258
 
                        _('All files reverted to last revision.'))
 
279
            info_dialog(_i18n('Revert successful'),
 
280
                        _i18n('Selected file reverted to last revision.'))
259
281
        self.app.refresh_right()       
260
282
    
261
283
    def commit(self, action):
268
290
        except NotBranchError, e:
269
291
            path = e.path
270
292
        
271
 
        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)
272
298
        response = commit.run()
273
299
        if response != gtk.RESPONSE_NONE:
274
300
            commit.hide()
282
308
    def diff(self, action):
283
309
        """ Right context menu -> Diff """
284
310
        wt = WorkingTree.open_containing(self.path)[0]
285
 
        window = DiffWindow()
 
311
        window = DiffWindow(self.app)
286
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
287
313
        window.set_diff(wt.branch.nick, wt, parent_tree)
288
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
291
317
    def bookmark(self, action):
292
318
        """ Right context menu -> Bookmark """
293
319
        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.'))
 
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.'))
296
322
            self.pref.write()
297
323
        else:
298
 
            warning_dialog(_('Location already bookmarked'),
299
 
                           _('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.'))
300
326
        
301
327
        self.app.refresh_left()
302
328
 
330
356
        path = self.selected
331
357
 
332
358
        if path != None:
333
 
            launch(path)
 
359
            launch.launch(path)
334
360
    
335
361
    def diff_selected(self, action):
336
362
        """ Diff toolbutton -> Selected... """
338
364
    
339
365
    def diff_all(self, action):
340
366
        """ Diff toolbutton -> All... """
341
 
        from diff import OliveDiff
342
 
        diff = OliveDiff(self.comm)
343
 
        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()
344
372
    
345
373
    def view_remote(self, action):
346
374
        """ Remote context menu -> View contents """