/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: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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, DiffWindow
 
39
from olive import Preferences
34
40
 
35
41
class OliveMenu:
36
42
    """ This class is responsible for building the context menus. """
41
47
        self.uifile = UIFILENAME
42
48
 
43
49
        # Preferences handler
44
 
        self.pref = OlivePreferences()
 
50
        self.pref = Preferences()
45
51
        
46
52
        # Set default values
47
53
        self.path = path
60
66
                                       _('Remove'), None,
61
67
                                       _('Remove the selected file'),
62
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),
63
73
                                      ('rename', None,
64
74
                                       _('Rename'), None,
65
75
                                       _('Rename the selected file'),
68
78
                                       _('Open'), None,
69
79
                                       _('Open the selected file'),
70
80
                                       self.open_file),
 
81
                                      ('revert', None,
 
82
                                       _('Revert'), None,
 
83
                                       _('Revert the changes'),
 
84
                                       self.revert),
71
85
                                      ('commit', None,
72
86
                                       _('Commit'), None,
73
87
                                       _('Commit the changes'),
74
88
                                       self.commit),
 
89
                                      ('annotate', None,
 
90
                                       _('Annotate'), None,
 
91
                                       _('Annotate the selected file'),
 
92
                                       self.annotate),
75
93
                                      ('diff', None,
76
94
                                       _('Diff'), None,
77
95
                                       _('Show the diff of the file'),
99
117
                                      ('diff_all', None,
100
118
                                       _('All...'), None,
101
119
                                       _('Show the differences of all files'),
102
 
                                       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)
103
133
                                     ])
104
134
        
105
135
        self.ui.insert_action_group(self.actiongroup, 0)
108
138
        self.cmenu_right = self.ui.get_widget('/context_right')
109
139
        self.cmenu_left = self.ui.get_widget('/context_left')
110
140
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
141
        self.cmenu_remote = self.ui.get_widget('/context_remote')
111
142
        
112
143
        # Set icons
113
144
        # TODO: do it without using deprecated comm
130
161
    def left_context_menu(self):
131
162
        return self.cmenu_left
132
163
    
 
164
    def remote_context_menu(self):
 
165
        return self.cmenu_remote
 
166
    
 
167
    @show_bzr_error
133
168
    def add_file(self, action):
134
169
        """ Right context menu -> Add """
135
170
        import bzrlib.add
143
178
                         _('Please select a file from the list,\nor choose the other option.'))
144
179
            return
145
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()
146
204
        try:
147
 
            bzrlib.add.smart_add([os.path.join(directory, filename)])
148
 
        except errors.NotBranchError:
149
 
            error_dialog(_('Directory is not a branch'),
150
 
                         _('You can perform this action only in a branch.'))
151
 
            return
 
205
            window.annotate(wt, branch, file_id)
 
206
        finally:
 
207
            branch.unlock()
152
208
    
153
 
    def remove_file(self, action):
 
209
    @show_bzr_error
 
210
    def remove_file(self, action,delete_on_disk=0):
154
211
        """ Right context menu -> Remove """
155
212
        # Remove only the selected file
156
213
        directory = self.path
161
218
                         _('Please select a file from the list,\nor choose the other option.'))
162
219
            return
163
220
        
164
 
        try:
165
 
            wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
166
 
            wt.remove(path)
167
 
 
168
 
        except errors.NotBranchError:
169
 
            error_dialog(_('Directory is not a branch'),
170
 
                         _('You can perform this action only in a branch.'))
171
 
            return
172
 
        except errors.NotVersionedError:
173
 
            error_dialog(_('File not versioned'),
174
 
                         _('The selected file is not versioned.'))
175
 
            return
176
 
 
 
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
                
177
233
        self.app.set_path(self.path)
178
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)
179
239
 
180
240
    def rename_file(self, action):
181
241
        """ Right context menu -> Rename """
206
266
            else:
207
267
                launch(fullpath) 
208
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
    
209
281
    def commit(self, action):
210
282
        """ Right context menu -> Commit """
211
283
        from commit import CommitDialog
215
287
            branch = wt.branch
216
288
        except NotBranchError, e:
217
289
            path = e.path
218
 
        commit = CommitDialog(wt, path, not branch)
219
 
        commit.display()
 
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()
220
304
    
 
305
    @show_bzr_error
221
306
    def diff(self, action):
222
307
        """ Right context menu -> Diff """
223
 
        try:
224
 
            wt = WorkingTree.open_containing(self.path)[0]
225
 
        except errors.NotBranchError:
226
 
            error_dialog(_('File is not in a branch'),
227
 
                         _('The selected file is not in a branch.'))
228
 
            return
229
 
        
230
 
        window = DiffWindow()
 
308
        wt = WorkingTree.open_containing(self.path)[0]
 
309
        window = DiffWindow(self.app)
231
310
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
232
311
        window.set_diff(wt.branch.nick, wt, parent_tree)
233
 
        try:
234
 
            window.set_file(wt.relpath(self.path + os.sep + self.selected))
235
 
        except errors.NoSuchFile:
236
 
            pass
 
312
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
237
313
        window.show()
238
314
    
239
315
    def bookmark(self, action):
250
326
 
251
327
    def edit_bookmark(self, action):
252
328
        """ Left context menu -> Edit """
253
 
        from bookmark import OliveBookmarkDialog
 
329
        from bookmark import BookmarkDialog
254
330
        
255
331
        if self.selected != None:
256
 
            bookmark = OliveBookmarkDialog(self.selected, self.app.window)
 
332
            bookmark = BookmarkDialog(self.selected, self.app.window)
257
333
            response = bookmark.run()
258
334
            
259
335
            if response != gtk.RESPONSE_NONE:
289
365
        from diff import OliveDiff
290
366
        diff = OliveDiff(self.comm)
291
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."