From 543df5c49e8a169bd6e2b884fa7b8b501f15823b Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Mon, 9 Jan 2006 18:32:58 +0000
Subject:         * gui.py (ExceptionWindow): Tweak display of the exception   
      window.         * ui/exn.glade: Change default size, add an hbox with an
 icon         next to the label.         * pixmaps/exception.png: Friendly
 icon indicating bad things         have happened.

---
 ChangeLog             |   9 +++++++
 gui.py                |   9 +++++++
 pixmaps/exception.png | Bin 0 -> 3461 bytes
 ui/exn.glade          |  70 +++++++++++++++++++++++++++++++++++---------------
 4 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 pixmaps/exception.png

diff --git a/ChangeLog b/ChangeLog
index ceb75f16a..b943afd8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-09  David Cantrell  <dcantrell@redhat.com>
+
+	* gui.py (ExceptionWindow): Tweak display of the exception
+	window.
+	* ui/exn.glade: Change default size, add an hbox with an icon
+	next to the label.
+	* pixmaps/exception.png: Friendly icon indicating bad things
+	have happened.
+
 2006-01-08  Jeremy Katz  <katzj@redhat.com>
 
 	* iw/GroupSelector.py (OptionalPackageSelector.__init__): Tweak
diff --git a/gui.py b/gui.py
index 657678339..9cd8f44e0 100755
--- a/gui.py
+++ b/gui.py
@@ -588,9 +588,18 @@ class ExceptionWindow:
         exnView = exnxml.get_widget("exnView")
         expander = exnxml.get_widget("exnExpander")
         info = exnxml.get_widget("info")
+        infoImage = exnxml.get_widget("infoImage")
 
         info.set_text(exceptionText)
 
+        # IKEA is fun
+        infoImage.clear()
+        for imgdir in ("/usr/share/anaconda/pixmaps", "/mnt/source/RHupdates"):
+            img = imgdir + "/exception.png"
+            if os.path.exists(img):
+                infoImage.set_from_file(img)
+                break
+
         # Add the brief traceback message to the upper text view.
         textbuf = gtk.TextBuffer()
         textbuf.set_text(shortTraceback)
diff --git a/pixmaps/exception.png b/pixmaps/exception.png
new file mode 100644
index 000000000..b989deb42
Binary files /dev/null and b/pixmaps/exception.png differ
diff --git a/ui/exn.glade b/ui/exn.glade
index d7bb77b9f..7a7ecee52 100644
--- a/ui/exn.glade
+++ b/ui/exn.glade
@@ -7,19 +7,20 @@
   <property name="visible">True</property>
   <property name="title">Exception Occurred</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">center</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">True</property>
+  <property name="default_width">550</property>
+  <property name="default_height">440</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">center</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
-  <property name="default_width">400</property>
-  <property name="default_height">300</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="exnDialog-vbox">
@@ -95,22 +96,50 @@
 	  <property name="spacing">5</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="info">
+	    <widget class="GtkHBox" id="hbox1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">True</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkImage" id="infoImage">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="info">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Exception Info</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">True</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -125,7 +154,6 @@
 	      <property name="can_focus">True</property>
 	      <property name="expanded">False</property>
 	      <property name="spacing">0</property>
-	      <property name="label">Exception text</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow2">
@@ -133,7 +161,7 @@
 		  <property name="can_focus">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">in</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
-- 
cgit