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