From d9b0467ca4ba7349c7659f4141f001c4b8709390 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 13 Feb 2005 15:41:13 +0000
Subject: [PATCH] Updates for changes in injector.

Removed used label.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/head/injector-gui/head@46 9f8c893c-44ee-0310-b757-c8ca8341c71e
---
 gui.py           | 14 +++++++-------
 iface_browser.py |  2 +-
 injector-gui     |  8 +++-----
 properties.py    |  6 +-----
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/gui.py b/gui.py
index dafcb4b..61ef0cd 100644
--- a/gui.py
+++ b/gui.py
@@ -10,7 +10,7 @@ gtk.rc_parse_string('style "scrolled" { '
 		    'class "GtkScrolledWindow" style : gtk "scrolled"\n')
 
 class MainWindow(Dialog):
-	def __init__(self, root_interface, prog, prog_args):
+	def __init__(self, prog, prog_args):
 		Dialog.__init__(self)
 		self.set_title('Dependency Injector')
 		self.set_default_size(400, 300)
@@ -18,10 +18,10 @@ class MainWindow(Dialog):
 		tips = gtk.Tooltips()
 
 		# Message
-		label = gtk.Label('Need to download interface definitions...')
-		self.vbox.pack_start(label, False, True, 0)
-		label.set_padding(8, 8)
-		label.show()
+		#label = gtk.Label('Need to download interface definitions...')
+		#self.vbox.pack_start(label, False, True, 0)
+		#label.set_padding(8, 8)
+		#label.show()
 
 		# Network use
 		hbox = gtk.HBox(False, 2)
@@ -43,7 +43,7 @@ class MainWindow(Dialog):
 		hbox.show_all()
 
 		# Tree view
-		browser = InterfaceBrowser(root_interface)
+		browser = InterfaceBrowser(policy.get_interface(policy.root))
 		self.vbox.pack_start(browser, True, True, 0)
 		browser.show()
 
@@ -85,7 +85,7 @@ class MainWindow(Dialog):
 			elif resp == gtk.RESPONSE_OK:
 				import run
 				try:
-					run.execute(root_interface, prog, prog_args)
+					run.execute(prog, prog_args)
 					self.destroy()
 				except SafeException, ex:
 					box = gtk.MessageDialog(self, gtk.DIALOG_MODAL,
diff --git a/iface_browser.py b/iface_browser.py
index 75999ad..719a23e 100644
--- a/iface_browser.py
+++ b/iface_browser.py
@@ -91,7 +91,7 @@ class InterfaceBrowser(gtk.ScrolledWindow):
 			if impl:
 				self.model[iter][InterfaceBrowser.VERSION] = impl.get_version()
 				for child in impl.dependencies.values():
-					add_node(iter, child.get_interface())
+					add_node(iter, policy.get_interface(child.interface))
 			else:
 				self.model[iter][InterfaceBrowser.VERSION] = '(choose)'
 		add_node(None, self.root)
diff --git a/injector-gui b/injector-gui
index fbe000b..08329a9 100755
--- a/injector-gui
+++ b/injector-gui
@@ -8,20 +8,18 @@ if len(sys.argv) < 3:
 	print "PROG is a relative path inside an implementation of INTERFACE. Eg:"
 	print "injector /uri/0install/site/myprog.xml bin/myprog --help"
 	sys.exit(1)
-interface_uri = sys.argv[1]
+interface_uri = os.path.realpath(sys.argv[1])
 prog = sys.argv[2]
 prog_args = sys.argv[3:]
-interactive = bool(os.environ.get('INJECTOR_INTERACTIVE', None))
 
 import model
 from policy import policy
 
-interface = model.get_interface(interface_uri)
-policy.set_root_iterface(interface)
+policy.set_root_interface(interface_uri)
 
 import gui, gtk
 
-window = gui.MainWindow(interface, prog, prog_args)
+window = gui.MainWindow(prog, prog_args)
 window.show()
 gtk.main()
 
diff --git a/properties.py b/properties.py
index 437f999..991e390 100644
--- a/properties.py
+++ b/properties.py
@@ -70,11 +70,7 @@ class Properties(Dialog):
 
 		description.set_size_request(-1, 100)
 
-		if interface.uptodate:
-			buffer.insert(iter, interface.description or "-")
-		else:
-			buffer.insert(iter, "Information about this interface has not "
-						"yet been downloaded.")
+		buffer.insert(iter, interface.description or "-")
 
 		self.use_list = ImplementationList(interface)
 		vbox.pack_start(self.use_list, True, True, 0)
-- 
2.11.4.GIT