/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 18:08:35 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927180835-4c295d9bb936623a
Turn some windows into dialogs.
Remove the diffwindow code from olive, 
switched to using the one from bzr-gtk instead.

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.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
38
34
from launch import launch
39
 
from olive import Preferences
40
35
 
41
36
class OliveMenu:
42
37
    """ This class is responsible for building the context menus. """
43
 
    def __init__(self, path, selected, app=None):
 
38
    def __init__(self, gladefile, comm):
44
39
        # Load the UI file
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
 
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
56
56
        
57
57
        # Create the file list context menu
58
58
        self.ui = gtk.UIManager()
66
66
                                       _('Remove'), None,
67
67
                                       _('Remove the selected file'),
68
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),
77
69
                                      ('open', gtk.STOCK_OPEN,
78
70
                                       _('Open'), None,
79
71
                                       _('Open the selected file'),
80
72
                                       self.open_file),
81
 
                                      ('revert', None,
82
 
                                       _('Revert'), None,
83
 
                                       _('Revert the changes'),
84
 
                                       self.revert),
85
73
                                      ('commit', None,
86
74
                                       _('Commit'), None,
87
75
                                       _('Commit the changes'),
88
76
                                       self.commit),
89
 
                                      ('annotate', None,
90
 
                                       _('Annotate'), None,
91
 
                                       _('Annotate the selected file'),
92
 
                                       self.annotate),
93
77
                                      ('diff', None,
94
78
                                       _('Diff'), None,
95
79
                                       _('Show the diff of the file'),
117
101
                                      ('diff_all', None,
118
102
                                       _('All...'), None,
119
103
                                       _('Show the differences of all files'),
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)
 
104
                                       self.diff_all)
133
105
                                     ])
134
106
        
135
107
        self.ui.insert_action_group(self.actiongroup, 0)
138
110
        self.cmenu_right = self.ui.get_widget('/context_right')
139
111
        self.cmenu_left = self.ui.get_widget('/context_left')
140
112
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
141
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
142
113
        
143
114
        # Set icons
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)
 
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)
157
127
 
158
128
    def right_context_menu(self):
159
129
        return self.cmenu_right
161
131
    def left_context_menu(self):
162
132
        return self.cmenu_left
163
133
    
164
 
    def remote_context_menu(self):
165
 
        return self.cmenu_remote
166
 
    
167
 
    @show_bzr_error
168
134
    def add_file(self, action):
169
135
        """ Right context menu -> Add """
170
 
        import bzrlib.add
171
 
        
172
136
        # Add only the selected file
173
 
        directory = self.path
174
 
        filename = self.selected
 
137
        directory = self.comm.get_path()
 
138
        filename = self.comm.get_selected_right()
175
139
            
176
140
        if filename is None:
177
141
            error_dialog(_('No file was selected'),
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)
200
 
        window.set_title(os.path.join(directory, filename) + " - Annotate")
201
 
        config = GAnnotateConfig(window)
202
 
        window.show()
203
 
        branch.lock_read()
 
142
                                     _('Please select a file from the list,\nor choose the other option.'))
 
143
            return
 
144
        
204
145
        try:
205
 
            window.annotate(wt, branch, file_id)
206
 
        finally:
207
 
            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()
208
153
    
209
 
    @show_bzr_error
210
 
    def remove_file(self, action,delete_on_disk=0):
 
154
    def remove_file(self, action):
211
155
        """ Right context menu -> Remove """
212
156
        # Remove only the selected file
213
 
        directory = self.path
214
 
        filename = self.selected
 
157
        directory = self.comm.get_path()
 
158
        filename = self.comm.get_selected_right()
215
159
        
216
160
        if filename is None:
217
161
            error_dialog(_('No file was selected'),
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
 
    
 
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
 
247
182
    def open_file(self, action):
248
183
        """ Right context menu -> Open """
249
184
        # Open only the selected file
250
 
        filename = self.selected
 
185
        filename = self.comm.get_selected_right()
251
186
        
252
187
        if filename is None:
253
188
            error_dialog(_('No file was selected'),
254
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
189
                                     _('Please select a file from the list,\nor choose the other option.'))
255
190
            return
256
191
 
257
192
        if filename == '..':
258
 
            # TODO: how to enter a directory?
259
 
            return
 
193
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
260
194
        else:
261
 
            fullpath = self.path + os.sep + filename
 
195
            fullpath = self.comm.get_path() + os.sep + filename
262
196
            if os.path.isdir(fullpath):
263
197
                # selected item is an existant directory
264
 
                # TODO: how to enter a directory?
265
 
                return
 
198
                self.comm.set_path(fullpath)
266
199
            else:
267
200
                launch(fullpath) 
 
201
        
 
202
        self.comm.refresh_right()
268
203
 
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
 
    
281
204
    def commit(self, action):
282
205
        """ Right context menu -> Commit """
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
        from commit import OliveCommit
 
207
        wt, path = WorkingTree.open_containing(self.comm.get_path())
 
208
        commit = OliveCommit(self.gladefile, wt, path)
 
209
        commit.display()
300
210
    
301
 
    @show_bzr_error
302
211
    def diff(self, action):
303
212
        """ Right context menu -> Diff """
304
 
        wt = WorkingTree.open_containing(self.path)[0]
305
 
        window = DiffWindow()
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()
 
213
        from diff import OliveDiff
 
214
        diff = OliveDiff(self.gladefile, self.comm)
 
215
        diff.display()
310
216
    
311
217
    def bookmark(self, action):
312
218
        """ Right context menu -> Bookmark """
313
 
        if self.pref.add_bookmark(self.path):
 
219
        if self.comm.pref.add_bookmark(self.comm.get_path()):
314
220
            info_dialog(_('Bookmark successfully added'),
315
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
316
 
            self.pref.write()
 
221
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
317
222
        else:
318
223
            warning_dialog(_('Location already bookmarked'),
319
 
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
224
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
320
225
        
321
 
        self.app.refresh_left()
 
226
        self.comm.refresh_left()
322
227
 
323
228
    def edit_bookmark(self, action):
324
229
        """ Left context menu -> Edit """
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()
 
230
        from bookmark import OliveBookmark
 
231
 
 
232
        if self.comm.get_selected_left() != None:
 
233
            bookmark = OliveBookmark(self.gladefile, self.comm)
 
234
            bookmark.display()
338
235
 
339
236
    def remove_bookmark(self, action):
340
237
        """ Left context menu -> Remove """
341
238
        
342
 
        if self.selected != None:
343
 
            self.pref.remove_bookmark(self.selected)
344
 
            self.pref.write()
345
 
        
346
 
        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()
347
242
    
348
243
    def open_folder(self, action):
349
244
        """ Left context menu -> Open Folder """
350
 
        path = self.selected
 
245
        path = self.comm.get_selected_left()
351
246
 
352
247
        if path != None:
353
248
            launch(path)
359
254
    def diff_all(self, action):
360
255
        """ Diff toolbutton -> All... """
361
256
        from diff import OliveDiff
362
 
        diff = OliveDiff(self.comm)
 
257
        diff = OliveDiff(self.gladefile, self.comm)
363
258
        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."