bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
1 |
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
|
0.8.51
by Szilveszter Farkas (Phanatic)
Some fixes for the Win32 platform; typo fixed. |
2 |
#
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
0.8.51
by Szilveszter Farkas (Phanatic)
Some fixes for the Win32 platform; typo fixed. |
7 |
#
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
0.8.51
by Szilveszter Farkas (Phanatic)
Some fixes for the Win32 platform; typo fixed. |
12 |
#
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
17 |
import os |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
18 |
import os.path |
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
19 |
import shutil |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
20 |
import sys |
21 |
||
22 |
try: |
|
23 |
import pygtk |
|
24 |
pygtk.require("2.0") |
|
25 |
except: |
|
26 |
pass
|
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
27 |
|
28 |
import gtk |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
29 |
|
0.11.1
by Jelmer Vernooij
Eliminate olive.backend.errors. |
30 |
import bzrlib.errors as errors |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
31 |
from bzrlib.workingtree import WorkingTree |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
32 |
|
272.1.3
by Mateusz Korniak
Proper import of question_dialog in context menu invocation. |
33 |
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog |
191
by Szilveszter Farkas (Phanatic)
Fixed an import issue (#104711). |
34 |
from bzrlib.plugins.gtk.errors import show_bzr_error |
195.4.1
by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu. |
35 |
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow |
36 |
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig |
|
37 |
from bzrlib.plugins.gtk.diff import DiffWindow |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
38 |
from launch import launch |
195.4.1
by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu. |
39 |
from olive import Preferences |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
40 |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
41 |
class OliveMenu: |
42 |
""" This class is responsible for building the context menus. """ |
|
120
by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove. |
43 |
def __init__(self, path, selected, app=None): |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
44 |
# Load the UI file
|
93.1.12
by Alexander Belchenko
Names XML files with GUI resources obtained via olive/guifiles.py |
45 |
from guifiles import UIFILENAME |
46 |
||
47 |
self.uifile = UIFILENAME |
|
48 |
||
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
49 |
# Preferences handler
|
142
by Jelmer Vernooij
Move some files to the top-level directory, add first test. |
50 |
self.pref = Preferences() |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
51 |
|
52 |
# Set default values
|
|
53 |
self.path = path |
|
54 |
self.selected = selected |
|
120
by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove. |
55 |
self.app = app |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
56 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
57 |
# Create the file list context menu
|
58 |
self.ui = gtk.UIManager() |
|
59 |
||
60 |
self.actiongroup = gtk.ActionGroup('context') |
|
61 |
self.actiongroup.add_actions([('add', gtk.STOCK_ADD, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
62 |
_('Add'), None, |
63 |
_('Add the selected file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
64 |
self.add_file), |
65 |
('remove', gtk.STOCK_REMOVE, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
66 |
_('Remove'), None, |
67 |
_('Remove the selected file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
68 |
self.remove_file), |
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
69 |
('remove_and_delete', gtk.STOCK_REMOVE, |
70 |
_('Remove and delete'), None, |
|
71 |
_('Remove the selected file/dir and delete from disk'), |
|
72 |
self.remove_and_delete_file), |
|
117
by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774). |
73 |
('rename', None, |
74 |
_('Rename'), None, |
|
75 |
_('Rename the selected file'), |
|
76 |
self.rename_file), |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
77 |
('open', gtk.STOCK_OPEN, |
78 |
_('Open'), None, |
|
79 |
_('Open the selected file'), |
|
80 |
self.open_file), |
|
126.1.12
by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu. |
81 |
('revert', None, |
82 |
_('Revert'), None, |
|
83 |
_('Revert the changes'), |
|
84 |
self.revert), |
|
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
85 |
('commit', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
86 |
_('Commit'), None, |
87 |
_('Commit the changes'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
88 |
self.commit), |
195.4.1
by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu. |
89 |
('annotate', None, |
90 |
_('Annotate'), None, |
|
91 |
_('Annotate the selected file'), |
|
92 |
self.annotate), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
93 |
('diff', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
94 |
_('Diff'), None, |
95 |
_('Show the diff of the file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
96 |
self.diff), |
97 |
('bookmark', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
98 |
_('Bookmark'), None, |
99 |
_('Bookmark current location'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
100 |
self.bookmark), |
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
101 |
('edit_bookmark', gtk.STOCK_EDIT, |
102 |
_('Edit'), None, |
|
103 |
_('Edit the selected bookmark'), |
|
104 |
self.edit_bookmark), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
105 |
('remove_bookmark', gtk.STOCK_REMOVE, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
106 |
_('Remove'), None, |
107 |
_('Remove the selected bookmark'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
108 |
self.remove_bookmark), |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
109 |
('open_folder', gtk.STOCK_OPEN, |
110 |
_('Open Folder'), None, |
|
111 |
_('Open bookmark folder in Nautilus'), |
|
112 |
self.open_folder), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
113 |
('diff_selected', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
114 |
_('Selected...'), None, |
115 |
_('Show the differences of the selected file'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
116 |
self.diff_selected), |
117 |
('diff_all', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
118 |
_('All...'), None, |
119 |
_('Show the differences of all files'), |
|
195.1.24
by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing. |
120 |
self.diff_all), |
121 |
('view_remote', None, |
|
122 |
_('View contents'), None, |
|
123 |
_('View the contents of the file in a builtin viewer'), |
|
124 |
self.view_remote), |
|
125 |
('diff_remote', None, |
|
126 |
_('Show differences'), None, |
|
127 |
_('Show the differences between two revisions of the file'), |
|
128 |
self.diff_remote), |
|
129 |
('revert_remote', None, |
|
130 |
_('Revert to this revision'), None, |
|
131 |
_('Revert the selected file to the selected revision'), |
|
132 |
self.revert_remote) |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
133 |
])
|
134 |
||
135 |
self.ui.insert_action_group(self.actiongroup, 0) |
|
136 |
self.ui.add_ui_from_file(self.uifile) |
|
137 |
||
138 |
self.cmenu_right = self.ui.get_widget('/context_right') |
|
139 |
self.cmenu_left = self.ui.get_widget('/context_left') |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
140 |
self.toolbar_diff = self.ui.get_widget('/toolbar_diff') |
195.1.24
by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing. |
141 |
self.cmenu_remote = self.ui.get_widget('/context_remote') |
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
142 |
|
143 |
# Set icons
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
144 |
# TODO: do it without using deprecated comm
|
145 |
#commit_menu = self.ui.get_widget('/context_right/commit')
|
|
146 |
#commit_image = self.comm.menuitem_branch_commit.get_image()
|
|
147 |
#commit_pixbuf = commit_image.get_pixbuf()
|
|
148 |
#commit_icon = gtk.Image()
|
|
149 |
#commit_icon.set_from_pixbuf(commit_pixbuf)
|
|
150 |
#commit_menu.set_image(commit_icon)
|
|
151 |
#diff_menu = self.ui.get_widget('/context_right/diff')
|
|
152 |
#diff_image = self.comm.menuitem_stats_diff.get_image()
|
|
153 |
#diff_pixbuf = diff_image.get_pixbuf()
|
|
154 |
#diff_icon = gtk.Image()
|
|
155 |
#diff_icon.set_from_pixbuf(diff_pixbuf)
|
|
156 |
#diff_menu.set_image(diff_icon)
|
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
157 |
|
158 |
def right_context_menu(self): |
|
159 |
return self.cmenu_right |
|
160 |
||
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
161 |
def left_context_menu(self): |
162 |
return self.cmenu_left |
|
163 |
||
195.1.24
by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing. |
164 |
def remote_context_menu(self): |
165 |
return self.cmenu_remote |
|
166 |
||
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
167 |
@show_bzr_error
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
168 |
def add_file(self, action): |
169 |
""" Right context menu -> Add """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
170 |
import bzrlib.add |
171 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
172 |
# Add only the selected file
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
173 |
directory = self.path |
174 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
175 |
|
176 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
177 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
178 |
_('Please select a file from the list,\nor choose the other option.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
179 |
return
|
180 |
||
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
181 |
bzrlib.add.smart_add([os.path.join(directory, filename)]) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
182 |
|
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
183 |
@show_bzr_error
|
195.4.1
by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu. |
184 |
def annotate(self, action): |
185 |
""" Right context menu -> Annotate """ |
|
186 |
directory = self.path |
|
187 |
filename = self.selected |
|
188 |
||
189 |
if filename is None: |
|
190 |
error_dialog(_('No file was selected'), |
|
191 |
_('Please select a file from the list.')) |
|
192 |
return
|
|
193 |
||
194 |
wt, path = WorkingTree.open_containing(os.path.join(directory, filename)) |
|
195 |
||
196 |
branch = wt.branch |
|
197 |
file_id = wt.path2id(wt.relpath(os.path.join(directory, filename))) |
|
198 |
||
275.1.8
by Daniel Schierbeck
Fixed bug in the Olive context menu |
199 |
window = GAnnotateWindow(all=False, plain=False, parent=self.app) |
195.4.1
by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu. |
200 |
window.set_title(os.path.join(directory, filename) + " - Annotate") |
201 |
config = GAnnotateConfig(window) |
|
202 |
window.show() |
|
203 |
branch.lock_read() |
|
204 |
try: |
|
205 |
window.annotate(wt, branch, file_id) |
|
206 |
finally: |
|
207 |
branch.unlock() |
|
208 |
||
209 |
@show_bzr_error
|
|
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
210 |
def remove_file(self, action,delete_on_disk=0): |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
211 |
""" Right context menu -> Remove """ |
212 |
# Remove only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
213 |
directory = self.path |
214 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
215 |
|
216 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
217 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
218 |
_('Please select a file from the list,\nor choose the other option.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
219 |
return
|
220 |
||
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
221 |
wt, path = WorkingTree.open_containing(os.path.join(directory, filename)) |
222 |
wt.remove(path) |
|
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
223 |
|
224 |
if delete_on_disk: |
|
225 |
abs_filename = os.path.join(directory,filename) |
|
226 |
if os.path.isdir(abs_filename): |
|
227 |
response = question_dialog(_('Delete directory with all directories below ?'), abs_filename ) |
|
228 |
if response == gtk.RESPONSE_YES: |
|
229 |
shutil.rmtree(abs_filename) |
|
230 |
else: |
|
231 |
os.remove(abs_filename) |
|
232 |
||
120
by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove. |
233 |
self.app.set_path(self.path) |
234 |
self.app.refresh_right() |
|
235.1.4
by Mateusz Korniak
Context menu "Remove and delete added" |
235 |
|
236 |
def remove_and_delete_file(self, action): |
|
237 |
""" Right context menu -> Remove and delete""" |
|
238 |
self.remove_file(action,delete_on_disk=1) |
|
120
by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove. |
239 |
|
117
by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774). |
240 |
def rename_file(self, action): |
241 |
""" Right context menu -> Rename """ |
|
242 |
from rename import OliveRename |
|
243 |
wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0] |
|
244 |
rename = OliveRename(wt, wt.relpath(self.path), self.selected) |
|
245 |
rename.display() |
|
246 |
||
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
247 |
def open_file(self, action): |
248 |
""" Right context menu -> Open """ |
|
249 |
# Open only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
250 |
filename = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
251 |
|
252 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
253 |
error_dialog(_('No file was selected'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
254 |
_('Please select a file from the list,\nor choose the other option.')) |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
255 |
return
|
256 |
||
257 |
if filename == '..': |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
258 |
# TODO: how to enter a directory?
|
259 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
260 |
else: |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
261 |
fullpath = self.path + os.sep + filename |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
262 |
if os.path.isdir(fullpath): |
263 |
# selected item is an existant directory
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
264 |
# TODO: how to enter a directory?
|
265 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
266 |
else: |
267 |
launch(fullpath) |
|
268 |
||
126.1.12
by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu. |
269 |
def revert(self, action): |
270 |
""" Right context menu -> Revert """ |
|
271 |
wt, path = WorkingTree.open_containing(self.path) |
|
272 |
ret = wt.revert([os.path.join(path, self.selected)]) |
|
273 |
if ret: |
|
274 |
warning_dialog(_('Conflicts detected'), |
|
275 |
_('Please have a look at the working tree before continuing.')) |
|
276 |
else: |
|
277 |
info_dialog(_('Revert successful'), |
|
278 |
_('All files reverted to last revision.')) |
|
279 |
self.app.refresh_right() |
|
280 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
281 |
def commit(self, action): |
282 |
""" Right context menu -> Commit """ |
|
89
by Jelmer Vernooij
Rename OliveBranch -> BranchDialog. |
283 |
from commit import CommitDialog |
93.1.18
by Alexander Belchenko
Fix for commit command in olive context menu |
284 |
branch = None |
285 |
try: |
|
286 |
wt, path = WorkingTree.open_containing(self.path) |
|
287 |
branch = wt.branch |
|
288 |
except NotBranchError, e: |
|
289 |
path = e.path |
|
126.1.10
by Szilveszter Farkas (Phanatic)
Allow to commit single files from the context menu (Fixed: #54983) |
290 |
|
291 |
commit = CommitDialog(wt, path, not branch, self.selected) |
|
292 |
response = commit.run() |
|
293 |
if response != gtk.RESPONSE_NONE: |
|
294 |
commit.hide() |
|
295 |
||
296 |
if response == gtk.RESPONSE_OK: |
|
297 |
self.app.refresh_right() |
|
298 |
||
299 |
commit.destroy() |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
300 |
|
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
301 |
@show_bzr_error
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
302 |
def diff(self, action): |
303 |
""" Right context menu -> Diff """ |
|
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
304 |
wt = WorkingTree.open_containing(self.path)[0] |
298.2.1
by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events. |
305 |
window = DiffWindow(self.app) |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
306 |
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) |
307 |
window.set_diff(wt.branch.nick, wt, parent_tree) |
|
132
by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory. |
308 |
window.set_file(wt.relpath(self.path + os.sep + self.selected)) |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
309 |
window.show() |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
310 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
311 |
def bookmark(self, action): |
312 |
""" Right context menu -> Bookmark """ |
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
313 |
if self.pref.add_bookmark(self.path): |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
314 |
info_dialog(_('Bookmark successfully added'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
315 |
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.')) |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
316 |
self.pref.write() |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
317 |
else: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
318 |
warning_dialog(_('Location already bookmarked'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
319 |
_('The current directory is already bookmarked.\nSee the left panel for reference.')) |
121
by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark. |
320 |
|
321 |
self.app.refresh_left() |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
322 |
|
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
323 |
def edit_bookmark(self, action): |
324 |
""" Left context menu -> Edit """ |
|
126.1.21
by Szilveszter Farkas (Phanatic)
Remove trash from olive.glade. Some cleanups. |
325 |
from bookmark import BookmarkDialog |
121
by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark. |
326 |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
327 |
if self.selected != None: |
126.1.21
by Szilveszter Farkas (Phanatic)
Remove trash from olive.glade. Some cleanups. |
328 |
bookmark = BookmarkDialog(self.selected, self.app.window) |
121
by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark. |
329 |
response = bookmark.run() |
330 |
||
331 |
if response != gtk.RESPONSE_NONE: |
|
332 |
bookmark.hide() |
|
333 |
||
334 |
if response == gtk.RESPONSE_OK: |
|
335 |
self.app.refresh_left() |
|
336 |
||
337 |
bookmark.destroy() |
|
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
338 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
339 |
def remove_bookmark(self, action): |
340 |
""" Left context menu -> Remove """ |
|
341 |
||
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
342 |
if self.selected != None: |
111
by Szilveszter Farkas (Phanatic)
Fixed bug: unable to remove bookmarks (not reported). |
343 |
self.pref.remove_bookmark(self.selected) |
344 |
self.pref.write() |
|
121
by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark. |
345 |
|
346 |
self.app.refresh_left() |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
347 |
|
348 |
def open_folder(self, action): |
|
349 |
""" Left context menu -> Open Folder """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
350 |
path = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
351 |
|
352 |
if path != None: |
|
353 |
launch(path) |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
354 |
|
355 |
def diff_selected(self, action): |
|
356 |
""" Diff toolbutton -> Selected... """ |
|
357 |
print "DEBUG: not implemented." |
|
358 |
||
359 |
def diff_all(self, action): |
|
360 |
""" Diff toolbutton -> All... """ |
|
361 |
from diff import OliveDiff |
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
362 |
diff = OliveDiff(self.comm) |
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
363 |
diff.display() |
195.1.24
by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing. |
364 |
|
365 |
def view_remote(self, action): |
|
366 |
""" Remote context menu -> View contents """ |
|
367 |
print "DEBUG: view contents." |
|
368 |
||
369 |
def diff_remote(self, action): |
|
370 |
""" Remote context menu -> Show differences """ |
|
371 |
print "DEBUG: show differences." |
|
372 |
||
373 |
def revert_remote(self, action): |
|
374 |
""" Remote context menu -> Revert to this revision """ |
|
375 |
print "DEBUG: revert to this revision." |