/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:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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