/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 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

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)
 
27
 
 
28
import gtk
30
29
 
31
30
import bzrlib.errors as errors
32
 
from dialog import error_dialog
 
31
from bzrlib.workingtree import WorkingTree
33
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
34
39
from launch import launch
 
40
from bzrlib.plugins.gtk.olive import Preferences
35
41
 
36
42
class OliveMenu:
37
43
    """ This class is responsible for building the context menus. """
38
 
    def __init__(self, gladefile, comm):
 
44
    def __init__(self, path, selected, app=None):
39
45
        # Load the UI file
40
 
        if sys.platform == 'win32':
41
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
42
 
        else:
43
 
            self.uifile = "/usr/share/olive/cmenu.ui"
44
 
        
45
 
        if not os.path.exists(self.uifile):
46
 
            # Load from current directory if not installed
47
 
            self.uifile = "cmenu.ui"
48
 
            # Check again
49
 
            if not os.path.exists(self.uifile):
50
 
                # Fail
51
 
                print _('UI description file cannot be found.')
52
 
                sys.exit(1)
53
 
        
54
 
        self.gladefile = gladefile
55
 
        self.comm = comm
 
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
56
57
        
57
58
        # Create the file list context menu
58
59
        self.ui = gtk.UIManager()
59
60
        
60
61
        self.actiongroup = gtk.ActionGroup('context')
61
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
62
 
                                       _('Add'), None,
63
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
64
65
                                       self.add_file),
65
66
                                      ('remove', gtk.STOCK_REMOVE,
66
 
                                       _('Remove'), None,
67
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
68
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),
69
78
                                      ('open', gtk.STOCK_OPEN,
70
 
                                       _('Open'), None,
71
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
72
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
 
85
                                       self.revert),
73
86
                                      ('commit', None,
74
 
                                       _('Commit'), None,
75
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
76
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
 
93
                                       self.annotate),
77
94
                                      ('diff', None,
78
 
                                       _('Diff'), None,
79
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
80
97
                                       self.diff),
81
98
                                      ('bookmark', None,
82
 
                                       _('Bookmark'), None,
83
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
84
101
                                       self.bookmark),
85
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
86
 
                                       _('Edit'), None,
87
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
88
105
                                       self.edit_bookmark),
89
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
90
 
                                       _('Remove'), None,
91
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
92
109
                                       self.remove_bookmark),
93
110
                                      ('open_folder', gtk.STOCK_OPEN,
94
 
                                       _('Open Folder'), None,
95
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
96
113
                                       self.open_folder),
97
114
                                      ('diff_selected', None,
98
 
                                       _('Selected...'), None,
99
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
100
117
                                       self.diff_selected),
101
118
                                      ('diff_all', None,
102
 
                                       _('All...'), None,
103
 
                                       _('Show the differences of all files'),
104
 
                                       self.diff_all)
 
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)
105
134
                                     ])
106
135
        
107
136
        self.ui.insert_action_group(self.actiongroup, 0)
110
139
        self.cmenu_right = self.ui.get_widget('/context_right')
111
140
        self.cmenu_left = self.ui.get_widget('/context_left')
112
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
113
143
        
114
144
        # Set icons
115
 
        commit_menu = self.ui.get_widget('/context_right/commit')
116
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
117
 
        commit_pixbuf = commit_image.get_pixbuf()
118
 
        commit_icon = gtk.Image()
119
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
120
 
        commit_menu.set_image(commit_icon)
121
 
        diff_menu = self.ui.get_widget('/context_right/diff')
122
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
123
 
        diff_pixbuf = diff_image.get_pixbuf()
124
 
        diff_icon = gtk.Image()
125
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
126
 
        diff_menu.set_image(diff_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)
127
158
 
128
159
    def right_context_menu(self):
129
160
        return self.cmenu_right
131
162
    def left_context_menu(self):
132
163
        return self.cmenu_left
133
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
 
168
    @show_bzr_error
134
169
    def add_file(self, action):
135
170
        """ Right context menu -> Add """
 
171
        import bzrlib.add
 
172
        
136
173
        # Add only the selected file
137
 
        directory = self.comm.get_path()
138
 
        filename = self.comm.get_selected_right()
 
174
        directory = self.path
 
175
        filename = self.selected
139
176
            
140
177
        if filename is None:
141
 
            error_dialog(_('No file was selected'),
142
 
                                     _('Please select a file from the list,\nor choose the other option.'))
143
 
            return
144
 
        
 
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
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
183
        wt.add([path])
 
184
    
 
185
    @show_bzr_error
 
186
    def annotate(self, action):
 
187
        """ Right context menu -> Annotate """
 
188
        directory = self.path
 
189
        filename = self.selected
 
190
        
 
191
        if filename is None:
 
192
            error_dialog(_i18n('No file was selected'),
 
193
                         _i18n('Please select a file from the list.'))
 
194
            return
 
195
        
 
196
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
197
        
 
198
        branch = wt.branch
 
199
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
200
        
 
201
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
 
202
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
203
        config = GAnnotateConfig(window)
 
204
        window.show()
 
205
        branch.lock_read()
145
206
        try:
146
 
            bzrlib.add.smart_add([directory + '/' + filename])
147
 
        except errors.NotBranchError:
148
 
            error_dialog(_('Directory is not a branch'),
149
 
                                     _('You can perform this action only in a branch.'))
150
 
            return
151
 
        
152
 
        self.comm.refresh_right()
 
207
            window.annotate(wt, branch, file_id)
 
208
        finally:
 
209
            branch.unlock()
153
210
    
154
 
    def remove_file(self, action):
 
211
    @show_bzr_error
 
212
    def remove_file(self, action,delete_on_disk=0):
155
213
        """ Right context menu -> Remove """
156
214
        # Remove only the selected file
157
 
        directory = self.comm.get_path()
158
 
        filename = self.comm.get_selected_right()
 
215
        directory = self.path
 
216
        filename = self.selected
159
217
        
160
218
        if filename is None:
161
 
            error_dialog(_('No file was selected'),
162
 
                                     _('Please select a file from the list,\nor choose the other option.'))
163
 
            return
164
 
        
165
 
        try:
166
 
            wt, path = WorkingTree.open_containing(directory+'/'+filename)
167
 
            wt.remove(path)
168
 
 
169
 
        except errors.NotBranchError:
170
 
            error_dialog(_('Directory is not a branch'),
171
 
                                     _('You can perform this action only in a branch.'))
172
 
            return
173
 
        except errors.NotVersionedError:
174
 
            error_dialog(_('File not versioned'),
175
 
                                     _('The selected file is not versioned.'))
176
 
            return
177
 
        except:
178
 
            raise
179
 
        
180
 
        self.comm.refresh_right()
181
 
 
 
219
            error_dialog(_i18n('No file was selected'),
 
220
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
221
            return
 
222
        
 
223
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
224
        wt.remove(path)
 
225
        
 
226
        if delete_on_disk:
 
227
            abs_filename = os.path.join(directory,filename)
 
228
            if os.path.isdir(abs_filename):
 
229
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
 
230
                if response == gtk.RESPONSE_YES:
 
231
                    shutil.rmtree(abs_filename)
 
232
            else:
 
233
                os.remove(abs_filename)
 
234
                
 
235
        self.app.set_path(self.path)
 
236
        self.app.refresh_right()
 
237
        
 
238
    def remove_and_delete_file(self, action):
 
239
        """ Right context menu -> Remove and delete"""
 
240
        self.remove_file(action,delete_on_disk=1)
 
241
 
 
242
    def rename_file(self, action):
 
243
        """ Right context menu -> Rename """
 
244
        from rename import OliveRename
 
245
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
246
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
247
        rename.display()
 
248
    
182
249
    def open_file(self, action):
183
250
        """ Right context menu -> Open """
184
251
        # Open only the selected file
185
 
        filename = self.comm.get_selected_right()
 
252
        filename = self.selected
186
253
        
187
254
        if filename is None:
188
 
            error_dialog(_('No file was selected'),
189
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
255
            error_dialog(_i18n('No file was selected'),
 
256
                         _i18n('Please select a file from the list,\nor choose the other option.'))
190
257
            return
191
258
 
192
259
        if filename == '..':
193
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
260
            # TODO: how to enter a directory?
 
261
            return
194
262
        else:
195
 
            fullpath = self.comm.get_path() + os.sep + filename
 
263
            fullpath = self.path + os.sep + filename
196
264
            if os.path.isdir(fullpath):
197
265
                # selected item is an existant directory
198
 
                self.comm.set_path(fullpath)
 
266
                # TODO: how to enter a directory?
 
267
                return
199
268
            else:
200
269
                launch(fullpath) 
201
 
        
202
 
        self.comm.refresh_right()
203
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('All files reverted to last revision.'))
 
281
        self.app.refresh_right()       
 
282
    
204
283
    def commit(self, action):
205
284
        """ Right context menu -> Commit """
206
 
        from commit import OliveCommit
207
 
        wt, path = WorkingTree.open_containing(self.comm.get_path())
208
 
        commit = OliveCommit(self.gladefile, wt, path)
209
 
        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()
210
306
    
 
307
    @show_bzr_error
211
308
    def diff(self, action):
212
309
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm)
215
 
        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()
216
316
    
217
317
    def bookmark(self, action):
218
318
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
220
 
            info_dialog(_('Bookmark successfully added'),
221
 
                                    _('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()
222
323
        else:
223
 
            warning_dialog(_('Location already bookmarked'),
224
 
                                       _('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.'))
225
326
        
226
 
        self.comm.refresh_left()
 
327
        self.app.refresh_left()
227
328
 
228
329
    def edit_bookmark(self, action):
229
330
        """ Left context menu -> Edit """
230
 
        from bookmark import OliveBookmark
231
 
 
232
 
        if self.comm.get_selected_left() != None:
233
 
            bookmark = OliveBookmark(self.gladefile, self.comm)
234
 
            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()
235
344
 
236
345
    def remove_bookmark(self, action):
237
346
        """ Left context menu -> Remove """
238
347
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
348
        if self.selected != None:
 
349
            self.pref.remove_bookmark(self.selected)
 
350
            self.pref.write()
 
351
        
 
352
        self.app.refresh_left()
242
353
    
243
354
    def open_folder(self, action):
244
355
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
356
        path = self.selected
246
357
 
247
358
        if path != None:
248
359
            launch(path)
254
365
    def diff_all(self, action):
255
366
        """ Diff toolbutton -> All... """
256
367
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm)
 
368
        diff = OliveDiff(self.comm)
258
369
        diff.display()
 
370
    
 
371
    def view_remote(self, action):
 
372
        """ Remote context menu -> View contents """
 
373
        print "DEBUG: view contents."
 
374
    
 
375
    def diff_remote(self, action):
 
376
        """ Remote context menu -> Show differences """
 
377
        print "DEBUG: show differences."
 
378
    
 
379
    def revert_remote(self, action):
 
380
        """ Remote context menu -> Revert to this revision """
 
381
        print "DEBUG: revert to this revision."