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), |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
62 |
('open', gtk.STOCK_OPEN, |
63 |
_('Open'), None, |
|
64 |
_('Open the selected file'), |
|
65 |
self.open_file), |
|
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
66 |
('commit', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
67 |
_('Commit'), None, |
68 |
_('Commit the changes'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
69 |
self.commit), |
70 |
('diff', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
71 |
_('Diff'), None, |
72 |
_('Show the diff of the file'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
73 |
self.diff), |
74 |
('bookmark', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
75 |
_('Bookmark'), None, |
76 |
_('Bookmark current location'), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
77 |
self.bookmark), |
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
78 |
('edit_bookmark', gtk.STOCK_EDIT, |
79 |
_('Edit'), None, |
|
80 |
_('Edit the selected bookmark'), |
|
81 |
self.edit_bookmark), |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
82 |
('remove_bookmark', gtk.STOCK_REMOVE, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
83 |
_('Remove'), None, |
84 |
_('Remove the selected bookmark'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
85 |
self.remove_bookmark), |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
86 |
('open_folder', gtk.STOCK_OPEN, |
87 |
_('Open Folder'), None, |
|
88 |
_('Open bookmark folder in Nautilus'), |
|
89 |
self.open_folder), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
90 |
('diff_selected', None, |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
91 |
_('Selected...'), None, |
92 |
_('Show the differences of the selected file'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
93 |
self.diff_selected), |
94 |
('diff_all', None, |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
95 |
_('All...'), None, |
96 |
_('Show the differences of all files'), |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
97 |
self.diff_all) |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
98 |
])
|
99 |
||
100 |
self.ui.insert_action_group(self.actiongroup, 0) |
|
101 |
self.ui.add_ui_from_file(self.uifile) |
|
102 |
||
103 |
self.cmenu_right = self.ui.get_widget('/context_right') |
|
104 |
self.cmenu_left = self.ui.get_widget('/context_left') |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
105 |
self.toolbar_diff = self.ui.get_widget('/toolbar_diff') |
0.8.50
by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class. |
106 |
|
107 |
# Set icons
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
108 |
# TODO: do it without using deprecated comm
|
109 |
#commit_menu = self.ui.get_widget('/context_right/commit')
|
|
110 |
#commit_image = self.comm.menuitem_branch_commit.get_image()
|
|
111 |
#commit_pixbuf = commit_image.get_pixbuf()
|
|
112 |
#commit_icon = gtk.Image()
|
|
113 |
#commit_icon.set_from_pixbuf(commit_pixbuf)
|
|
114 |
#commit_menu.set_image(commit_icon)
|
|
115 |
#diff_menu = self.ui.get_widget('/context_right/diff')
|
|
116 |
#diff_image = self.comm.menuitem_stats_diff.get_image()
|
|
117 |
#diff_pixbuf = diff_image.get_pixbuf()
|
|
118 |
#diff_icon = gtk.Image()
|
|
119 |
#diff_icon.set_from_pixbuf(diff_pixbuf)
|
|
120 |
#diff_menu.set_image(diff_icon)
|
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
121 |
|
122 |
def right_context_menu(self): |
|
123 |
return self.cmenu_right |
|
124 |
||
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
125 |
def left_context_menu(self): |
126 |
return self.cmenu_left |
|
127 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
128 |
def add_file(self, action): |
129 |
""" Right context menu -> Add """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
130 |
import bzrlib.add |
131 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
132 |
# Add only the selected file
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
133 |
directory = self.path |
134 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
135 |
|
136 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
137 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
138 |
_('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) |
139 |
return
|
140 |
||
141 |
try: |
|
93.1.1
by Alexander Belchenko
merge win32 fixes from my olive branch |
142 |
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) |
143 |
except errors.NotBranchError: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
144 |
error_dialog(_('Directory is not a branch'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
145 |
_('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) |
146 |
return
|
147 |
||
148 |
def remove_file(self, action): |
|
149 |
""" Right context menu -> Remove """ |
|
150 |
# Remove only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
151 |
directory = self.path |
152 |
filename = self.selected |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
153 |
|
154 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
155 |
error_dialog(_('No file was selected'), |
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
156 |
_('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) |
157 |
return
|
158 |
||
159 |
try: |
|
0.14.2
by Szilveszter Farkas (Phanatic)
Fix init error. Added .bzrignore. |
160 |
wt, path = WorkingTree.open_containing(directory + os.sep + filename) |
0.11.8
by Jelmer Vernooij
Integrate olive.backend.fileops |
161 |
wt.remove(path) |
162 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
163 |
except errors.NotBranchError: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
164 |
error_dialog(_('Directory is not a branch'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
165 |
_('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) |
166 |
return
|
167 |
except errors.NotVersionedError: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
168 |
error_dialog(_('File not versioned'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
169 |
_('The selected file is not versioned.')) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
170 |
return
|
171 |
||
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
172 |
def open_file(self, action): |
173 |
""" Right context menu -> Open """ |
|
174 |
# Open only the selected file
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
175 |
filename = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
176 |
|
177 |
if filename is None: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
178 |
error_dialog(_('No file was selected'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
179 |
_('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. |
180 |
return
|
181 |
||
182 |
if filename == '..': |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
183 |
# TODO: how to enter a directory?
|
184 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
185 |
else: |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
186 |
fullpath = self.path + os.sep + filename |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
187 |
if os.path.isdir(fullpath): |
188 |
# selected item is an existant directory
|
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
189 |
# TODO: how to enter a directory?
|
190 |
return
|
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
191 |
else: |
192 |
launch(fullpath) |
|
193 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
194 |
def commit(self, action): |
195 |
""" Right context menu -> Commit """ |
|
89
by Jelmer Vernooij
Rename OliveBranch -> BranchDialog. |
196 |
from commit import CommitDialog |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
197 |
wt, path = WorkingTree.open_containing(self.path) |
89
by Jelmer Vernooij
Rename OliveBranch -> BranchDialog. |
198 |
commit = CommitDialog(wt, path) |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
199 |
commit.display() |
200 |
||
201 |
def diff(self, action): |
|
202 |
""" Right context menu -> Diff """ |
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
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() |
|
211 |
parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) |
|
212 |
window.set_diff(wt.branch.nick, wt, parent_tree) |
|
213 |
window.show() |
|
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
214 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
215 |
def bookmark(self, action): |
216 |
""" Right context menu -> Bookmark """ |
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
217 |
if self.pref.add_bookmark(self.path): |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
218 |
info_dialog(_('Bookmark successfully added'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
219 |
_('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. |
220 |
self.pref.write() |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
221 |
else: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
222 |
warning_dialog(_('Location already bookmarked'), |
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
223 |
_('The current directory is already bookmarked.\nSee the left panel for reference.')) |
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
224 |
|
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
225 |
def edit_bookmark(self, action): |
226 |
""" Left context menu -> Edit """ |
|
227 |
from bookmark import OliveBookmark |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
228 |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
229 |
if self.selected != None: |
0.8.93
by Szilveszter Farkas (Phanatic)
Some further cleanups. More to come. |
230 |
bookmark = OliveBookmark(self.selected) |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
231 |
bookmark.display() |
0.8.57
by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them. |
232 |
|
0.8.33
by Szilveszter Farkas (Phanatic)
Implemented bookmarking. |
233 |
def remove_bookmark(self, action): |
234 |
""" Left context menu -> Remove """ |
|
235 |
||
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
236 |
if self.selected != None: |
111
by Szilveszter Farkas (Phanatic)
Fixed bug: unable to remove bookmarks (not reported). |
237 |
self.pref.remove_bookmark(self.selected) |
238 |
self.pref.write() |
|
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
239 |
|
240 |
def open_folder(self, action): |
|
241 |
""" Left context menu -> Open Folder """ |
|
0.8.92
by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes. |
242 |
path = self.selected |
0.8.72
by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch. |
243 |
|
244 |
if path != None: |
|
245 |
launch(path) |
|
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
246 |
|
247 |
def diff_selected(self, action): |
|
248 |
""" Diff toolbutton -> Selected... """ |
|
249 |
print "DEBUG: not implemented." |
|
250 |
||
251 |
def diff_all(self, action): |
|
252 |
""" Diff toolbutton -> All... """ |
|
253 |
from diff import OliveDiff |
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
254 |
diff = OliveDiff(self.comm) |
0.8.52
by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup. |
255 |
diff.display() |