2006-01-09 Jeremy Katz <katzj@redhat.com>

	* ui/exn.glade: Various little tweaks

	* pixmaps/exception.png: More accurate icon

	* gui.py (ExceptionWindow.__init__): Use our method for finding
	images so this works everywhere.

4 files changed, 45 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index c44402d15..74b2b1acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-09  Jeremy Katz  <katzj@redhat.com>
+
+	* ui/exn.glade: Various little tweaks
+
+	* pixmaps/exception.png: More accurate icon
+
+	* gui.py (ExceptionWindow.__init__): Use our method for finding
+	images so this works everywhere.
+
 2006-01-09  Jesse Keating  <jkeating@redhat.com>
 
 	* scripts/mk-rescueimage.ppc:  Copy boot_image from ppc
diff --git a/gui.py b/gui.py
index 9cd8f44e0..7a341f84a 100755
--- a/gui.py
+++ b/gui.py
@@ -592,13 +592,10 @@ class ExceptionWindow:
 
         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
+        img = findPixmap("exception.png")
+        if os.path.exists(img):
+            infoImage.set_from_file(img)
 
         # Add the brief traceback message to the upper text view.
         textbuf = gtk.TextBuffer()
diff --git a/pixmaps/exception.png b/pixmaps/exception.png
index b989deb42..5eb4af420 100644
--- a/pixmaps/exception.png
+++ b/pixmaps/exception.png
diff --git a/ui/exn.glade b/ui/exn.glade
index 7a7ecee52..9b415925a 100644
--- a/ui/exn.glade
+++ b/ui/exn.glade
@@ -10,7 +10,7 @@
   <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="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -26,7 +26,7 @@
     <widget class="GtkVBox" id="exnDialog-vbox">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="buttonBox">
@@ -93,13 +93,13 @@
 	<widget class="GtkVBox" id="mainVBox">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">5</property>
+	  <property name="spacing">12</property>
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox1">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkImage" id="infoImage">
@@ -111,7 +111,7 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
+		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
@@ -125,7 +125,7 @@
 		  <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="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -136,8 +136,8 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
@@ -161,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">GTK_SHADOW_NONE</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
@@ -185,11 +185,35 @@
 		  </child>
 		</widget>
 	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label1">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_Exception details</property>
+		  <property name="use_underline">True</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</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="type">label_item</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
 	      <property name="expand">True</property>
 	      <property name="fill">True</property>
+	      <property name="pack_type">GTK_PACK_END</property>
 	    </packing>
 	  </child>
 	</widget>