/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: Daniel Schierbeck
  • Date: 2008-01-27 01:13:38 UTC
  • mto: (423.1.11 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080127011338-dksksvbbpbf3jig8
Changed About dialog URL, reverted change to license dialog.

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