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

  • Committer: Jelmer Vernooij
  • Date: 2007-02-03 14:18:57 UTC
  • Revision ID: jelmer@samba.org-20070203141857-9xxd3uvju5oo1p8z
Move dialog to top-level directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
35
35
import bzrlib.errors as bzrerrors
36
36
from bzrlib.workingtree import WorkingTree
37
37
 
38
 
from dialog import error_dialog, info_dialog, warning_dialog
39
 
from errors import show_bzr_error
 
38
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
39
from bzrlib.plugins.gtk.errors import show_bzr_error
40
40
from guifiles import GLADEFILENAME
41
41
 
42
 
from bzrlib.plugins.gtk.viz.diff import DiffWindow
 
42
from bzrlib.plugins.gtk.diff import DiffWindow
43
43
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
44
44
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
45
45
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
46
46
from bzrlib.plugins.gtk.commit import CommitDialog
47
47
from bzrlib.plugins.gtk.push import PushDialog
48
48
 
49
 
# History delimiter used in config files
50
49
delimiter = ' '
51
50
 
52
51
class OliveGtk:
202
201
        return self.path
203
202
   
204
203
    def on_about_activate(self, widget):
205
 
        from dialog import about
 
204
        from bzrlib.plugins.gtk.dialog import about
206
205
        about()
207
206
        
208
207
    def on_menuitem_add_files_activate(self, widget):