/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: Aaron Bentley
  • Date: 2007-08-16 14:31:02 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070816143102-27yzfhdgdv3ggo6e
Fix hue selection to use author in gannotate

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:
24
26
    pass
25
27
 
26
28
import gtk
 
29
from dialog import question_dialog
27
30
 
28
31
import bzrlib.errors as errors
29
32
from bzrlib.workingtree import WorkingTree
30
33
 
31
 
from dialog import error_dialog, info_dialog, warning_dialog
 
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_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
32
39
from launch import launch
33
 
from olive import OlivePreferences
 
40
from olive import Preferences
34
41
 
35
42
class OliveMenu:
36
43
    """ This class is responsible for building the context menus. """
37
 
    def __init__(self, path, selected):
 
44
    def __init__(self, path, selected, app=None):
38
45
        # 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
 
        
 
46
        from guifiles import UIFILENAME
 
47
 
 
48
        self.uifile = UIFILENAME
 
49
 
53
50
        # Preferences handler
54
 
        self.pref = OlivePreferences()
 
51
        self.pref = Preferences()
55
52
        
56
53
        # Set default values
57
54
        self.path = path
58
55
        self.selected = selected
 
56
        self.app = app
59
57
        
60
58
        # Create the file list context menu
61
59
        self.ui = gtk.UIManager()
69
67
                                       _('Remove'), None,
70
68
                                       _('Remove the selected file'),
71
69
                                       self.remove_file),
 
70
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
 
71
                                       _('Remove and delete'), None,
 
72
                                       _('Remove the selected file/dir and delete from disk'),
 
73
                                       self.remove_and_delete_file),
 
74
                                      ('rename', None,
 
75
                                       _('Rename'), None,
 
76
                                       _('Rename the selected file'),
 
77
                                       self.rename_file),
72
78
                                      ('open', gtk.STOCK_OPEN,
73
79
                                       _('Open'), None,
74
80
                                       _('Open the selected file'),
75
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _('Revert'), None,
 
84
                                       _('Revert the changes'),
 
85
                                       self.revert),
76
86
                                      ('commit', None,
77
87
                                       _('Commit'), None,
78
88
                                       _('Commit the changes'),
79
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _('Annotate'), None,
 
92
                                       _('Annotate the selected file'),
 
93
                                       self.annotate),
80
94
                                      ('diff', None,
81
95
                                       _('Diff'), None,
82
96
                                       _('Show the diff of the file'),
104
118
                                      ('diff_all', None,
105
119
                                       _('All...'), None,
106
120
                                       _('Show the differences of all files'),
107
 
                                       self.diff_all)
 
121
                                       self.diff_all),
 
122
                                      ('view_remote', None,
 
123
                                       _('View contents'), None,
 
124
                                       _('View the contents of the file in a builtin viewer'),
 
125
                                       self.view_remote),
 
126
                                      ('diff_remote', None,
 
127
                                       _('Show differences'), None,
 
128
                                       _('Show the differences between two revisions of the file'),
 
129
                                       self.diff_remote),
 
130
                                      ('revert_remote', None,
 
131
                                       _('Revert to this revision'), None,
 
132
                                       _('Revert the selected file to the selected revision'),
 
133
                                       self.revert_remote)
108
134
                                     ])
109
135
        
110
136
        self.ui.insert_action_group(self.actiongroup, 0)
113
139
        self.cmenu_right = self.ui.get_widget('/context_right')
114
140
        self.cmenu_left = self.ui.get_widget('/context_left')
115
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
116
143
        
117
144
        # Set icons
118
145
        # TODO: do it without using deprecated comm
135
162
    def left_context_menu(self):
136
163
        return self.cmenu_left
137
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
 
168
    @show_bzr_error
138
169
    def add_file(self, action):
139
170
        """ Right context menu -> Add """
140
171
        import bzrlib.add
148
179
                         _('Please select a file from the list,\nor choose the other option.'))
149
180
            return
150
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(_('No file was selected'),
 
192
                         _('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)
 
201
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
202
        config = GAnnotateConfig(window)
 
203
        window.show()
 
204
        branch.lock_read()
151
205
        try:
152
 
            bzrlib.add.smart_add([directory + '/' + filename])
153
 
        except errors.NotBranchError:
154
 
            error_dialog(_('Directory is not a branch'),
155
 
                         _('You can perform this action only in a branch.'))
156
 
            return
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
157
209
    
158
 
    def remove_file(self, action):
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
159
212
        """ Right context menu -> Remove """
160
213
        # Remove only the selected file
161
214
        directory = self.path
166
219
                         _('Please select a file from the list,\nor choose the other option.'))
167
220
            return
168
221
        
169
 
        try:
170
 
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
171
 
            wt.remove(path)
172
 
 
173
 
        except errors.NotBranchError:
174
 
            error_dialog(_('Directory is not a branch'),
175
 
                         _('You can perform this action only in a branch.'))
176
 
            return
177
 
        except errors.NotVersionedError:
178
 
            error_dialog(_('File not versioned'),
179
 
                         _('The selected file is not versioned.'))
180
 
            return
181
 
 
 
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(_('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
    
182
248
    def open_file(self, action):
183
249
        """ Right context menu -> Open """
184
250
        # Open only the selected file
201
267
            else:
202
268
                launch(fullpath) 
203
269
 
 
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(_('Conflicts detected'),
 
276
                           _('Please have a look at the working tree before continuing.'))
 
277
        else:
 
278
            info_dialog(_('Revert successful'),
 
279
                        _('All files reverted to last revision.'))
 
280
        self.app.refresh_right()       
 
281
    
204
282
    def commit(self, action):
205
283
        """ Right context menu -> Commit """
206
284
        from commit import CommitDialog
207
 
        wt, path = WorkingTree.open_containing(self.path)
208
 
        commit = CommitDialog(wt, path)
209
 
        commit.display()
 
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
        commit = CommitDialog(wt, path, not branch, self.selected)
 
293
        response = commit.run()
 
294
        if response != gtk.RESPONSE_NONE:
 
295
            commit.hide()
 
296
        
 
297
            if response == gtk.RESPONSE_OK:
 
298
                self.app.refresh_right()
 
299
            
 
300
            commit.destroy()
210
301
    
 
302
    @show_bzr_error
211
303
    def diff(self, action):
212
304
        """ Right context menu -> Diff """
213
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
214
 
        
215
 
        try:
216
 
            wt = WorkingTree.open_containing(self.path)[0]
217
 
        except errors.NotBranchError:
218
 
            error_dialog(_('File is not in a branch'),
219
 
                         _('The selected file is not in a branch.'))
220
 
            return
221
 
        
 
305
        wt = WorkingTree.open_containing(self.path)[0]
222
306
        window = DiffWindow()
223
307
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
224
308
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
309
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
225
310
        window.show()
226
311
    
227
312
    def bookmark(self, action):
233
318
        else:
234
319
            warning_dialog(_('Location already bookmarked'),
235
320
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
321
        
 
322
        self.app.refresh_left()
236
323
 
237
324
    def edit_bookmark(self, action):
238
325
        """ Left context menu -> Edit """
239
 
        from bookmark import OliveBookmark
240
 
 
 
326
        from bookmark import BookmarkDialog
 
327
        
241
328
        if self.selected != None:
242
 
            bookmark = OliveBookmark(self.selected)
243
 
            bookmark.display()
 
329
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
330
            response = bookmark.run()
 
331
            
 
332
            if response != gtk.RESPONSE_NONE:
 
333
                bookmark.hide()
 
334
        
 
335
                if response == gtk.RESPONSE_OK:
 
336
                    self.app.refresh_left()
 
337
            
 
338
                bookmark.destroy()
244
339
 
245
340
    def remove_bookmark(self, action):
246
341
        """ Left context menu -> Remove """
247
342
        
248
343
        if self.selected != None:
249
 
            self.pref.remove_bookmark(self.comm.get_selected_left())
250
 
            self.comm.refresh_left()
 
344
            self.pref.remove_bookmark(self.selected)
 
345
            self.pref.write()
 
346
        
 
347
        self.app.refresh_left()
251
348
    
252
349
    def open_folder(self, action):
253
350
        """ Left context menu -> Open Folder """
265
362
        from diff import OliveDiff
266
363
        diff = OliveDiff(self.comm)
267
364
        diff.display()
 
365
    
 
366
    def view_remote(self, action):
 
367
        """ Remote context menu -> View contents """
 
368
        print "DEBUG: view contents."
 
369
    
 
370
    def diff_remote(self, action):
 
371
        """ Remote context menu -> Show differences """
 
372
        print "DEBUG: show differences."
 
373
    
 
374
    def revert_remote(self, action):
 
375
        """ Remote context menu -> Revert to this revision """
 
376
        print "DEBUG: revert to this revision."