/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

Merged an approved request (single clicking bookmark).

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import os
17
18
import os.path
 
19
import shutil
18
20
import sys
19
21
 
20
22
try:
28
30
import bzrlib.errors as errors
29
31
from bzrlib.workingtree import WorkingTree
30
32
 
31
 
from dialog import error_dialog, info_dialog, warning_dialog
 
33
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
 
34
from bzrlib.plugins.gtk.errors import show_bzr_error
 
35
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
36
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 
37
from bzrlib.plugins.gtk.diff import DiffWindow
32
38
from launch import launch
33
 
from olive import OlivePreferences
 
39
from olive import Preferences
34
40
 
35
41
class OliveMenu:
36
42
    """ This class is responsible for building the context menus. """
37
 
    def __init__(self, path, selected):
 
43
    def __init__(self, path, selected, app=None):
38
44
        # Load the UI file
39
 
        if sys.platform == 'win32':
40
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
41
 
        else:
42
 
            self.uifile = "/usr/share/olive/cmenu.ui"
43
 
        
44
 
        if not os.path.exists(self.uifile):
45
 
            # Load from current directory if not installed
46
 
            self.uifile = "cmenu.ui"
47
 
            # Check again
48
 
            if not os.path.exists(self.uifile):
49
 
                # Fail
50
 
                print _('UI description file cannot be found.')
51
 
                sys.exit(1)
52
 
        
 
45
        from guifiles import UIFILENAME
 
46
 
 
47
        self.uifile = UIFILENAME
 
48
 
53
49
        # Preferences handler
54
 
        self.pref = OlivePreferences()
 
50
        self.pref = Preferences()
55
51
        
56
52
        # Set default values
57
53
        self.path = path
58
54
        self.selected = selected
 
55
        self.app = app
59
56
        
60
57
        # Create the file list context menu
61
58
        self.ui = gtk.UIManager()
69
66
                                       _('Remove'), None,
70
67
                                       _('Remove the selected file'),
71
68
                                       self.remove_file),
 
69
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
 
70
                                       _('Remove and delete'), None,
 
71
                                       _('Remove the selected file/dir and delete from disk'),
 
72
                                       self.remove_and_delete_file),
 
73
                                      ('rename', None,
 
74
                                       _('Rename'), None,
 
75
                                       _('Rename the selected file'),
 
76
                                       self.rename_file),
72
77
                                      ('open', gtk.STOCK_OPEN,
73
78
                                       _('Open'), None,
74
79
                                       _('Open the selected file'),
75
80
                                       self.open_file),
 
81
                                      ('revert', None,
 
82
                                       _('Revert'), None,
 
83
                                       _('Revert the changes'),
 
84
                                       self.revert),
76
85
                                      ('commit', None,
77
86
                                       _('Commit'), None,
78
87
                                       _('Commit the changes'),
79
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _('Annotate'), None,
 
91
                                       _('Annotate the selected file'),
 
92
                                       self.annotate),
80
93
                                      ('diff', None,
81
94
                                       _('Diff'), None,
82
95
                                       _('Show the diff of the file'),
104
117
                                      ('diff_all', None,
105
118
                                       _('All...'), None,
106
119
                                       _('Show the differences of all files'),
107
 
                                       self.diff_all)
 
120
                                       self.diff_all),
 
121
                                      ('view_remote', None,
 
122
                                       _('View contents'), None,
 
123
                                       _('View the contents of the file in a builtin viewer'),
 
124
                                       self.view_remote),
 
125
                                      ('diff_remote', None,
 
126
                                       _('Show differences'), None,
 
127
                                       _('Show the differences between two revisions of the file'),
 
128
                                       self.diff_remote),
 
129
                                      ('revert_remote', None,
 
130
                                       _('Revert to this revision'), None,
 
131
                                       _('Revert the selected file to the selected revision'),
 
132
                                       self.revert_remote)
108
133
                                     ])
109
134
        
110
135
        self.ui.insert_action_group(self.actiongroup, 0)
113
138
        self.cmenu_right = self.ui.get_widget('/context_right')
114
139
        self.cmenu_left = self.ui.get_widget('/context_left')
115
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
116
142
        
117
143
        # Set icons
118
144
        # TODO: do it without using deprecated comm
135
161
    def left_context_menu(self):
136
162
        return self.cmenu_left
137
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
138
168
    def add_file(self, action):
139
169
        """ Right context menu -> Add """
140
170
        import bzrlib.add
148
178
                         _('Please select a file from the list,\nor choose the other option.'))
149
179
            return
150
180
        
 
181
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
182
    
 
183
    @show_bzr_error
 
184
    def annotate(self, action):
 
185
        """ Right context menu -> Annotate """
 
186
        directory = self.path
 
187
        filename = self.selected
 
188
        
 
189
        if filename is None:
 
190
            error_dialog(_('No file was selected'),
 
191
                         _('Please select a file from the list.'))
 
192
            return
 
193
        
 
194
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
195
        
 
196
        branch = wt.branch
 
197
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
198
        
 
199
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
 
200
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
201
        config = GAnnotateConfig(window)
 
202
        window.show()
 
203
        branch.lock_read()
151
204
        try:
152
 
            bzrlib.add.smart_add([directory + os.sep + filename])
153
 
        except errors.NotBranchError:
154
 
            error_dialog(_('Directory is not a branch'),
155
 
                         _('You can perform this action only in a branch.'))
156
 
            return
 
205
            window.annotate(wt, branch, file_id)
 
206
        finally:
 
207
            branch.unlock()
157
208
    
158
 
    def remove_file(self, action):
 
209
    @show_bzr_error
 
210
    def remove_file(self, action,delete_on_disk=0):
159
211
        """ Right context menu -> Remove """
160
212
        # Remove only the selected file
161
213
        directory = self.path
166
218
                         _('Please select a file from the list,\nor choose the other option.'))
167
219
            return
168
220
        
169
 
        try:
170
 
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
171
 
            wt.remove(path)
172
 
 
173
 
        except errors.NotBranchError:
174
 
            error_dialog(_('Directory is not a branch'),
175
 
                         _('You can perform this action only in a branch.'))
176
 
            return
177
 
        except errors.NotVersionedError:
178
 
            error_dialog(_('File not versioned'),
179
 
                         _('The selected file is not versioned.'))
180
 
            return
181
 
 
 
221
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
222
        wt.remove(path)
 
223
        
 
224
        if delete_on_disk:
 
225
            abs_filename = os.path.join(directory,filename)
 
226
            if os.path.isdir(abs_filename):
 
227
                response = question_dialog(_('Delete directory with all directories below ?'), abs_filename )
 
228
                if response == gtk.RESPONSE_YES:
 
229
                    shutil.rmtree(abs_filename)
 
230
            else:
 
231
                os.remove(abs_filename)
 
232
                
 
233
        self.app.set_path(self.path)
 
234
        self.app.refresh_right()
 
235
        
 
236
    def remove_and_delete_file(self, action):
 
237
        """ Right context menu -> Remove and delete"""
 
238
        self.remove_file(action,delete_on_disk=1)
 
239
 
 
240
    def rename_file(self, action):
 
241
        """ Right context menu -> Rename """
 
242
        from rename import OliveRename
 
243
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
244
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
245
        rename.display()
 
246
    
182
247
    def open_file(self, action):
183
248
        """ Right context menu -> Open """
184
249
        # Open only the selected file
201
266
            else:
202
267
                launch(fullpath) 
203
268
 
 
269
    def revert(self, action):
 
270
        """ Right context menu -> Revert """
 
271
        wt, path = WorkingTree.open_containing(self.path)
 
272
        ret = wt.revert([os.path.join(path, self.selected)])
 
273
        if ret:
 
274
            warning_dialog(_('Conflicts detected'),
 
275
                           _('Please have a look at the working tree before continuing.'))
 
276
        else:
 
277
            info_dialog(_('Revert successful'),
 
278
                        _('All files reverted to last revision.'))
 
279
        self.app.refresh_right()       
 
280
    
204
281
    def commit(self, action):
205
282
        """ Right context menu -> Commit """
206
 
        from commit import OliveCommit
207
 
        wt, path = WorkingTree.open_containing(self.path)
208
 
        commit = OliveCommit(wt, path)
209
 
        commit.display()
 
283
        from commit import CommitDialog
 
284
        branch = None
 
285
        try:
 
286
            wt, path = WorkingTree.open_containing(self.path)
 
287
            branch = wt.branch
 
288
        except NotBranchError, e:
 
289
            path = e.path
 
290
        
 
291
        if self.selected:
 
292
            selected = os.path.join(path, self.selected)
 
293
        else:
 
294
            selected = None
 
295
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
 
296
        response = commit.run()
 
297
        if response != gtk.RESPONSE_NONE:
 
298
            commit.hide()
 
299
        
 
300
            if response == gtk.RESPONSE_OK:
 
301
                self.app.refresh_right()
 
302
            
 
303
            commit.destroy()
210
304
    
 
305
    @show_bzr_error
211
306
    def diff(self, action):
212
307
        """ Right context menu -> Diff """
213
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
214
 
        
215
 
        try:
216
 
            wt = WorkingTree.open_containing(self.path)[0]
217
 
        except errors.NotBranchError:
218
 
            error_dialog(_('File is not in a branch'),
219
 
                         _('The selected file is not in a branch.'))
220
 
            return
221
 
        
222
 
        window = DiffWindow()
 
308
        wt = WorkingTree.open_containing(self.path)[0]
 
309
        window = DiffWindow(self.app)
223
310
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
224
311
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
312
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
225
313
        window.show()
226
314
    
227
315
    def bookmark(self, action):
233
321
        else:
234
322
            warning_dialog(_('Location already bookmarked'),
235
323
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
324
        
 
325
        self.app.refresh_left()
236
326
 
237
327
    def edit_bookmark(self, action):
238
328
        """ Left context menu -> Edit """
239
 
        from bookmark import OliveBookmark
240
 
 
 
329
        from bookmark import BookmarkDialog
 
330
        
241
331
        if self.selected != None:
242
 
            bookmark = OliveBookmark(self.selected)
243
 
            bookmark.display()
 
332
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
333
            response = bookmark.run()
 
334
            
 
335
            if response != gtk.RESPONSE_NONE:
 
336
                bookmark.hide()
 
337
        
 
338
                if response == gtk.RESPONSE_OK:
 
339
                    self.app.refresh_left()
 
340
            
 
341
                bookmark.destroy()
244
342
 
245
343
    def remove_bookmark(self, action):
246
344
        """ Left context menu -> Remove """
247
345
        
248
346
        if self.selected != None:
249
 
            self.pref.remove_bookmark(self.comm.get_selected_left())
250
 
            self.comm.refresh_left()
 
347
            self.pref.remove_bookmark(self.selected)
 
348
            self.pref.write()
 
349
        
 
350
        self.app.refresh_left()
251
351
    
252
352
    def open_folder(self, action):
253
353
        """ Left context menu -> Open Folder """
265
365
        from diff import OliveDiff
266
366
        diff = OliveDiff(self.comm)
267
367
        diff.display()
 
368
    
 
369
    def view_remote(self, action):
 
370
        """ Remote context menu -> View contents """
 
371
        print "DEBUG: view contents."
 
372
    
 
373
    def diff_remote(self, action):
 
374
        """ Remote context menu -> Show differences """
 
375
        print "DEBUG: show differences."
 
376
    
 
377
    def revert_remote(self, action):
 
378
        """ Remote context menu -> Revert to this revision """
 
379
        print "DEBUG: revert to this revision."