/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-19 20:31:46 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-20060819203146-1a5b098844b3f106
GUI (toolbar + menu) cleanup.

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

    * olive/frontend/gtk/__init__.py: applied Diff toolbutton menu
    * olive/frontend/gtk/menu.py: implemented the Diff toolbutton menu
    * cmenu.ui: added Diff toolbutton menu; removed Log from right context menu
    * olive.glade: swapped Diff and Log toolbuttons; coverted log button to an
      ordinary GtkToolButton

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/menu.py
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
41
33
 
42
34
class OliveMenu:
43
35
    """ This class is responsible for building the context menus. """
44
 
    def __init__(self, path, selected, app=None):
 
36
    def __init__(self, gladefile, comm, dialog):
45
37
        # Load the UI file
46
 
        from guifiles import UIFILENAME
47
 
 
48
 
        self.uifile = UIFILENAME
49
 
 
50
 
        # Preferences handler
51
 
        self.pref = Preferences()
52
 
        
53
 
        # Set default values
54
 
        self.path = path
55
 
        self.selected = selected
56
 
        self.app = app
 
38
        if sys.platform == 'win32':
 
39
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
 
40
        else:
 
41
            self.uifile = "/usr/share/olive/cmenu.ui"
 
42
        
 
43
        if not os.path.exists(self.uifile):
 
44
            # Load from current directory if not installed
 
45
            self.uifile = "cmenu.ui"
 
46
            # Check again
 
47
            if not os.path.exists(self.uifile):
 
48
                # Fail
 
49
                print "UI description file cannot be found."
 
50
                sys.exit(1)
 
51
        
 
52
        self.gladefile = gladefile
 
53
        self.comm = comm
 
54
        self.dialog = dialog
57
55
        
58
56
        # Create the file list context menu
59
57
        self.ui = gtk.UIManager()
60
58
        
61
59
        self.actiongroup = gtk.ActionGroup('context')
62
60
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _i18n('Add'), None,
64
 
                                       _i18n('Add the selected file'),
 
61
                                       'Add', None,
 
62
                                       'Add the selected file',
65
63
                                       self.add_file),
66
64
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _i18n('Remove'), None,
68
 
                                       _i18n('Remove the selected file'),
 
65
                                       'Remove', None,
 
66
                                       'Remove the selected file',
69
67
                                       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
68
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
69
                                       'Commit', None,
 
70
                                       'Commit the changes',
89
71
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
72
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
73
                                       'Diff', None,
 
74
                                       'Show the diff of the file',
97
75
                                       self.diff),
98
76
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
77
                                       'Bookmark', None,
 
78
                                       'Bookmark current location',
101
79
                                       self.bookmark),
102
 
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
105
 
                                       self.edit_bookmark),
106
80
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
 
81
                                       'Remove', None,
 
82
                                       'Remove the selected bookmark',
109
83
                                       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
84
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
 
85
                                       'Selected...', None,
 
86
                                       'Show the differences of the selected file',
117
87
                                       self.diff_selected),
118
88
                                      ('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)
 
89
                                       'All...', None,
 
90
                                       'Show the differences of all files',
 
91
                                       self.diff_all)
134
92
                                     ])
135
93
        
136
94
        self.ui.insert_action_group(self.actiongroup, 0)
139
97
        self.cmenu_right = self.ui.get_widget('/context_right')
140
98
        self.cmenu_left = self.ui.get_widget('/context_left')
141
99
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
100
        
144
101
        # 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)
 
102
        commit_menu = self.ui.get_widget('/context_right/commit')
 
103
        commit_image = self.comm.menuitem_branch_commit.get_image()
 
104
        commit_pixbuf = commit_image.get_pixbuf()
 
105
        commit_icon = gtk.Image()
 
106
        commit_icon.set_from_pixbuf(commit_pixbuf)
 
107
        commit_menu.set_image(commit_icon)
 
108
        diff_menu = self.ui.get_widget('/context_right/diff')
 
109
        diff_image = self.comm.menuitem_stats_diff.get_image()
 
110
        diff_pixbuf = diff_image.get_pixbuf()
 
111
        diff_icon = gtk.Image()
 
112
        diff_icon.set_from_pixbuf(diff_pixbuf)
 
113
        diff_menu.set_image(diff_icon)
158
114
 
159
115
    def right_context_menu(self):
160
116
        return self.cmenu_right
162
118
    def left_context_menu(self):
163
119
        return self.cmenu_left
164
120
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
 
    @show_bzr_error
169
121
    def add_file(self, action):
170
122
        """ Right context menu -> Add """
171
 
        import bzrlib.add
172
 
        
173
123
        # Add only the selected file
174
 
        directory = self.path
175
 
        filename = self.selected
 
124
        directory = self.comm.get_path()
 
125
        filename = self.comm.get_selected_right()
176
126
            
177
127
        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()
 
128
            self.dialog.error_dialog('No file was selected',
 
129
                                     'Please select a file from the list,\nor choose the other option.')
 
130
            return
 
131
        
206
132
        try:
207
 
            window.annotate(wt, branch, file_id)
208
 
        finally:
209
 
            branch.unlock()
 
133
            fileops.add([directory + '/' + filename])
 
134
        except errors.NotBranchError:
 
135
            self.dialog.error_dialog('Directory is not a branch',
 
136
                                     'You can perform this action only in a branch.')
 
137
            return
 
138
        except:
 
139
            raise
 
140
        
 
141
        self.comm.refresh_right()
210
142
    
211
 
    @show_bzr_error
212
 
    def remove_file(self, action,delete_on_disk=0):
 
143
    def remove_file(self, action):
213
144
        """ Right context menu -> Remove """
214
145
        # 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
 
    
 
146
        directory = self.comm.get_path()
 
147
        filename = self.comm.get_selected_right()
 
148
        
 
149
        if filename is None:
 
150
            self.dialog.error_dialog('No file was selected',
 
151
                                     'Please select a file from the list,\nor choose the other option.')
 
152
            return
 
153
        
 
154
        try:
 
155
            fileops.remove([directory + '/' + filename])
 
156
        except errors.NotBranchError:
 
157
            self.dialog.error_dialog('Directory is not a branch',
 
158
                                     'You can perform this action only in a branch.')
 
159
            return
 
160
        except errors.NotVersionedError:
 
161
            self.dialog.error_dialog('File not versioned',
 
162
                                     'The selected file is not versioned.')
 
163
            return
 
164
        except:
 
165
            raise
 
166
        
 
167
        self.comm.refresh_right()
 
168
 
283
169
    def commit(self, action):
284
170
        """ 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()
 
171
        from commit import OliveCommit
 
172
        commit = OliveCommit(self.gladefile, self.comm, self.dialog)
 
173
        commit.display()
306
174
    
307
 
    @show_bzr_error
308
175
    def diff(self, action):
309
176
        """ 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()
 
177
        from diff import OliveDiff
 
178
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
179
        diff.display()
316
180
    
317
181
    def bookmark(self, action):
318
182
        """ 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()
 
183
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
184
            self.dialog.info_dialog('Bookmark successfully added',
 
185
                                    'The current directory was bookmarked. You can reach\nit by selecting it from the left panel.')
323
186
        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()
 
187
            self.dialog.warning_dialog('Location already bookmarked'
 
188
                                       'The current directory is already bookmarked.\nSee the left panel for reference.')
 
189
        
 
190
        self.comm.refresh_left()
344
191
 
345
192
    def remove_bookmark(self, action):
346
193
        """ 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)
 
194
        self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
195
        
 
196
        self.comm.refresh_left()
360
197
    
361
198
    def diff_selected(self, action):
362
199
        """ Diff toolbutton -> Selected... """
365
202
    def diff_all(self, action):
366
203
        """ Diff toolbutton -> All... """
367
204
        from diff import OliveDiff
368
 
        diff = OliveDiff(self.comm)
 
205
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
369
206
        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."