/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: Daniel Schierbeck
  • Date: 2007-12-06 23:37:06 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: daniel.schierbeck@gmail.com-20071206233706-eeinks66w86r3gfm
Fixed bug in gmissing.

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:
28
30
import bzrlib.errors as errors
29
31
from bzrlib.workingtree import WorkingTree
30
32
 
31
 
from dialog import error_dialog, info_dialog, warning_dialog
 
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
32
38
from launch import launch
33
 
from olive import OlivePreferences
 
39
from olive import Preferences
34
40
 
35
41
class OliveMenu:
36
42
    """ This class is responsible for building the context menus. """
37
 
    def __init__(self, path, selected):
 
43
    def __init__(self, path, selected, app=None):
38
44
        # Load the UI file
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
 
        
 
45
        from guifiles import UIFILENAME
 
46
 
 
47
        self.uifile = UIFILENAME
 
48
 
53
49
        # Preferences handler
54
 
        self.pref = OlivePreferences()
 
50
        self.pref = Preferences()
55
51
        
56
52
        # Set default values
57
53
        self.path = path
58
54
        self.selected = selected
59
 
        print "DEBUG: path =", self.path
60
 
        print "DEBUG: selected =", self.selected
 
55
        self.app = app
61
56
        
62
57
        # Create the file list context menu
63
58
        self.ui = gtk.UIManager()
71
66
                                       _('Remove'), None,
72
67
                                       _('Remove the selected file'),
73
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),
74
77
                                      ('open', gtk.STOCK_OPEN,
75
78
                                       _('Open'), None,
76
79
                                       _('Open the selected file'),
77
80
                                       self.open_file),
 
81
                                      ('revert', None,
 
82
                                       _('Revert'), None,
 
83
                                       _('Revert the changes'),
 
84
                                       self.revert),
78
85
                                      ('commit', None,
79
86
                                       _('Commit'), None,
80
87
                                       _('Commit the changes'),
81
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _('Annotate'), None,
 
91
                                       _('Annotate the selected file'),
 
92
                                       self.annotate),
82
93
                                      ('diff', None,
83
94
                                       _('Diff'), None,
84
95
                                       _('Show the diff of the file'),
106
117
                                      ('diff_all', None,
107
118
                                       _('All...'), None,
108
119
                                       _('Show the differences of all files'),
109
 
                                       self.diff_all)
 
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)
110
133
                                     ])
111
134
        
112
135
        self.ui.insert_action_group(self.actiongroup, 0)
115
138
        self.cmenu_right = self.ui.get_widget('/context_right')
116
139
        self.cmenu_left = self.ui.get_widget('/context_left')
117
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
118
142
        
119
143
        # Set icons
120
144
        # TODO: do it without using deprecated comm
137
161
    def left_context_menu(self):
138
162
        return self.cmenu_left
139
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
140
168
    def add_file(self, action):
141
169
        """ Right context menu -> Add """
142
170
        import bzrlib.add
150
178
                         _('Please select a file from the list,\nor choose the other option.'))
151
179
            return
152
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, parent=self.app)
 
200
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
201
        config = GAnnotateConfig(window)
 
202
        window.show()
 
203
        branch.lock_read()
153
204
        try:
154
 
            bzrlib.add.smart_add([directory + '/' + filename])
155
 
        except errors.NotBranchError:
156
 
            error_dialog(_('Directory is not a branch'),
157
 
                         _('You can perform this action only in a branch.'))
158
 
            return
 
205
            window.annotate(wt, branch, file_id)
 
206
        finally:
 
207
            branch.unlock()
159
208
    
160
 
    def remove_file(self, action):
 
209
    @show_bzr_error
 
210
    def remove_file(self, action,delete_on_disk=0):
161
211
        """ Right context menu -> Remove """
162
212
        # Remove only the selected file
163
213
        directory = self.path
168
218
                         _('Please select a file from the list,\nor choose the other option.'))
169
219
            return
170
220
        
171
 
        try:
172
 
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
173
 
            wt.remove(path)
174
 
 
175
 
        except errors.NotBranchError:
176
 
            error_dialog(_('Directory is not a branch'),
177
 
                         _('You can perform this action only in a branch.'))
178
 
            return
179
 
        except errors.NotVersionedError:
180
 
            error_dialog(_('File not versioned'),
181
 
                         _('The selected file is not versioned.'))
182
 
            return
183
 
 
 
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
    
184
247
    def open_file(self, action):
185
248
        """ Right context menu -> Open """
186
249
        # Open only the selected file
203
266
            else:
204
267
                launch(fullpath) 
205
268
 
 
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
    
206
281
    def commit(self, action):
207
282
        """ Right context menu -> Commit """
208
 
        from commit import OliveCommit
209
 
        wt, path = WorkingTree.open_containing(self.path)
210
 
        commit = OliveCommit(wt, path)
211
 
        commit.display()
 
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
        if self.selected:
 
292
            selected = os.path.join(path, self.selected)
 
293
        else:
 
294
            selected = None
 
295
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
 
296
        response = commit.run()
 
297
        if response != gtk.RESPONSE_NONE:
 
298
            commit.hide()
 
299
        
 
300
            if response == gtk.RESPONSE_OK:
 
301
                self.app.refresh_right()
 
302
            
 
303
            commit.destroy()
212
304
    
 
305
    @show_bzr_error
213
306
    def diff(self, action):
214
307
        """ Right context menu -> Diff """
215
 
        from diff import OliveDiff
216
 
        diff = OliveDiff(self.comm)
217
 
        diff.display()
 
308
        wt = WorkingTree.open_containing(self.path)[0]
 
309
        window = DiffWindow(self.app)
 
310
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
311
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
312
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
313
        window.show()
218
314
    
219
315
    def bookmark(self, action):
220
316
        """ Right context menu -> Bookmark """
221
 
        if self.pref.add_bookmark(self.comm.get_path()):
 
317
        if self.pref.add_bookmark(self.path):
222
318
            info_dialog(_('Bookmark successfully added'),
223
319
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
320
            self.pref.write()
224
321
        else:
225
322
            warning_dialog(_('Location already bookmarked'),
226
323
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
324
        
 
325
        self.app.refresh_left()
227
326
 
228
327
    def edit_bookmark(self, action):
229
328
        """ Left context menu -> Edit """
230
 
        from bookmark import OliveBookmark
231
 
 
 
329
        from bookmark import BookmarkDialog
 
330
        
232
331
        if self.selected != None:
233
 
            bookmark = OliveBookmark()
234
 
            bookmark.display()
 
332
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
333
            response = bookmark.run()
 
334
            
 
335
            if response != gtk.RESPONSE_NONE:
 
336
                bookmark.hide()
 
337
        
 
338
                if response == gtk.RESPONSE_OK:
 
339
                    self.app.refresh_left()
 
340
            
 
341
                bookmark.destroy()
235
342
 
236
343
    def remove_bookmark(self, action):
237
344
        """ Left context menu -> Remove """
238
345
        
239
346
        if self.selected != None:
240
 
            self.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
347
            self.pref.remove_bookmark(self.selected)
 
348
            self.pref.write()
 
349
        
 
350
        self.app.refresh_left()
242
351
    
243
352
    def open_folder(self, action):
244
353
        """ Left context menu -> Open Folder """
256
365
        from diff import OliveDiff
257
366
        diff = OliveDiff(self.comm)
258
367
        diff.display()
 
368
    
 
369
    def view_remote(self, action):
 
370
        """ Remote context menu -> View contents """
 
371
        print "DEBUG: view contents."
 
372
    
 
373
    def diff_remote(self, action):
 
374
        """ Remote context menu -> Show differences """
 
375
        print "DEBUG: show differences."
 
376
    
 
377
    def revert_remote(self, action):
 
378
        """ Remote context menu -> Revert to this revision """
 
379
        print "DEBUG: revert to this revision."