diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-09-13 01:46:07 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-09-13 01:46:07 +0000 |
| commit | 946c4fcc8b8cb1afbbf170323a6c6d0c68437db9 (patch) | |
| tree | 82c2a717d9c383d81b4c511d1436dbc1f7b7a742 /iw | |
| parent | cc2d00da74aab4977fb7cb54faa3404ac5425397 (diff) | |
| download | anaconda-946c4fcc8b8cb1afbbf170323a6c6d0c68437db9.tar.gz anaconda-946c4fcc8b8cb1afbbf170323a6c6d0c68437db9.tar.xz anaconda-946c4fcc8b8cb1afbbf170323a6c6d0c68437db9.zip | |
2005-09-12 Jeremy Katz <katzj@redhat.com>
* iw/release_notes_viewer_gui.py (exposeCB): Switch to using
gtkhtml2 instead of htmlbuffer for more complete HTML support.
* scripts/upd-instroot: Add gnome-python2-gtkhtml2 stuff
Diffstat (limited to 'iw')
| -rwxr-xr-x | iw/release_notes_viewer_gui.py | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/iw/release_notes_viewer_gui.py b/iw/release_notes_viewer_gui.py index 413095023..b46206997 100755 --- a/iw/release_notes_viewer_gui.py +++ b/iw/release_notes_viewer_gui.py @@ -23,27 +23,36 @@ from rhpl.translate import _, N_ sys.path.append('/usr/lib/anaconda') from gui import TextViewBrowser, addFrame -import htmlbuffer +import gtkhtml2 screenshot = None +htmlheader = "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body bgcolor=\"white\"><pre>" +htmlfooter = "</pre></body></html>" + def loadReleaseNotes(fn): + doc = gtkhtml2.Document() + doc.clear() + doc.open_stream("text/html") + if os.access(fn, os.R_OK): file = open(fn, "r") if fn.endswith('.html'): - buffer = htmlbuffer.HTMLBuffer() - buffer.feed(file.read()) - return buffer.get_buffer() + doc.write_stream(file.read()) else: - buffer = gtk.TextBuffer(None) - buffer.set_text(file.read()) - file.close() - return buffer - - buffer = gtk.TextBuffer(None) - buffer.set_text(_("Release notes are missing.\n")) - - return buffer + doc.write_stream(htmlheader) + doc.write_stream(file.read()) + doc.write_stream(htmlfooter) + doc.close_stream() + file.close() + else: + doc.write_stream(htmlheader) + doc.write_stream(_("Release notes are missing.\n")) + doc.write_stream(htmlfooter) + + view = gtkhtml2.View() + view.set_document(doc) + return view def relnotes_closed(widget, data): os._exit(0) @@ -118,13 +127,10 @@ if __name__ == "__main__": relnotes = loadReleaseNotes(sys.argv[1]) if relnotes is not None: - text = TextViewBrowser() - text.set_buffer(relnotes) - sw = gtk.ScrolledWindow() sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS) sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(text) + sw.add(relnotes) vbox1.pack_start(sw) a = gtk.Alignment (0, 0, 1.0, 1.0) |