/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: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

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
 
29
from dialog import question_dialog
30
30
 
31
31
import bzrlib.errors as errors
32
 
from dialog import error_dialog
 
32
from bzrlib.workingtree import WorkingTree
33
33
 
 
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_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 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()
66
67
                                       _('Remove'), None,
67
68
                                       _('Remove the selected file'),
68
69
                                       self.remove_file),
 
70
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
 
71
                                       _('Remove and delete'), None,
 
72
                                       _('Remove the selected file/dir and delete from disk'),
 
73
                                       self.remove_and_delete_file),
 
74
                                      ('rename', None,
 
75
                                       _('Rename'), None,
 
76
                                       _('Rename the selected file'),
 
77
                                       self.rename_file),
69
78
                                      ('open', gtk.STOCK_OPEN,
70
79
                                       _('Open'), None,
71
80
                                       _('Open the selected file'),
72
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _('Revert'), None,
 
84
                                       _('Revert the changes'),
 
85
                                       self.revert),
73
86
                                      ('commit', None,
74
87
                                       _('Commit'), None,
75
88
                                       _('Commit the changes'),
76
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _('Annotate'), None,
 
92
                                       _('Annotate the selected file'),
 
93
                                       self.annotate),
77
94
                                      ('diff', None,
78
95
                                       _('Diff'), None,
79
96
                                       _('Show the diff of the file'),
101
118
                                      ('diff_all', None,
102
119
                                       _('All...'), None,
103
120
                                       _('Show the differences of all files'),
104
 
                                       self.diff_all)
 
121
                                       self.diff_all),
 
122
                                      ('view_remote', None,
 
123
                                       _('View contents'), None,
 
124
                                       _('View the contents of the file in a builtin viewer'),
 
125
                                       self.view_remote),
 
126
                                      ('diff_remote', None,
 
127
                                       _('Show differences'), None,
 
128
                                       _('Show the differences between two revisions of the file'),
 
129
                                       self.diff_remote),
 
130
                                      ('revert_remote', None,
 
131
                                       _('Revert to this revision'), None,
 
132
                                       _('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
178
            error_dialog(_('No file was selected'),
142
 
                                     _('Please select a file from the list,\nor choose the other option.'))
143
 
            return
144
 
        
 
179
                         _('Please select a file from the list,\nor choose the other option.'))
 
180
            return
 
181
        
 
182
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
183
    
 
184
    @show_bzr_error
 
185
    def annotate(self, action):
 
186
        """ Right context menu -> Annotate """
 
187
        directory = self.path
 
188
        filename = self.selected
 
189
        
 
190
        if filename is None:
 
191
            error_dialog(_('No file was selected'),
 
192
                         _('Please select a file from the list.'))
 
193
            return
 
194
        
 
195
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
196
        
 
197
        branch = wt.branch
 
198
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
199
        
 
200
        window = GAnnotateWindow(all=False, plain=False)
 
201
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
202
        config = GAnnotateConfig(window)
 
203
        window.show()
 
204
        branch.lock_read()
145
205
        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()
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
153
209
    
154
 
    def remove_file(self, action):
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
155
212
        """ Right context menu -> Remove """
156
213
        # Remove only the selected file
157
 
        directory = self.comm.get_path()
158
 
        filename = self.comm.get_selected_right()
 
214
        directory = self.path
 
215
        filename = self.selected
159
216
        
160
217
        if filename is None:
161
218
            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
                         _('Please select a file from the list,\nor choose the other option.'))
 
220
            return
 
221
        
 
222
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
223
        wt.remove(path)
 
224
        
 
225
        if delete_on_disk:
 
226
            abs_filename = os.path.join(directory,filename)
 
227
            if os.path.isdir(abs_filename):
 
228
                response = question_dialog(_('Delete directory with all directories below ?'), abs_filename )
 
229
                if response == gtk.RESPONSE_YES:
 
230
                    shutil.rmtree(abs_filename)
 
231
            else:
 
232
                os.remove(abs_filename)
 
233
                
 
234
        self.app.set_path(self.path)
 
235
        self.app.refresh_right()
 
236
        
 
237
    def remove_and_delete_file(self, action):
 
238
        """ Right context menu -> Remove and delete"""
 
239
        self.remove_file(action,delete_on_disk=1)
 
240
 
 
241
    def rename_file(self, action):
 
242
        """ Right context menu -> Rename """
 
243
        from rename import OliveRename
 
244
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
245
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
246
        rename.display()
 
247
    
182
248
    def open_file(self, action):
183
249
        """ Right context menu -> Open """
184
250
        # Open only the selected file
185
 
        filename = self.comm.get_selected_right()
 
251
        filename = self.selected
186
252
        
187
253
        if filename is None:
188
254
            error_dialog(_('No file was selected'),
189
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
255
                         _('Please select a file from the list,\nor choose the other option.'))
190
256
            return
191
257
 
192
258
        if filename == '..':
193
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
259
            # TODO: how to enter a directory?
 
260
            return
194
261
        else:
195
 
            fullpath = self.comm.get_path() + os.sep + filename
 
262
            fullpath = self.path + os.sep + filename
196
263
            if os.path.isdir(fullpath):
197
264
                # selected item is an existant directory
198
 
                self.comm.set_path(fullpath)
 
265
                # TODO: how to enter a directory?
 
266
                return
199
267
            else:
200
268
                launch(fullpath) 
201
 
        
202
 
        self.comm.refresh_right()
203
269
 
 
270
    def revert(self, action):
 
271
        """ Right context menu -> Revert """
 
272
        wt, path = WorkingTree.open_containing(self.path)
 
273
        ret = wt.revert([os.path.join(path, self.selected)])
 
274
        if ret:
 
275
            warning_dialog(_('Conflicts detected'),
 
276
                           _('Please have a look at the working tree before continuing.'))
 
277
        else:
 
278
            info_dialog(_('Revert successful'),
 
279
                        _('All files reverted to last revision.'))
 
280
        self.app.refresh_right()       
 
281
    
204
282
    def commit(self, action):
205
283
        """ 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()
 
284
        from commit import CommitDialog
 
285
        branch = None
 
286
        try:
 
287
            wt, path = WorkingTree.open_containing(self.path)
 
288
            branch = wt.branch
 
289
        except NotBranchError, e:
 
290
            path = e.path
 
291
        
 
292
        commit = CommitDialog(wt, path, not branch, self.selected)
 
293
        response = commit.run()
 
294
        if response != gtk.RESPONSE_NONE:
 
295
            commit.hide()
 
296
        
 
297
            if response == gtk.RESPONSE_OK:
 
298
                self.app.refresh_right()
 
299
            
 
300
            commit.destroy()
210
301
    
 
302
    @show_bzr_error
211
303
    def diff(self, action):
212
304
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm)
215
 
        diff.display()
 
305
        wt = WorkingTree.open_containing(self.path)[0]
 
306
        window = DiffWindow()
 
307
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
308
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
309
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
310
        window.show()
216
311
    
217
312
    def bookmark(self, action):
218
313
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
314
        if self.pref.add_bookmark(self.path):
220
315
            info_dialog(_('Bookmark successfully added'),
221
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
316
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
317
            self.pref.write()
222
318
        else:
223
319
            warning_dialog(_('Location already bookmarked'),
224
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
320
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
225
321
        
226
 
        self.comm.refresh_left()
 
322
        self.app.refresh_left()
227
323
 
228
324
    def edit_bookmark(self, action):
229
325
        """ 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()
 
326
        from bookmark import BookmarkDialog
 
327
        
 
328
        if self.selected != None:
 
329
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
330
            response = bookmark.run()
 
331
            
 
332
            if response != gtk.RESPONSE_NONE:
 
333
                bookmark.hide()
 
334
        
 
335
                if response == gtk.RESPONSE_OK:
 
336
                    self.app.refresh_left()
 
337
            
 
338
                bookmark.destroy()
235
339
 
236
340
    def remove_bookmark(self, action):
237
341
        """ Left context menu -> Remove """
238
342
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
343
        if self.selected != None:
 
344
            self.pref.remove_bookmark(self.selected)
 
345
            self.pref.write()
 
346
        
 
347
        self.app.refresh_left()
242
348
    
243
349
    def open_folder(self, action):
244
350
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
351
        path = self.selected
246
352
 
247
353
        if path != None:
248
354
            launch(path)
254
360
    def diff_all(self, action):
255
361
        """ Diff toolbutton -> All... """
256
362
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm)
 
363
        diff = OliveDiff(self.comm)
258
364
        diff.display()
 
365
    
 
366
    def view_remote(self, action):
 
367
        """ Remote context menu -> View contents """
 
368
        print "DEBUG: view contents."
 
369
    
 
370
    def diff_remote(self, action):
 
371
        """ Remote context menu -> Show differences """
 
372
        print "DEBUG: show differences."
 
373
    
 
374
    def revert_remote(self, action):
 
375
        """ Remote context menu -> Revert to this revision """
 
376
        print "DEBUG: revert to this revision."