/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-08 19:02:08 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-20060808190208-196e342eb0531ceb
Some artwork revamp; added 16x16 icons to the menu.

2006-08-08  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
    * olive.glade: some icons redrawn + added 16x16 icons
    * icons/*: some icons redrawn + added 16x16 icons
    * setup.py: modified respectively

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
 
        bzrlib.add.smart_add([os.path.join(directory, filename)])
183
 
    
184
 
    @show_bzr_error
185
 
    def annotate(self, action):
186
 
        """ Right context menu -> Annotate """
187
 
        directory = self.path
188
 
        filename = self.selected
189
 
        
190
 
        if filename is None:
191
 
            error_dialog(_i18n('No file was selected'),
192
 
                         _i18n('Please select a file from the list.'))
193
 
            return
194
 
        
195
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
196
 
        
197
 
        branch = wt.branch
198
 
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
199
 
        
200
 
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
201
 
        window.set_title(os.path.join(directory, filename) + " - Annotate")
202
 
        config = GAnnotateConfig(window)
203
 
        window.show()
204
 
        branch.lock_read()
 
104
            self.dialog.error_dialog('No file was selected.')
 
105
            return
 
106
        
205
107
        try:
206
 
            window.annotate(wt, branch, file_id)
207
 
        finally:
208
 
            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()
209
116
    
210
 
    @show_bzr_error
211
 
    def remove_file(self, action,delete_on_disk=0):
 
117
    def remove_file(self, action):
212
118
        """ Right context menu -> Remove """
213
119
        # Remove only the selected file
214
 
        directory = self.path
215
 
        filename = self.selected
216
 
        
217
 
        if filename is None:
218
 
            error_dialog(_i18n('No file was selected'),
219
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
220
 
            return
221
 
        
222
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
223
 
        wt.remove(path)
224
 
        
225
 
        if delete_on_disk:
226
 
            abs_filename = os.path.join(directory,filename)
227
 
            if os.path.isdir(abs_filename):
228
 
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
229
 
                if response == gtk.RESPONSE_YES:
230
 
                    shutil.rmtree(abs_filename)
231
 
            else:
232
 
                os.remove(abs_filename)
233
 
                
234
 
        self.app.set_path(self.path)
235
 
        self.app.refresh_right()
236
 
        
237
 
    def remove_and_delete_file(self, action):
238
 
        """ Right context menu -> Remove and delete"""
239
 
        self.remove_file(action,delete_on_disk=1)
240
 
 
241
 
    def rename_file(self, action):
242
 
        """ Right context menu -> Rename """
243
 
        from rename import OliveRename
244
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
245
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
246
 
        rename.display()
247
 
    
248
 
    def open_file(self, action):
249
 
        """ Right context menu -> Open """
250
 
        # Open only the selected file
251
 
        filename = self.selected
252
 
        
253
 
        if filename is None:
254
 
            error_dialog(_i18n('No file was selected'),
255
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
256
 
            return
257
 
 
258
 
        if filename == '..':
259
 
            # TODO: how to enter a directory?
260
 
            return
261
 
        else:
262
 
            fullpath = self.path + os.sep + filename
263
 
            if os.path.isdir(fullpath):
264
 
                # selected item is an existant directory
265
 
                # TODO: how to enter a directory?
266
 
                return
267
 
            else:
268
 
                launch(fullpath) 
269
 
 
270
 
    def revert(self, action):
271
 
        """ Right context menu -> Revert """
272
 
        wt, path = WorkingTree.open_containing(self.path)
273
 
        ret = wt.revert([os.path.join(path, self.selected)])
274
 
        if ret:
275
 
            warning_dialog(_i18n('Conflicts detected'),
276
 
                           _i18n('Please have a look at the working tree before continuing.'))
277
 
        else:
278
 
            info_dialog(_i18n('Revert successful'),
279
 
                        _i18n('All files reverted to last revision.'))
280
 
        self.app.refresh_right()       
281
 
    
 
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
 
282
140
    def commit(self, action):
283
141
        """ Right context menu -> Commit """
284
 
        from commit import CommitDialog
285
 
        branch = None
286
 
        try:
287
 
            wt, path = WorkingTree.open_containing(self.path)
288
 
            branch = wt.branch
289
 
        except NotBranchError, e:
290
 
            path = e.path
291
 
        
292
 
        if self.selected:
293
 
            selected = os.path.join(path, self.selected)
294
 
        else:
295
 
            selected = None
296
 
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
297
 
        response = commit.run()
298
 
        if response != gtk.RESPONSE_NONE:
299
 
            commit.hide()
300
 
        
301
 
            if response == gtk.RESPONSE_OK:
302
 
                self.app.refresh_right()
303
 
            
304
 
            commit.destroy()
 
142
        commit = OliveCommit(self.gladefile, self.comm)
 
143
        commit.display()
305
144
    
306
 
    @show_bzr_error
307
145
    def diff(self, action):
308
146
        """ Right context menu -> Diff """
309
 
        wt = WorkingTree.open_containing(self.path)[0]
310
 
        window = DiffWindow(self.app)
311
 
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
312
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
313
 
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
314
 
        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.')
315
153
    
316
154
    def bookmark(self, action):
317
155
        """ Right context menu -> Bookmark """
318
 
        if self.pref.add_bookmark(self.path):
319
 
            info_dialog(_i18n('Bookmark successfully added'),
320
 
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
321
 
            self.pref.write()
 
156
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
157
            self.dialog.info_dialog('Bookmark successfully added.')
322
158
        else:
323
 
            warning_dialog(_i18n('Location already bookmarked'),
324
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
325
 
        
326
 
        self.app.refresh_left()
327
 
 
328
 
    def edit_bookmark(self, action):
329
 
        """ Left context menu -> Edit """
330
 
        from bookmark import BookmarkDialog
331
 
        
332
 
        if self.selected != None:
333
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
334
 
            response = bookmark.run()
335
 
            
336
 
            if response != gtk.RESPONSE_NONE:
337
 
                bookmark.hide()
338
 
        
339
 
                if response == gtk.RESPONSE_OK:
340
 
                    self.app.refresh_left()
341
 
            
342
 
                bookmark.destroy()
 
159
            self.dialog.warning_dialog('Location already bookmarked.')
 
160
        
 
161
        self.comm.refresh_left()
343
162
 
344
163
    def remove_bookmark(self, action):
345
164
        """ Left context menu -> Remove """
346
 
        
347
 
        if self.selected != None:
348
 
            self.pref.remove_bookmark(self.selected)
349
 
            self.pref.write()
350
 
        
351
 
        self.app.refresh_left()
352
 
    
353
 
    def open_folder(self, action):
354
 
        """ Left context menu -> Open Folder """
355
 
        path = self.selected
356
 
 
357
 
        if path != None:
358
 
            launch(path)
359
 
    
360
 
    def diff_selected(self, action):
361
 
        """ Diff toolbutton -> Selected... """
362
 
        print "DEBUG: not implemented."
363
 
    
364
 
    def diff_all(self, action):
365
 
        """ Diff toolbutton -> All... """
366
 
        from diff import OliveDiff
367
 
        diff = OliveDiff(self.comm)
368
 
        diff.display()
369
 
    
370
 
    def view_remote(self, action):
371
 
        """ Remote context menu -> View contents """
372
 
        print "DEBUG: view contents."
373
 
    
374
 
    def diff_remote(self, action):
375
 
        """ Remote context menu -> Show differences """
376
 
        print "DEBUG: show differences."
377
 
    
378
 
    def revert_remote(self, action):
379
 
        """ Remote context menu -> Revert to this revision """
380
 
        print "DEBUG: revert to this revision."
 
165
        self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
166
        
 
167
        self.comm.refresh_left()