[Pkg-bazaar-commits] ./bzr-gtk/unstable r133: Actually use the ui factory.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 133
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2007-01-30 00:42:57 +0100
message:
  Actually use the ui factory.
modified:
  __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-01-02 17:27:43 +0000
+++ b/__init__.py	2007-01-29 23:42:57 +0000
@@ -35,6 +35,13 @@
     return pygtk
 
 
+def set_ui_factory():
+    pygtk = import_pygtk()
+    from olive.ui import GtkUIFactory
+    import bzrlib.ui
+    bzrlib.ui.ui_factory = GtkUIFactory()
+
+
 class cmd_gbranch(Command):
     """GTK+ branching.
     
@@ -50,6 +57,7 @@
 
         from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
+        set_ui_factory()
         window = BranchDialog('.')
         window.display()
 
@@ -65,6 +73,7 @@
 
     @display_command
     def run(self, revision=None, filename=None):
+        set_ui_factory()
         wt = WorkingTree.open_containing(".")[0]
         branch = wt.branch
         if revision is not None:
@@ -119,6 +128,7 @@
     aliases = [ "visualize", "vis", "viz" ]
 
     def run(self, location=".", revision=None, limit=None):
+        set_ui_factory()
         (branch, path) = Branch.open_containing(location)
         branch.lock_read()
         branch.repository.lock_read()
@@ -166,6 +176,7 @@
         except RuntimeError, e:
             if str(e) == "could not open display":
                 raise NoDisplayError
+        set_ui_factory()
 
         try:
             line = int(line)
@@ -229,6 +240,7 @@
             if str(e) == "could not open display":
                 raise NoDisplayError
 
+        set_ui_factory()
         from olive.commit import CommitDialog
         from bzrlib.commit import Commit
         from bzrlib.errors import (BzrCommandError,
@@ -263,4 +275,6 @@
     """gtk could not find a proper display"""
 
     def __str__(self):
-        return "No DISPLAY. gannotate is disabled."
+        return "No DISPLAY. Unable to run GTK+ application."
+
+