/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: Daniel Schierbeck
  • Date: 2007-10-14 15:54:57 UTC
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: daniel.schierbeck@gmail.com-20071014155457-m3ek29p4ima8ev7d
Added the new Window base class.

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, comm):
 
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"
41
 
        
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)
50
 
        
51
 
        self.comm = comm
 
45
        from guifiles import UIFILENAME
 
46
 
 
47
        self.uifile = UIFILENAME
 
48
 
 
49
        # Preferences handler
 
50
        self.pref = Preferences()
 
51
        
 
52
        # Set default values
 
53
        self.path = path
 
54
        self.selected = selected
 
55
        self.app = app
52
56
        
53
57
        # Create the file list context menu
54
58
        self.ui = gtk.UIManager()
62
66
                                       _('Remove'), None,
63
67
                                       _('Remove the selected file'),
64
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),
65
77
                                      ('open', gtk.STOCK_OPEN,
66
78
                                       _('Open'), None,
67
79
                                       _('Open the selected file'),
68
80
                                       self.open_file),
 
81
                                      ('revert', None,
 
82
                                       _('Revert'), None,
 
83
                                       _('Revert the changes'),
 
84
                                       self.revert),
69
85
                                      ('commit', None,
70
86
                                       _('Commit'), None,
71
87
                                       _('Commit the changes'),
72
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _('Annotate'), None,
 
91
                                       _('Annotate the selected file'),
 
92
                                       self.annotate),
73
93
                                      ('diff', None,
74
94
                                       _('Diff'), None,
75
95
                                       _('Show the diff of the file'),
97
117
                                      ('diff_all', None,
98
118
                                       _('All...'), None,
99
119
                                       _('Show the differences of all files'),
100
 
                                       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)
101
133
                                     ])
102
134
        
103
135
        self.ui.insert_action_group(self.actiongroup, 0)
106
138
        self.cmenu_right = self.ui.get_widget('/context_right')
107
139
        self.cmenu_left = self.ui.get_widget('/context_left')
108
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
109
142
        
110
143
        # Set icons
111
 
        commit_menu = self.ui.get_widget('/context_right/commit')
112
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
113
 
        commit_pixbuf = commit_image.get_pixbuf()
114
 
        commit_icon = gtk.Image()
115
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
116
 
        commit_menu.set_image(commit_icon)
117
 
        diff_menu = self.ui.get_widget('/context_right/diff')
118
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
119
 
        diff_pixbuf = diff_image.get_pixbuf()
120
 
        diff_icon = gtk.Image()
121
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
122
 
        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)
123
157
 
124
158
    def right_context_menu(self):
125
159
        return self.cmenu_right
127
161
    def left_context_menu(self):
128
162
        return self.cmenu_left
129
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
130
168
    def add_file(self, action):
131
169
        """ Right context menu -> Add """
 
170
        import bzrlib.add
 
171
        
132
172
        # Add only the selected file
133
 
        directory = self.comm.get_path()
134
 
        filename = self.comm.get_selected_right()
 
173
        directory = self.path
 
174
        filename = self.selected
135
175
            
136
176
        if filename is None:
137
177
            error_dialog(_('No file was selected'),
138
 
                                     _('Please select a file from the list,\nor choose the other option.'))
139
 
            return
140
 
        
 
178
                         _('Please select a file from the list,\nor choose the other option.'))
 
179
            return
 
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()
141
204
        try:
142
 
            bzrlib.add.smart_add([directory + '/' + filename])
143
 
        except errors.NotBranchError:
144
 
            error_dialog(_('Directory is not a branch'),
145
 
                                     _('You can perform this action only in a branch.'))
146
 
            return
147
 
        
148
 
        self.comm.refresh_right()
 
205
            window.annotate(wt, branch, file_id)
 
206
        finally:
 
207
            branch.unlock()
149
208
    
150
 
    def remove_file(self, action):
 
209
    @show_bzr_error
 
210
    def remove_file(self, action,delete_on_disk=0):
151
211
        """ Right context menu -> Remove """
152
212
        # Remove only the selected file
153
 
        directory = self.comm.get_path()
154
 
        filename = self.comm.get_selected_right()
 
213
        directory = self.path
 
214
        filename = self.selected
155
215
        
156
216
        if filename is None:
157
217
            error_dialog(_('No file was selected'),
158
 
                                     _('Please select a file from the list,\nor choose the other option.'))
159
 
            return
160
 
        
161
 
        try:
162
 
            wt, path = WorkingTree.open_containing(directory+'/'+filename)
163
 
            wt.remove(path)
164
 
 
165
 
        except errors.NotBranchError:
166
 
            error_dialog(_('Directory is not a branch'),
167
 
                                     _('You can perform this action only in a branch.'))
168
 
            return
169
 
        except errors.NotVersionedError:
170
 
            error_dialog(_('File not versioned'),
171
 
                                     _('The selected file is not versioned.'))
172
 
            return
173
 
        except:
174
 
            raise
175
 
        
176
 
        self.comm.refresh_right()
177
 
 
 
218
                         _('Please select a file from the list,\nor choose the other option.'))
 
219
            return
 
220
        
 
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
    
178
247
    def open_file(self, action):
179
248
        """ Right context menu -> Open """
180
249
        # Open only the selected file
181
 
        filename = self.comm.get_selected_right()
 
250
        filename = self.selected
182
251
        
183
252
        if filename is None:
184
253
            error_dialog(_('No file was selected'),
185
 
                                     _('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.'))
186
255
            return
187
256
 
188
257
        if filename == '..':
189
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
258
            # TODO: how to enter a directory?
 
259
            return
190
260
        else:
191
 
            fullpath = self.comm.get_path() + os.sep + filename
 
261
            fullpath = self.path + os.sep + filename
192
262
            if os.path.isdir(fullpath):
193
263
                # selected item is an existant directory
194
 
                self.comm.set_path(fullpath)
 
264
                # TODO: how to enter a directory?
 
265
                return
195
266
            else:
196
267
                launch(fullpath) 
197
 
        
198
 
        self.comm.refresh_right()
199
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
    
200
281
    def commit(self, action):
201
282
        """ Right context menu -> Commit """
202
 
        from commit import OliveCommit
203
 
        wt, path = WorkingTree.open_containing(self.comm.get_path())
204
 
        commit = OliveCommit(wt, path)
205
 
        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
        commit = CommitDialog(wt, path, not branch, self.selected)
 
292
        response = commit.run()
 
293
        if response != gtk.RESPONSE_NONE:
 
294
            commit.hide()
 
295
        
 
296
            if response == gtk.RESPONSE_OK:
 
297
                self.app.refresh_right()
 
298
            
 
299
            commit.destroy()
206
300
    
 
301
    @show_bzr_error
207
302
    def diff(self, action):
208
303
        """ Right context menu -> Diff """
209
 
        from diff import OliveDiff
210
 
        diff = OliveDiff(self.comm)
211
 
        diff.display()
 
304
        wt = WorkingTree.open_containing(self.path)[0]
 
305
        window = DiffWindow(self.app)
 
306
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
307
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
308
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
309
        window.show()
212
310
    
213
311
    def bookmark(self, action):
214
312
        """ Right context menu -> Bookmark """
215
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
313
        if self.pref.add_bookmark(self.path):
216
314
            info_dialog(_('Bookmark successfully added'),
217
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
315
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
316
            self.pref.write()
218
317
        else:
219
318
            warning_dialog(_('Location already bookmarked'),
220
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
319
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
221
320
        
222
 
        self.comm.refresh_left()
 
321
        self.app.refresh_left()
223
322
 
224
323
    def edit_bookmark(self, action):
225
324
        """ Left context menu -> Edit """
226
 
        from bookmark import OliveBookmark
227
 
 
228
 
        if self.comm.get_selected_left() != None:
229
 
            bookmark = OliveBookmark(self.comm)
230
 
            bookmark.display()
 
325
        from bookmark import BookmarkDialog
 
326
        
 
327
        if self.selected != None:
 
328
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
329
            response = bookmark.run()
 
330
            
 
331
            if response != gtk.RESPONSE_NONE:
 
332
                bookmark.hide()
 
333
        
 
334
                if response == gtk.RESPONSE_OK:
 
335
                    self.app.refresh_left()
 
336
            
 
337
                bookmark.destroy()
231
338
 
232
339
    def remove_bookmark(self, action):
233
340
        """ Left context menu -> Remove """
234
341
        
235
 
        if self.comm.get_selected_left() != None:
236
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
237
 
            self.comm.refresh_left()
 
342
        if self.selected != None:
 
343
            self.pref.remove_bookmark(self.selected)
 
344
            self.pref.write()
 
345
        
 
346
        self.app.refresh_left()
238
347
    
239
348
    def open_folder(self, action):
240
349
        """ Left context menu -> Open Folder """
241
 
        path = self.comm.get_selected_left()
 
350
        path = self.selected
242
351
 
243
352
        if path != None:
244
353
            launch(path)
252
361
        from diff import OliveDiff
253
362
        diff = OliveDiff(self.comm)
254
363
        diff.display()
 
364
    
 
365
    def view_remote(self, action):
 
366
        """ Remote context menu -> View contents """
 
367
        print "DEBUG: view contents."
 
368
    
 
369
    def diff_remote(self, action):
 
370
        """ Remote context menu -> Show differences """
 
371
        print "DEBUG: show differences."
 
372
    
 
373
    def revert_remote(self, action):
 
374
        """ Remote context menu -> Revert to this revision """
 
375
        print "DEBUG: revert to this revision."