diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | iw/release_notes_viewer_gui.py | 40 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 3 |
3 files changed, 31 insertions, 17 deletions
@@ -1,5 +1,10 @@ 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 + * yuminstall.py (YumBackend.doPreSelection): Do a minimal install if we ask for it until we get real package selection going. (AnacondaYum.run): Get RPM logging going to the install log. 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) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index e2b25ab22..abf1cfb51 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -175,6 +175,7 @@ PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts anaconda-images anaconda-help XFree86-base-fonts ttfonts-ko taipeifonts XFree86-ISO8859-15-75dpi-fonts rhpl system-config-keyboard Xft fontconfig gtk2-engines gnome-themes + gtkhtml2 gnome-python2-gtkhtml2 gail ttfonts-ja ttfonts-zh_TW bitmap-fonts-cjk urw-fonts fonts-arabic comps-extras XFree86-libs-data convertdb1 fonts-bengali vnc-server libjpeg tcp_wrappers system-config-date @@ -639,6 +640,7 @@ usr/$LIBDIR/libcairo* usr/$LIBDIR/libesd* usr/$LIBDIR/libfontconfig* usr/$LIBDIR/libfreetype* +usr/$LIBDIR/libgailutil* usr/$LIBDIR/libgdk* usr/$LIBDIR/libglade* usr/$LIBDIR/libgnomecanvas* @@ -653,6 +655,7 @@ usr/$LIBDIR/libstdc++.so.* usr/$LIBDIR/libwrap* usr/$LIBDIR/pango/* usr/$LIBDIR/python?.?/site-packages/gtk*/gtk/* +usr/$LIBDIR/python?.?/site-packages/gtk*/* usr/$LIBDIR/rpm/rpmpopt usr/lib/syslinux/* usr/lib/yaboot/* |