/b-gtk/fix-viz

To get this branch, use:
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
531.5.1 by Jasper Groenewegen
Fix import changed in rev 523
33
from bzrlib.plugins.gtk import _i18n
272.1.3 by Mateusz Korniak
Proper import of question_dialog in context menu invocation.
34
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
191 by Szilveszter Farkas (Phanatic)
Fixed an import issue (#104711).
35
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.
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
531.5.1 by Jasper Groenewegen
Fix import changed in rev 523
39
from bzrlib.plugins.gtk.olive import Preferences, launch
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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
62
                                       _i18n('Add'), None,
63
                                       _i18n('Add the selected file'),
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
64
                                       self.add_file),
65
                                      ('remove', gtk.STOCK_REMOVE,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
66
                                       _i18n('Remove'), None,
67
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
70
                                       _i18n('Remove and delete'), None,
71
                                       _i18n('Remove the selected file/dir and delete from disk'),
235.1.4 by Mateusz Korniak
Context menu "Remove and delete added"
72
                                       self.remove_and_delete_file),
117 by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774).
73
                                      ('rename', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
74
                                       _i18n('Rename'), None,
75
                                       _i18n('Rename the selected file'),
117 by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774).
76
                                       self.rename_file),
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
77
                                      ('open', gtk.STOCK_OPEN,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
78
                                       _i18n('Open'), None,
79
                                       _i18n('Open the selected file'),
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
80
                                       self.open_file),
126.1.12 by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu.
81
                                      ('revert', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
82
                                       _i18n('Revert'), None,
83
                                       _i18n('Revert the changes'),
126.1.12 by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu.
84
                                       self.revert),
0.8.50 by Szilveszter Farkas (Phanatic)
Major updates in the OliveMenu class.
85
                                      ('commit', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
86
                                       _i18n('Commit'), None,
87
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
90
                                       _i18n('Annotate'), None,
91
                                       _i18n('Annotate the selected file'),
195.4.1 by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu.
92
                                       self.annotate),
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
93
                                      ('diff', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
94
                                       _i18n('Diff'), None,
95
                                       _i18n('Show the diff of the file'),
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
96
                                       self.diff),
97
                                      ('bookmark', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
98
                                       _i18n('Bookmark'), None,
99
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
102
                                       _i18n('Edit'), None,
103
                                       _i18n('Edit the selected bookmark'),
0.8.57 by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them.
104
                                       self.edit_bookmark),
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
105
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
106
                                       _i18n('Remove'), None,
107
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
110
                                       _i18n('Open Folder'), None,
111
                                       _i18n('Open bookmark folder in Nautilus'),
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
112
                                       self.open_folder),
0.8.52 by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup.
113
                                      ('diff_selected', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
114
                                       _i18n('Selected...'), None,
115
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
118
                                       _i18n('All...'), None,
119
                                       _i18n('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,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
122
                                       _i18n('View contents'), None,
123
                                       _i18n('View the contents of the file in a builtin viewer'),
195.1.24 by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing.
124
                                       self.view_remote),
125
                                      ('diff_remote', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
126
                                       _i18n('Show differences'), None,
127
                                       _i18n('Show the differences between two revisions of the file'),
195.1.24 by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing.
128
                                       self.diff_remote),
129
                                      ('revert_remote', None,
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
130
                                       _i18n('Revert to this revision'), None,
131
                                       _i18n('Revert the selected file to the selected revision'),
195.1.24 by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing.
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:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
177
            error_dialog(_i18n('No file was selected'),
178
                         _i18n('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
        
511.4.1 by Jelmer Vernooij
Fix use of smart_add.
181
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
182
        wt.add([path])
531.4.1 by Jasper Groenewegen
Refresh right_view on add_file()
183
        
184
        self.app.refresh_right()
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
185
    
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.
186
    @show_bzr_error
195.4.1 by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu.
187
    def annotate(self, action):
188
        """ Right context menu -> Annotate """
189
        directory = self.path
190
        filename = self.selected
191
        
192
        if filename is None:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
193
            error_dialog(_i18n('No file was selected'),
194
                         _i18n('Please select a file from the list.'))
195.4.1 by Szilveszter Farkas (Phanatic)
Added Annotate to the right context menu + fixed Diff in that menu.
195
            return
196
        
197
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
198
        
199
        branch = wt.branch
200
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
560.4.1 by Jasper Groenewegen
Add test to contextmenu->annotate to raise error if selected file is unversioned as gannotate expects it.
201
        if file_id is None:
202
            raise errors.NotVersionedError(filename)
275.1.8 by Daniel Schierbeck
Fixed bug in the Olive context menu
203
        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.
204
        window.set_title(os.path.join(directory, filename) + " - Annotate")
205
        config = GAnnotateConfig(window)
206
        window.show()
207
        branch.lock_read()
208
        try:
209
            window.annotate(wt, branch, file_id)
210
        finally:
211
            branch.unlock()
212
    
213
    @show_bzr_error
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
214
    def remove_file(self, action, delete_on_disk=False):
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
215
        """ Right context menu -> Remove """
216
        # Remove only the selected file
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
217
        directory = self.path
218
        filename = self.selected
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
219
        
220
        if filename is None:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
221
            error_dialog(_i18n('No file was selected'),
222
                         _i18n('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)
223
            return
224
        
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.
225
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
226
        wt.remove(path)
235.1.4 by Mateusz Korniak
Context menu "Remove and delete added"
227
        
228
        if delete_on_disk:
229
            abs_filename = os.path.join(directory,filename)
230
            if os.path.isdir(abs_filename):
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
231
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
235.1.4 by Mateusz Korniak
Context menu "Remove and delete added"
232
                if response == gtk.RESPONSE_YES:
233
                    shutil.rmtree(abs_filename)
234
            else:
235
                os.remove(abs_filename)
236
                
120 by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove.
237
        self.app.set_path(self.path)
238
        self.app.refresh_right()
235.1.4 by Mateusz Korniak
Context menu "Remove and delete added"
239
        
240
    def remove_and_delete_file(self, action):
241
        """ Right context menu -> Remove and delete"""
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
242
        self.remove_file(action, delete_on_disk=True)
120 by Szilveszter Farkas (Phanatic)
Use OliveRemoveDialog class instead of OliveRemove.
243
117 by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774).
244
    def rename_file(self, action):
245
        """ Right context menu -> Rename """
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
246
        from bzrlib.plugins.gtk.olive.rename import RenameDialog
247
        wt = WorkingTree.open_containing(os.path.join(self.path, self.selected))[0]
248
        rename = RenameDialog(wt, wt.relpath(self.path), self.selected)
249
        response = rename.run()
250
        rename.destroy()
251
        if response == gtk.RESPONSE_OK:
252
            self.app.refresh_right()
117 by Szilveszter Farkas (Phanatic)
Rename put into context menu (Fixed: #73774).
253
    
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
254
    def open_file(self, action):
255
        """ Right context menu -> Open """
256
        # Open only the selected file
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
257
        filename = self.selected
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
258
        
259
        if filename is None:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
260
            error_dialog(_i18n('No file was selected'),
261
                         _i18n('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.
262
            return
263
264
        if filename == '..':
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
265
            # TODO: how to enter a directory?
266
            return
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
267
        else:
560.6.1 by Jasper Groenewegen
Fixes to launch in menu.py
268
            fullpath = os.path.join(self.path, filename)
566 by Jasper Groenewegen
Merge of fix to launch in olive context menu
269
            launch.launch(fullpath) 
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
270
126.1.12 by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu.
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:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
276
            warning_dialog(_i18n('Conflicts detected'),
277
                           _i18n('Please have a look at the working tree before continuing.'))
126.1.12 by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu.
278
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
279
            info_dialog(_i18n('Revert successful'),
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
280
                        _i18n('Selected file reverted to last revision.'))
126.1.12 by Szilveszter Farkas (Phanatic)
Added revert functionality to the context menu.
281
        self.app.refresh_right()       
282
    
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
283
    def commit(self, action):
284
        """ Right context menu -> Commit """
672.1.1 by Mathias Brodala
olive/menu.py: Correctly import commit dialog.
285
        from bzrlib.plugins.gtk.commit import CommitDialog
93.1.18 by Alexander Belchenko
Fix for commit command in olive context menu
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
126.1.10 by Szilveszter Farkas (Phanatic)
Allow to commit single files from the context menu (Fixed: #54983)
292
        
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
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)
126.1.10 by Szilveszter Farkas (Phanatic)
Allow to commit single files from the context menu (Fixed: #54983)
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()
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
306
    
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.
307
    @show_bzr_error
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
308
    def diff(self, action):
309
        """ 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.
310
        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.
311
        window = DiffWindow(self.app)
0.8.98 by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup.
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
630 by Jelmer Vernooij
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since
313
        window.set_diff(wt.branch._get_nick(local=True), 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.
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
0.8.98 by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup.
315
        window.show()
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
316
    
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
317
    def bookmark(self, action):
318
        """ Right context menu -> Bookmark """
0.8.98 by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup.
319
        if self.pref.add_bookmark(self.path):
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
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.'))
0.8.98 by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup.
322
            self.pref.write()
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
323
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
324
            warning_dialog(_i18n('Location already bookmarked'),
325
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
121 by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark.
326
        
327
        self.app.refresh_left()
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
328
0.8.57 by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them.
329
    def edit_bookmark(self, action):
330
        """ Left context menu -> Edit """
126.1.21 by Szilveszter Farkas (Phanatic)
Remove trash from olive.glade. Some cleanups.
331
        from bookmark import BookmarkDialog
121 by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark.
332
        
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
333
        if self.selected != None:
126.1.21 by Szilveszter Farkas (Phanatic)
Remove trash from olive.glade. Some cleanups.
334
            bookmark = BookmarkDialog(self.selected, self.app.window)
121 by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark.
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()
0.8.57 by Szilveszter Farkas (Phanatic)
Bookmarks have titles; you can also edit them.
344
0.8.33 by Szilveszter Farkas (Phanatic)
Implemented bookmarking.
345
    def remove_bookmark(self, action):
346
        """ Left context menu -> Remove """
347
        
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
348
        if self.selected != None:
111 by Szilveszter Farkas (Phanatic)
Fixed bug: unable to remove bookmarks (not reported).
349
            self.pref.remove_bookmark(self.selected)
350
            self.pref.write()
121 by Szilveszter Farkas (Phanatic)
Use OliveBookmarkDialog instead of OliveBookmark.
351
        
352
        self.app.refresh_left()
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
353
    
354
    def open_folder(self, action):
355
        """ Left context menu -> Open Folder """
0.8.92 by Szilveszter Farkas (Phanatic)
Cleanup Jelmer's changes.
356
        path = self.selected
0.8.72 by Szilveszter Farkas (Phanatic)
Merge from Richard Ferguson's development branch.
357
358
        if path != None:
560.6.1 by Jasper Groenewegen
Fixes to launch in menu.py
359
            launch.launch(path)
0.8.52 by Szilveszter Farkas (Phanatic)
GUI (toolbar + menu) cleanup.
360
    
361
    def diff_selected(self, action):
362
        """ Diff toolbutton -> Selected... """
363
        print "DEBUG: not implemented."
364
    
365
    def diff_all(self, action):
366
        """ Diff toolbutton -> All... """
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
367
        wt = WorkingTree.open_containing(self.path)[0]
368
        window = DiffWindow(self.app)
369
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
630 by Jelmer Vernooij
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since
370
        window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree)
569.1.1 by Jasper Groenewegen
Fix breakage in context menu caused by change OliveRename -> RenameDialog
371
        window.show()
195.1.24 by Szilveszter Farkas (Phanatic)
The History feature kinda works now, but still needs some polishing.
372
    
373
    def view_remote(self, action):
374
        """ Remote context menu -> View contents """
375
        print "DEBUG: view contents."
376
    
377
    def diff_remote(self, action):
378
        """ Remote context menu -> Show differences """
379
        print "DEBUG: show differences."
380
    
381
    def revert_remote(self, action):
382
        """ Remote context menu -> Revert to this revision """
383
        print "DEBUG: revert to this revision."