/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: 2007-07-15 15:22:29 UTC
  • Revision ID: jelmer@samba.org-20070715152229-clmlen0vpd8d2pzx
Add docstrings, remove unused code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
22
22
    pygtk.require("2.0")
23
23
except:
24
24
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
 
25
 
 
26
import gtk
30
27
 
31
28
import bzrlib.errors as errors
32
 
from dialog import error_dialog
 
29
from bzrlib.workingtree import WorkingTree
33
30
 
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
32
from bzrlib.plugins.gtk.errors import show_bzr_error
 
33
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
34
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 
35
from bzrlib.plugins.gtk.diff import DiffWindow
34
36
from launch import launch
 
37
from olive import Preferences
35
38
 
36
39
class OliveMenu:
37
40
    """ This class is responsible for building the context menus. """
38
 
    def __init__(self, gladefile, comm):
 
41
    def __init__(self, path, selected, app=None):
39
42
        # 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
 
43
        from guifiles import UIFILENAME
 
44
 
 
45
        self.uifile = UIFILENAME
 
46
 
 
47
        # Preferences handler
 
48
        self.pref = Preferences()
 
49
        
 
50
        # Set default values
 
51
        self.path = path
 
52
        self.selected = selected
 
53
        self.app = app
56
54
        
57
55
        # Create the file list context menu
58
56
        self.ui = gtk.UIManager()
66
64
                                       _('Remove'), None,
67
65
                                       _('Remove the selected file'),
68
66
                                       self.remove_file),
 
67
                                      ('rename', None,
 
68
                                       _('Rename'), None,
 
69
                                       _('Rename the selected file'),
 
70
                                       self.rename_file),
69
71
                                      ('open', gtk.STOCK_OPEN,
70
72
                                       _('Open'), None,
71
73
                                       _('Open the selected file'),
72
74
                                       self.open_file),
 
75
                                      ('revert', None,
 
76
                                       _('Revert'), None,
 
77
                                       _('Revert the changes'),
 
78
                                       self.revert),
73
79
                                      ('commit', None,
74
80
                                       _('Commit'), None,
75
81
                                       _('Commit the changes'),
76
82
                                       self.commit),
 
83
                                      ('annotate', None,
 
84
                                       _('Annotate'), None,
 
85
                                       _('Annotate the selected file'),
 
86
                                       self.annotate),
77
87
                                      ('diff', None,
78
88
                                       _('Diff'), None,
79
89
                                       _('Show the diff of the file'),
101
111
                                      ('diff_all', None,
102
112
                                       _('All...'), None,
103
113
                                       _('Show the differences of all files'),
104
 
                                       self.diff_all)
 
114
                                       self.diff_all),
 
115
                                      ('view_remote', None,
 
116
                                       _('View contents'), None,
 
117
                                       _('View the contents of the file in a builtin viewer'),
 
118
                                       self.view_remote),
 
119
                                      ('diff_remote', None,
 
120
                                       _('Show differences'), None,
 
121
                                       _('Show the differences between two revisions of the file'),
 
122
                                       self.diff_remote),
 
123
                                      ('revert_remote', None,
 
124
                                       _('Revert to this revision'), None,
 
125
                                       _('Revert the selected file to the selected revision'),
 
126
                                       self.revert_remote)
105
127
                                     ])
106
128
        
107
129
        self.ui.insert_action_group(self.actiongroup, 0)
110
132
        self.cmenu_right = self.ui.get_widget('/context_right')
111
133
        self.cmenu_left = self.ui.get_widget('/context_left')
112
134
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
135
        self.cmenu_remote = self.ui.get_widget('/context_remote')
113
136
        
114
137
        # 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)
 
138
        # TODO: do it without using deprecated comm
 
139
        #commit_menu = self.ui.get_widget('/context_right/commit')
 
140
        #commit_image = self.comm.menuitem_branch_commit.get_image()
 
141
        #commit_pixbuf = commit_image.get_pixbuf()
 
142
        #commit_icon = gtk.Image()
 
143
        #commit_icon.set_from_pixbuf(commit_pixbuf)
 
144
        #commit_menu.set_image(commit_icon)
 
145
        #diff_menu = self.ui.get_widget('/context_right/diff')
 
146
        #diff_image = self.comm.menuitem_stats_diff.get_image()
 
147
        #diff_pixbuf = diff_image.get_pixbuf()
 
148
        #diff_icon = gtk.Image()
 
149
        #diff_icon.set_from_pixbuf(diff_pixbuf)
 
150
        #diff_menu.set_image(diff_icon)
127
151
 
128
152
    def right_context_menu(self):
129
153
        return self.cmenu_right
131
155
    def left_context_menu(self):
132
156
        return self.cmenu_left
133
157
    
 
158
    def remote_context_menu(self):
 
159
        return self.cmenu_remote
 
160
    
 
161
    @show_bzr_error
134
162
    def add_file(self, action):
135
163
        """ Right context menu -> Add """
 
164
        import bzrlib.add
 
165
        
136
166
        # Add only the selected file
137
 
        directory = self.comm.get_path()
138
 
        filename = self.comm.get_selected_right()
 
167
        directory = self.path
 
168
        filename = self.selected
139
169
            
140
170
        if filename is None:
141
171
            error_dialog(_('No file was selected'),
142
 
                                     _('Please select a file from the list,\nor choose the other option.'))
143
 
            return
144
 
        
 
172
                         _('Please select a file from the list,\nor choose the other option.'))
 
173
            return
 
174
        
 
175
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
176
    
 
177
    @show_bzr_error
 
178
    def annotate(self, action):
 
179
        """ Right context menu -> Annotate """
 
180
        directory = self.path
 
181
        filename = self.selected
 
182
        
 
183
        if filename is None:
 
184
            error_dialog(_('No file was selected'),
 
185
                         _('Please select a file from the list.'))
 
186
            return
 
187
        
 
188
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
189
        
 
190
        branch = wt.branch
 
191
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
192
        
 
193
        window = GAnnotateWindow(all=False, plain=False)
 
194
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
195
        config = GAnnotateConfig(window)
 
196
        window.show()
 
197
        branch.lock_read()
145
198
        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()
 
199
            window.annotate(wt, branch, file_id)
 
200
        finally:
 
201
            branch.unlock()
153
202
    
 
203
    @show_bzr_error
154
204
    def remove_file(self, action):
155
205
        """ Right context menu -> Remove """
156
206
        # Remove only the selected file
157
 
        directory = self.comm.get_path()
158
 
        filename = self.comm.get_selected_right()
 
207
        directory = self.path
 
208
        filename = self.selected
159
209
        
160
210
        if filename is None:
161
211
            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
 
 
 
212
                         _('Please select a file from the list,\nor choose the other option.'))
 
213
            return
 
214
        
 
215
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
216
        wt.remove(path)
 
217
        self.app.set_path(self.path)
 
218
        self.app.refresh_right()
 
219
 
 
220
    def rename_file(self, action):
 
221
        """ Right context menu -> Rename """
 
222
        from rename import OliveRename
 
223
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
224
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
225
        rename.display()
 
226
    
182
227
    def open_file(self, action):
183
228
        """ Right context menu -> Open """
184
229
        # Open only the selected file
185
 
        filename = self.comm.get_selected_right()
 
230
        filename = self.selected
186
231
        
187
232
        if filename is None:
188
233
            error_dialog(_('No file was selected'),
189
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
234
                         _('Please select a file from the list,\nor choose the other option.'))
190
235
            return
191
236
 
192
237
        if filename == '..':
193
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
238
            # TODO: how to enter a directory?
 
239
            return
194
240
        else:
195
 
            fullpath = self.comm.get_path() + os.sep + filename
 
241
            fullpath = self.path + os.sep + filename
196
242
            if os.path.isdir(fullpath):
197
243
                # selected item is an existant directory
198
 
                self.comm.set_path(fullpath)
 
244
                # TODO: how to enter a directory?
 
245
                return
199
246
            else:
200
247
                launch(fullpath) 
201
 
        
202
 
        self.comm.refresh_right()
203
248
 
 
249
    def revert(self, action):
 
250
        """ Right context menu -> Revert """
 
251
        wt, path = WorkingTree.open_containing(self.path)
 
252
        ret = wt.revert([os.path.join(path, self.selected)])
 
253
        if ret:
 
254
            warning_dialog(_('Conflicts detected'),
 
255
                           _('Please have a look at the working tree before continuing.'))
 
256
        else:
 
257
            info_dialog(_('Revert successful'),
 
258
                        _('All files reverted to last revision.'))
 
259
        self.app.refresh_right()       
 
260
    
204
261
    def commit(self, action):
205
262
        """ 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()
 
263
        from commit import CommitDialog
 
264
        branch = None
 
265
        try:
 
266
            wt, path = WorkingTree.open_containing(self.path)
 
267
            branch = wt.branch
 
268
        except NotBranchError, e:
 
269
            path = e.path
 
270
        
 
271
        commit = CommitDialog(wt, path, not branch, self.selected)
 
272
        response = commit.run()
 
273
        if response != gtk.RESPONSE_NONE:
 
274
            commit.hide()
 
275
        
 
276
            if response == gtk.RESPONSE_OK:
 
277
                self.app.refresh_right()
 
278
            
 
279
            commit.destroy()
210
280
    
 
281
    @show_bzr_error
211
282
    def diff(self, action):
212
283
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm)
215
 
        diff.display()
 
284
        wt = WorkingTree.open_containing(self.path)[0]
 
285
        window = DiffWindow()
 
286
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
287
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
288
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
289
        window.show()
216
290
    
217
291
    def bookmark(self, action):
218
292
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
293
        if self.pref.add_bookmark(self.path):
220
294
            info_dialog(_('Bookmark successfully added'),
221
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
295
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
296
            self.pref.write()
222
297
        else:
223
298
            warning_dialog(_('Location already bookmarked'),
224
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
299
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
225
300
        
226
 
        self.comm.refresh_left()
 
301
        self.app.refresh_left()
227
302
 
228
303
    def edit_bookmark(self, action):
229
304
        """ 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()
 
305
        from bookmark import BookmarkDialog
 
306
        
 
307
        if self.selected != None:
 
308
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
309
            response = bookmark.run()
 
310
            
 
311
            if response != gtk.RESPONSE_NONE:
 
312
                bookmark.hide()
 
313
        
 
314
                if response == gtk.RESPONSE_OK:
 
315
                    self.app.refresh_left()
 
316
            
 
317
                bookmark.destroy()
235
318
 
236
319
    def remove_bookmark(self, action):
237
320
        """ Left context menu -> Remove """
238
321
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
322
        if self.selected != None:
 
323
            self.pref.remove_bookmark(self.selected)
 
324
            self.pref.write()
 
325
        
 
326
        self.app.refresh_left()
242
327
    
243
328
    def open_folder(self, action):
244
329
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
330
        path = self.selected
246
331
 
247
332
        if path != None:
248
333
            launch(path)
254
339
    def diff_all(self, action):
255
340
        """ Diff toolbutton -> All... """
256
341
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm)
 
342
        diff = OliveDiff(self.comm)
258
343
        diff.display()
 
344
    
 
345
    def view_remote(self, action):
 
346
        """ Remote context menu -> View contents """
 
347
        print "DEBUG: view contents."
 
348
    
 
349
    def diff_remote(self, action):
 
350
        """ Remote context menu -> Show differences """
 
351
        print "DEBUG: show differences."
 
352
    
 
353
    def revert_remote(self, action):
 
354
        """ Remote context menu -> Revert to this revision """
 
355
        print "DEBUG: revert to this revision."