/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-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

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
 
from bzrlib.plugins.gtk.olive import Preferences, launch
 
36
from launch import launch
 
37
from olive import Preferences
40
38
 
41
39
class OliveMenu:
42
40
    """ This class is responsible for building the context menus. """
59
57
        
60
58
        self.actiongroup = gtk.ActionGroup('context')
61
59
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
62
 
                                       _i18n('Add'), None,
63
 
                                       _i18n('Add the selected file'),
 
60
                                       _('Add'), None,
 
61
                                       _('Add the selected file'),
64
62
                                       self.add_file),
65
63
                                      ('remove', gtk.STOCK_REMOVE,
66
 
                                       _i18n('Remove'), None,
67
 
                                       _i18n('Remove the selected file'),
 
64
                                       _('Remove'), None,
 
65
                                       _('Remove the selected file'),
68
66
                                       self.remove_file),
69
 
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
70
 
                                       _i18n('Remove and delete'), None,
71
 
                                       _i18n('Remove the selected file/dir and delete from disk'),
72
 
                                       self.remove_and_delete_file),
73
67
                                      ('rename', None,
74
 
                                       _i18n('Rename'), None,
75
 
                                       _i18n('Rename the selected file'),
 
68
                                       _('Rename'), None,
 
69
                                       _('Rename the selected file'),
76
70
                                       self.rename_file),
77
71
                                      ('open', gtk.STOCK_OPEN,
78
 
                                       _i18n('Open'), None,
79
 
                                       _i18n('Open the selected file'),
 
72
                                       _('Open'), None,
 
73
                                       _('Open the selected file'),
80
74
                                       self.open_file),
81
75
                                      ('revert', None,
82
 
                                       _i18n('Revert'), None,
83
 
                                       _i18n('Revert the changes'),
 
76
                                       _('Revert'), None,
 
77
                                       _('Revert the changes'),
84
78
                                       self.revert),
85
79
                                      ('commit', None,
86
 
                                       _i18n('Commit'), None,
87
 
                                       _i18n('Commit the changes'),
 
80
                                       _('Commit'), None,
 
81
                                       _('Commit the changes'),
88
82
                                       self.commit),
89
83
                                      ('annotate', None,
90
 
                                       _i18n('Annotate'), None,
91
 
                                       _i18n('Annotate the selected file'),
 
84
                                       _('Annotate'), None,
 
85
                                       _('Annotate the selected file'),
92
86
                                       self.annotate),
93
87
                                      ('diff', None,
94
 
                                       _i18n('Diff'), None,
95
 
                                       _i18n('Show the diff of the file'),
 
88
                                       _('Diff'), None,
 
89
                                       _('Show the diff of the file'),
96
90
                                       self.diff),
97
91
                                      ('bookmark', None,
98
 
                                       _i18n('Bookmark'), None,
99
 
                                       _i18n('Bookmark current location'),
 
92
                                       _('Bookmark'), None,
 
93
                                       _('Bookmark current location'),
100
94
                                       self.bookmark),
101
95
                                      ('edit_bookmark', gtk.STOCK_EDIT,
102
 
                                       _i18n('Edit'), None,
103
 
                                       _i18n('Edit the selected bookmark'),
 
96
                                       _('Edit'), None,
 
97
                                       _('Edit the selected bookmark'),
104
98
                                       self.edit_bookmark),
105
99
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
106
 
                                       _i18n('Remove'), None,
107
 
                                       _i18n('Remove the selected bookmark'),
 
100
                                       _('Remove'), None,
 
101
                                       _('Remove the selected bookmark'),
108
102
                                       self.remove_bookmark),
109
103
                                      ('open_folder', gtk.STOCK_OPEN,
110
 
                                       _i18n('Open Folder'), None,
111
 
                                       _i18n('Open bookmark folder in Nautilus'),
 
104
                                       _('Open Folder'), None,
 
105
                                       _('Open bookmark folder in Nautilus'),
112
106
                                       self.open_folder),
113
107
                                      ('diff_selected', None,
114
 
                                       _i18n('Selected...'), None,
115
 
                                       _i18n('Show the differences of the selected file'),
 
108
                                       _('Selected...'), None,
 
109
                                       _('Show the differences of the selected file'),
116
110
                                       self.diff_selected),
117
111
                                      ('diff_all', None,
118
 
                                       _i18n('All...'), None,
119
 
                                       _i18n('Show the differences of all files'),
120
 
                                       self.diff_all),
121
 
                                      ('view_remote', None,
122
 
                                       _i18n('View contents'), None,
123
 
                                       _i18n('View the contents of the file in a builtin viewer'),
124
 
                                       self.view_remote),
125
 
                                      ('diff_remote', None,
126
 
                                       _i18n('Show differences'), None,
127
 
                                       _i18n('Show the differences between two revisions of the file'),
128
 
                                       self.diff_remote),
129
 
                                      ('revert_remote', None,
130
 
                                       _i18n('Revert to this revision'), None,
131
 
                                       _i18n('Revert the selected file to the selected revision'),
132
 
                                       self.revert_remote)
 
112
                                       _('All...'), None,
 
113
                                       _('Show the differences of all files'),
 
114
                                       self.diff_all)
133
115
                                     ])
134
116
        
135
117
        self.ui.insert_action_group(self.actiongroup, 0)
138
120
        self.cmenu_right = self.ui.get_widget('/context_right')
139
121
        self.cmenu_left = self.ui.get_widget('/context_left')
140
122
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
141
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
142
123
        
143
124
        # Set icons
144
125
        # TODO: do it without using deprecated comm
161
142
    def left_context_menu(self):
162
143
        return self.cmenu_left
163
144
    
164
 
    def remote_context_menu(self):
165
 
        return self.cmenu_remote
166
 
    
167
145
    @show_bzr_error
168
146
    def add_file(self, action):
169
147
        """ Right context menu -> Add """
174
152
        filename = self.selected
175
153
            
176
154
        if filename is None:
177
 
            error_dialog(_i18n('No file was selected'),
178
 
                         _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.'))
179
157
            return
180
158
        
181
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
182
 
        wt.add([path])
183
 
        
184
 
        self.app.refresh_right()
 
159
        bzrlib.add.smart_add([os.path.join(directory, filename)])
185
160
    
186
161
    @show_bzr_error
187
162
    def annotate(self, action):
190
165
        filename = self.selected
191
166
        
192
167
        if filename is None:
193
 
            error_dialog(_i18n('No file was selected'),
194
 
                         _i18n('Please select a file from the list.'))
 
168
            error_dialog(_('No file was selected'),
 
169
                         _('Please select a file from the list.'))
195
170
            return
196
171
        
197
172
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
198
173
        
199
174
        branch = wt.branch
200
175
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
201
 
        if file_id is None:
202
 
            raise errors.NotVersionedError(filename)
203
 
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
 
176
        
 
177
        window = GAnnotateWindow(all=False, plain=False)
204
178
        window.set_title(os.path.join(directory, filename) + " - Annotate")
205
179
        config = GAnnotateConfig(window)
206
180
        window.show()
211
185
            branch.unlock()
212
186
    
213
187
    @show_bzr_error
214
 
    def remove_file(self, action, delete_on_disk=False):
 
188
    def remove_file(self, action):
215
189
        """ Right context menu -> Remove """
216
190
        # Remove only the selected file
217
191
        directory = self.path
218
192
        filename = self.selected
219
193
        
220
194
        if filename is None:
221
 
            error_dialog(_i18n('No file was selected'),
222
 
                         _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.'))
223
197
            return
224
198
        
225
199
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
226
200
        wt.remove(path)
227
 
        
228
 
        if delete_on_disk:
229
 
            abs_filename = os.path.join(directory,filename)
230
 
            if os.path.isdir(abs_filename):
231
 
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
232
 
                if response == gtk.RESPONSE_YES:
233
 
                    shutil.rmtree(abs_filename)
234
 
            else:
235
 
                os.remove(abs_filename)
236
 
                
237
201
        self.app.set_path(self.path)
238
202
        self.app.refresh_right()
239
 
        
240
 
    def remove_and_delete_file(self, action):
241
 
        """ Right context menu -> Remove and delete"""
242
 
        self.remove_file(action, delete_on_disk=True)
243
203
 
244
204
    def rename_file(self, action):
245
205
        """ Right context menu -> Rename """
246
 
        from bzrlib.plugins.gtk.olive.rename import RenameDialog
247
 
        wt = WorkingTree.open_containing(os.path.join(self.path, self.selected))[0]
248
 
        rename = RenameDialog(wt, wt.relpath(self.path), self.selected)
249
 
        response = rename.run()
250
 
        rename.destroy()
251
 
        if response == gtk.RESPONSE_OK:
252
 
            self.app.refresh_right()
 
206
        from rename import OliveRename
 
207
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
208
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
209
        rename.display()
253
210
    
254
211
    def open_file(self, action):
255
212
        """ Right context menu -> Open """
257
214
        filename = self.selected
258
215
        
259
216
        if filename is None:
260
 
            error_dialog(_i18n('No file was selected'),
261
 
                         _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.'))
262
219
            return
263
220
 
264
221
        if filename == '..':
265
222
            # TODO: how to enter a directory?
266
223
            return
267
224
        else:
268
 
            fullpath = os.path.join(self.path, filename)
269
 
            launch.launch(fullpath) 
 
225
            fullpath = self.path + os.sep + filename
 
226
            if os.path.isdir(fullpath):
 
227
                # selected item is an existant directory
 
228
                # TODO: how to enter a directory?
 
229
                return
 
230
            else:
 
231
                launch(fullpath) 
270
232
 
271
233
    def revert(self, action):
272
234
        """ Right context menu -> Revert """
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('Selected file 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
 
356
314
        path = self.selected
357
315
 
358
316
        if path != None:
359
 
            launch.launch(path)
 
317
            launch(path)
360
318
    
361
319
    def diff_selected(self, action):
362
320
        """ Diff toolbutton -> Selected... """
364
322
    
365
323
    def diff_all(self, action):
366
324
        """ Diff toolbutton -> All... """
367
 
        wt = WorkingTree.open_containing(self.path)[0]
368
 
        window = DiffWindow(self.app)
369
 
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
370
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
371
 
        window.show()
372
 
    
373
 
    def view_remote(self, action):
374
 
        """ Remote context menu -> View contents """
375
 
        print "DEBUG: view contents."
376
 
    
377
 
    def diff_remote(self, action):
378
 
        """ Remote context menu -> Show differences """
379
 
        print "DEBUG: show differences."
380
 
    
381
 
    def revert_remote(self, action):
382
 
        """ Remote context menu -> Revert to this revision """
383
 
        print "DEBUG: revert to this revision."
 
325
        from diff import OliveDiff
 
326
        diff = OliveDiff(self.comm)
 
327
        diff.display()