/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 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

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