/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 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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:
22
24
    pygtk.require("2.0")
23
25
except:
24
26
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
30
 
 
31
 
import olive.backend.fileops as fileops
32
 
import olive.backend.errors as errors
33
 
 
 
27
 
 
28
import gtk
 
29
 
 
30
import bzrlib.errors as errors
 
31
from bzrlib.workingtree import WorkingTree
 
32
 
 
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
34
39
from launch import launch
 
40
from bzrlib.plugins.gtk.olive import Preferences
35
41
 
36
42
class OliveMenu:
37
43
    """ This class is responsible for building the context menus. """
38
 
    def __init__(self, gladefile, comm, dialog):
 
44
    def __init__(self, path, selected, app=None):
39
45
        # Load the UI file
40
 
        if sys.platform == 'win32':
41
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
42
 
        else:
43
 
            self.uifile = "/usr/share/olive/cmenu.ui"
44
 
        
45
 
        if not os.path.exists(self.uifile):
46
 
            # Load from current directory if not installed
47
 
            self.uifile = "cmenu.ui"
48
 
            # Check again
49
 
            if not os.path.exists(self.uifile):
50
 
                # Fail
51
 
                print _('UI description file cannot be found.')
52
 
                sys.exit(1)
53
 
        
54
 
        self.gladefile = gladefile
55
 
        self.comm = comm
56
 
        self.dialog = dialog
 
46
        from guifiles import UIFILENAME
 
47
 
 
48
        self.uifile = UIFILENAME
 
49
 
 
50
        # Preferences handler
 
51
        self.pref = Preferences()
 
52
        
 
53
        # Set default values
 
54
        self.path = path
 
55
        self.selected = selected
 
56
        self.app = app
57
57
        
58
58
        # Create the file list context menu
59
59
        self.ui = gtk.UIManager()
60
60
        
61
61
        self.actiongroup = gtk.ActionGroup('context')
62
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _('Add'), None,
64
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
65
65
                                       self.add_file),
66
66
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _('Remove'), None,
68
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
69
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),
70
78
                                      ('open', gtk.STOCK_OPEN,
71
 
                                       _('Open'), None,
72
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
73
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
 
85
                                       self.revert),
74
86
                                      ('commit', None,
75
 
                                       _('Commit'), None,
76
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
77
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
 
93
                                       self.annotate),
78
94
                                      ('diff', None,
79
 
                                       _('Diff'), None,
80
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
81
97
                                       self.diff),
82
98
                                      ('bookmark', None,
83
 
                                       _('Bookmark'), None,
84
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
85
101
                                       self.bookmark),
86
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
87
 
                                       _('Edit'), None,
88
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
89
105
                                       self.edit_bookmark),
90
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
91
 
                                       _('Remove'), None,
92
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
93
109
                                       self.remove_bookmark),
94
110
                                      ('open_folder', gtk.STOCK_OPEN,
95
 
                                       _('Open Folder'), None,
96
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
97
113
                                       self.open_folder),
98
114
                                      ('diff_selected', None,
99
 
                                       _('Selected...'), None,
100
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
101
117
                                       self.diff_selected),
102
118
                                      ('diff_all', None,
103
 
                                       _('All...'), None,
104
 
                                       _('Show the differences of all files'),
105
 
                                       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)
106
134
                                     ])
107
135
        
108
136
        self.ui.insert_action_group(self.actiongroup, 0)
111
139
        self.cmenu_right = self.ui.get_widget('/context_right')
112
140
        self.cmenu_left = self.ui.get_widget('/context_left')
113
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
114
143
        
115
144
        # Set icons
116
 
        commit_menu = self.ui.get_widget('/context_right/commit')
117
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
118
 
        commit_pixbuf = commit_image.get_pixbuf()
119
 
        commit_icon = gtk.Image()
120
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
121
 
        commit_menu.set_image(commit_icon)
122
 
        diff_menu = self.ui.get_widget('/context_right/diff')
123
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
124
 
        diff_pixbuf = diff_image.get_pixbuf()
125
 
        diff_icon = gtk.Image()
126
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
127
 
        diff_menu.set_image(diff_icon)
 
145
        # TODO: do it without using deprecated comm
 
146
        #commit_menu = self.ui.get_widget('/context_right/commit')
 
147
        #commit_image = self.comm.menuitem_branch_commit.get_image()
 
148
        #commit_pixbuf = commit_image.get_pixbuf()
 
149
        #commit_icon = gtk.Image()
 
150
        #commit_icon.set_from_pixbuf(commit_pixbuf)
 
151
        #commit_menu.set_image(commit_icon)
 
152
        #diff_menu = self.ui.get_widget('/context_right/diff')
 
153
        #diff_image = self.comm.menuitem_stats_diff.get_image()
 
154
        #diff_pixbuf = diff_image.get_pixbuf()
 
155
        #diff_icon = gtk.Image()
 
156
        #diff_icon.set_from_pixbuf(diff_pixbuf)
 
157
        #diff_menu.set_image(diff_icon)
128
158
 
129
159
    def right_context_menu(self):
130
160
        return self.cmenu_right
132
162
    def left_context_menu(self):
133
163
        return self.cmenu_left
134
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
 
168
    @show_bzr_error
135
169
    def add_file(self, action):
136
170
        """ Right context menu -> Add """
 
171
        import bzrlib.add
 
172
        
137
173
        # Add only the selected file
138
 
        directory = self.comm.get_path()
139
 
        filename = self.comm.get_selected_right()
 
174
        directory = self.path
 
175
        filename = self.selected
140
176
            
141
177
        if filename is None:
142
 
            self.dialog.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
 
            fileops.add([directory + '/' + filename])
148
 
        except errors.NotBranchError:
149
 
            self.dialog.error_dialog(_('Directory is not a branch'),
150
 
                                     _('You can perform this action only in a branch.'))
151
 
            return
152
 
        except:
153
 
            raise
154
 
        
155
 
        self.comm.refresh_right()
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
156
209
    
157
 
    def remove_file(self, action):
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
158
212
        """ Right context menu -> Remove """
159
213
        # Remove only the selected file
160
 
        directory = self.comm.get_path()
161
 
        filename = self.comm.get_selected_right()
 
214
        directory = self.path
 
215
        filename = self.selected
162
216
        
163
217
        if filename is None:
164
 
            self.dialog.error_dialog(_('No file was selected'),
165
 
                                     _('Please select a file from the list,\nor choose the other option.'))
166
 
            return
167
 
        
168
 
        try:
169
 
            fileops.remove([directory + '/' + filename])
170
 
        except errors.NotBranchError:
171
 
            self.dialog.error_dialog(_('Directory is not a branch'),
172
 
                                     _('You can perform this action only in a branch.'))
173
 
            return
174
 
        except errors.NotVersionedError:
175
 
            self.dialog.error_dialog(_('File not versioned'),
176
 
                                     _('The selected file is not versioned.'))
177
 
            return
178
 
        except:
179
 
            raise
180
 
        
181
 
        self.comm.refresh_right()
 
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)
182
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
    
183
248
    def open_file(self, action):
184
249
        """ Right context menu -> Open """
185
250
        # Open only the selected file
186
 
        filename = self.comm.get_selected_right()
 
251
        filename = self.selected
187
252
        
188
253
        if filename is None:
189
 
            self.dialog.error_dialog(_('No file was selected'),
190
 
                                     _('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.'))
191
256
            return
192
257
 
193
258
        if filename == '..':
194
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
259
            # TODO: how to enter a directory?
 
260
            return
195
261
        else:
196
 
            fullpath = self.comm.get_path() + os.sep + filename
 
262
            fullpath = self.path + os.sep + filename
197
263
            if os.path.isdir(fullpath):
198
264
                # selected item is an existant directory
199
 
                self.comm.set_path(fullpath)
 
265
                # TODO: how to enter a directory?
 
266
                return
200
267
            else:
201
268
                launch(fullpath) 
202
 
        
203
 
        self.comm.refresh_right()
204
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
    
205
282
    def commit(self, action):
206
283
        """ Right context menu -> Commit """
207
 
        from commit import OliveCommit
208
 
        commit = OliveCommit(self.gladefile, self.comm, self.dialog)
209
 
        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()
210
305
    
 
306
    @show_bzr_error
211
307
    def diff(self, action):
212
308
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
215
 
        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()
216
315
    
217
316
    def bookmark(self, action):
218
317
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
220
 
            self.dialog.info_dialog(_('Bookmark successfully added'),
221
 
                                    _('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()
222
322
        else:
223
 
            self.dialog.warning_dialog(_('Location already bookmarked'),
224
 
                                       _('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.'))
225
325
        
226
 
        self.comm.refresh_left()
 
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
 
 
232
 
        if self.comm.get_selected_left() != None:
233
 
            bookmark = OliveBookmark(self.gladefile, self.comm, self.dialog)
234
 
            bookmark.display()
 
330
        from bookmark import BookmarkDialog
 
331
        
 
332
        if self.selected != None:
 
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
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
347
        if self.selected != None:
 
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 """
245
 
        path = self.comm.get_selected_left()
 
355
        path = self.selected
246
356
 
247
357
        if path != None:
248
358
            launch(path)
254
364
    def diff_all(self, action):
255
365
        """ Diff toolbutton -> All... """
256
366
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
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."