/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-14 10:54:40 UTC
  • mto: (195.1.4 trunk)
  • mto: This revision was merged to the branch mainline in revision 199.
  • Revision ID: szilveszter.farkas@gmail.com-20070514105440-e5fhlftlp3r0bgmr
Fixed Branch -> Status in Olive (no more traceback).

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