/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-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

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
 
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. """
37
 
    def __init__(self, path, selected):
 
44
    def __init__(self, path, selected, app=None):
38
45
        # Load the UI file
39
 
        if sys.platform == 'win32':
40
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
41
 
        else:
42
 
            self.uifile = "/usr/share/olive/cmenu.ui"
43
 
        
44
 
        if not os.path.exists(self.uifile):
45
 
            # Load from current directory if not installed
46
 
            self.uifile = "cmenu.ui"
47
 
            # Check again
48
 
            if not os.path.exists(self.uifile):
49
 
                # Fail
50
 
                print _('UI description file cannot be found.')
51
 
                sys.exit(1)
52
 
        
 
46
        from guifiles import UIFILENAME
 
47
 
 
48
        self.uifile = UIFILENAME
 
49
 
53
50
        # Preferences handler
54
 
        self.pref = OlivePreferences()
 
51
        self.pref = Preferences()
55
52
        
56
53
        # Set default values
57
54
        self.path = path
58
55
        self.selected = selected
59
 
        print "DEBUG: path =", self.path
60
 
        print "DEBUG: selected =", self.selected
 
56
        self.app = app
61
57
        
62
58
        # Create the file list context menu
63
59
        self.ui = gtk.UIManager()
64
60
        
65
61
        self.actiongroup = gtk.ActionGroup('context')
66
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
67
 
                                       _('Add'), None,
68
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
69
65
                                       self.add_file),
70
66
                                      ('remove', gtk.STOCK_REMOVE,
71
 
                                       _('Remove'), None,
72
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
73
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),
 
74
                                      ('rename', None,
 
75
                                       _i18n('Rename'), None,
 
76
                                       _i18n('Rename the selected file'),
 
77
                                       self.rename_file),
74
78
                                      ('open', gtk.STOCK_OPEN,
75
 
                                       _('Open'), None,
76
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
77
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
 
85
                                       self.revert),
78
86
                                      ('commit', None,
79
 
                                       _('Commit'), None,
80
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
81
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
 
93
                                       self.annotate),
82
94
                                      ('diff', None,
83
 
                                       _('Diff'), None,
84
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
85
97
                                       self.diff),
86
98
                                      ('bookmark', None,
87
 
                                       _('Bookmark'), None,
88
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
89
101
                                       self.bookmark),
90
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
91
 
                                       _('Edit'), None,
92
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
93
105
                                       self.edit_bookmark),
94
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
95
 
                                       _('Remove'), None,
96
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
97
109
                                       self.remove_bookmark),
98
110
                                      ('open_folder', gtk.STOCK_OPEN,
99
 
                                       _('Open Folder'), None,
100
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
101
113
                                       self.open_folder),
102
114
                                      ('diff_selected', None,
103
 
                                       _('Selected...'), None,
104
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
105
117
                                       self.diff_selected),
106
118
                                      ('diff_all', None,
107
 
                                       _('All...'), None,
108
 
                                       _('Show the differences of all files'),
109
 
                                       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)
110
134
                                     ])
111
135
        
112
136
        self.ui.insert_action_group(self.actiongroup, 0)
115
139
        self.cmenu_right = self.ui.get_widget('/context_right')
116
140
        self.cmenu_left = self.ui.get_widget('/context_left')
117
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
118
143
        
119
144
        # Set icons
120
145
        # TODO: do it without using deprecated comm
137
162
    def left_context_menu(self):
138
163
        return self.cmenu_left
139
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
 
168
    @show_bzr_error
140
169
    def add_file(self, action):
141
170
        """ Right context menu -> Add """
142
171
        import bzrlib.add
146
175
        filename = self.selected
147
176
            
148
177
        if filename is None:
149
 
            error_dialog(_('No file was selected'),
150
 
                         _('Please select a file from the list,\nor choose the other option.'))
151
 
            return
152
 
        
 
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()
153
205
        try:
154
 
            bzrlib.add.smart_add([directory + '/' + filename])
155
 
        except errors.NotBranchError:
156
 
            error_dialog(_('Directory is not a branch'),
157
 
                         _('You can perform this action only in a branch.'))
158
 
            return
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
159
209
    
160
 
    def remove_file(self, action):
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
161
212
        """ Right context menu -> Remove """
162
213
        # Remove only the selected file
163
214
        directory = self.path
164
215
        filename = self.selected
165
216
        
166
217
        if filename is None:
167
 
            error_dialog(_('No file was selected'),
168
 
                         _('Please select a file from the list,\nor choose the other option.'))
169
 
            return
170
 
        
171
 
        try:
172
 
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
173
 
            wt.remove(path)
174
 
 
175
 
        except errors.NotBranchError:
176
 
            error_dialog(_('Directory is not a branch'),
177
 
                         _('You can perform this action only in a branch.'))
178
 
            return
179
 
        except errors.NotVersionedError:
180
 
            error_dialog(_('File not versioned'),
181
 
                         _('The selected file is not versioned.'))
182
 
            return
183
 
 
 
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
                
 
234
        self.app.set_path(self.path)
 
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)
 
240
 
 
241
    def rename_file(self, action):
 
242
        """ Right context menu -> Rename """
 
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()
 
247
    
184
248
    def open_file(self, action):
185
249
        """ Right context menu -> Open """
186
250
        # Open only the selected file
187
251
        filename = self.selected
188
252
        
189
253
        if filename is None:
190
 
            error_dialog(_('No file was selected'),
191
 
                         _('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.'))
192
256
            return
193
257
 
194
258
        if filename == '..':
203
267
            else:
204
268
                launch(fullpath) 
205
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
    
206
282
    def commit(self, action):
207
283
        """ Right context menu -> Commit """
208
 
        from commit import OliveCommit
209
 
        wt, path = WorkingTree.open_containing(self.path)
210
 
        commit = OliveCommit(wt, path)
211
 
        commit.display()
 
284
        from commit import CommitDialog
 
285
        branch = None
 
286
        try:
 
287
            wt, path = WorkingTree.open_containing(self.path)
 
288
            branch = wt.branch
 
289
        except NotBranchError, e:
 
290
            path = e.path
 
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()
212
305
    
 
306
    @show_bzr_error
213
307
    def diff(self, action):
214
308
        """ Right context menu -> Diff """
215
 
        from diff import OliveDiff
216
 
        diff = OliveDiff(self.comm)
217
 
        diff.display()
 
309
        wt = WorkingTree.open_containing(self.path)[0]
 
310
        window = DiffWindow(self.app)
 
311
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
312
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
313
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
314
        window.show()
218
315
    
219
316
    def bookmark(self, action):
220
317
        """ Right context menu -> Bookmark """
221
 
        if self.pref.add_bookmark(self.comm.get_path()):
222
 
            info_dialog(_('Bookmark successfully added'),
223
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
318
        if self.pref.add_bookmark(self.path):
 
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.'))
 
321
            self.pref.write()
224
322
        else:
225
 
            warning_dialog(_('Location already bookmarked'),
226
 
                           _('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.'))
 
325
        
 
326
        self.app.refresh_left()
227
327
 
228
328
    def edit_bookmark(self, action):
229
329
        """ Left context menu -> Edit """
230
 
        from bookmark import OliveBookmark
231
 
 
 
330
        from bookmark import BookmarkDialog
 
331
        
232
332
        if self.selected != None:
233
 
            bookmark = OliveBookmark(self.selected)
234
 
            bookmark.display()
 
333
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
334
            response = bookmark.run()
 
335
            
 
336
            if response != gtk.RESPONSE_NONE:
 
337
                bookmark.hide()
 
338
        
 
339
                if response == gtk.RESPONSE_OK:
 
340
                    self.app.refresh_left()
 
341
            
 
342
                bookmark.destroy()
235
343
 
236
344
    def remove_bookmark(self, action):
237
345
        """ Left context menu -> Remove """
238
346
        
239
347
        if self.selected != None:
240
 
            self.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
348
            self.pref.remove_bookmark(self.selected)
 
349
            self.pref.write()
 
350
        
 
351
        self.app.refresh_left()
242
352
    
243
353
    def open_folder(self, action):
244
354
        """ Left context menu -> Open Folder """
256
366
        from diff import OliveDiff
257
367
        diff = OliveDiff(self.comm)
258
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."