/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

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