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 511.4.2
- compare with another revision
- download diff
- download tarball
- view history from revision 511.4.2
- Committer: Jelmer Vernooij
- Date: 2008-06-29 18:32:05 UTC
- mto: This revision was merged to the branch mainline in revision 518.
- Revision ID: jelmer@samba.org-20080629183205-mmj1fnd8t9l80czj
Fix another use of smart_add.
- files added:
- HACKING
- branchview
- preferences
- tests
- files removed:
- NEWS
- files renamed:
- olive/branch.py => branch.py
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- olive/checkout.py => checkout.py
- olive/commit.py => commit.py
- olive/dialog.py => dialog.py
- viz/diffwin.py => diff.py
- oliveicon2.png => icons/oliveicon2.png
- olive/merge.py => merge.py
- olive/push.py => push.py
- annotate/logview.py => revisionview.py
- olive/status.py => status.py
- olive/ui.py => ui.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
17
18
import os.path
19
import shutil
18
20
import sys
19
21
20
22
try:
28
30
import bzrlib.errors as errors
29
31
from bzrlib.workingtree import WorkingTree
30
32
31
from dialog import error_dialog, info_dialog, warning_dialog
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
32
39
from launch import launch
33
from olive import OlivePreferences, DiffWindow
40
from bzrlib.plugins.gtk.olive import Preferences
34
41
35
42
class OliveMenu:
36
43
""" This class is responsible for building the context menus. """
37
def __init__(self, path, selected):
44
def __init__(self, path, selected, app=None):
38
45
# Load the UI file
39
46
from guifiles import UIFILENAME
40
47
41
48
self.uifile = UIFILENAME
42
49
43
50
# Preferences handler
44
self.pref = OlivePreferences()
51
self.pref = Preferences()
45
52
46
53
# Set default values
47
54
self.path = path
48
55
self.selected = selected
56
self.app = app
49
57
50
58
# Create the file list context menu
51
59
self.ui = gtk.UIManager()
52
60
53
61
self.actiongroup = gtk.ActionGroup('context')
54
62
self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
55
_('Add'), None,
56
_('Add the selected file'),
63
_i18n('Add'), None,
64
_i18n('Add the selected file'),
57
65
self.add_file),
58
66
('remove', gtk.STOCK_REMOVE,
59
_('Remove'), None,
60
_('Remove the selected file'),
67
_i18n('Remove'), None,
68
_i18n('Remove the selected file'),
61
69
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),
62
74
('rename', None,
63
_('Rename'), None,
64
_('Rename the selected file'),
75
_i18n('Rename'), None,
76
_i18n('Rename the selected file'),
65
77
self.rename_file),
66
78
('open', gtk.STOCK_OPEN,
67
_('Open'), None,
68
_('Open the selected file'),
79
_i18n('Open'), None,
80
_i18n('Open the selected file'),
69
81
self.open_file),
82
('revert', None,
83
_i18n('Revert'), None,
84
_i18n('Revert the changes'),
85
self.revert),
70
86
('commit', None,
71
_('Commit'), None,
72
_('Commit the changes'),
87
_i18n('Commit'), None,
88
_i18n('Commit the changes'),
73
89
self.commit),
90
('annotate', None,
91
_i18n('Annotate'), None,
92
_i18n('Annotate the selected file'),
93
self.annotate),
74
94
('diff', None,
75
_('Diff'), None,
76
_('Show the diff of the file'),
95
_i18n('Diff'), None,
96
_i18n('Show the diff of the file'),
77
97
self.diff),
78
98
('bookmark', None,
79
_('Bookmark'), None,
80
_('Bookmark current location'),
99
_i18n('Bookmark'), None,
100
_i18n('Bookmark current location'),
81
101
self.bookmark),
82
102
('edit_bookmark', gtk.STOCK_EDIT,
83
_('Edit'), None,
84
_('Edit the selected bookmark'),
103
_i18n('Edit'), None,
104
_i18n('Edit the selected bookmark'),
85
105
self.edit_bookmark),
86
106
('remove_bookmark', gtk.STOCK_REMOVE,
87
_('Remove'), None,
88
_('Remove the selected bookmark'),
107
_i18n('Remove'), None,
108
_i18n('Remove the selected bookmark'),
89
109
self.remove_bookmark),
90
110
('open_folder', gtk.STOCK_OPEN,
91
_('Open Folder'), None,
92
_('Open bookmark folder in Nautilus'),
111
_i18n('Open Folder'), None,
112
_i18n('Open bookmark folder in Nautilus'),
93
113
self.open_folder),
94
114
('diff_selected', None,
95
_('Selected...'), None,
96
_('Show the differences of the selected file'),
115
_i18n('Selected...'), None,
116
_i18n('Show the differences of the selected file'),
97
117
self.diff_selected),
98
118
('diff_all', None,
99
_('All...'), None,
100
_('Show the differences of all files'),
101
self.diff_all)
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)
102
134
])
103
135
104
136
self.ui.insert_action_group(self.actiongroup, 0)
107
139
self.cmenu_right = self.ui.get_widget('/context_right')
108
140
self.cmenu_left = self.ui.get_widget('/context_left')
109
141
self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
self.cmenu_remote = self.ui.get_widget('/context_remote')
110
143
111
144
# Set icons
112
145
# TODO: do it without using deprecated comm
129
162
def left_context_menu(self):
130
163
return self.cmenu_left
131
164
165
def remote_context_menu(self):
166
return self.cmenu_remote
167
168
@show_bzr_error
132
169
def add_file(self, action):
133
170
""" Right context menu -> Add """
134
171
import bzrlib.add
138
175
filename = self.selected
139
176
140
177
if filename is None:
141
error_dialog(_('No file was selected'),
142
_('Please select a file from the list,\nor choose the other option.'))
143
return
144
178
error_dialog(_i18n('No file was selected'),
179
_i18n('Please select a file from the list,\nor choose the other option.'))
180
return
181
182
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
183
wt.add([path])
184
185
@show_bzr_error
186
def annotate(self, action):
187
""" Right context menu -> Annotate """
188
directory = self.path
189
filename = self.selected
190
191
if filename is None:
192
error_dialog(_i18n('No file was selected'),
193
_i18n('Please select a file from the list.'))
194
return
195
196
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
197
198
branch = wt.branch
199
file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
200
201
window = GAnnotateWindow(all=False, plain=False, parent=self.app)
202
window.set_title(os.path.join(directory, filename) + " - Annotate")
203
config = GAnnotateConfig(window)
204
window.show()
205
branch.lock_read()
145
206
try:
146
bzrlib.add.smart_add([os.path.join(directory, filename)])
147
except errors.NotBranchError:
148
error_dialog(_('Directory is not a branch'),
149
_('You can perform this action only in a branch.'))
150
return
207
window.annotate(wt, branch, file_id)
208
finally:
209
branch.unlock()
151
210
152
def remove_file(self, action):
211
@show_bzr_error
212
def remove_file(self, action,delete_on_disk=0):
153
213
""" Right context menu -> Remove """
154
214
# Remove only the selected file
155
215
directory = self.path
156
216
filename = self.selected
157
217
158
218
if filename is None:
159
error_dialog(_('No file was selected'),
160
_('Please select a file from the list,\nor choose the other option.'))
161
return
162
163
try:
164
wt, path = WorkingTree.open_containing(directory + os.sep + filename)
165
wt.remove(path)
166
167
except errors.NotBranchError:
168
error_dialog(_('Directory is not a branch'),
169
_('You can perform this action only in a branch.'))
170
return
171
except errors.NotVersionedError:
172
error_dialog(_('File not versioned'),
173
_('The selected file is not versioned.'))
174
return
219
error_dialog(_i18n('No file was selected'),
220
_i18n('Please select a file from the list,\nor choose the other option.'))
221
return
222
223
wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
224
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
self.app.set_path(self.path)
236
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)
175
241
176
242
def rename_file(self, action):
177
243
""" Right context menu -> Rename """
186
252
filename = self.selected
187
253
188
254
if filename is None:
189
error_dialog(_('No file was selected'),
190
_('Please select a file from the list,\nor choose the other option.'))
255
error_dialog(_i18n('No file was selected'),
256
_i18n('Please select a file from the list,\nor choose the other option.'))
191
257
return
192
258
193
259
if filename == '..':
202
268
else:
203
269
launch(fullpath)
204
270
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('All files reverted to last revision.'))
281
self.app.refresh_right()
282
205
283
def commit(self, action):
206
284
""" Right context menu -> Commit """
207
285
from commit import CommitDialog
208
wt, path = WorkingTree.open_containing(self.path)
209
commit = CommitDialog(wt, path)
210
commit.display()
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()
211
306
307
@show_bzr_error
212
308
def diff(self, action):
213
309
""" Right context menu -> Diff """
214
try:
215
wt = WorkingTree.open_containing(self.path)[0]
216
except errors.NotBranchError:
217
error_dialog(_('File is not in a branch'),
218
_('The selected file is not in a branch.'))
219
return
220
221
window = DiffWindow()
310
wt = WorkingTree.open_containing(self.path)[0]
311
window = DiffWindow(self.app)
222
312
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
223
313
window.set_diff(wt.branch.nick, wt, parent_tree)
224
try:
225
window.set_file(wt.relpath(self.path + os.sep + self.selected))
226
except errors.NoSuchFile:
227
pass
314
window.set_file(wt.relpath(self.path + os.sep + self.selected))
228
315
window.show()
229
316
230
317
def bookmark(self, action):
231
318
""" Right context menu -> Bookmark """
232
319
if self.pref.add_bookmark(self.path):
233
info_dialog(_('Bookmark successfully added'),
234
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
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.'))
235
322
self.pref.write()
236
323
else:
237
warning_dialog(_('Location already bookmarked'),
238
_('The current directory is already bookmarked.\nSee the left panel for reference.'))
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()
239
328
240
329
def edit_bookmark(self, action):
241
330
""" Left context menu -> Edit """
242
from bookmark import OliveBookmark
243
331
from bookmark import BookmarkDialog
332
244
333
if self.selected != None:
245
bookmark = OliveBookmark(self.selected)
246
bookmark.display()
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()
247
344
248
345
def remove_bookmark(self, action):
249
346
""" Left context menu -> Remove """
251
348
if self.selected != None:
252
349
self.pref.remove_bookmark(self.selected)
253
350
self.pref.write()
351
352
self.app.refresh_left()
254
353
255
354
def open_folder(self, action):
256
355
""" Left context menu -> Open Folder """
268
367
from diff import OliveDiff
269
368
diff = OliveDiff(self.comm)
270
369
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."
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0