/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: 2008-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

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 bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
33
from bzrlib.plugins.gtk import _i18n
 
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
32
35
from bzrlib.plugins.gtk.errors import show_bzr_error
33
36
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
34
37
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
35
38
from bzrlib.plugins.gtk.diff import DiffWindow
36
39
from launch import launch
37
 
from olive import Preferences
 
40
from bzrlib.plugins.gtk.olive import Preferences
38
41
 
39
42
class OliveMenu:
40
43
    """ This class is responsible for building the context menus. """
57
60
        
58
61
        self.actiongroup = gtk.ActionGroup('context')
59
62
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
60
 
                                       _('Add'), None,
61
 
                                       _('Add the selected file'),
 
63
                                       _i18n('Add'), None,
 
64
                                       _i18n('Add the selected file'),
62
65
                                       self.add_file),
63
66
                                      ('remove', gtk.STOCK_REMOVE,
64
 
                                       _('Remove'), None,
65
 
                                       _('Remove the selected file'),
 
67
                                       _i18n('Remove'), None,
 
68
                                       _i18n('Remove the selected file'),
66
69
                                       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),
67
74
                                      ('rename', None,
68
 
                                       _('Rename'), None,
69
 
                                       _('Rename the selected file'),
 
75
                                       _i18n('Rename'), None,
 
76
                                       _i18n('Rename the selected file'),
70
77
                                       self.rename_file),
71
78
                                      ('open', gtk.STOCK_OPEN,
72
 
                                       _('Open'), None,
73
 
                                       _('Open the selected file'),
 
79
                                       _i18n('Open'), None,
 
80
                                       _i18n('Open the selected file'),
74
81
                                       self.open_file),
75
82
                                      ('revert', None,
76
 
                                       _('Revert'), None,
77
 
                                       _('Revert the changes'),
 
83
                                       _i18n('Revert'), None,
 
84
                                       _i18n('Revert the changes'),
78
85
                                       self.revert),
79
86
                                      ('commit', None,
80
 
                                       _('Commit'), None,
81
 
                                       _('Commit the changes'),
 
87
                                       _i18n('Commit'), None,
 
88
                                       _i18n('Commit the changes'),
82
89
                                       self.commit),
83
90
                                      ('annotate', None,
84
 
                                       _('Annotate'), None,
85
 
                                       _('Annotate the selected file'),
 
91
                                       _i18n('Annotate'), None,
 
92
                                       _i18n('Annotate the selected file'),
86
93
                                       self.annotate),
87
94
                                      ('diff', None,
88
 
                                       _('Diff'), None,
89
 
                                       _('Show the diff of the file'),
 
95
                                       _i18n('Diff'), None,
 
96
                                       _i18n('Show the diff of the file'),
90
97
                                       self.diff),
91
98
                                      ('bookmark', None,
92
 
                                       _('Bookmark'), None,
93
 
                                       _('Bookmark current location'),
 
99
                                       _i18n('Bookmark'), None,
 
100
                                       _i18n('Bookmark current location'),
94
101
                                       self.bookmark),
95
102
                                      ('edit_bookmark', gtk.STOCK_EDIT,
96
 
                                       _('Edit'), None,
97
 
                                       _('Edit the selected bookmark'),
 
103
                                       _i18n('Edit'), None,
 
104
                                       _i18n('Edit the selected bookmark'),
98
105
                                       self.edit_bookmark),
99
106
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
100
 
                                       _('Remove'), None,
101
 
                                       _('Remove the selected bookmark'),
 
107
                                       _i18n('Remove'), None,
 
108
                                       _i18n('Remove the selected bookmark'),
102
109
                                       self.remove_bookmark),
103
110
                                      ('open_folder', gtk.STOCK_OPEN,
104
 
                                       _('Open Folder'), None,
105
 
                                       _('Open bookmark folder in Nautilus'),
 
111
                                       _i18n('Open Folder'), None,
 
112
                                       _i18n('Open bookmark folder in Nautilus'),
106
113
                                       self.open_folder),
107
114
                                      ('diff_selected', None,
108
 
                                       _('Selected...'), None,
109
 
                                       _('Show the differences of the selected file'),
 
115
                                       _i18n('Selected...'), None,
 
116
                                       _i18n('Show the differences of the selected file'),
110
117
                                       self.diff_selected),
111
118
                                      ('diff_all', None,
112
 
                                       _('All...'), None,
113
 
                                       _('Show the differences of all files'),
114
 
                                       self.diff_all)
 
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)
115
134
                                     ])
116
135
        
117
136
        self.ui.insert_action_group(self.actiongroup, 0)
120
139
        self.cmenu_right = self.ui.get_widget('/context_right')
121
140
        self.cmenu_left = self.ui.get_widget('/context_left')
122
141
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
 
142
        self.cmenu_remote = self.ui.get_widget('/context_remote')
123
143
        
124
144
        # Set icons
125
145
        # TODO: do it without using deprecated comm
142
162
    def left_context_menu(self):
143
163
        return self.cmenu_left
144
164
    
 
165
    def remote_context_menu(self):
 
166
        return self.cmenu_remote
 
167
    
145
168
    @show_bzr_error
146
169
    def add_file(self, action):
147
170
        """ Right context menu -> Add """
152
175
        filename = self.selected
153
176
            
154
177
        if filename is None:
155
 
            error_dialog(_('No file was selected'),
156
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
178
            error_dialog(_i18n('No file was selected'),
 
179
                         _i18n('Please select a file from the list,\nor choose the other option.'))
157
180
            return
158
181
        
159
 
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
182
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
183
        wt.add([path])
160
184
    
161
185
    @show_bzr_error
162
186
    def annotate(self, action):
165
189
        filename = self.selected
166
190
        
167
191
        if filename is None:
168
 
            error_dialog(_('No file was selected'),
169
 
                         _('Please select a file from the list.'))
 
192
            error_dialog(_i18n('No file was selected'),
 
193
                         _i18n('Please select a file from the list.'))
170
194
            return
171
195
        
172
196
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
174
198
        branch = wt.branch
175
199
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
176
200
        
177
 
        window = GAnnotateWindow(all=False, plain=False)
 
201
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
178
202
        window.set_title(os.path.join(directory, filename) + " - Annotate")
179
203
        config = GAnnotateConfig(window)
180
204
        window.show()
185
209
            branch.unlock()
186
210
    
187
211
    @show_bzr_error
188
 
    def remove_file(self, action):
 
212
    def remove_file(self, action,delete_on_disk=0):
189
213
        """ Right context menu -> Remove """
190
214
        # Remove only the selected file
191
215
        directory = self.path
192
216
        filename = self.selected
193
217
        
194
218
        if filename is None:
195
 
            error_dialog(_('No file was selected'),
196
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
219
            error_dialog(_i18n('No file was selected'),
 
220
                         _i18n('Please select a file from the list,\nor choose the other option.'))
197
221
            return
198
222
        
199
223
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
200
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
                
201
235
        self.app.set_path(self.path)
202
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)
203
241
 
204
242
    def rename_file(self, action):
205
243
        """ Right context menu -> Rename """
214
252
        filename = self.selected
215
253
        
216
254
        if filename is None:
217
 
            error_dialog(_('No file was selected'),
218
 
                         _('Please select a file from the list,\nor choose the other option.'))
 
255
            error_dialog(_i18n('No file was selected'),
 
256
                         _i18n('Please select a file from the list,\nor choose the other option.'))
219
257
            return
220
258
 
221
259
        if filename == '..':
235
273
        wt, path = WorkingTree.open_containing(self.path)
236
274
        ret = wt.revert([os.path.join(path, self.selected)])
237
275
        if ret:
238
 
            warning_dialog(_('Conflicts detected'),
239
 
                           _('Please have a look at the working tree before continuing.'))
 
276
            warning_dialog(_i18n('Conflicts detected'),
 
277
                           _i18n('Please have a look at the working tree before continuing.'))
240
278
        else:
241
 
            info_dialog(_('Revert successful'),
242
 
                        _('All files reverted to last revision.'))
 
279
            info_dialog(_i18n('Revert successful'),
 
280
                        _i18n('All files reverted to last revision.'))
243
281
        self.app.refresh_right()       
244
282
    
245
283
    def commit(self, action):
252
290
        except NotBranchError, e:
253
291
            path = e.path
254
292
        
255
 
        commit = CommitDialog(wt, path, not branch, self.selected)
 
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)
256
298
        response = commit.run()
257
299
        if response != gtk.RESPONSE_NONE:
258
300
            commit.hide()
266
308
    def diff(self, action):
267
309
        """ Right context menu -> Diff """
268
310
        wt = WorkingTree.open_containing(self.path)[0]
269
 
        window = DiffWindow()
 
311
        window = DiffWindow(self.app)
270
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
271
313
        window.set_diff(wt.branch.nick, wt, parent_tree)
272
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
275
317
    def bookmark(self, action):
276
318
        """ Right context menu -> Bookmark """
277
319
        if self.pref.add_bookmark(self.path):
278
 
            info_dialog(_('Bookmark successfully added'),
279
 
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
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.'))
280
322
            self.pref.write()
281
323
        else:
282
 
            warning_dialog(_('Location already bookmarked'),
283
 
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
324
            warning_dialog(_i18n('Location already bookmarked'),
 
325
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
284
326
        
285
327
        self.app.refresh_left()
286
328
 
325
367
        from diff import OliveDiff
326
368
        diff = OliveDiff(self.comm)
327
369
        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."