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