/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/menu.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
22
22
    pygtk.require("2.0")
23
23
except:
24
24
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
 
25
 
 
26
import gtk
30
27
 
31
28
import bzrlib.errors as errors
32
 
from dialog import error_dialog
 
29
from bzrlib.workingtree import WorkingTree
33
30
 
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
32
from bzrlib.plugins.gtk.errors import show_bzr_error
 
33
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
34
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 
35
from bzrlib.plugins.gtk.diff import DiffWindow
34
36
from launch import launch
 
37
from olive import Preferences
35
38
 
36
39
class OliveMenu:
37
40
    """ This class is responsible for building the context menus. """
38
 
    def __init__(self, gladefile, comm):
 
41
    def __init__(self, path, selected, app=None):
39
42
        # Load the UI file
40
 
        if sys.platform == 'win32':
41
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
42
 
        else:
43
 
            self.uifile = "/usr/share/olive/cmenu.ui"
44
 
        
45
 
        if not os.path.exists(self.uifile):
46
 
            # Load from current directory if not installed
47
 
            self.uifile = "cmenu.ui"
48
 
            # Check again
49
 
            if not os.path.exists(self.uifile):
50
 
                # Fail
51
 
                print _('UI description file cannot be found.')
52
 
                sys.exit(1)
53
 
        
54
 
        self.gladefile = gladefile
55
 
        self.comm = comm
 
43
        from guifiles import UIFILENAME
 
44
 
 
45
        self.uifile = UIFILENAME
 
46
 
 
47
        # Preferences handler
 
48
        self.pref = Preferences()
 
49
        
 
50
        # Set default values
 
51
        self.path = path
 
52
        self.selected = selected
 
53
        self.app = app
56
54
        
57
55
        # Create the file list context menu
58
56
        self.ui = gtk.UIManager()
66
64
                                       _('Remove'), None,
67
65
                                       _('Remove the selected file'),
68
66
                                       self.remove_file),
 
67
                                      ('rename', None,
 
68
                                       _('Rename'), None,
 
69
                                       _('Rename the selected file'),
 
70
                                       self.rename_file),
69
71
                                      ('open', gtk.STOCK_OPEN,
70
72
                                       _('Open'), None,
71
73
                                       _('Open the selected file'),
72
74
                                       self.open_file),
 
75
                                      ('revert', None,
 
76
                                       _('Revert'), None,
 
77
                                       _('Revert the changes'),
 
78
                                       self.revert),
73
79
                                      ('commit', None,
74
80
                                       _('Commit'), None,
75
81
                                       _('Commit the changes'),
76
82
                                       self.commit),
 
83
                                      ('annotate', None,
 
84
                                       _('Annotate'), None,
 
85
                                       _('Annotate the selected file'),
 
86
                                       self.annotate),
77
87
                                      ('diff', None,
78
88
                                       _('Diff'), None,
79
89
                                       _('Show the diff of the file'),
112
122
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
113
123
        
114
124
        # Set icons
115
 
        commit_menu = self.ui.get_widget('/context_right/commit')
116
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
117
 
        commit_pixbuf = commit_image.get_pixbuf()
118
 
        commit_icon = gtk.Image()
119
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
120
 
        commit_menu.set_image(commit_icon)
121
 
        diff_menu = self.ui.get_widget('/context_right/diff')
122
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
123
 
        diff_pixbuf = diff_image.get_pixbuf()
124
 
        diff_icon = gtk.Image()
125
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
126
 
        diff_menu.set_image(diff_icon)
 
125
        # TODO: do it without using deprecated comm
 
126
        #commit_menu = self.ui.get_widget('/context_right/commit')
 
127
        #commit_image = self.comm.menuitem_branch_commit.get_image()
 
128
        #commit_pixbuf = commit_image.get_pixbuf()
 
129
        #commit_icon = gtk.Image()
 
130
        #commit_icon.set_from_pixbuf(commit_pixbuf)
 
131
        #commit_menu.set_image(commit_icon)
 
132
        #diff_menu = self.ui.get_widget('/context_right/diff')
 
133
        #diff_image = self.comm.menuitem_stats_diff.get_image()
 
134
        #diff_pixbuf = diff_image.get_pixbuf()
 
135
        #diff_icon = gtk.Image()
 
136
        #diff_icon.set_from_pixbuf(diff_pixbuf)
 
137
        #diff_menu.set_image(diff_icon)
127
138
 
128
139
    def right_context_menu(self):
129
140
        return self.cmenu_right
131
142
    def left_context_menu(self):
132
143
        return self.cmenu_left
133
144
    
 
145
    @show_bzr_error
134
146
    def add_file(self, action):
135
147
        """ Right context menu -> Add """
 
148
        import bzrlib.add
 
149
        
136
150
        # Add only the selected file
137
 
        directory = self.comm.get_path()
138
 
        filename = self.comm.get_selected_right()
 
151
        directory = self.path
 
152
        filename = self.selected
139
153
            
140
154
        if filename is None:
141
155
            error_dialog(_('No file was selected'),
142
 
                                     _('Please select a file from the list,\nor choose the other option.'))
143
 
            return
144
 
        
 
156
                         _('Please select a file from the list,\nor choose the other option.'))
 
157
            return
 
158
        
 
159
        bzrlib.add.smart_add([os.path.join(directory, filename)])
 
160
    
 
161
    @show_bzr_error
 
162
    def annotate(self, action):
 
163
        """ Right context menu -> Annotate """
 
164
        directory = self.path
 
165
        filename = self.selected
 
166
        
 
167
        if filename is None:
 
168
            error_dialog(_('No file was selected'),
 
169
                         _('Please select a file from the list.'))
 
170
            return
 
171
        
 
172
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
173
        
 
174
        branch = wt.branch
 
175
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
 
176
        
 
177
        window = GAnnotateWindow(all=False, plain=False)
 
178
        window.set_title(os.path.join(directory, filename) + " - Annotate")
 
179
        config = GAnnotateConfig(window)
 
180
        window.show()
 
181
        branch.lock_read()
145
182
        try:
146
 
            bzrlib.add.smart_add([directory + '/' + filename])
147
 
        except errors.NotBranchError:
148
 
            error_dialog(_('Directory is not a branch'),
149
 
                                     _('You can perform this action only in a branch.'))
150
 
            return
151
 
        
152
 
        self.comm.refresh_right()
 
183
            window.annotate(wt, branch, file_id)
 
184
        finally:
 
185
            branch.unlock()
153
186
    
 
187
    @show_bzr_error
154
188
    def remove_file(self, action):
155
189
        """ Right context menu -> Remove """
156
190
        # Remove only the selected file
157
 
        directory = self.comm.get_path()
158
 
        filename = self.comm.get_selected_right()
 
191
        directory = self.path
 
192
        filename = self.selected
159
193
        
160
194
        if filename is None:
161
195
            error_dialog(_('No file was selected'),
162
 
                                     _('Please select a file from the list,\nor choose the other option.'))
163
 
            return
164
 
        
165
 
        try:
166
 
            wt, path = WorkingTree.open_containing(directory+'/'+filename)
167
 
            wt.remove(path)
168
 
 
169
 
        except errors.NotBranchError:
170
 
            error_dialog(_('Directory is not a branch'),
171
 
                                     _('You can perform this action only in a branch.'))
172
 
            return
173
 
        except errors.NotVersionedError:
174
 
            error_dialog(_('File not versioned'),
175
 
                                     _('The selected file is not versioned.'))
176
 
            return
177
 
        except:
178
 
            raise
179
 
        
180
 
        self.comm.refresh_right()
181
 
 
 
196
                         _('Please select a file from the list,\nor choose the other option.'))
 
197
            return
 
198
        
 
199
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
200
        wt.remove(path)
 
201
        self.app.set_path(self.path)
 
202
        self.app.refresh_right()
 
203
 
 
204
    def rename_file(self, action):
 
205
        """ Right context menu -> Rename """
 
206
        from rename import OliveRename
 
207
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
208
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
209
        rename.display()
 
210
    
182
211
    def open_file(self, action):
183
212
        """ Right context menu -> Open """
184
213
        # Open only the selected file
185
 
        filename = self.comm.get_selected_right()
 
214
        filename = self.selected
186
215
        
187
216
        if filename is None:
188
217
            error_dialog(_('No file was selected'),
189
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
218
                         _('Please select a file from the list,\nor choose the other option.'))
190
219
            return
191
220
 
192
221
        if filename == '..':
193
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
222
            # TODO: how to enter a directory?
 
223
            return
194
224
        else:
195
 
            fullpath = self.comm.get_path() + os.sep + filename
 
225
            fullpath = self.path + os.sep + filename
196
226
            if os.path.isdir(fullpath):
197
227
                # selected item is an existant directory
198
 
                self.comm.set_path(fullpath)
 
228
                # TODO: how to enter a directory?
 
229
                return
199
230
            else:
200
231
                launch(fullpath) 
201
 
        
202
 
        self.comm.refresh_right()
203
232
 
 
233
    def revert(self, action):
 
234
        """ Right context menu -> Revert """
 
235
        wt, path = WorkingTree.open_containing(self.path)
 
236
        ret = wt.revert([os.path.join(path, self.selected)])
 
237
        if ret:
 
238
            warning_dialog(_('Conflicts detected'),
 
239
                           _('Please have a look at the working tree before continuing.'))
 
240
        else:
 
241
            info_dialog(_('Revert successful'),
 
242
                        _('All files reverted to last revision.'))
 
243
        self.app.refresh_right()       
 
244
    
204
245
    def commit(self, action):
205
246
        """ Right context menu -> Commit """
206
 
        from commit import OliveCommit
207
 
        wt, path = WorkingTree.open_containing(self.comm.get_path())
208
 
        commit = OliveCommit(self.gladefile, wt, path)
209
 
        commit.display()
 
247
        from commit import CommitDialog
 
248
        branch = None
 
249
        try:
 
250
            wt, path = WorkingTree.open_containing(self.path)
 
251
            branch = wt.branch
 
252
        except NotBranchError, e:
 
253
            path = e.path
 
254
        
 
255
        commit = CommitDialog(wt, path, not branch, self.selected)
 
256
        response = commit.run()
 
257
        if response != gtk.RESPONSE_NONE:
 
258
            commit.hide()
 
259
        
 
260
            if response == gtk.RESPONSE_OK:
 
261
                self.app.refresh_right()
 
262
            
 
263
            commit.destroy()
210
264
    
 
265
    @show_bzr_error
211
266
    def diff(self, action):
212
267
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm)
215
 
        diff.display()
 
268
        wt = WorkingTree.open_containing(self.path)[0]
 
269
        window = DiffWindow()
 
270
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
271
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
272
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
273
        window.show()
216
274
    
217
275
    def bookmark(self, action):
218
276
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
277
        if self.pref.add_bookmark(self.path):
220
278
            info_dialog(_('Bookmark successfully added'),
221
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
279
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
280
            self.pref.write()
222
281
        else:
223
282
            warning_dialog(_('Location already bookmarked'),
224
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
283
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
225
284
        
226
 
        self.comm.refresh_left()
 
285
        self.app.refresh_left()
227
286
 
228
287
    def edit_bookmark(self, action):
229
288
        """ Left context menu -> Edit """
230
 
        from bookmark import OliveBookmark
231
 
 
232
 
        if self.comm.get_selected_left() != None:
233
 
            bookmark = OliveBookmark(self.gladefile, self.comm)
234
 
            bookmark.display()
 
289
        from bookmark import BookmarkDialog
 
290
        
 
291
        if self.selected != None:
 
292
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
293
            response = bookmark.run()
 
294
            
 
295
            if response != gtk.RESPONSE_NONE:
 
296
                bookmark.hide()
 
297
        
 
298
                if response == gtk.RESPONSE_OK:
 
299
                    self.app.refresh_left()
 
300
            
 
301
                bookmark.destroy()
235
302
 
236
303
    def remove_bookmark(self, action):
237
304
        """ Left context menu -> Remove """
238
305
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
241
 
            self.comm.refresh_left()
 
306
        if self.selected != None:
 
307
            self.pref.remove_bookmark(self.selected)
 
308
            self.pref.write()
 
309
        
 
310
        self.app.refresh_left()
242
311
    
243
312
    def open_folder(self, action):
244
313
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
314
        path = self.selected
246
315
 
247
316
        if path != None:
248
317
            launch(path)
254
323
    def diff_all(self, action):
255
324
        """ Diff toolbutton -> All... """
256
325
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm)
 
326
        diff = OliveDiff(self.comm)
258
327
        diff.display()