/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

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
32
 
from errors import show_bzr_error
 
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
33
39
from launch import launch
34
 
from olive import OlivePreferences, DiffWindow
 
40
from olive import Preferences
35
41
 
36
42
class OliveMenu:
37
43
    """ This class is responsible for building the context menus. """
42
48
        self.uifile = UIFILENAME
43
49
 
44
50
        # Preferences handler
45
 
        self.pref = OlivePreferences()
 
51
        self.pref = Preferences()
46
52
        
47
53
        # Set default values
48
54
        self.path = path
61
67
                                       _('Remove'), None,
62
68
                                       _('Remove the selected file'),
63
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),
64
74
                                      ('rename', None,
65
75
                                       _('Rename'), None,
66
76
                                       _('Rename the selected file'),
69
79
                                       _('Open'), None,
70
80
                                       _('Open the selected file'),
71
81
                                       self.open_file),
 
82
                                      ('revert', None,
 
83
                                       _('Revert'), None,
 
84
                                       _('Revert the changes'),
 
85
                                       self.revert),
72
86
                                      ('commit', None,
73
87
                                       _('Commit'), None,
74
88
                                       _('Commit the changes'),
75
89
                                       self.commit),
 
90
                                      ('annotate', None,
 
91
                                       _('Annotate'), None,
 
92
                                       _('Annotate the selected file'),
 
93
                                       self.annotate),
76
94
                                      ('diff', None,
77
95
                                       _('Diff'), None,
78
96
                                       _('Show the diff of the file'),
100
118
                                      ('diff_all', None,
101
119
                                       _('All...'), None,
102
120
                                       _('Show the differences of all files'),
103
 
                                       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)
104
134
                                     ])
105
135
        
106
136
        self.ui.insert_action_group(self.actiongroup, 0)
109
139
        self.cmenu_right = self.ui.get_widget('/context_right')
110
140
        self.cmenu_left = self.ui.get_widget('/context_left')
111
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
112
143
        
113
144
        # Set icons
114
145
        # TODO: do it without using deprecated comm
131
162
    def left_context_menu(self):
132
163
        return self.cmenu_left
133
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
134
168
    @show_bzr_error
135
169
    def add_file(self, action):
136
170
        """ Right context menu -> Add """
148
182
        bzrlib.add.smart_add([os.path.join(directory, filename)])
149
183
    
150
184
    @show_bzr_error
151
 
    def remove_file(self, action):
 
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()
 
205
        try:
 
206
            window.annotate(wt, branch, file_id)
 
207
        finally:
 
208
            branch.unlock()
 
209
    
 
210
    @show_bzr_error
 
211
    def remove_file(self, action,delete_on_disk=0):
152
212
        """ Right context menu -> Remove """
153
213
        # Remove only the selected file
154
214
        directory = self.path
161
221
        
162
222
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
163
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
                
164
234
        self.app.set_path(self.path)
165
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)
166
240
 
167
241
    def rename_file(self, action):
168
242
        """ Right context menu -> Rename """
193
267
            else:
194
268
                launch(fullpath) 
195
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
    
196
282
    def commit(self, action):
197
283
        """ Right context menu -> Commit """
198
284
        from commit import CommitDialog
202
288
            branch = wt.branch
203
289
        except NotBranchError, e:
204
290
            path = e.path
205
 
        commit = CommitDialog(wt, path, not branch)
206
 
        commit.display()
 
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()
207
301
    
208
302
    @show_bzr_error
209
303
    def diff(self, action):
229
323
 
230
324
    def edit_bookmark(self, action):
231
325
        """ Left context menu -> Edit """
232
 
        from bookmark import OliveBookmarkDialog
 
326
        from bookmark import BookmarkDialog
233
327
        
234
328
        if self.selected != None:
235
 
            bookmark = OliveBookmarkDialog(self.selected, self.app.window)
 
329
            bookmark = BookmarkDialog(self.selected, self.app.window)
236
330
            response = bookmark.run()
237
331
            
238
332
            if response != gtk.RESPONSE_NONE:
268
362
        from diff import OliveDiff
269
363
        diff = OliveDiff(self.comm)
270
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."