/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: Jelmer Vernooij
  • Date: 2006-10-24 22:33:01 UTC
  • mfrom: (103 bzr-gtk)
  • mto: (66.2.3 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 105.
  • Revision ID: jelmer@samba.org-20061024223301-16abbd495c88e2f7
[merge] Szilvester

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
30
30
 
31
31
from dialog import error_dialog, info_dialog, warning_dialog
32
32
from launch import launch
33
 
from olive import OlivePreferences
 
33
from olive import OlivePreferences, DiffWindow
34
34
 
35
35
class OliveMenu:
36
36
    """ This class is responsible for building the context menus. """
149
149
            return
150
150
        
151
151
        try:
152
 
            bzrlib.add.smart_add([directory + '/' + filename])
 
152
            bzrlib.add.smart_add([os.path.join(directory, filename)])
153
153
        except errors.NotBranchError:
154
154
            error_dialog(_('Directory is not a branch'),
155
155
                         _('You can perform this action only in a branch.'))
210
210
    
211
211
    def diff(self, action):
212
212
        """ Right context menu -> Diff """
213
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
214
 
        
215
213
        try:
216
214
            wt = WorkingTree.open_containing(self.path)[0]
217
215
        except errors.NotBranchError: