/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: 2006-09-27 17:49:18 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927174918-0e5c331b574d16a3
Don't pass along dialog context everywhere.

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
18
17
import os.path
19
 
import shutil
20
18
import sys
21
19
 
22
20
try:
24
22
    pygtk.require("2.0")
25
23
except:
26
24
    pass
27
 
 
28
 
import gtk
 
25
try:
 
26
    import gtk
 
27
    import gtk.glade
 
28
except:
 
29
    sys.exit(1)
29
30
 
30
31
import bzrlib.errors as errors
31
 
from bzrlib.workingtree import WorkingTree
 
32
from dialog import error_dialog
32
33
 
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
34
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
41
35
 
42
36
class OliveMenu:
43
37
    """ This class is responsible for building the context menus. """
44
 
    def __init__(self, path, selected, app=None):
 
38
    def __init__(self, gladefile, comm):
45
39
        # Load the UI file
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
 
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
57
56
        
58
57
        # Create the file list context menu
59
58
        self.ui = gtk.UIManager()
60
59
        
61
60
        self.actiongroup = gtk.ActionGroup('context')
62
61
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _i18n('Add'), None,
64
 
                                       _i18n('Add the selected file'),
 
62
                                       _('Add'), None,
 
63
                                       _('Add the selected file'),
65
64
                                       self.add_file),
66
65
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _i18n('Remove'), None,
68
 
                                       _i18n('Remove the selected file'),
 
66
                                       _('Remove'), None,
 
67
                                       _('Remove the selected file'),
69
68
                                       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),
78
69
                                      ('open', gtk.STOCK_OPEN,
79
 
                                       _i18n('Open'), None,
80
 
                                       _i18n('Open the selected file'),
 
70
                                       _('Open'), None,
 
71
                                       _('Open the selected file'),
81
72
                                       self.open_file),
82
 
                                      ('revert', None,
83
 
                                       _i18n('Revert'), None,
84
 
                                       _i18n('Revert the changes'),
85
 
                                       self.revert),
86
73
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
74
                                       _('Commit'), None,
 
75
                                       _('Commit the changes'),
89
76
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
77
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
78
                                       _('Diff'), None,
 
79
                                       _('Show the diff of the file'),
97
80
                                       self.diff),
98
81
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
82
                                       _('Bookmark'), None,
 
83
                                       _('Bookmark current location'),
101
84
                                       self.bookmark),
102
85
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
 
86
                                       _('Edit'), None,
 
87
                                       _('Edit the selected bookmark'),
105
88
                                       self.edit_bookmark),
106
89
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
 
90
                                       _('Remove'), None,
 
91
                                       _('Remove the selected bookmark'),
109
92
                                       self.remove_bookmark),
110
93
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _i18n('Open Folder'), None,
112
 
                                       _i18n('Open bookmark folder in Nautilus'),
 
94
                                       _('Open Folder'), None,
 
95
                                       _('Open bookmark folder in Nautilus'),
113
96
                                       self.open_folder),
114
97
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
 
98
                                       _('Selected...'), None,
 
99
                                       _('Show the differences of the selected file'),
117
100
                                       self.diff_selected),
118
101
                                      ('diff_all', None,
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)
 
102
                                       _('All...'), None,
 
103
                                       _('Show the differences of all files'),
 
104
                                       self.diff_all)
134
105
                                     ])
135
106
        
136
107
        self.ui.insert_action_group(self.actiongroup, 0)
139
110
        self.cmenu_right = self.ui.get_widget('/context_right')
140
111
        self.cmenu_left = self.ui.get_widget('/context_left')
141
112
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
113
        
144
114
        # Set icons
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)
 
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)
158
127
 
159
128
    def right_context_menu(self):
160
129
        return self.cmenu_right
162
131
    def left_context_menu(self):
163
132
        return self.cmenu_left
164
133
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
 
    @show_bzr_error
169
134
    def add_file(self, action):
170
135
        """ Right context menu -> Add """
171
 
        import bzrlib.add
172
 
        
173
136
        # Add only the selected file
174
 
        directory = self.path
175
 
        filename = self.selected
 
137
        directory = self.comm.get_path()
 
138
        filename = self.comm.get_selected_right()
176
139
            
177
140
        if filename is None:
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()
 
141
            error_dialog(_('No file was selected'),
 
142
                                     _('Please select a file from the list,\nor choose the other option.'))
 
143
            return
 
144
        
206
145
        try:
207
 
            window.annotate(wt, branch, file_id)
208
 
        finally:
209
 
            branch.unlock()
 
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()
210
153
    
211
 
    @show_bzr_error
212
 
    def remove_file(self, action,delete_on_disk=0):
 
154
    def remove_file(self, action):
213
155
        """ Right context menu -> Remove """
214
156
        # Remove only the selected file
215
 
        directory = self.path
216
 
        filename = self.selected
 
157
        directory = self.comm.get_path()
 
158
        filename = self.comm.get_selected_right()
217
159
        
218
160
        if filename is None:
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
 
    
 
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
 
249
182
    def open_file(self, action):
250
183
        """ Right context menu -> Open """
251
184
        # Open only the selected file
252
 
        filename = self.selected
 
185
        filename = self.comm.get_selected_right()
253
186
        
254
187
        if filename is None:
255
 
            error_dialog(_i18n('No file was selected'),
256
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
188
            error_dialog(_('No file was selected'),
 
189
                                     _('Please select a file from the list,\nor choose the other option.'))
257
190
            return
258
191
 
259
192
        if filename == '..':
260
 
            # TODO: how to enter a directory?
261
 
            return
 
193
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
262
194
        else:
263
 
            fullpath = self.path + os.sep + filename
 
195
            fullpath = self.comm.get_path() + os.sep + filename
264
196
            if os.path.isdir(fullpath):
265
197
                # selected item is an existant directory
266
 
                # TODO: how to enter a directory?
267
 
                return
 
198
                self.comm.set_path(fullpath)
268
199
            else:
269
200
                launch(fullpath) 
 
201
        
 
202
        self.comm.refresh_right()
270
203
 
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
 
    
283
204
    def commit(self, action):
284
205
        """ Right context menu -> Commit """
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()
 
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()
306
210
    
307
 
    @show_bzr_error
308
211
    def diff(self, action):
309
212
        """ Right context menu -> Diff """
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()
 
213
        from diff import OliveDiff
 
214
        diff = OliveDiff(self.gladefile, self.comm)
 
215
        diff.display()
316
216
    
317
217
    def bookmark(self, action):
318
218
        """ Right context menu -> Bookmark """
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()
 
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.'))
323
222
        else:
324
 
            warning_dialog(_i18n('Location already bookmarked'),
325
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
223
            warning_dialog(_('Location already bookmarked'),
 
224
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
326
225
        
327
 
        self.app.refresh_left()
 
226
        self.comm.refresh_left()
328
227
 
329
228
    def edit_bookmark(self, action):
330
229
        """ 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()
 
230
        from bookmark import OliveBookmark
 
231
 
 
232
        if self.comm.get_selected_left() != None:
 
233
            bookmark = OliveBookmark(self.gladefile, self.comm)
 
234
            bookmark.display()
344
235
 
345
236
    def remove_bookmark(self, action):
346
237
        """ Left context menu -> Remove """
347
238
        
348
 
        if self.selected != None:
349
 
            self.pref.remove_bookmark(self.selected)
350
 
            self.pref.write()
351
 
        
352
 
        self.app.refresh_left()
 
239
        if self.comm.get_selected_left() != None:
 
240
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
241
            self.comm.refresh_left()
353
242
    
354
243
    def open_folder(self, action):
355
244
        """ Left context menu -> Open Folder """
356
 
        path = self.selected
 
245
        path = self.comm.get_selected_left()
357
246
 
358
247
        if path != None:
359
248
            launch(path)
365
254
    def diff_all(self, action):
366
255
        """ Diff toolbutton -> All... """
367
256
        from diff import OliveDiff
368
 
        diff = OliveDiff(self.comm)
 
257
        diff = OliveDiff(self.gladefile, self.comm)
369
258
        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."