/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/frontend/gtk/menu.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-10 17:25:30 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060810172530-d63fde9240356aab
Implemented Log functionality (via bzrk).

2006-08-10  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/gtk/log.py: implemented OliveLog (calls BzrkApp)
    * olive/frontend/gtk/viz/diffwin.py: made it bzrlib 0.9 API compatible
    * olive/frontend/gtk/viz/bzrkapp.py: don't quit main loop
    * olive/frontend/gtk/viz: added bzrk codebase for Log functionality
    * setup.py: added olive.frontend.gtk.viz package

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/menu.py
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
 
#
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
17
import os.path
19
 
import shutil
20
18
import sys
21
19
 
22
20
try:
24
22
    pygtk.require("2.0")
25
23
except:
26
24
    pass
27
 
 
28
 
import gtk
29
 
 
30
 
import bzrlib.errors as errors
31
 
from bzrlib.workingtree import WorkingTree
32
 
 
33
 
from bzrlib.plugins.gtk import _i18n
34
 
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
35
 
from bzrlib.plugins.gtk.errors import show_bzr_error
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
39
 
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
 
25
try:
 
26
    import gtk
 
27
    import gtk.glade
 
28
except:
 
29
    sys.exit(1)
 
30
 
 
31
import olive.backend.fileops as fileops
 
32
import olive.backend.errors as errors
 
33
 
 
34
from commit import OliveCommit
 
35
from diff import OliveDiff
41
36
 
42
37
class OliveMenu:
43
38
    """ This class is responsible for building the context menus. """
44
 
    def __init__(self, path, selected, app=None):
 
39
    def __init__(self, gladefile, comm, dialog):
45
40
        # Load the UI file
46
 
        from guifiles import UIFILENAME
47
 
 
48
 
        self.uifile = UIFILENAME
49
 
 
50
 
        # Preferences handler
51
 
        self.pref = Preferences()
 
41
        self.uifile = "/usr/share/olive/cmenu.ui"
 
42
        if not os.path.exists(self.uifile):
 
43
            # Load from current directory if not installed
 
44
            self.uifile = "cmenu.ui"
52
45
        
53
 
        # Set default values
54
 
        self.path = path
55
 
        self.selected = selected
56
 
        self.app = app
 
46
        self.gladefile = gladefile
 
47
        self.comm = comm
 
48
        self.dialog = dialog
57
49
        
58
50
        # Create the file list context menu
59
51
        self.ui = gtk.UIManager()
60
52
        
61
53
        self.actiongroup = gtk.ActionGroup('context')
62
54
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _i18n('Add'), None,
64
 
                                       _i18n('Add the selected file'),
 
55
                                       'Add', None,
 
56
                                       'Add the selected file',
65
57
                                       self.add_file),
66
58
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _i18n('Remove'), None,
68
 
                                       _i18n('Remove the selected file'),
 
59
                                       'Remove', None,
 
60
                                       'Remove the selected file',
69
61
                                       self.remove_file),
70
 
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
71
 
                                       _i18n('Remove and delete'), None,
72
 
                                       _i18n('Remove the selected file/dir and delete from disk'),
73
 
                                       self.remove_and_delete_file),
74
 
                                      ('rename', None,
75
 
                                       _i18n('Rename'), None,
76
 
                                       _i18n('Rename the selected file'),
77
 
                                       self.rename_file),
78
 
                                      ('open', gtk.STOCK_OPEN,
79
 
                                       _i18n('Open'), None,
80
 
                                       _i18n('Open the selected file'),
81
 
                                       self.open_file),
82
 
                                      ('revert', None,
83
 
                                       _i18n('Revert'), None,
84
 
                                       _i18n('Revert the changes'),
85
 
                                       self.revert),
86
 
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
62
                                      ('commit', gtk.STOCK_REDO,
 
63
                                       'Commit', None,
 
64
                                       'Commit the changes',
89
65
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
66
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
67
                                       'Diff', None,
 
68
                                       'Show the diff of the file',
97
69
                                       self.diff),
 
70
                                      ('log', None,
 
71
                                       'Log', None,
 
72
                                       'Show the log of the file',
 
73
                                       self.log),
98
74
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
75
                                       'Bookmark', None,
 
76
                                       'Bookmark current location',
101
77
                                       self.bookmark),
102
 
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
105
 
                                       self.edit_bookmark),
106
78
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
109
 
                                       self.remove_bookmark),
110
 
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _i18n('Open Folder'), None,
112
 
                                       _i18n('Open bookmark folder in Nautilus'),
113
 
                                       self.open_folder),
114
 
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
117
 
                                       self.diff_selected),
118
 
                                      ('diff_all', None,
119
 
                                       _i18n('All...'), None,
120
 
                                       _i18n('Show the differences of all files'),
121
 
                                       self.diff_all),
122
 
                                      ('view_remote', None,
123
 
                                       _i18n('View contents'), None,
124
 
                                       _i18n('View the contents of the file in a builtin viewer'),
125
 
                                       self.view_remote),
126
 
                                      ('diff_remote', None,
127
 
                                       _i18n('Show differences'), None,
128
 
                                       _i18n('Show the differences between two revisions of the file'),
129
 
                                       self.diff_remote),
130
 
                                      ('revert_remote', None,
131
 
                                       _i18n('Revert to this revision'), None,
132
 
                                       _i18n('Revert the selected file to the selected revision'),
133
 
                                       self.revert_remote)
 
79
                                       'Remove', None,
 
80
                                       'Remove the selected bookmark',
 
81
                                       self.remove_bookmark)
134
82
                                     ])
135
83
        
136
84
        self.ui.insert_action_group(self.actiongroup, 0)
137
85
        self.ui.add_ui_from_file(self.uifile)
138
86
        
139
87
        self.cmenu_right = self.ui.get_widget('/context_right')
 
88
        
140
89
        self.cmenu_left = self.ui.get_widget('/context_left')
141
 
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
 
        
144
 
        # Set icons
145
 
        # TODO: do it without using deprecated comm
146
 
        #commit_menu = self.ui.get_widget('/context_right/commit')
147
 
        #commit_image = self.comm.menuitem_branch_commit.get_image()
148
 
        #commit_pixbuf = commit_image.get_pixbuf()
149
 
        #commit_icon = gtk.Image()
150
 
        #commit_icon.set_from_pixbuf(commit_pixbuf)
151
 
        #commit_menu.set_image(commit_icon)
152
 
        #diff_menu = self.ui.get_widget('/context_right/diff')
153
 
        #diff_image = self.comm.menuitem_stats_diff.get_image()
154
 
        #diff_pixbuf = diff_image.get_pixbuf()
155
 
        #diff_icon = gtk.Image()
156
 
        #diff_icon.set_from_pixbuf(diff_pixbuf)
157
 
        #diff_menu.set_image(diff_icon)
158
90
 
159
91
    def right_context_menu(self):
160
92
        return self.cmenu_right
162
94
    def left_context_menu(self):
163
95
        return self.cmenu_left
164
96
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
 
    @show_bzr_error
169
97
    def add_file(self, action):
170
98
        """ Right context menu -> Add """
171
 
        import bzrlib.add
172
 
        
173
99
        # Add only the selected file
174
 
        directory = self.path
175
 
        filename = self.selected
 
100
        directory = self.comm.get_path()
 
101
        filename = self.comm.get_selected_right()
176
102
            
177
103
        if filename is None:
178
 
            error_dialog(_i18n('No file was selected'),
179
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
180
 
            return
181
 
        
182
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
183
 
        wt.add([path])
184
 
    
185
 
    @show_bzr_error
186
 
    def annotate(self, action):
187
 
        """ Right context menu -> Annotate """
188
 
        directory = self.path
189
 
        filename = self.selected
190
 
        
191
 
        if filename is None:
192
 
            error_dialog(_i18n('No file was selected'),
193
 
                         _i18n('Please select a file from the list.'))
194
 
            return
195
 
        
196
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
197
 
        
198
 
        branch = wt.branch
199
 
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
200
 
        
201
 
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
202
 
        window.set_title(os.path.join(directory, filename) + " - Annotate")
203
 
        config = GAnnotateConfig(window)
204
 
        window.show()
205
 
        branch.lock_read()
 
104
            self.dialog.error_dialog('No file was selected.')
 
105
            return
 
106
        
206
107
        try:
207
 
            window.annotate(wt, branch, file_id)
208
 
        finally:
209
 
            branch.unlock()
 
108
            fileops.add([directory + '/' + filename])
 
109
        except errors.NotBranchError:
 
110
            self.dialog.error_dialog('The directory is not a branch.')
 
111
            return
 
112
        except:
 
113
            raise
 
114
        
 
115
        self.comm.refresh_right()
210
116
    
211
 
    @show_bzr_error
212
 
    def remove_file(self, action,delete_on_disk=0):
 
117
    def remove_file(self, action):
213
118
        """ Right context menu -> Remove """
214
119
        # Remove only the selected file
215
 
        directory = self.path
216
 
        filename = self.selected
217
 
        
218
 
        if filename is None:
219
 
            error_dialog(_i18n('No file was selected'),
220
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
221
 
            return
222
 
        
223
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
224
 
        wt.remove(path)
225
 
        
226
 
        if delete_on_disk:
227
 
            abs_filename = os.path.join(directory,filename)
228
 
            if os.path.isdir(abs_filename):
229
 
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
230
 
                if response == gtk.RESPONSE_YES:
231
 
                    shutil.rmtree(abs_filename)
232
 
            else:
233
 
                os.remove(abs_filename)
234
 
                
235
 
        self.app.set_path(self.path)
236
 
        self.app.refresh_right()
237
 
        
238
 
    def remove_and_delete_file(self, action):
239
 
        """ Right context menu -> Remove and delete"""
240
 
        self.remove_file(action,delete_on_disk=1)
241
 
 
242
 
    def rename_file(self, action):
243
 
        """ Right context menu -> Rename """
244
 
        from rename import OliveRename
245
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
246
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
247
 
        rename.display()
248
 
    
249
 
    def open_file(self, action):
250
 
        """ Right context menu -> Open """
251
 
        # Open only the selected file
252
 
        filename = self.selected
253
 
        
254
 
        if filename is None:
255
 
            error_dialog(_i18n('No file was selected'),
256
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
257
 
            return
258
 
 
259
 
        if filename == '..':
260
 
            # TODO: how to enter a directory?
261
 
            return
262
 
        else:
263
 
            fullpath = self.path + os.sep + filename
264
 
            if os.path.isdir(fullpath):
265
 
                # selected item is an existant directory
266
 
                # TODO: how to enter a directory?
267
 
                return
268
 
            else:
269
 
                launch(fullpath) 
270
 
 
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:
276
 
            warning_dialog(_i18n('Conflicts detected'),
277
 
                           _i18n('Please have a look at the working tree before continuing.'))
278
 
        else:
279
 
            info_dialog(_i18n('Revert successful'),
280
 
                        _i18n('All files reverted to last revision.'))
281
 
        self.app.refresh_right()       
282
 
    
 
120
        directory = self.comm.get_path()
 
121
        filename = self.comm.get_selected_right()
 
122
        
 
123
        if filename is None:
 
124
            self.dialog.error_dialog('No file was selected.')
 
125
            return
 
126
        
 
127
        try:
 
128
            fileops.remove([directory + '/' + filename])
 
129
        except errors.NotBranchError:
 
130
            self.dialog.error_dialog('The directory is not a branch.')
 
131
            return
 
132
        except errors.NotVersionedError:
 
133
            self.dialog.error_dialog('Selected file is not versioned.')
 
134
            return
 
135
        except:
 
136
            raise
 
137
        
 
138
        self.comm.refresh_right()
 
139
 
283
140
    def commit(self, action):
284
141
        """ Right context menu -> Commit """
285
 
        from commit import CommitDialog
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
292
 
        
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)
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()
 
142
        commit = OliveCommit(self.gladefile, self.comm)
 
143
        commit.display()
306
144
    
307
 
    @show_bzr_error
308
145
    def diff(self, action):
309
146
        """ Right context menu -> Diff """
310
 
        wt = WorkingTree.open_containing(self.path)[0]
311
 
        window = DiffWindow(self.app)
312
 
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
313
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
314
 
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
315
 
        window.show()
 
147
        diff = OliveDiff(self.gladefile, self.comm)
 
148
        diff.display()
 
149
    
 
150
    def log(self, action):
 
151
        """ Right context menu -> Log """
 
152
        self.dialog.error_dialog('This feature is not yet implemented.')
316
153
    
317
154
    def bookmark(self, action):
318
155
        """ Right context menu -> Bookmark """
319
 
        if self.pref.add_bookmark(self.path):
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.'))
322
 
            self.pref.write()
 
156
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
157
            self.dialog.info_dialog('Bookmark successfully added.')
323
158
        else:
324
 
            warning_dialog(_i18n('Location already bookmarked'),
325
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
326
 
        
327
 
        self.app.refresh_left()
328
 
 
329
 
    def edit_bookmark(self, action):
330
 
        """ Left context menu -> Edit """
331
 
        from bookmark import BookmarkDialog
332
 
        
333
 
        if self.selected != None:
334
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
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()
 
159
            self.dialog.warning_dialog('Location already bookmarked.')
 
160
        
 
161
        self.comm.refresh_left()
344
162
 
345
163
    def remove_bookmark(self, action):
346
164
        """ Left context menu -> Remove """
347
 
        
348
 
        if self.selected != None:
349
 
            self.pref.remove_bookmark(self.selected)
350
 
            self.pref.write()
351
 
        
352
 
        self.app.refresh_left()
353
 
    
354
 
    def open_folder(self, action):
355
 
        """ Left context menu -> Open Folder """
356
 
        path = self.selected
357
 
 
358
 
        if path != None:
359
 
            launch(path)
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... """
367
 
        from diff import OliveDiff
368
 
        diff = OliveDiff(self.comm)
369
 
        diff.display()
370
 
    
371
 
    def view_remote(self, action):
372
 
        """ Remote context menu -> View contents """
373
 
        print "DEBUG: view contents."
374
 
    
375
 
    def diff_remote(self, action):
376
 
        """ Remote context menu -> Show differences """
377
 
        print "DEBUG: show differences."
378
 
    
379
 
    def revert_remote(self, action):
380
 
        """ Remote context menu -> Revert to this revision """
381
 
        print "DEBUG: revert to this revision."
 
165
        self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
166
        
 
167
        self.comm.refresh_left()