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
- browse files at revision 231
- compare with another revision
- download diff
- download tarball
- view history from revision 231
- Committer: Jelmer Vernooij
- Date: 2007-07-15 18:12:57 UTC
- Revision ID: jelmer@samba.org-20070715181257-g264qus2zyi3v39z
Add RevisionSelectionBox widget, use in TagDialog.
- files added:
- olive.glade
- files removed:
- branchbox.py
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- icons/oliveicon2.png => oliveicon2.png
- preferences/__init__.py => preferences.py
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.py
- files modified:
- .bzrignore
added
removed
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'),
112
_('All...'), None,
113
_('Show the differences of all files'),
120
114
self.diff_all),
121
115
('view_remote', None,
122
_i18n('View contents'), None,
123
_i18n('View the contents of the file in a builtin viewer'),
116
_('View contents'), None,
117
_('View the contents of the file in a builtin viewer'),
124
118
self.view_remote),
125
119
('diff_remote', None,
126
_i18n('Show differences'), None,
127
_i18n('Show the differences between two revisions of the file'),
120
_('Show differences'), None,
121
_('Show the differences between two revisions of the file'),
128
122
self.diff_remote),
129
123
('revert_remote', None,
130
_i18n('Revert to this revision'), None,
131
_i18n('Revert the selected file to the selected revision'),
124
_('Revert to this revision'), None,
125
_('Revert the selected file to the selected revision'),
132
126
self.revert_remote)
133
127
])
134
128
174
168
filename = self.selected
175
169
176
170
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.'))
171
error_dialog(_('No file was selected'),
172
_('Please select a file from the list,\nor choose the other option.'))
179
173
return
180
174
181
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
182
wt.add([path])
183
184
self.app.refresh_right()
175
bzrlib.add.smart_add([os.path.join(directory, filename)])
185
176
186
177
@show_bzr_error
187
178
def annotate(self, action):
190
181
filename = self.selected
191
182
192
183
if filename is None:
193
error_dialog(_i18n('No file was selected'),
194
_i18n('Please select a file from the list.'))
184
error_dialog(_('No file was selected'),
185
_('Please select a file from the list.'))
195
186
return
196
187
197
188
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
198
189
199
190
branch = wt.branch
200
191
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)
192
193
window = GAnnotateWindow(all=False, plain=False)
204
194
window.set_title(os.path.join(directory, filename) + " - Annotate")
205
195
config = GAnnotateConfig(window)
206
196
window.show()
211
201
branch.unlock()
212
202
213
203
@show_bzr_error
214
def remove_file(self, action, delete_on_disk=False):
204
def remove_file(self, action):
215
205
""" Right context menu -> Remove """
216
206
# Remove only the selected file
217
207
directory = self.path
218
208
filename = self.selected
219
209
220
210
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.'))
211
error_dialog(_('No file was selected'),
212
_('Please select a file from the list,\nor choose the other option.'))
223
213
return
224
214
225
215
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
226
216
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
217
self.app.set_path(self.path)
238
218
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
219
244
220
def rename_file(self, action):
245
221
""" 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()
222
from rename import OliveRename
223
wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
224
rename = OliveRename(wt, wt.relpath(self.path), self.selected)
225
rename.display()
253
226
254
227
def open_file(self, action):
255
228
""" Right context menu -> Open """
257
230
filename = self.selected
258
231
259
232
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.'))
233
error_dialog(_('No file was selected'),
234
_('Please select a file from the list,\nor choose the other option.'))
262
235
return
263
236
264
237
if filename == '..':
265
238
# TODO: how to enter a directory?
266
239
return
267
240
else:
268
fullpath = os.path.join(self.path, filename)
269
launch.launch(fullpath)
241
fullpath = self.path + os.sep + filename
242
if os.path.isdir(fullpath):
243
# selected item is an existant directory
244
# TODO: how to enter a directory?
245
return
246
else:
247
launch(fullpath)
270
248
271
249
def revert(self, action):
272
250
""" Right context menu -> Revert """
273
251
wt, path = WorkingTree.open_containing(self.path)
274
252
ret = wt.revert([os.path.join(path, self.selected)])
275
253
if ret:
276
warning_dialog(_i18n('Conflicts detected'),
277
_i18n('Please have a look at the working tree before continuing.'))
254
warning_dialog(_('Conflicts detected'),
255
_('Please have a look at the working tree before continuing.'))
278
256
else:
279
info_dialog(_i18n('Revert successful'),
280
_i18n('Selected file reverted to last revision.'))
257
info_dialog(_('Revert successful'),
258
_('All files reverted to last revision.'))
281
259
self.app.refresh_right()
282
260
283
261
def commit(self, action):
290
268
except NotBranchError, e:
291
269
path = e.path
292
270
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)
271
commit = CommitDialog(wt, path, not branch, self.selected)
298
272
response = commit.run()
299
273
if response != gtk.RESPONSE_NONE:
300
274
commit.hide()
308
282
def diff(self, action):
309
283
""" Right context menu -> Diff """
310
284
wt = WorkingTree.open_containing(self.path)[0]
311
window = DiffWindow(self.app)
285
window = DiffWindow()
312
286
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
313
287
window.set_diff(wt.branch.nick, wt, parent_tree)
314
288
window.set_file(wt.relpath(self.path + os.sep + self.selected))
317
291
def bookmark(self, action):
318
292
""" Right context menu -> Bookmark """
319
293
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.'))
294
info_dialog(_('Bookmark successfully added'),
295
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
322
296
self.pref.write()
323
297
else:
324
warning_dialog(_i18n('Location already bookmarked'),
325
_i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
298
warning_dialog(_('Location already bookmarked'),
299
_('The current directory is already bookmarked.\nSee the left panel for reference.'))
326
300
327
301
self.app.refresh_left()
328
302
356
330
path = self.selected
357
331
358
332
if path != None:
359
launch.launch(path)
333
launch(path)
360
334
361
335
def diff_selected(self, action):
362
336
""" Diff toolbutton -> Selected... """
364
338
365
339
def diff_all(self, action):
366
340
""" 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()
341
from diff import OliveDiff
342
diff = OliveDiff(self.comm)
343
diff.display()
372
344
373
345
def view_remote(self, action):
374
346
""" Remote context menu -> View contents """
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0