summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-01-11 17:59:36 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-01-11 17:59:36 +0000
commit3681b8dca9ab8c09bd64fd03eecb36c2b73d53d0 (patch)
tree14e2f8096434ea9a97659e19642e7e7fe3e910bc /iw
parent3fff3f951268b74e66948f43351944cd0988f0eb (diff)
downloadanaconda-3681b8dca9ab8c09bd64fd03eecb36c2b73d53d0.tar.gz
anaconda-3681b8dca9ab8c09bd64fd03eecb36c2b73d53d0.tar.xz
anaconda-3681b8dca9ab8c09bd64fd03eecb36c2b73d53d0.zip
* iw/release_notes.py (ReleaseNotesViewer.setupWindow): Switch to
just a GtkWindow so that we don't have annoying GtkDialog behavior on press of ESC (#220418). From katzj.
Diffstat (limited to 'iw')
-rw-r--r--iw/release_notes.py24
1 files changed, 19 insertions, 5 deletions
diff --git a/iw/release_notes.py b/iw/release_notes.py
index a4371d742..6b6ee01f0 100644
--- a/iw/release_notes.py
+++ b/iw/release_notes.py
@@ -149,10 +149,12 @@ class ReleaseNotesViewer:
self.currentURI = self.resolveURI(uri)
else:
loadWrapper(_("Release notes are missing.\n"))
+ self.doc.close_stream()
self.currentURI = None
else:
loadWrapper(_("Release notes are missing.\n"))
+ self.doc.close_stream()
self.currentURI = None
@@ -166,11 +168,22 @@ class ReleaseNotesViewer:
def setupWindow(self):
self.vue.set_document(self.doc)
- self.textWin = gtk.Dialog(flags=gtk.DIALOG_MODAL)
+ self.textWin = gtk.Window()
+ self.textWin.connect("delete-event", self.closedCallBack)
+ mainbox = gtk.VBox(False, 6)
+ self.textWin.add(mainbox)
+
table = gtk.Table(3, 3, False)
- self.textWin.vbox.pack_start(table)
- self.textWin.add_button('gtk-close', gtk.RESPONSE_NONE)
- self.textWin.connect("response", self.closedCallBack)
+ mainbox.pack_start(table)
+
+ mainbox.pack_start(gtk.HSeparator(), False, False)
+ bb = gtk.HButtonBox()
+ bb.set_property("layout-style", gtk.BUTTONBOX_END)
+
+ b = gtk.Button(stock="gtk-close")
+ b.connect("clicked", self.closedCallBack)
+ bb.pack_start(b)
+ mainbox.pack_start(bb, False, False)
vbox1 = gtk.VBox()
vbox1.set_border_width(10)
@@ -187,6 +200,7 @@ class ReleaseNotesViewer:
sw.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
sw.set_shadow_type(gtk.SHADOW_IN)
sw.add(self.vue)
+ sw.show_all()
vbox1.pack_start(sw)
a = gtk.Alignment(0, 0, 1.0, 1.0)
@@ -258,7 +272,7 @@ class ReleaseNotesViewer:
return ret
- def closedCallBack(self, widget, data):
+ def closedCallBack(self, *args):
self.textWin.hide_all()
self.is_showing = False