/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
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
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
 
 
34
 
from commit import OliveCommit
35
 
from diff import OliveDiff
 
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
36
40
 
37
41
class OliveMenu:
38
42
    """ This class is responsible for building the context menus. """
39
 
    def __init__(self, gladefile, comm, dialog):
 
43
    def __init__(self, path, selected, app=None):
40
44
        # Load the UI file
41
 
        self.uifile = "/usr/share/olive/cmenu.ui"
42
 
        if not os.path.exists(self.uifile):
43
 
            # Load from current directory if not installed
44
 
            self.uifile = "cmenu.ui"
 
45
        from guifiles import UIFILENAME
 
46
 
 
47
        self.uifile = UIFILENAME
 
48
 
 
49
        # Preferences handler
 
50
        self.pref = Preferences()
45
51
        
46
 
        self.gladefile = gladefile
47
 
        self.comm = comm
48
 
        self.dialog = dialog
 
52
        # Set default values
 
53
        self.path = path
 
54
        self.selected = selected
 
55
        self.app = app
49
56
        
50
57
        # Create the file list context menu
51
58
        self.ui = gtk.UIManager()
52
59
        
53
60
        self.actiongroup = gtk.ActionGroup('context')
54
61
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
55
 
                                       'Add', None,
56
 
                                       'Add the selected file',
 
62
                                       _i18n('Add'), None,
 
63
                                       _i18n('Add the selected file'),
57
64
                                       self.add_file),
58
65
                                      ('remove', gtk.STOCK_REMOVE,
59
 
                                       'Remove', None,
60
 
                                       'Remove the selected file',
 
66
                                       _i18n('Remove'), None,
 
67
                                       _i18n('Remove the selected file'),
61
68
                                       self.remove_file),
62
 
                                      ('commit', gtk.STOCK_REDO,
63
 
                                       'Commit', None,
64
 
                                       'Commit the changes',
 
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),
 
85
                                      ('commit', None,
 
86
                                       _i18n('Commit'), None,
 
87
                                       _i18n('Commit the changes'),
65
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _i18n('Annotate'), None,
 
91
                                       _i18n('Annotate the selected file'),
 
92
                                       self.annotate),
66
93
                                      ('diff', None,
67
 
                                       'Diff', None,
68
 
                                       'Show the diff of the file',
 
94
                                       _i18n('Diff'), None,
 
95
                                       _i18n('Show the diff of the file'),
69
96
                                       self.diff),
70
 
                                      ('log', None,
71
 
                                       'Log', None,
72
 
                                       'Show the log of the file',
73
 
                                       self.log),
74
97
                                      ('bookmark', None,
75
 
                                       'Bookmark', None,
76
 
                                       'Bookmark current location',
 
98
                                       _i18n('Bookmark'), None,
 
99
                                       _i18n('Bookmark current location'),
77
100
                                       self.bookmark),
 
101
                                      ('edit_bookmark', gtk.STOCK_EDIT,
 
102
                                       _i18n('Edit'), None,
 
103
                                       _i18n('Edit the selected bookmark'),
 
104
                                       self.edit_bookmark),
78
105
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
79
 
                                       'Remove', None,
80
 
                                       'Remove the selected bookmark',
81
 
                                       self.remove_bookmark)
 
106
                                       _i18n('Remove'), None,
 
107
                                       _i18n('Remove the selected bookmark'),
 
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),
 
113
                                      ('diff_selected', None,
 
114
                                       _i18n('Selected...'), None,
 
115
                                       _i18n('Show the differences of the selected file'),
 
116
                                       self.diff_selected),
 
117
                                      ('diff_all', None,
 
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)
82
133
                                     ])
83
134
        
84
135
        self.ui.insert_action_group(self.actiongroup, 0)
85
136
        self.ui.add_ui_from_file(self.uifile)
86
137
        
87
138
        self.cmenu_right = self.ui.get_widget('/context_right')
88
 
        
89
139
        self.cmenu_left = self.ui.get_widget('/context_left')
 
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
 
142
        
 
143
        # Set icons
 
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)
90
157
 
91
158
    def right_context_menu(self):
92
159
        return self.cmenu_right
94
161
    def left_context_menu(self):
95
162
        return self.cmenu_left
96
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
97
168
    def add_file(self, action):
98
169
        """ Right context menu -> Add """
 
170
        import bzrlib.add
 
171
        
99
172
        # Add only the selected file
100
 
        directory = self.comm.get_path()
101
 
        filename = self.comm.get_selected_right()
 
173
        directory = self.path
 
174
        filename = self.selected
102
175
            
103
176
        if filename is None:
104
 
            self.dialog.error_dialog('No file was selected.')
105
 
            return
106
 
        
 
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()
107
208
        try:
108
 
            fileops.add([directory + '/' + filename])
109
 
        except errors.NotBranchError:
110
 
            self.dialog.error_dialog('The directory is not a branch.')
111
 
            return
112
 
        except:
113
 
            raise
114
 
        
115
 
        self.comm.refresh_right()
 
209
            window.annotate(wt, branch, file_id)
 
210
        finally:
 
211
            branch.unlock()
116
212
    
117
 
    def remove_file(self, action):
 
213
    @show_bzr_error
 
214
    def remove_file(self, action, delete_on_disk=False):
118
215
        """ Right context menu -> Remove """
119
216
        # Remove only the selected file
120
 
        directory = self.comm.get_path()
121
 
        filename = self.comm.get_selected_right()
122
 
        
123
 
        if filename is None:
124
 
            self.dialog.error_dialog('No file was selected.')
125
 
            return
126
 
        
127
 
        try:
128
 
            fileops.remove([directory + '/' + filename])
129
 
        except errors.NotBranchError:
130
 
            self.dialog.error_dialog('The directory is not a branch.')
131
 
            return
132
 
        except errors.NotVersionedError:
133
 
            self.dialog.error_dialog('Selected file is not versioned.')
134
 
            return
135
 
        except:
136
 
            raise
137
 
        
138
 
        self.comm.refresh_right()
139
 
 
 
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
    
140
283
    def commit(self, action):
141
284
        """ Right context menu -> Commit """
142
 
        commit = OliveCommit(self.gladefile, self.comm)
143
 
        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()
144
306
    
 
307
    @show_bzr_error
145
308
    def diff(self, action):
146
309
        """ Right context menu -> Diff """
147
 
        diff = OliveDiff(self.gladefile, self.comm)
148
 
        diff.display()
149
 
    
150
 
    def log(self, action):
151
 
        """ Right context menu -> Log """
152
 
        self.dialog.error_dialog('This feature is not yet implemented.')
 
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()
153
316
    
154
317
    def bookmark(self, action):
155
318
        """ Right context menu -> Bookmark """
156
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
157
 
            self.dialog.info_dialog('Bookmark successfully added.')
 
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()
158
323
        else:
159
 
            self.dialog.warning_dialog('Location already bookmarked.')
160
 
        
161
 
        self.comm.refresh_left()
 
324
            warning_dialog(_i18n('Location already bookmarked'),
 
325
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
326
        
 
327
        self.app.refresh_left()
 
328
 
 
329
    def edit_bookmark(self, action):
 
330
        """ Left context menu -> Edit """
 
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()
162
344
 
163
345
    def remove_bookmark(self, action):
164
346
        """ Left context menu -> Remove """
165
 
        self.comm.pref.remove_bookmark(self.comm.get_selected_left())
166
 
        
167
 
        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)
 
360
    
 
361
    def diff_selected(self, action):
 
362
        """ Diff toolbutton -> Selected... """
 
363
        print "DEBUG: not implemented."
 
364
    
 
365
    def diff_all(self, action):
 
366
        """ Diff toolbutton -> All... """
 
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."