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 93.1.14
- compare with another revision
- download diff
- download tarball
- view history from revision 93.1.14
- Committer: Alexander Belchenko
- Date: 2006-10-26 13:16:07 UTC
- mto: (91.1.8 trunk) (66.2.10 trunk)
- mto: This revision was merged to the branch mainline in revision 107.
- Revision ID: bialix@ukr.net-20061026131607-fa48887c5a4869a5
olive-gtk: use olive ui factory
- files added:
- Makefile
- files removed:
- HACKING
- branchview
- preferences
- tests
- files renamed:
- revisionview.py => annotate/logview.py
- branch.py => olive/branch.py
- checkout.py => olive/checkout.py
- commit.py => olive/commit.py
- dialog.py => olive/dialog.py
- merge.py => olive/merge.py
- push.py => olive/push.py
- status.py => olive/status.py
- ui.py => olive/ui.py
- icons/oliveicon2.png => oliveicon2.png
- diff.py => viz/diffwin.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
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
39
from bzrlib.plugins.gtk.olive import Preferences, launch
31
from dialog import error_dialog, info_dialog, warning_dialog
32
from launch import launch
33
from olive import OlivePreferences, DiffWindow
40
34
41
35
class OliveMenu:
42
36
""" This class is responsible for building the context menus. """
43
def __init__(self, path, selected, app=None):
37
def __init__(self, path, selected):
44
38
# Load the UI file
45
39
from guifiles import UIFILENAME
46
40
47
41
self.uifile = UIFILENAME
48
42
49
43
# Preferences handler
50
self.pref = Preferences()
44
self.pref = OlivePreferences()
51
45
52
46
# Set default values
53
47
self.path = path
54
48
self.selected = selected
55
self.app = app
56
49
57
50
# Create the file list context menu
58
51
self.ui = gtk.UIManager()
59
52
60
53
self.actiongroup = gtk.ActionGroup('context')
61
54
self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
62
_i18n('Add'), None,
63
_i18n('Add the selected file'),
55
_('Add'), None,
56
_('Add the selected file'),
64
57
self.add_file),
65
58
('remove', gtk.STOCK_REMOVE,
66
_i18n('Remove'), None,
67
_i18n('Remove the selected file'),
59
_('Remove'), None,
60
_('Remove the selected file'),
68
61
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
('rename', None,
74
_i18n('Rename'), None,
75
_i18n('Rename the selected file'),
76
self.rename_file),
77
62
('open', gtk.STOCK_OPEN,
78
_i18n('Open'), None,
79
_i18n('Open the selected file'),
63
_('Open'), None,
64
_('Open the selected file'),
80
65
self.open_file),
81
('revert', None,
82
_i18n('Revert'), None,
83
_i18n('Revert the changes'),
84
self.revert),
85
66
('commit', None,
86
_i18n('Commit'), None,
87
_i18n('Commit the changes'),
67
_('Commit'), None,
68
_('Commit the changes'),
88
69
self.commit),
89
('annotate', None,
90
_i18n('Annotate'), None,
91
_i18n('Annotate the selected file'),
92
self.annotate),
93
70
('diff', None,
94
_i18n('Diff'), None,
95
_i18n('Show the diff of the file'),
71
_('Diff'), None,
72
_('Show the diff of the file'),
96
73
self.diff),
97
74
('bookmark', None,
98
_i18n('Bookmark'), None,
99
_i18n('Bookmark current location'),
75
_('Bookmark'), None,
76
_('Bookmark current location'),
100
77
self.bookmark),
101
78
('edit_bookmark', gtk.STOCK_EDIT,
102
_i18n('Edit'), None,
103
_i18n('Edit the selected bookmark'),
79
_('Edit'), None,
80
_('Edit the selected bookmark'),
104
81
self.edit_bookmark),
105
82
('remove_bookmark', gtk.STOCK_REMOVE,
106
_i18n('Remove'), None,
107
_i18n('Remove the selected bookmark'),
83
_('Remove'), None,
84
_('Remove the selected bookmark'),
108
85
self.remove_bookmark),
109
86
('open_folder', gtk.STOCK_OPEN,
110
_i18n('Open Folder'), None,
111
_i18n('Open bookmark folder in Nautilus'),
87
_('Open Folder'), None,
88
_('Open bookmark folder in Nautilus'),
112
89
self.open_folder),
113
90
('diff_selected', None,
114
_i18n('Selected...'), None,
115
_i18n('Show the differences of the selected file'),
91
_('Selected...'), None,
92
_('Show the differences of the selected file'),
116
93
self.diff_selected),
117
94
('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)
95
_('All...'), None,
96
_('Show the differences of all files'),
97
self.diff_all)
133
98
])
134
99
135
100
self.ui.insert_action_group(self.actiongroup, 0)
138
103
self.cmenu_right = self.ui.get_widget('/context_right')
139
104
self.cmenu_left = self.ui.get_widget('/context_left')
140
105
self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
141
self.cmenu_remote = self.ui.get_widget('/context_remote')
142
106
143
107
# Set icons
144
108
# TODO: do it without using deprecated comm
161
125
def left_context_menu(self):
162
126
return self.cmenu_left
163
127
164
def remote_context_menu(self):
165
return self.cmenu_remote
166
167
@show_bzr_error
168
128
def add_file(self, action):
169
129
""" Right context menu -> Add """
170
130
import bzrlib.add
174
134
filename = self.selected
175
135
176
136
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()
137
error_dialog(_('No file was selected'),
138
_('Please select a file from the list,\nor choose the other option.'))
139
return
140
208
141
try:
209
window.annotate(wt, branch, file_id)
210
finally:
211
branch.unlock()
142
bzrlib.add.smart_add([os.path.join(directory, filename)])
143
except errors.NotBranchError:
144
error_dialog(_('Directory is not a branch'),
145
_('You can perform this action only in a branch.'))
146
return
212
147
213
@show_bzr_error
214
def remove_file(self, action, delete_on_disk=False):
148
def remove_file(self, action):
215
149
""" Right context menu -> Remove """
216
150
# Remove only the selected file
217
151
directory = self.path
218
152
filename = self.selected
219
153
220
154
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.'))
223
return
224
225
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
226
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
self.app.set_path(self.path)
238
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
244
def rename_file(self, action):
245
""" 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()
253
155
error_dialog(_('No file was selected'),
156
_('Please select a file from the list,\nor choose the other option.'))
157
return
158
159
try:
160
wt, path = WorkingTree.open_containing(directory + os.sep + filename)
161
wt.remove(path)
162
163
except errors.NotBranchError:
164
error_dialog(_('Directory is not a branch'),
165
_('You can perform this action only in a branch.'))
166
return
167
except errors.NotVersionedError:
168
error_dialog(_('File not versioned'),
169
_('The selected file is not versioned.'))
170
return
171
254
172
def open_file(self, action):
255
173
""" Right context menu -> Open """
256
174
# Open only the selected file
257
175
filename = self.selected
258
176
259
177
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.'))
178
error_dialog(_('No file was selected'),
179
_('Please select a file from the list,\nor choose the other option.'))
262
180
return
263
181
264
182
if filename == '..':
265
183
# TODO: how to enter a directory?
266
184
return
267
185
else:
268
fullpath = os.path.join(self.path, filename)
269
launch.launch(fullpath)
186
fullpath = self.path + os.sep + filename
187
if os.path.isdir(fullpath):
188
# selected item is an existant directory
189
# TODO: how to enter a directory?
190
return
191
else:
192
launch(fullpath)
270
193
271
def revert(self, action):
272
""" Right context menu -> Revert """
273
wt, path = WorkingTree.open_containing(self.path)
274
ret = wt.revert([os.path.join(path, self.selected)])
275
if ret:
276
warning_dialog(_i18n('Conflicts detected'),
277
_i18n('Please have a look at the working tree before continuing.'))
278
else:
279
info_dialog(_i18n('Revert successful'),
280
_i18n('Selected file reverted to last revision.'))
281
self.app.refresh_right()
282
283
194
def commit(self, action):
284
195
""" Right context menu -> Commit """
285
196
from commit import CommitDialog
286
branch = None
287
try:
288
wt, path = WorkingTree.open_containing(self.path)
289
branch = wt.branch
290
except NotBranchError, e:
291
path = e.path
292
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)
298
response = commit.run()
299
if response != gtk.RESPONSE_NONE:
300
commit.hide()
301
302
if response == gtk.RESPONSE_OK:
303
self.app.refresh_right()
304
305
commit.destroy()
197
wt, path = WorkingTree.open_containing(self.path)
198
commit = CommitDialog(wt, path)
199
commit.display()
306
200
307
@show_bzr_error
308
201
def diff(self, action):
309
202
""" Right context menu -> Diff """
310
wt = WorkingTree.open_containing(self.path)[0]
311
window = DiffWindow(self.app)
203
try:
204
wt = WorkingTree.open_containing(self.path)[0]
205
except errors.NotBranchError:
206
error_dialog(_('File is not in a branch'),
207
_('The selected file is not in a branch.'))
208
return
209
210
window = DiffWindow()
312
211
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
313
212
window.set_diff(wt.branch.nick, wt, parent_tree)
314
window.set_file(wt.relpath(self.path + os.sep + self.selected))
315
213
window.show()
316
214
317
215
def bookmark(self, action):
318
216
""" Right context menu -> Bookmark """
319
217
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.'))
218
info_dialog(_('Bookmark successfully added'),
219
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
322
220
self.pref.write()
323
221
else:
324
warning_dialog(_i18n('Location already bookmarked'),
325
_i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
326
327
self.app.refresh_left()
222
warning_dialog(_('Location already bookmarked'),
223
_('The current directory is already bookmarked.\nSee the left panel for reference.'))
328
224
329
225
def edit_bookmark(self, action):
330
226
""" Left context menu -> Edit """
331
from bookmark import BookmarkDialog
332
227
from bookmark import OliveBookmark
228
333
229
if self.selected != None:
334
bookmark = BookmarkDialog(self.selected, self.app.window)
335
response = bookmark.run()
336
337
if response != gtk.RESPONSE_NONE:
338
bookmark.hide()
339
340
if response == gtk.RESPONSE_OK:
341
self.app.refresh_left()
342
343
bookmark.destroy()
230
bookmark = OliveBookmark(self.selected)
231
bookmark.display()
344
232
345
233
def remove_bookmark(self, action):
346
234
""" Left context menu -> Remove """
347
235
348
236
if self.selected != None:
349
self.pref.remove_bookmark(self.selected)
350
self.pref.write()
351
352
self.app.refresh_left()
237
self.pref.remove_bookmark(self.comm.get_selected_left())
238
self.comm.refresh_left()
353
239
354
240
def open_folder(self, action):
355
241
""" Left context menu -> Open Folder """
356
242
path = self.selected
357
243
358
244
if path != None:
359
launch.launch(path)
245
launch(path)
360
246
361
247
def diff_selected(self, action):
362
248
""" Diff toolbutton -> Selected... """
364
250
365
251
def diff_all(self, action):
366
252
""" 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."
253
from diff import OliveDiff
254
diff = OliveDiff(self.comm)
255
diff.display()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0