/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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