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 |
||
17 |
import os.path |
|
18 |
import sys |
|
19 |
||
20 |
try: |
|
21 |
import pygtk |
|
22 |
pygtk.require("2.0") |
|
23 |
except: |
|
24 |
pass
|
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
25 |
|
26 |
import gtk |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
27 |
|
0.11.1
by Jelmer Vernooij
Eliminate olive.backend.errors. |
28 |
import bzrlib.errors as errors |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
29 |
from bzrlib.workingtree import WorkingTree |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
30 |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
31 |
from dialog import error_dialog, info_dialog, warning_dialog |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
32 |
from launch import launch |
93.1.3
by Alexander Belchenko
olive is able to successfully work without installation |
33 |
from olive import OlivePreferences, DiffWindow |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
34 |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
35 |
class OliveMenu: |
36 |
""" This class is responsible for building the context menus. """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
37 |
def __init__(self, path, selected): |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
38 |
# Load the UI file
|
93.1.12
by Alexander Belchenko
Names XML files with GUI resources obtained via olive/guifiles.py |
39 |
from guifiles import UIFILENAME |
40 |
||
41 |
self.uifile = UIFILENAME |
|
42 |
||
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
43 |
# Preferences handler
|
44 |
self.pref = OlivePreferences() |
|
45 |
||
46 |
# Set default values
|
|
47 |
self.path = path |
|
48 |
self.selected = selected |
|
49 |
||
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
50 |
# Create the file list context menu
|
51 |
self.ui = gtk.UIManager() |
|
52 |
||
53 |
self.actiongroup = gtk.ActionGroup('context') |
|
54 |
self.actiongroup.add_actions([('add', gtk.STOCK_ADD, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
55 |
_('Add'), None, |
56 |
_('Add the selected file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
57 |
self.add_file), |
58 |
('remove', gtk.STOCK_REMOVE, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
59 |
_('Remove'), None, |
60 |
_('Remove the selected file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
61 |
self.remove_file), |
117
by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774). |
62 |
('rename', None, |
63 |
_('Rename'), None, |
|
64 |
_('Rename the selected file'), |
|
65 |
self.rename_file), |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
66 |
('open', gtk.STOCK_OPEN, |
67 |
_('Open'), None, |
|
68 |
_('Open the selected file'), |
|
69 |
self.open_file), |
|
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
70 |
('commit', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
71 |
_('Commit'), None, |
72 |
_('Commit the changes'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
73 |
self.commit), |
74 |
('diff', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
75 |
_('Diff'), None, |
76 |
_('Show the diff of the file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
77 |
self.diff), |
78 |
('bookmark', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
79 |
_('Bookmark'), None, |
80 |
_('Bookmark current location'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
81 |
self.bookmark), |
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
82 |
('edit_bookmark', gtk.STOCK_EDIT, |
83 |
_('Edit'), None, |
|
84 |
_('Edit the selected bookmark'), |
|
85 |
self.edit_bookmark), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
86 |
('remove_bookmark', gtk.STOCK_REMOVE, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
87 |
_('Remove'), None, |
88 |
_('Remove the selected bookmark'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
89 |
self.remove_bookmark), |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
90 |
('open_folder', gtk.STOCK_OPEN, |
91 |
_('Open Folder'), None, |
|
92 |
_('Open bookmark folder in Nautilus'), |
|
93 |
self.open_folder), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
94 |
('diff_selected', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
95 |
_('Selected...'), None, |
96 |
_('Show the differences of the selected file'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
97 |
self.diff_selected), |
98 |
('diff_all', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
99 |
_('All...'), None, |
100 |
_('Show the differences of all files'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
101 |
self.diff_all) |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
102 |
])
|
103 |
||
104 |
self.ui.insert_action_group(self.actiongroup, 0) |
|
105 |
self.ui.add_ui_from_file(self.uifile) |
|
106 |
||
107 |
self.cmenu_right = self.ui.get_widget('/context_right') |
|
108 |
self.cmenu_left = self.ui.get_widget('/context_left') |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
109 |
self.toolbar_diff = self.ui.get_widget('/toolbar_diff') |
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
110 |
|
111 |
# Set icons
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
112 |
# TODO: do it without using deprecated comm
|
113 |
#commit_menu = self.ui.get_widget('/context_right/commit')
|
|
114 |
#commit_image = self.comm.menuitem_branch_commit.get_image()
|
|
115 |
#commit_pixbuf = commit_image.get_pixbuf()
|
|
116 |
#commit_icon = gtk.Image()
|
|
117 |
#commit_icon.set_from_pixbuf(commit_pixbuf)
|
|
118 |
#commit_menu.set_image(commit_icon)
|
|
119 |
#diff_menu = self.ui.get_widget('/context_right/diff')
|
|
120 |
#diff_image = self.comm.menuitem_stats_diff.get_image()
|
|
121 |
#diff_pixbuf = diff_image.get_pixbuf()
|
|
122 |
#diff_icon = gtk.Image()
|
|
123 |
#diff_icon.set_from_pixbuf(diff_pixbuf)
|
|
124 |
#diff_menu.set_image(diff_icon)
|
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
125 |
|
126 |
def right_context_menu(self): |
|
127 |
return self.cmenu_right |
|
128 |
||
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
129 |
def left_context_menu(self): |
130 |
return self.cmenu_left |
|
131 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
132 |
def add_file(self, action): |
133 |
""" Right context menu -> Add """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
134 |
import bzrlib.add |
135 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
136 |
# Add only the selected file
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
137 |
directory = self.path |
138 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
139 |
|
140 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
141 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
142 |
_('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) |
143 |
return
|
144 |
||
145 |
try: |
|
93.1.1
by Alexander Belchenko
merge win32 fixes from my olive branch |
146 |
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) |
147 |
except errors.NotBranchError: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
148 |
error_dialog(_('Directory is not a branch'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
149 |
_('You can perform this action only in a branch.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
150 |
return
|
151 |
||
152 |
def remove_file(self, action): |
|
153 |
""" Right context menu -> Remove """ |
|
154 |
# Remove only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
155 |
directory = self.path |
156 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
157 |
|
158 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
159 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
160 |
_('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) |
161 |
return
|
162 |
||
163 |
try: |
|
0.14.2
by Szilveszter Farkas (Phanatic)
Fix init error. Added .bzrignore. |
164 |
wt, path = WorkingTree.open_containing(directory + os.sep + filename) |
0.11.8
by Jelmer Vernooij
Integrate olive.backend.fileops |
165 |
wt.remove(path) |
166 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
167 |
except errors.NotBranchError: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
168 |
error_dialog(_('Directory is not a branch'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
169 |
_('You can perform this action only in a branch.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
170 |
return
|
171 |
except errors.NotVersionedError: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
172 |
error_dialog(_('File not versioned'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
173 |
_('The selected file is not versioned.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
174 |
return
|
175 |
||
117
by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774). |
176 |
def rename_file(self, action): |
177 |
""" Right context menu -> Rename """ |
|
178 |
from rename import OliveRename |
|
179 |
wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0] |
|
180 |
rename = OliveRename(wt, wt.relpath(self.path), self.selected) |
|
181 |
rename.display() |
|
182 |
||
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
183 |
def open_file(self, action): |
184 |
""" Right context menu -> Open """ |
|
185 |
# Open only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
186 |
filename = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
187 |
|
188 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
189 |
error_dialog(_('No file was selected'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
190 |
_('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. |
191 |
return
|
192 |
||
193 |
if filename == '..': |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
194 |
# TODO: how to enter a directory?
|
195 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
196 |
else: |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
197 |
fullpath = self.path + os.sep + filename |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
198 |
if os.path.isdir(fullpath): |
199 |
# selected item is an existant directory
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
200 |
# TODO: how to enter a directory?
|
201 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
202 |
else: |
203 |
launch(fullpath) |
|
204 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
205 |
def commit(self, action): |
206 |
""" Right context menu -> Commit """ |
|
89
by Jelmer Vernooij
Rename OliveBranch -> BranchDialog. |
207 |
from commit import CommitDialog |
93.1.18
by Alexander Belchenko
Fix for commit command in olive context menu |
208 |
branch = None |
209 |
try: |
|
210 |
wt, path = WorkingTree.open_containing(self.path) |
|
211 |
branch = wt.branch |
|
212 |
except NotBranchError, e: |
|
213 |
path = e.path |
|
214 |
commit = CommitDialog(wt, path, not branch) |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
215 |
commit.display() |
216 |
||
217 |
def diff(self, action): |
|
218 |
""" Right context menu -> Diff """ |
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
219 |
try: |
220 |
wt = WorkingTree.open_containing(self.path)[0] |
|
221 |
except errors.NotBranchError: |
|
222 |
error_dialog(_('File is not in a branch'), |
|
223 |
_('The selected file is not in a branch.')) |
|
224 |
return
|
|
225 |
||
226 |
window = DiffWindow() |
|
227 |
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) |
|
228 |
window.set_diff(wt.branch.nick, wt, parent_tree) |
|
116
by Szilveszter Farkas (Phanatic)
Selecting Diff from context menu shows diff for the selected file. |
229 |
try: |
230 |
window.set_file(wt.relpath(self.path + os.sep + self.selected)) |
|
231 |
except errors.NoSuchFile: |
|
232 |
pass
|
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
233 |
window.show() |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
234 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
235 |
def bookmark(self, action): |
236 |
""" Right context menu -> Bookmark """ |
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
237 |
if self.pref.add_bookmark(self.path): |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
238 |
info_dialog(_('Bookmark successfully added'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
239 |
_('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. |
240 |
self.pref.write() |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
241 |
else: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
242 |
warning_dialog(_('Location already bookmarked'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
243 |
_('The current directory is already bookmarked.\nSee the left panel for reference.')) |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
244 |
|
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
245 |
def edit_bookmark(self, action): |
246 |
""" Left context menu -> Edit """ |
|
247 |
from bookmark import OliveBookmark |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
248 |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
249 |
if self.selected != None: |
0.8.93
by Szilveszter Farkas (Phanatic)
Some further cleanups. More to come. |
250 |
bookmark = OliveBookmark(self.selected) |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
251 |
bookmark.display() |
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
252 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
253 |
def remove_bookmark(self, action): |
254 |
""" Left context menu -> Remove """ |
|
255 |
||
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
256 |
if self.selected != None: |
111
by Szilveszter Farkas (Phanatic)
Fixed bug: unable to remove bookmarks (not reported). |
257 |
self.pref.remove_bookmark(self.selected) |
258 |
self.pref.write() |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
259 |
|
260 |
def open_folder(self, action): |
|
261 |
""" Left context menu -> Open Folder """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
262 |
path = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
263 |
|
264 |
if path != None: |
|
265 |
launch(path) |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
266 |
|
267 |
def diff_selected(self, action): |
|
268 |
""" Diff toolbutton -> Selected... """ |
|
269 |
print "DEBUG: not implemented." |
|
270 |
||
271 |
def diff_all(self, action): |
|
272 |
""" Diff toolbutton -> All... """ |
|
273 |
from diff import OliveDiff |
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
274 |
diff = OliveDiff(self.comm) |
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
275 |
diff.display() |