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