/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-01-30 15:15:28 UTC
  • mto: (157.1.2 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 138.
  • Revision ID: szilveszter.farkas@gmail.com-20070130151528-072x45e8u5ofzsdd
Add revert all functionality and fix another regression.

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
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
 
31
from dialog import error_dialog, info_dialog, warning_dialog
 
32
from errors import show_bzr_error
39
33
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
 
34
from olive import OlivePreferences, DiffWindow
41
35
 
42
36
class OliveMenu:
43
37
    """ This class is responsible for building the context menus. """
48
42
        self.uifile = UIFILENAME
49
43
 
50
44
        # Preferences handler
51
 
        self.pref = Preferences()
 
45
        self.pref = OlivePreferences()
52
46
        
53
47
        # Set default values
54
48
        self.path = path
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
 
                                      ('revert', None,
83
 
                                       _i18n('Revert'), None,
84
 
                                       _i18n('Revert the changes'),
85
 
                                       self.revert),
86
72
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
73
                                       _('Commit'), None,
 
74
                                       _('Commit the changes'),
89
75
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
76
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
77
                                       _('Diff'), None,
 
78
                                       _('Show the diff of the file'),
97
79
                                       self.diff),
98
80
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
81
                                       _('Bookmark'), None,
 
82
                                       _('Bookmark current location'),
101
83
                                       self.bookmark),
102
84
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
 
85
                                       _('Edit'), None,
 
86
                                       _('Edit the selected bookmark'),
105
87
                                       self.edit_bookmark),
106
88
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
 
89
                                       _('Remove'), None,
 
90
                                       _('Remove the selected bookmark'),
109
91
                                       self.remove_bookmark),
110
92
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _i18n('Open Folder'), None,
112
 
                                       _i18n('Open bookmark folder in Nautilus'),
 
93
                                       _('Open Folder'), None,
 
94
                                       _('Open bookmark folder in Nautilus'),
113
95
                                       self.open_folder),
114
96
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
 
97
                                       _('Selected...'), None,
 
98
                                       _('Show the differences of the selected file'),
117
99
                                       self.diff_selected),
118
100
                                      ('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)
 
101
                                       _('All...'), None,
 
102
                                       _('Show the differences of all files'),
 
103
                                       self.diff_all)
134
104
                                     ])
135
105
        
136
106
        self.ui.insert_action_group(self.actiongroup, 0)
139
109
        self.cmenu_right = self.ui.get_widget('/context_right')
140
110
        self.cmenu_left = self.ui.get_widget('/context_left')
141
111
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
112
        
144
113
        # Set icons
145
114
        # TODO: do it without using deprecated comm
162
131
    def left_context_menu(self):
163
132
        return self.cmenu_left
164
133
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
134
    @show_bzr_error
169
135
    def add_file(self, action):
170
136
        """ Right context menu -> Add """
175
141
        filename = self.selected
176
142
            
177
143
        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.'))
 
144
            error_dialog(_('No file was selected'),
 
145
                         _('Please select a file from the list,\nor choose the other option.'))
180
146
            return
181
147
        
182
148
        bzrlib.add.smart_add([os.path.join(directory, filename)])
183
149
    
184
150
    @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):
 
151
    def remove_file(self, action):
212
152
        """ Right context menu -> Remove """
213
153
        # Remove only the selected file
214
154
        directory = self.path
215
155
        filename = self.selected
216
156
        
217
157
        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.'))
 
158
            error_dialog(_('No file was selected'),
 
159
                         _('Please select a file from the list,\nor choose the other option.'))
220
160
            return
221
161
        
222
162
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
223
163
        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
164
        self.app.set_path(self.path)
235
165
        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
166
 
241
167
    def rename_file(self, action):
242
168
        """ Right context menu -> Rename """
251
177
        filename = self.selected
252
178
        
253
179
        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.'))
 
180
            error_dialog(_('No file was selected'),
 
181
                         _('Please select a file from the list,\nor choose the other option.'))
256
182
            return
257
183
 
258
184
        if filename == '..':
267
193
            else:
268
194
                launch(fullpath) 
269
195
 
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(_i18n('Conflicts detected'),
276
 
                           _i18n('Please have a look at the working tree before continuing.'))
277
 
        else:
278
 
            info_dialog(_i18n('Revert successful'),
279
 
                        _i18n('All files reverted to last revision.'))
280
 
        self.app.refresh_right()       
281
 
    
282
196
    def commit(self, action):
283
197
        """ Right context menu -> Commit """
284
198
        from commit import CommitDialog
289
203
        except NotBranchError, e:
290
204
            path = e.path
291
205
        
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)
 
206
        commit = CommitDialog(wt, path, not branch, self.selected)
297
207
        response = commit.run()
298
208
        if response != gtk.RESPONSE_NONE:
299
209
            commit.hide()
307
217
    def diff(self, action):
308
218
        """ Right context menu -> Diff """
309
219
        wt = WorkingTree.open_containing(self.path)[0]
310
 
        window = DiffWindow(self.app)
 
220
        window = DiffWindow()
311
221
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
312
222
        window.set_diff(wt.branch.nick, wt, parent_tree)
313
223
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
316
226
    def bookmark(self, action):
317
227
        """ Right context menu -> Bookmark """
318
228
        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.'))
 
229
            info_dialog(_('Bookmark successfully added'),
 
230
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
321
231
            self.pref.write()
322
232
        else:
323
 
            warning_dialog(_i18n('Location already bookmarked'),
324
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
233
            warning_dialog(_('Location already bookmarked'),
 
234
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
325
235
        
326
236
        self.app.refresh_left()
327
237
 
328
238
    def edit_bookmark(self, action):
329
239
        """ Left context menu -> Edit """
330
 
        from bookmark import BookmarkDialog
 
240
        from bookmark import OliveBookmarkDialog
331
241
        
332
242
        if self.selected != None:
333
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
243
            bookmark = OliveBookmarkDialog(self.selected, self.app.window)
334
244
            response = bookmark.run()
335
245
            
336
246
            if response != gtk.RESPONSE_NONE:
366
276
        from diff import OliveDiff
367
277
        diff = OliveDiff(self.comm)
368
278
        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."