/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-05-16 14:02:21 UTC
  • mto: (195.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 200.
  • Revision ID: szilveszter.farkas@gmail.com-20070516140221-v4871zk3fvnr143o
Added NEWS entry.

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