[Debugger] Use David's prettier icon for the new ExceptionCaughtDialog UI

2 files changed, 67 insertions, 63 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
index b4050d927b..239b90f999 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
@@ -8,7 +8,8 @@ namespace MonoDevelop.Debugger
 		private global::Gtk.VBox vbox2;
 		private global::Gtk.HBox hbox2;
 		private global::Gtk.Image imageWarning;
-		private global::Gtk.VBox vbox3;
+		private global::Gtk.Alignment alignment1;
+		private global::Gtk.VBox vboxExceptionInfo;
 		private global::Gtk.Label labelType;
 		private global::Gtk.Label labelMessage;
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
@@ -31,33 +32,35 @@ namespace MonoDevelop.Debugger
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.hbox2 = new global::Gtk.HBox ();
 			this.hbox2.Name = "hbox2";
-			this.hbox2.Spacing = 12;
-			this.hbox2.BorderWidth = ((uint)(12));
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.imageWarning = new global::Gtk.Image ();
 			this.imageWarning.Name = "imageWarning";
-			this.imageWarning.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog);
+			this.imageWarning.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("exception-icon.png");
 			this.hbox2.Add (this.imageWarning);
 			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageWarning]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
+			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1.Name = "alignment1";
+			this.alignment1.TopPadding = ((uint)(12));
+			// Container child alignment1.Gtk.Container+ContainerChild
+			this.vboxExceptionInfo = new global::Gtk.VBox ();
+			this.vboxExceptionInfo.Name = "vboxExceptionInfo";
+			this.vboxExceptionInfo.Spacing = 6;
+			// Container child vboxExceptionInfo.Gtk.Box+BoxChild
 			this.labelType = new global::Gtk.Label ();
 			this.labelType.Name = "labelType";
 			this.labelType.Xalign = 0F;
 			this.labelType.LabelProp = "<b>Exception</b> has been thrown";
 			this.labelType.UseMarkup = true;
-			this.vbox3.Add (this.labelType);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.labelType]));
+			this.vboxExceptionInfo.Add (this.labelType);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vboxExceptionInfo [this.labelType]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
+			// Container child vboxExceptionInfo.Gtk.Box+BoxChild
 			this.labelMessage = new global::Gtk.Label ();
 			this.labelMessage.WidthRequest = 500;
 			this.labelMessage.Name = "labelMessage";
@@ -65,21 +68,20 @@ namespace MonoDevelop.Debugger
 			this.labelMessage.LabelProp = "test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test";
 			this.labelMessage.Wrap = true;
 			this.labelMessage.Selectable = true;
-			this.vbox3.Add (this.labelMessage);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.labelMessage]));
+			this.vboxExceptionInfo.Add (this.labelMessage);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vboxExceptionInfo [this.labelMessage]));
 			w3.Position = 1;
 			w3.Expand = false;
 			w3.Fill = false;
-			this.hbox2.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox3]));
-			w4.Position = 1;
-			w4.Expand = false;
-			w4.Fill = false;
+			this.alignment1.Add (this.vboxExceptionInfo);
+			this.hbox2.Add (this.alignment1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.alignment1]));
+			w5.Position = 1;
 			this.vbox2.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Fill = false;
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
+			w6.Position = 0;
+			w6.Expand = false;
+			w6.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow1.HeightRequest = 128;
@@ -92,8 +94,8 @@ namespace MonoDevelop.Debugger
 			this.treeStack.HeadersVisible = false;
 			this.GtkScrolledWindow1.Add (this.treeStack);
 			this.vbox2.Add (this.GtkScrolledWindow1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1]));
-			w7.Position = 1;
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1]));
+			w8.Position = 1;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow.HeightRequest = 128;
@@ -112,11 +114,11 @@ namespace MonoDevelop.Debugger
 			this.valueView.CompactView = false;
 			this.GtkScrolledWindow.Add (this.valueView);
 			this.vbox2.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
-			w9.Position = 2;
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
+			w10.Position = 2;
 			this.dialog1_VBox.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
-			w10.Position = 0;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
+			w11.Position = 0;
 			this.Add (this.dialog1_VBox);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index 0954280778..4a342563c9 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -1757,7 +1757,7 @@ Break when the hit count is a multiple of</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.ExceptionCaughtWidget" design-size="588 332">
+  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.ExceptionCaughtWidget" design-size="588 362">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -1769,12 +1769,10 @@ Break when the hit count is a multiple of</property>
             <child>
               <widget class="Gtk.HBox" id="hbox2">
                 <property name="MemberName" />
-                <property name="Spacing">12</property>
-                <property name="BorderWidth">12</property>
                 <child>
                   <widget class="Gtk.Image" id="imageWarning">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property>
+                    <property name="Pixbuf">resource:exception-icon.png</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -1784,45 +1782,49 @@ Break when the hit count is a multiple of</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.VBox" id="vbox3">
+                  <widget class="Gtk.Alignment" id="alignment1">
                     <property name="MemberName" />
-                    <property name="Spacing">6</property>
+                    <property name="TopPadding">12</property>
                     <child>
-                      <widget class="Gtk.Label" id="labelType">
+                      <widget class="Gtk.VBox" id="vboxExceptionInfo">
                         <property name="MemberName" />
-                        <property name="Xalign">0</property>
-                        <property name="LabelProp">&lt;b&gt;Exception&lt;/b&gt; has been thrown</property>
-                        <property name="UseMarkup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="labelMessage">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">500</property>
-                        <property name="Xalign">0</property>
-                        <property name="LabelProp">test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test</property>
-                        <property name="Wrap">True</property>
-                        <property name="Selectable">True</property>
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.Label" id="labelType">
+                            <property name="MemberName" />
+                            <property name="Xalign">0</property>
+                            <property name="LabelProp">&lt;b&gt;Exception&lt;/b&gt; has been thrown</property>
+                            <property name="UseMarkup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="labelMessage">
+                            <property name="MemberName" />
+                            <property name="WidthRequest">500</property>
+                            <property name="Xalign">0</property>
+                            <property name="LabelProp">test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test</property>
+                            <property name="Wrap">True</property>
+                            <property name="Selectable">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
                       </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
                     </child>
                   </widget>
                   <packing>
                     <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
+                    <property name="AutoSize">False</property>
                   </packing>
                 </child>
               </widget>