From d716eb0d15c8c6a5cf8e21c388bb4a5401cdfb50 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Fri, 20 Jun 2008 15:18:39 +0100
Subject: [PATCH] Moved help_box to zeroinstall.gtkui.

---
 zeroinstall/0launch-gui/cache.py               |  2 +-
 zeroinstall/0launch-gui/mainwindow.py          |  2 +-
 zeroinstall/0launch-gui/preferences.py         |  2 +-
 zeroinstall/0launch-gui/properties.py          |  2 +-
 zeroinstall/0launch-gui/trust_box.py           |  3 ++-
 zeroinstall/{0launch-gui => gtkui}/help_box.py | 15 ++++++++++++---
 6 files changed, 18 insertions(+), 8 deletions(-)
 rename zeroinstall/{0launch-gui => gtkui}/help_box.py (75%)

diff --git a/zeroinstall/0launch-gui/cache.py b/zeroinstall/0launch-gui/cache.py
index 8bfa057..751ffae 100644
--- a/zeroinstall/0launch-gui/cache.py
+++ b/zeroinstall/0launch-gui/cache.py
@@ -4,7 +4,6 @@
 import os, shutil
 import gtk, gobject
 
-import help_box
 from dialog import Dialog, alert
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.injector import namespaces, model
@@ -12,6 +11,7 @@ from zeroinstall.zerostore import BadDigest, manifest
 from zeroinstall import support
 from zeroinstall.support import basedir
 from zeroinstall.gtkui.treetips import TreeTips
+from zeroinstall.gtkui import help_box
 
 ROX_IFACE = 'http://rox.sourceforge.net/2005/interfaces/ROX-Filer'
 
diff --git a/zeroinstall/0launch-gui/mainwindow.py b/zeroinstall/0launch-gui/mainwindow.py
index 0364013..2a6784b 100644
--- a/zeroinstall/0launch-gui/mainwindow.py
+++ b/zeroinstall/0launch-gui/mainwindow.py
@@ -8,9 +8,9 @@ from zeroinstall import SafeException
 from zeroinstall.support import tasks, pretty_size
 from zeroinstall.injector import download
 from iface_browser import InterfaceBrowser
-import help_box
 import dialog
 from zeroinstall.gtkui import gtkutils
+from zeroinstall.gtkui import help_box
 
 tips = gtk.Tooltips()
 
diff --git a/zeroinstall/0launch-gui/preferences.py b/zeroinstall/0launch-gui/preferences.py
index 13a3e71..2b41bb3 100644
--- a/zeroinstall/0launch-gui/preferences.py
+++ b/zeroinstall/0launch-gui/preferences.py
@@ -4,8 +4,8 @@
 import gtk
 from logging import warn
 import os, sys
-import help_box
 from dialog import Dialog, MixedButton, frame, Template
+from zeroinstall.gtkui import help_box
 from zeroinstall.injector.model import network_levels
 from zeroinstall.injector import trust, gpg
 from freshness import freshness_levels, Freshness
diff --git a/zeroinstall/0launch-gui/properties.py b/zeroinstall/0launch-gui/properties.py
index 2ba353b..80278b3 100644
--- a/zeroinstall/0launch-gui/properties.py
+++ b/zeroinstall/0launch-gui/properties.py
@@ -6,11 +6,11 @@ from zeroinstall.support import tasks
 from zeroinstall.injector.model import *
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.injector import writer, namespaces, gpg
+from zeroinstall.gtkui import help_box
 
 import gtk, sys, os
 from logging import warn
 
-import help_box
 from dialog import DialogResponse, Template
 from impl_list import ImplementationList
 import time
diff --git a/zeroinstall/0launch-gui/trust_box.py b/zeroinstall/0launch-gui/trust_box.py
index c4faf28..1f38e66 100644
--- a/zeroinstall/0launch-gui/trust_box.py
+++ b/zeroinstall/0launch-gui/trust_box.py
@@ -7,9 +7,10 @@ from zeroinstall.injector.model import SafeException
 from zeroinstall.injector import gpg, trust
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.support import tasks
+from zeroinstall.gtkui import help_box
 
 import gui
-import dialog, help_box
+import dialog
 
 def pretty_fp(fp):
 	s = fp[0:4]
diff --git a/zeroinstall/0launch-gui/help_box.py b/zeroinstall/gtkui/help_box.py
similarity index 75%
rename from zeroinstall/0launch-gui/help_box.py
rename to zeroinstall/gtkui/help_box.py
index 03ee534..dd6c219 100644
--- a/zeroinstall/0launch-gui/help_box.py
+++ b/zeroinstall/gtkui/help_box.py
@@ -1,25 +1,34 @@
+"""A dialog box for displaying help text."""
 # Copyright (C) 2008, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
 import gtk
 
-from dialog import Dialog
-
 class HelpBox:
+	"""A dialog for showing longish help texts.
+	The GTK widget is not created until L{display} is called.
+	"""
 	box = None
 	title = None
 	sections = None
 
 	def __init__(self, title, *sections):
+		"""Constructor.
+		@param title: window title
+		@param sections: the content, as a list of (section_title, section_body) pairs
+		@type sections: [(str, str)]"""
 		self.title = title
 		self.sections = sections
 	
 	def display(self):
+		"""Display this help text. If it is already displayed, close the old window first."""
 		if self.box:
 			self.box.destroy()
 			assert not self.box
 
-		self.box = box = Dialog()
+		self.box = box = gtk.Dialog()
+		self.box.set_has_separator(False)
+		self.box.set_position(gtk.WIN_POS_CENTER)
 		box.set_title(self.title)
 		box.set_has_separator(False)
 
-- 
2.11.4.GIT