112
117
self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
115
commit_menu = self.ui.get_widget('/context_right/commit')
116
commit_image = self.comm.menuitem_branch_commit.get_image()
117
commit_pixbuf = commit_image.get_pixbuf()
118
commit_icon = gtk.Image()
119
commit_icon.set_from_pixbuf(commit_pixbuf)
120
commit_menu.set_image(commit_icon)
121
diff_menu = self.ui.get_widget('/context_right/diff')
122
diff_image = self.comm.menuitem_stats_diff.get_image()
123
diff_pixbuf = diff_image.get_pixbuf()
124
diff_icon = gtk.Image()
125
diff_icon.set_from_pixbuf(diff_pixbuf)
126
diff_menu.set_image(diff_icon)
120
# TODO: do it without using deprecated comm
121
#commit_menu = self.ui.get_widget('/context_right/commit')
122
#commit_image = self.comm.menuitem_branch_commit.get_image()
123
#commit_pixbuf = commit_image.get_pixbuf()
124
#commit_icon = gtk.Image()
125
#commit_icon.set_from_pixbuf(commit_pixbuf)
126
#commit_menu.set_image(commit_icon)
127
#diff_menu = self.ui.get_widget('/context_right/diff')
128
#diff_image = self.comm.menuitem_stats_diff.get_image()
129
#diff_pixbuf = diff_image.get_pixbuf()
130
#diff_icon = gtk.Image()
131
#diff_icon.set_from_pixbuf(diff_pixbuf)
132
#diff_menu.set_image(diff_icon)
128
134
def right_context_menu(self):
129
135
return self.cmenu_right
134
140
def add_file(self, action):
135
141
""" Right context menu -> Add """
136
144
# Add only the selected file
137
directory = self.comm.get_path()
138
filename = self.comm.get_selected_right()
145
directory = self.path
146
filename = self.selected
140
148
if filename is None:
141
149
error_dialog(_('No file was selected'),
142
_('Please select a file from the list,\nor choose the other option.'))
150
_('Please select a file from the list,\nor choose the other option.'))
146
154
bzrlib.add.smart_add([directory + '/' + filename])
147
155
except errors.NotBranchError:
148
156
error_dialog(_('Directory is not a branch'),
149
_('You can perform this action only in a branch.'))
157
_('You can perform this action only in a branch.'))
152
self.comm.refresh_right()
154
160
def remove_file(self, action):
155
161
""" Right context menu -> Remove """
156
162
# Remove only the selected file
157
directory = self.comm.get_path()
158
filename = self.comm.get_selected_right()
163
directory = self.path
164
filename = self.selected
160
166
if filename is None:
161
167
error_dialog(_('No file was selected'),
162
_('Please select a file from the list,\nor choose the other option.'))
168
_('Please select a file from the list,\nor choose the other option.'))
166
wt, path = WorkingTree.open_containing(directory+'/'+filename)
172
wt, path = WorkingTree.open_containing(directory + os.sep + filename)
169
175
except errors.NotBranchError:
170
176
error_dialog(_('Directory is not a branch'),
171
_('You can perform this action only in a branch.'))
177
_('You can perform this action only in a branch.'))
173
179
except errors.NotVersionedError:
174
180
error_dialog(_('File not versioned'),
175
_('The selected file is not versioned.'))
181
_('The selected file is not versioned.'))
180
self.comm.refresh_right()
182
184
def open_file(self, action):
183
185
""" Right context menu -> Open """
184
186
# Open only the selected file
185
filename = self.comm.get_selected_right()
187
filename = self.selected
187
189
if filename is None:
188
190
error_dialog(_('No file was selected'),
189
_('Please select a file from the list,\nor choose the other option.'))
191
_('Please select a file from the list,\nor choose the other option.'))
192
194
if filename == '..':
193
self.comm.set_path(os.path.split(self.comm.get_path())[0])
195
# TODO: how to enter a directory?
195
fullpath = self.comm.get_path() + os.sep + filename
198
fullpath = self.path + os.sep + filename
196
199
if os.path.isdir(fullpath):
197
200
# selected item is an existant directory
198
self.comm.set_path(fullpath)
201
# TODO: how to enter a directory?
202
self.comm.refresh_right()
204
206
def commit(self, action):
205
207
""" Right context menu -> Commit """
206
208
from commit import OliveCommit
207
wt, path = WorkingTree.open_containing(self.comm.get_path())
208
commit = OliveCommit(self.gladefile, wt, path)
209
wt, path = WorkingTree.open_containing(self.path)
210
commit = OliveCommit(wt, path)
211
213
def diff(self, action):
212
214
""" Right context menu -> Diff """
213
215
from diff import OliveDiff
214
diff = OliveDiff(self.gladefile, self.comm)
216
diff = OliveDiff(self.comm)
217
219
def bookmark(self, action):
218
220
""" Right context menu -> Bookmark """
219
if self.comm.pref.add_bookmark(self.comm.get_path()):
221
if self.pref.add_bookmark(self.comm.get_path()):
220
222
info_dialog(_('Bookmark successfully added'),
221
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
223
_('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
223
225
warning_dialog(_('Location already bookmarked'),
224
_('The current directory is already bookmarked.\nSee the left panel for reference.'))
226
self.comm.refresh_left()
226
_('The current directory is already bookmarked.\nSee the left panel for reference.'))
228
228
def edit_bookmark(self, action):
229
229
""" Left context menu -> Edit """
230
230
from bookmark import OliveBookmark
232
if self.comm.get_selected_left() != None:
233
bookmark = OliveBookmark(self.gladefile, self.comm)
232
if self.selected != None:
233
bookmark = OliveBookmark(self.selected)
234
234
bookmark.display()
236
236
def remove_bookmark(self, action):
237
237
""" Left context menu -> Remove """
239
if self.comm.get_selected_left() != None:
240
self.comm.pref.remove_bookmark(self.comm.get_selected_left())
239
if self.selected != None:
240
self.pref.remove_bookmark(self.comm.get_selected_left())
241
241
self.comm.refresh_left()
243
243
def open_folder(self, action):
244
244
""" Left context menu -> Open Folder """
245
path = self.comm.get_selected_left()