/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

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
28
28
import bzrlib.errors as errors
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
 
from dialog import error_dialog, info_dialog, warning_dialog
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
32
32
from errors import show_bzr_error
33
33
from launch import launch
34
 
from olive import OlivePreferences, DiffWindow
 
34
from olive import Preferences, DiffWindow
35
35
 
36
36
class OliveMenu:
37
37
    """ This class is responsible for building the context menus. """
42
42
        self.uifile = UIFILENAME
43
43
 
44
44
        # Preferences handler
45
 
        self.pref = OlivePreferences()
 
45
        self.pref = Preferences()
46
46
        
47
47
        # Set default values
48
48
        self.path = path