/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: 2007-05-19 09:58:19 UTC
  • Revision ID: jelmer@samba.org-20070519095819-d1khttifjfcoqa2f
Fix some warnings when displaying ghost revisions. Reported by John.

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
18
17
import os.path
19
 
import shutil
20
18
import sys
21
19
 
22
20
try:
30
28
import bzrlib.errors as errors
31
29
from bzrlib.workingtree import WorkingTree
32
30
 
33
 
from bzrlib.plugins.gtk import _i18n
34
 
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
35
32
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
39
33
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
 
34
from olive import Preferences, DiffWindow
41
35
 
42
36
class OliveMenu:
43
37
    """ This class is responsible for building the context menus. """
60
54
        
61
55
        self.actiongroup = gtk.ActionGroup('context')
62
56
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _i18n('Add'), None,
64
 
                                       _i18n('Add the selected file'),
 
57
                                       _('Add'), None,
 
58
                                       _('Add the selected file'),
65
59
                                       self.add_file),
66
60
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _i18n('Remove'), None,
68
 
                                       _i18n('Remove the selected file'),
 
61
                                       _('Remove'), None,
 
62
                                       _('Remove the selected file'),
69
63
                                       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),
74
64
                                      ('rename', None,
75
 
                                       _i18n('Rename'), None,
76
 
                                       _i18n('Rename the selected file'),
 
65
                                       _('Rename'), None,
 
66
                                       _('Rename the selected file'),
77
67
                                       self.rename_file),
78
68
                                      ('open', gtk.STOCK_OPEN,
79
 
                                       _i18n('Open'), None,
80
 
                                       _i18n('Open the selected file'),
 
69
                                       _('Open'), None,
 
70
                                       _('Open the selected file'),
81
71
                                       self.open_file),
82
72
                                      ('revert', None,
83
 
                                       _i18n('Revert'), None,
84
 
                                       _i18n('Revert the changes'),
 
73
                                       _('Revert'), None,
 
74
                                       _('Revert the changes'),
85
75
                                       self.revert),
86
76
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
77
                                       _('Commit'), None,
 
78
                                       _('Commit the changes'),
89
79
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
80
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
81
                                       _('Diff'), None,
 
82
                                       _('Show the diff of the file'),
97
83
                                       self.diff),
98
84
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
85
                                       _('Bookmark'), None,
 
86
                                       _('Bookmark current location'),
101
87
                                       self.bookmark),
102
88
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
 
89
                                       _('Edit'), None,
 
90
                                       _('Edit the selected bookmark'),
105
91
                                       self.edit_bookmark),
106
92
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
 
93
                                       _('Remove'), None,
 
94
                                       _('Remove the selected bookmark'),
109
95
                                       self.remove_bookmark),
110
96
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _i18n('Open Folder'), None,
112
 
                                       _i18n('Open bookmark folder in Nautilus'),
 
97
                                       _('Open Folder'), None,
 
98
                                       _('Open bookmark folder in Nautilus'),
113
99
                                       self.open_folder),
114
100
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
 
101
                                       _('Selected...'), None,
 
102
                                       _('Show the differences of the selected file'),
117
103
                                       self.diff_selected),
118
104
                                      ('diff_all', None,
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)
 
105
                                       _('All...'), None,
 
106
                                       _('Show the differences of all files'),
 
107
                                       self.diff_all)
134
108
                                     ])
135
109
        
136
110
        self.ui.insert_action_group(self.actiongroup, 0)
139
113
        self.cmenu_right = self.ui.get_widget('/context_right')
140
114
        self.cmenu_left = self.ui.get_widget('/context_left')
141
115
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
116
        
144
117
        # Set icons
145
118
        # TODO: do it without using deprecated comm
162
135
    def left_context_menu(self):
163
136
        return self.cmenu_left
164
137
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
138
    @show_bzr_error
169
139
    def add_file(self, action):
170
140
        """ Right context menu -> Add """
175
145
        filename = self.selected
176
146
            
177
147
        if filename is None:
178
 
            error_dialog(_i18n('No file was selected'),
179
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
148
            error_dialog(_('No file was selected'),
 
149
                         _('Please select a file from the list,\nor choose the other option.'))
180
150
            return
181
151
        
182
152
        bzrlib.add.smart_add([os.path.join(directory, filename)])
183
153
    
184
154
    @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(_i18n('No file was selected'),
192
 
                         _i18n('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, parent=self.app)
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):
 
155
    def remove_file(self, action):
212
156
        """ Right context menu -> Remove """
213
157
        # Remove only the selected file
214
158
        directory = self.path
215
159
        filename = self.selected
216
160
        
217
161
        if filename is None:
218
 
            error_dialog(_i18n('No file was selected'),
219
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
162
            error_dialog(_('No file was selected'),
 
163
                         _('Please select a file from the list,\nor choose the other option.'))
220
164
            return
221
165
        
222
166
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
223
167
        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(_i18n('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
168
        self.app.set_path(self.path)
235
169
        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
170
 
241
171
    def rename_file(self, action):
242
172
        """ Right context menu -> Rename """
251
181
        filename = self.selected
252
182
        
253
183
        if filename is None:
254
 
            error_dialog(_i18n('No file was selected'),
255
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
184
            error_dialog(_('No file was selected'),
 
185
                         _('Please select a file from the list,\nor choose the other option.'))
256
186
            return
257
187
 
258
188
        if filename == '..':
272
202
        wt, path = WorkingTree.open_containing(self.path)
273
203
        ret = wt.revert([os.path.join(path, self.selected)])
274
204
        if ret:
275
 
            warning_dialog(_i18n('Conflicts detected'),
276
 
                           _i18n('Please have a look at the working tree before continuing.'))
 
205
            warning_dialog(_('Conflicts detected'),
 
206
                           _('Please have a look at the working tree before continuing.'))
277
207
        else:
278
 
            info_dialog(_i18n('Revert successful'),
279
 
                        _i18n('All files reverted to last revision.'))
 
208
            info_dialog(_('Revert successful'),
 
209
                        _('All files reverted to last revision.'))
280
210
        self.app.refresh_right()       
281
211
    
282
212
    def commit(self, action):
289
219
        except NotBranchError, e:
290
220
            path = e.path
291
221
        
292
 
        if self.selected:
293
 
            selected = os.path.join(path, self.selected)
294
 
        else:
295
 
            selected = None
296
 
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
 
222
        commit = CommitDialog(wt, path, not branch, self.selected)
297
223
        response = commit.run()
298
224
        if response != gtk.RESPONSE_NONE:
299
225
            commit.hide()
307
233
    def diff(self, action):
308
234
        """ Right context menu -> Diff """
309
235
        wt = WorkingTree.open_containing(self.path)[0]
310
 
        window = DiffWindow(self.app)
 
236
        window = DiffWindow()
311
237
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
312
238
        window.set_diff(wt.branch.nick, wt, parent_tree)
313
239
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
316
242
    def bookmark(self, action):
317
243
        """ Right context menu -> Bookmark """
318
244
        if self.pref.add_bookmark(self.path):
319
 
            info_dialog(_i18n('Bookmark successfully added'),
320
 
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
245
            info_dialog(_('Bookmark successfully added'),
 
246
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
321
247
            self.pref.write()
322
248
        else:
323
 
            warning_dialog(_i18n('Location already bookmarked'),
324
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
249
            warning_dialog(_('Location already bookmarked'),
 
250
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
325
251
        
326
252
        self.app.refresh_left()
327
253
 
366
292
        from diff import OliveDiff
367
293
        diff = OliveDiff(self.comm)
368
294
        diff.display()
369
 
    
370
 
    def view_remote(self, action):
371
 
        """ Remote context menu -> View contents """
372
 
        print "DEBUG: view contents."
373
 
    
374
 
    def diff_remote(self, action):
375
 
        """ Remote context menu -> Show differences """
376
 
        print "DEBUG: show differences."
377
 
    
378
 
    def revert_remote(self, action):
379
 
        """ Remote context menu -> Revert to this revision """
380
 
        print "DEBUG: revert to this revision."