/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-27 19:10:00 UTC
  • mto: (0.14.1 main)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060927191000-2b5382eda85d82e4
Fixed a context menu bug; set release date.

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
32
 
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
33
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
41
34
 
42
35
class OliveMenu:
43
36
    """ This class is responsible for building the context menus. """
44
 
    def __init__(self, path, selected, app=None):
 
37
    def __init__(self, gladefile, comm, dialog):
45
38
        # 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
 
39
        if sys.platform == 'win32':
 
40
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
 
41
        else:
 
42
            self.uifile = "/usr/share/olive/cmenu.ui"
 
43
        
 
44
        if not os.path.exists(self.uifile):
 
45
            # Load from current directory if not installed
 
46
            self.uifile = "cmenu.ui"
 
47
            # Check again
 
48
            if not os.path.exists(self.uifile):
 
49
                # Fail
 
50
                print _('UI description file cannot be found.')
 
51
                sys.exit(1)
 
52
        
 
53
        self.gladefile = gladefile
 
54
        self.comm = comm
 
55
        self.dialog = dialog
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
 
        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(_i18n('No file was selected'),
192
 
                         _i18n('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, parent=self.app)
201
 
        window.set_title(os.path.join(directory, filename) + " - Annotate")
202
 
        config = GAnnotateConfig(window)
203
 
        window.show()
204
 
        branch.lock_read()
 
141
            self.dialog.error_dialog(_('No file was selected'),
 
142
                                     _('Please select a file from the list,\nor choose the other option.'))
 
143
            return
 
144
        
205
145
        try:
206
 
            window.annotate(wt, branch, file_id)
207
 
        finally:
208
 
            branch.unlock()
 
146
            bzrlib.add.smart_add([directory + '/' + filename])
 
147
        except errors.NotBranchError:
 
148
            self.dialog.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()
209
153
    
210
 
    @show_bzr_error
211
 
    def remove_file(self, action,delete_on_disk=0):
 
154
    def remove_file(self, action):
212
155
        """ Right context menu -> Remove """
213
156
        # Remove only the selected file
214
 
        directory = self.path
215
 
        filename = self.selected
 
157
        directory = self.comm.get_path()
 
158
        filename = self.comm.get_selected_right()
216
159
        
217
160
        if filename is None:
218
 
            error_dialog(_i18n('No file was selected'),
219
 
                         _i18n('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(_i18n('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
 
    
 
161
            self.dialog.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
            self.dialog.error_dialog(_('Directory is not a branch'),
 
171
                                     _('You can perform this action only in a branch.'))
 
172
            return
 
173
        except errors.NotVersionedError:
 
174
            self.dialog.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
 
248
182
    def open_file(self, action):
249
183
        """ Right context menu -> Open """
250
184
        # Open only the selected file
251
 
        filename = self.selected
 
185
        filename = self.comm.get_selected_right()
252
186
        
253
187
        if filename is None:
254
 
            error_dialog(_i18n('No file was selected'),
255
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
188
            self.dialog.error_dialog(_('No file was selected'),
 
189
                                     _('Please select a file from the list,\nor choose the other option.'))
256
190
            return
257
191
 
258
192
        if filename == '..':
259
 
            # TODO: how to enter a directory?
260
 
            return
 
193
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
261
194
        else:
262
 
            fullpath = self.path + os.sep + filename
 
195
            fullpath = self.comm.get_path() + os.sep + filename
263
196
            if os.path.isdir(fullpath):
264
197
                # selected item is an existant directory
265
 
                # TODO: how to enter a directory?
266
 
                return
 
198
                self.comm.set_path(fullpath)
267
199
            else:
268
200
                launch(fullpath) 
 
201
        
 
202
        self.comm.refresh_right()
269
203
 
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(_i18n('Conflicts detected'),
276
 
                           _i18n('Please have a look at the working tree before continuing.'))
277
 
        else:
278
 
            info_dialog(_i18n('Revert successful'),
279
 
                        _i18n('All files reverted to last revision.'))
280
 
        self.app.refresh_right()       
281
 
    
282
204
    def commit(self, action):
283
205
        """ Right context menu -> Commit """
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
 
        if self.selected:
293
 
            selected = os.path.join(path, self.selected)
294
 
        else:
295
 
            selected = None
296
 
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
297
 
        response = commit.run()
298
 
        if response != gtk.RESPONSE_NONE:
299
 
            commit.hide()
300
 
        
301
 
            if response == gtk.RESPONSE_OK:
302
 
                self.app.refresh_right()
303
 
            
304
 
            commit.destroy()
 
206
        from commit import OliveCommit
 
207
        commit = OliveCommit(self.gladefile, self.comm, self.dialog)
 
208
        commit.display()
305
209
    
306
 
    @show_bzr_error
307
210
    def diff(self, action):
308
211
        """ Right context menu -> Diff """
309
 
        wt = WorkingTree.open_containing(self.path)[0]
310
 
        window = DiffWindow(self.app)
311
 
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
312
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
313
 
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
314
 
        window.show()
 
212
        from diff import OliveDiff
 
213
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
214
        diff.display()
315
215
    
316
216
    def bookmark(self, action):
317
217
        """ Right context menu -> Bookmark """
318
 
        if self.pref.add_bookmark(self.path):
319
 
            info_dialog(_i18n('Bookmark successfully added'),
320
 
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
321
 
            self.pref.write()
 
218
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
219
            self.dialog.info_dialog(_('Bookmark successfully added'),
 
220
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
322
221
        else:
323
 
            warning_dialog(_i18n('Location already bookmarked'),
324
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
222
            self.dialog.warning_dialog(_('Location already bookmarked'),
 
223
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
325
224
        
326
 
        self.app.refresh_left()
 
225
        self.comm.refresh_left()
327
226
 
328
227
    def edit_bookmark(self, action):
329
228
        """ Left context menu -> Edit """
330
 
        from bookmark import BookmarkDialog
331
 
        
332
 
        if self.selected != None:
333
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
334
 
            response = bookmark.run()
335
 
            
336
 
            if response != gtk.RESPONSE_NONE:
337
 
                bookmark.hide()
338
 
        
339
 
                if response == gtk.RESPONSE_OK:
340
 
                    self.app.refresh_left()
341
 
            
342
 
                bookmark.destroy()
 
229
        from bookmark import OliveBookmark
 
230
 
 
231
        if self.comm.get_selected_left() != None:
 
232
            bookmark = OliveBookmark(self.gladefile, self.comm, self.dialog)
 
233
            bookmark.display()
343
234
 
344
235
    def remove_bookmark(self, action):
345
236
        """ Left context menu -> Remove """
346
237
        
347
 
        if self.selected != None:
348
 
            self.pref.remove_bookmark(self.selected)
349
 
            self.pref.write()
350
 
        
351
 
        self.app.refresh_left()
 
238
        if self.comm.get_selected_left() != None:
 
239
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
240
            self.comm.refresh_left()
352
241
    
353
242
    def open_folder(self, action):
354
243
        """ Left context menu -> Open Folder """
355
 
        path = self.selected
 
244
        path = self.comm.get_selected_left()
356
245
 
357
246
        if path != None:
358
247
            launch(path)
364
253
    def diff_all(self, action):
365
254
        """ Diff toolbutton -> All... """
366
255
        from diff import OliveDiff
367
 
        diff = OliveDiff(self.comm)
 
256
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
368
257
        diff.display()
369
 
    
370
 
    def view_remote(self, action):
371
 
        """ Remote context menu -> View contents """
372
 
        print "DEBUG: view contents."
373
 
    
374
 
    def diff_remote(self, action):
375
 
        """ Remote context menu -> Show differences """
376
 
        print "DEBUG: show differences."
377
 
    
378
 
    def revert_remote(self, action):
379
 
        """ Remote context menu -> Revert to this revision """
380
 
        print "DEBUG: revert to this revision."