/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: Jelmer Vernooij
  • Date: 2008-06-28 16:59:50 UTC
  • mto: This revision was merged to the branch mainline in revision 516.
  • Revision ID: jelmer@samba.org-20080628165950-18kv7bdykgf1f1jf
https://launchpad.net/bugs/223935
Fix import in olive.

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 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
 
35
from bzrlib.plugins.gtk.errors import show_bzr_error
 
36
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
37
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 
38
from bzrlib.plugins.gtk.diff import DiffWindow
32
39
from launch import launch
33
 
from olive import OlivePreferences, DiffWindow
 
40
from bzrlib.plugins.gtk.olive import Preferences
34
41
 
35
42
class OliveMenu:
36
43
    """ This class is responsible for building the context menus. """
41
48
        self.uifile = UIFILENAME
42
49
 
43
50
        # Preferences handler
44
 
        self.pref = OlivePreferences()
 
51
        self.pref = Preferences()
45
52
        
46
53
        # Set default values
47
54
        self.path = path
53
60
        
54
61
        self.actiongroup = gtk.ActionGroup('context')
55
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
56
 
                                       _('Add'), None,
57
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
58
65
                                       self.add_file),
59
66
                                      ('remove', gtk.STOCK_REMOVE,
60
 
                                       _('Remove'), None,
61
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
62
69
                                       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),
63
74
                                      ('rename', None,
64
 
                                       _('Rename'), None,
65
 
                                       _('Rename the selected file'),
 
75
                                       _i18n('Rename'), None,
 
76
                                       _i18n('Rename the selected file'),
66
77
                                       self.rename_file),
67
78
                                      ('open', gtk.STOCK_OPEN,
68
 
                                       _('Open'), None,
69
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
70
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
 
85
                                       self.revert),
71
86
                                      ('commit', None,
72
 
                                       _('Commit'), None,
73
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
74
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
 
93
                                       self.annotate),
75
94
                                      ('diff', None,
76
 
                                       _('Diff'), None,
77
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
78
97
                                       self.diff),
79
98
                                      ('bookmark', None,
80
 
                                       _('Bookmark'), None,
81
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
82
101
                                       self.bookmark),
83
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
84
 
                                       _('Edit'), None,
85
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
86
105
                                       self.edit_bookmark),
87
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
88
 
                                       _('Remove'), None,
89
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
90
109
                                       self.remove_bookmark),
91
110
                                      ('open_folder', gtk.STOCK_OPEN,
92
 
                                       _('Open Folder'), None,
93
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
94
113
                                       self.open_folder),
95
114
                                      ('diff_selected', None,
96
 
                                       _('Selected...'), None,
97
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
98
117
                                       self.diff_selected),
99
118
                                      ('diff_all', None,
100
 
                                       _('All...'), None,
101
 
                                       _('Show the differences of all files'),
102
 
                                       self.diff_all)
 
119
                                       _i18n('All...'), None,
 
120
                                       _i18n('Show the differences of all files'),
 
121
                                       self.diff_all),
 
122
                                      ('view_remote', None,
 
123
                                       _i18n('View contents'), None,
 
124
                                       _i18n('View the contents of the file in a builtin viewer'),
 
125
                                       self.view_remote),
 
126
                                      ('diff_remote', None,
 
127
                                       _i18n('Show differences'), None,
 
128
                                       _i18n('Show the differences between two revisions of the file'),
 
129
                                       self.diff_remote),
 
130
                                      ('revert_remote', None,
 
131
                                       _i18n('Revert to this revision'), None,
 
132
                                       _i18n('Revert the selected file to the selected revision'),
 
133
                                       self.revert_remote)
103
134
                                     ])
104
135
        
105
136
        self.ui.insert_action_group(self.actiongroup, 0)
108
139
        self.cmenu_right = self.ui.get_widget('/context_right')
109
140
        self.cmenu_left = self.ui.get_widget('/context_left')
110
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
111
143
        
112
144
        # Set icons
113
145
        # TODO: do it without using deprecated comm
130
162
    def left_context_menu(self):
131
163
        return self.cmenu_left
132
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
 
168
    @show_bzr_error
133
169
    def add_file(self, action):
134
170
        """ Right context menu -> Add """
135
171
        import bzrlib.add
139
175
        filename = self.selected
140
176
            
141
177
        if filename is None:
142
 
            error_dialog(_('No file was selected'),
143
 
                         _('Please select a file from the list,\nor choose the other option.'))
144
 
            return
145
 
        
 
178
            error_dialog(_i18n('No file was selected'),
 
179
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
180
            return
 
181
        
 
182
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
183
    
 
184
    @show_bzr_error
 
185
    def annotate(self, action):
 
186
        """ Right context menu -> Annotate """
 
187
        directory = self.path
 
188
        filename = self.selected
 
189
        
 
190
        if filename is None:
 
191
            error_dialog(_i18n('No file was selected'),
 
192
                         _i18n('Please select a file from the list.'))
 
193
            return
 
194
        
 
195
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
196
        
 
197
        branch = wt.branch
 
198
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
199
        
 
200
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
 
201
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
202
        config = GAnnotateConfig(window)
 
203
        window.show()
 
204
        branch.lock_read()
146
205
        try:
147
 
            bzrlib.add.smart_add([os.path.join(directory, filename)])
148
 
        except errors.NotBranchError:
149
 
            error_dialog(_('Directory is not a branch'),
150
 
                         _('You can perform this action only in a branch.'))
151
 
            return
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
152
209
    
153
 
    def remove_file(self, action):
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
154
212
        """ Right context menu -> Remove """
155
213
        # Remove only the selected file
156
214
        directory = self.path
157
215
        filename = self.selected
158
216
        
159
217
        if filename is None:
160
 
            error_dialog(_('No file was selected'),
161
 
                         _('Please select a file from the list,\nor choose the other option.'))
162
 
            return
163
 
        
164
 
        try:
165
 
            wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
166
 
            wt.remove(path)
167
 
 
168
 
        except errors.NotBranchError:
169
 
            error_dialog(_('Directory is not a branch'),
170
 
                         _('You can perform this action only in a branch.'))
171
 
            return
172
 
        except errors.NotVersionedError:
173
 
            error_dialog(_('File not versioned'),
174
 
                         _('The selected file is not versioned.'))
175
 
            return
176
 
 
 
218
            error_dialog(_i18n('No file was selected'),
 
219
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
220
            return
 
221
        
 
222
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
223
        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
                
177
234
        self.app.set_path(self.path)
178
235
        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)
179
240
 
180
241
    def rename_file(self, action):
181
242
        """ Right context menu -> Rename """
190
251
        filename = self.selected
191
252
        
192
253
        if filename is None:
193
 
            error_dialog(_('No file was selected'),
194
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
254
            error_dialog(_i18n('No file was selected'),
 
255
                         _i18n('Please select a file from the list,\nor choose the other option.'))
195
256
            return
196
257
 
197
258
        if filename == '..':
206
267
            else:
207
268
                launch(fullpath) 
208
269
 
 
270
    def revert(self, action):
 
271
        """ Right context menu -> Revert """
 
272
        wt, path = WorkingTree.open_containing(self.path)
 
273
        ret = wt.revert([os.path.join(path, self.selected)])
 
274
        if ret:
 
275
            warning_dialog(_i18n('Conflicts detected'),
 
276
                           _i18n('Please have a look at the working tree before continuing.'))
 
277
        else:
 
278
            info_dialog(_i18n('Revert successful'),
 
279
                        _i18n('All files reverted to last revision.'))
 
280
        self.app.refresh_right()       
 
281
    
209
282
    def commit(self, action):
210
283
        """ Right context menu -> Commit """
211
284
        from commit import CommitDialog
215
288
            branch = wt.branch
216
289
        except NotBranchError, e:
217
290
            path = e.path
218
 
        commit = CommitDialog(wt, path, not branch)
219
 
        commit.display()
 
291
        
 
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)
 
297
        response = commit.run()
 
298
        if response != gtk.RESPONSE_NONE:
 
299
            commit.hide()
 
300
        
 
301
            if response == gtk.RESPONSE_OK:
 
302
                self.app.refresh_right()
 
303
            
 
304
            commit.destroy()
220
305
    
 
306
    @show_bzr_error
221
307
    def diff(self, action):
222
308
        """ Right context menu -> Diff """
223
 
        try:
224
 
            wt = WorkingTree.open_containing(self.path)[0]
225
 
        except errors.NotBranchError:
226
 
            error_dialog(_('File is not in a branch'),
227
 
                         _('The selected file is not in a branch.'))
228
 
            return
229
 
        
230
 
        window = DiffWindow()
 
309
        wt = WorkingTree.open_containing(self.path)[0]
 
310
        window = DiffWindow(self.app)
231
311
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
232
312
        window.set_diff(wt.branch.nick, wt, parent_tree)
233
 
        try:
234
 
            window.set_file(wt.relpath(self.path + os.sep + self.selected))
235
 
        except errors.NoSuchFile:
236
 
            pass
 
313
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
237
314
        window.show()
238
315
    
239
316
    def bookmark(self, action):
240
317
        """ Right context menu -> Bookmark """
241
318
        if self.pref.add_bookmark(self.path):
242
 
            info_dialog(_('Bookmark successfully added'),
243
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
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.'))
244
321
            self.pref.write()
245
322
        else:
246
 
            warning_dialog(_('Location already bookmarked'),
247
 
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
323
            warning_dialog(_i18n('Location already bookmarked'),
 
324
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
248
325
        
249
326
        self.app.refresh_left()
250
327
 
251
328
    def edit_bookmark(self, action):
252
329
        """ Left context menu -> Edit """
253
 
        from bookmark import OliveBookmarkDialog
 
330
        from bookmark import BookmarkDialog
254
331
        
255
332
        if self.selected != None:
256
 
            bookmark = OliveBookmarkDialog(self.selected, self.app.window)
 
333
            bookmark = BookmarkDialog(self.selected, self.app.window)
257
334
            response = bookmark.run()
258
335
            
259
336
            if response != gtk.RESPONSE_NONE:
289
366
        from diff import OliveDiff
290
367
        diff = OliveDiff(self.comm)
291
368
        diff.display()
 
369
    
 
370
    def view_remote(self, action):
 
371
        """ Remote context menu -> View contents """
 
372
        print "DEBUG: view contents."
 
373
    
 
374
    def diff_remote(self, action):
 
375
        """ Remote context menu -> Show differences """
 
376
        print "DEBUG: show differences."
 
377
    
 
378
    def revert_remote(self, action):
 
379
        """ Remote context menu -> Revert to this revision """
 
380
        print "DEBUG: revert to this revision."