/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: 2007-02-01 15:50:40 UTC
  • Revision ID: jelmer@samba.org-20070201155040-3hq4mfbxs99kzazy
add framework for tests.

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 bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
31
from 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 Preferences, DiffWindow
 
34
from olive import OlivePreferences, 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 = Preferences()
 
45
        self.pref = OlivePreferences()
46
46
        
47
47
        # Set default values
48
48
        self.path = path
253
253
 
254
254
    def edit_bookmark(self, action):
255
255
        """ Left context menu -> Edit """
256
 
        from bookmark import BookmarkDialog
 
256
        from bookmark import OliveBookmarkDialog
257
257
        
258
258
        if self.selected != None:
259
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
259
            bookmark = OliveBookmarkDialog(self.selected, self.app.window)
260
260
            response = bookmark.run()
261
261
            
262
262
            if response != gtk.RESPONSE_NONE: