/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:
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
32
 
from launch import launch
33
 
from olive import OlivePreferences, DiffWindow
 
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
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
45
        from guifiles import UIFILENAME
40
46
 
41
47
        self.uifile = UIFILENAME
42
48
 
43
49
        # Preferences handler
44
 
        self.pref = OlivePreferences()
 
50
        self.pref = Preferences()
45
51
        
46
52
        # Set default values
47
53
        self.path = path
48
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),
 
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),
62
73
                                      ('rename', None,
63
 
                                       _('Rename'), None,
64
 
                                       _('Rename the selected file'),
 
74
                                       _i18n('Rename'), None,
 
75
                                       _i18n('Rename the selected file'),
65
76
                                       self.rename_file),
66
77
                                      ('open', gtk.STOCK_OPEN,
67
 
                                       _('Open'), None,
68
 
                                       _('Open the selected file'),
 
78
                                       _i18n('Open'), None,
 
79
                                       _i18n('Open the selected file'),
69
80
                                       self.open_file),
 
81
                                      ('revert', None,
 
82
                                       _i18n('Revert'), None,
 
83
                                       _i18n('Revert the changes'),
 
84
                                       self.revert),
70
85
                                      ('commit', None,
71
 
                                       _('Commit'), None,
72
 
                                       _('Commit the changes'),
 
86
                                       _i18n('Commit'), None,
 
87
                                       _i18n('Commit the changes'),
73
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _i18n('Annotate'), None,
 
91
                                       _i18n('Annotate the selected file'),
 
92
                                       self.annotate),
74
93
                                      ('diff', None,
75
 
                                       _('Diff'), None,
76
 
                                       _('Show the diff of the file'),
 
94
                                       _i18n('Diff'), None,
 
95
                                       _i18n('Show the diff of the file'),
77
96
                                       self.diff),
78
97
                                      ('bookmark', None,
79
 
                                       _('Bookmark'), None,
80
 
                                       _('Bookmark current location'),
 
98
                                       _i18n('Bookmark'), None,
 
99
                                       _i18n('Bookmark current location'),
81
100
                                       self.bookmark),
82
101
                                      ('edit_bookmark', gtk.STOCK_EDIT,
83
 
                                       _('Edit'), None,
84
 
                                       _('Edit the selected bookmark'),
 
102
                                       _i18n('Edit'), None,
 
103
                                       _i18n('Edit the selected bookmark'),
85
104
                                       self.edit_bookmark),
86
105
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
87
 
                                       _('Remove'), None,
88
 
                                       _('Remove the selected bookmark'),
 
106
                                       _i18n('Remove'), None,
 
107
                                       _i18n('Remove the selected bookmark'),
89
108
                                       self.remove_bookmark),
90
109
                                      ('open_folder', gtk.STOCK_OPEN,
91
 
                                       _('Open Folder'), None,
92
 
                                       _('Open bookmark folder in Nautilus'),
 
110
                                       _i18n('Open Folder'), None,
 
111
                                       _i18n('Open bookmark folder in Nautilus'),
93
112
                                       self.open_folder),
94
113
                                      ('diff_selected', None,
95
 
                                       _('Selected...'), None,
96
 
                                       _('Show the differences of the selected file'),
 
114
                                       _i18n('Selected...'), None,
 
115
                                       _i18n('Show the differences of the selected file'),
97
116
                                       self.diff_selected),
98
117
                                      ('diff_all', None,
99
 
                                       _('All...'), None,
100
 
                                       _('Show the differences of all files'),
101
 
                                       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)
102
133
                                     ])
103
134
        
104
135
        self.ui.insert_action_group(self.actiongroup, 0)
107
138
        self.cmenu_right = self.ui.get_widget('/context_right')
108
139
        self.cmenu_left = self.ui.get_widget('/context_left')
109
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
110
142
        
111
143
        # Set icons
112
144
        # TODO: do it without using deprecated comm
129
161
    def left_context_menu(self):
130
162
        return self.cmenu_left
131
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
132
168
    def add_file(self, action):
133
169
        """ Right context menu -> Add """
134
170
        import bzrlib.add
138
174
        filename = self.selected
139
175
            
140
176
        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
 
        
 
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()
145
208
        try:
146
 
            bzrlib.add.smart_add([os.path.join(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
 
209
            window.annotate(wt, branch, file_id)
 
210
        finally:
 
211
            branch.unlock()
151
212
    
152
 
    def remove_file(self, action):
 
213
    @show_bzr_error
 
214
    def remove_file(self, action, delete_on_disk=False):
153
215
        """ Right context menu -> Remove """
154
216
        # Remove only the selected file
155
217
        directory = self.path
156
218
        filename = self.selected
157
219
        
158
220
        if filename is None:
159
 
            error_dialog(_('No file was selected'),
160
 
                         _('Please select a file from the list,\nor choose the other option.'))
161
 
            return
162
 
        
163
 
        try:
164
 
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
165
 
            wt.remove(path)
166
 
 
167
 
        except errors.NotBranchError:
168
 
            error_dialog(_('Directory is not a branch'),
169
 
                         _('You can perform this action only in a branch.'))
170
 
            return
171
 
        except errors.NotVersionedError:
172
 
            error_dialog(_('File not versioned'),
173
 
                         _('The selected file is not versioned.'))
174
 
            return
 
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)
175
243
 
176
244
    def rename_file(self, action):
177
245
        """ Right context menu -> Rename """
178
 
        from rename import OliveRename
179
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
180
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
181
 
        rename.display()
 
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()
182
253
    
183
254
    def open_file(self, action):
184
255
        """ Right context menu -> Open """
186
257
        filename = self.selected
187
258
        
188
259
        if filename is None:
189
 
            error_dialog(_('No file was selected'),
190
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
260
            error_dialog(_i18n('No file was selected'),
 
261
                         _i18n('Please select a file from the list,\nor choose the other option.'))
191
262
            return
192
263
 
193
264
        if filename == '..':
194
265
            # TODO: how to enter a directory?
195
266
            return
196
267
        else:
197
 
            fullpath = self.path + os.sep + filename
198
 
            if os.path.isdir(fullpath):
199
 
                # selected item is an existant directory
200
 
                # TODO: how to enter a directory?
201
 
                return
202
 
            else:
203
 
                launch(fullpath) 
 
268
            fullpath = os.path.join(self.path, filename)
 
269
            launch.launch(fullpath) 
204
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
    
205
283
    def commit(self, action):
206
284
        """ Right context menu -> Commit """
207
285
        from commit import CommitDialog
208
 
        wt, path = WorkingTree.open_containing(self.path)
209
 
        commit = CommitDialog(wt, path)
210
 
        commit.display()
 
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()
211
306
    
 
307
    @show_bzr_error
212
308
    def diff(self, action):
213
309
        """ Right context menu -> Diff """
214
 
        try:
215
 
            wt = WorkingTree.open_containing(self.path)[0]
216
 
        except errors.NotBranchError:
217
 
            error_dialog(_('File is not in a branch'),
218
 
                         _('The selected file is not in a branch.'))
219
 
            return
220
 
        
221
 
        window = DiffWindow()
 
310
        wt = WorkingTree.open_containing(self.path)[0]
 
311
        window = DiffWindow(self.app)
222
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
223
313
        window.set_diff(wt.branch.nick, wt, parent_tree)
224
 
        try:
225
 
            window.set_file(wt.relpath(self.path + os.sep + self.selected))
226
 
        except errors.NoSuchFile:
227
 
            pass
 
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
228
315
        window.show()
229
316
    
230
317
    def bookmark(self, action):
231
318
        """ Right context menu -> Bookmark """
232
319
        if self.pref.add_bookmark(self.path):
233
 
            info_dialog(_('Bookmark successfully added'),
234
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
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.'))
235
322
            self.pref.write()
236
323
        else:
237
 
            warning_dialog(_('Location already bookmarked'),
238
 
                           _('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.'))
 
326
        
 
327
        self.app.refresh_left()
239
328
 
240
329
    def edit_bookmark(self, action):
241
330
        """ Left context menu -> Edit """
242
 
        from bookmark import OliveBookmark
243
 
 
 
331
        from bookmark import BookmarkDialog
 
332
        
244
333
        if self.selected != None:
245
 
            bookmark = OliveBookmark(self.selected)
246
 
            bookmark.display()
 
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()
247
344
 
248
345
    def remove_bookmark(self, action):
249
346
        """ Left context menu -> Remove """
251
348
        if self.selected != None:
252
349
            self.pref.remove_bookmark(self.selected)
253
350
            self.pref.write()
 
351
        
 
352
        self.app.refresh_left()
254
353
    
255
354
    def open_folder(self, action):
256
355
        """ Left context menu -> Open Folder """
257
356
        path = self.selected
258
357
 
259
358
        if path != None:
260
 
            launch(path)
 
359
            launch.launch(path)
261
360
    
262
361
    def diff_selected(self, action):
263
362
        """ Diff toolbutton -> Selected... """
265
364
    
266
365
    def diff_all(self, action):
267
366
        """ Diff toolbutton -> All... """
268
 
        from diff import OliveDiff
269
 
        diff = OliveDiff(self.comm)
270
 
        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."