[Debugger] Implemented the new ExceptionCaughtDialog UI

2 files changed, 129 insertions, 110 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 2d823ee259..b4050d927b 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
@@ -6,16 +6,16 @@ namespace MonoDevelop.Debugger
 	{
 		private global::Gtk.VBox dialog1_VBox;
 		private global::Gtk.VBox vbox2;
+		private global::Gtk.HBox hbox2;
+		private global::Gtk.Image imageWarning;
+		private global::Gtk.VBox vbox3;
 		private global::Gtk.Label labelType;
 		private global::Gtk.Label labelMessage;
-		private global::Gtk.Notebook notebook1;
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
 		private global::Gtk.TreeView treeStack;
-		private global::Gtk.Label label2;
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
 		private global::MonoDevelop.Debugger.ObjectValueTreeView valueView;
-		private global::Gtk.Label page1;
-		
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -25,63 +25,80 @@ namespace MonoDevelop.Debugger
 			// Container child MonoDevelop.Debugger.ExceptionCaughtWidget.Gtk.Container+ContainerChild
 			this.dialog1_VBox = new global::Gtk.VBox ();
 			this.dialog1_VBox.Name = "dialog1_VBox";
-			this.dialog1_VBox.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
 			this.vbox2 = new global::Gtk.VBox ();
 			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			this.vbox2.BorderWidth = ((uint)(6));
 			// 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.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.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.vbox2.Add (this.labelType);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelType]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
+			this.vbox3.Add (this.labelType);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.labelType]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
 			this.labelMessage = new global::Gtk.Label ();
 			this.labelMessage.WidthRequest = 500;
 			this.labelMessage.Name = "labelMessage";
 			this.labelMessage.Xalign = 0F;
 			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.vbox2.Add (this.labelMessage);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelMessage]));
-			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
+			this.labelMessage.Selectable = true;
+			this.vbox3.Add (this.labelMessage);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [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.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;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
 			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow1.HeightRequest = 128;
 			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
 			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			this.GtkScrolledWindow1.BorderWidth = ((uint)(3));
 			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
 			this.treeStack = new global::Gtk.TreeView ();
 			this.treeStack.CanFocus = true;
 			this.treeStack.Name = "treeStack";
 			this.treeStack.HeadersVisible = false;
 			this.GtkScrolledWindow1.Add (this.treeStack);
-			this.notebook1.Add (this.GtkScrolledWindow1);
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Stack Trace");
-			this.notebook1.SetTabLabel (this.GtkScrolledWindow1, this.label2);
-			this.label2.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
+			this.vbox2.Add (this.GtkScrolledWindow1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1]));
+			w7.Position = 1;
+			// Container child vbox2.Gtk.Box+BoxChild
 			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow.HeightRequest = 128;
 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			this.GtkScrolledWindow.BorderWidth = ((uint)(3));
 			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
 			this.valueView = new global::MonoDevelop.Debugger.ObjectValueTreeView ();
 			this.valueView.CanFocus = true;
@@ -94,21 +111,12 @@ namespace MonoDevelop.Debugger
 			this.valueView.PinnedWatchLine = 0;
 			this.valueView.CompactView = false;
 			this.GtkScrolledWindow.Add (this.valueView);
-			this.notebook1.Add (this.GtkScrolledWindow);
-			global::Gtk.Notebook.NotebookChild w6 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.GtkScrolledWindow]));
-			w6.Position = 1;
-			// Notebook tab
-			this.page1 = new global::Gtk.Label ();
-			this.page1.Name = "page1";
-			this.page1.LabelProp = global::Mono.Unix.Catalog.GetString ("Details");
-			this.notebook1.SetTabLabel (this.GtkScrolledWindow, this.page1);
-			this.page1.ShowAll ();
-			this.vbox2.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebook1]));
-			w7.Position = 2;
+			this.vbox2.Add (this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
+			w9.Position = 2;
 			this.dialog1_VBox.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
-			w8.Position = 0;
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
+			w10.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 b7c8a4c968..0954280778 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -1757,24 +1757,74 @@ Break when the hit count is a multiple of</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.ExceptionCaughtWidget" design-size="541 358">
+  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.ExceptionCaughtWidget" design-size="588 332">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
       <widget class="Gtk.VBox" id="dialog1_VBox">
         <property name="MemberName" />
-        <property name="BorderWidth">2</property>
         <child>
           <widget class="Gtk.VBox" id="vbox2">
             <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">6</property>
             <child>
-              <widget class="Gtk.Label" id="labelType">
+              <widget class="Gtk.HBox" id="hbox2">
                 <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>
+                <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>
+                  </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.VBox" id="vbox3">
+                    <property name="MemberName" />
+                    <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">0</property>
@@ -1784,56 +1834,31 @@ Break when the hit count is a multiple of</property>
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Label" id="labelMessage">
+              <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow1">
                 <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="HeightRequest">128</property>
+                <property name="ShadowType">In</property>
+                <child>
+                  <widget class="Gtk.TreeView" id="treeStack">
+                    <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="ShowScrollbars">True</property>
+                    <property name="HeadersVisible">False</property>
+                  </widget>
+                </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>
             <child>
-              <widget class="Gtk.Notebook" id="notebook1">
+              <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
                 <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="CurrentPage">0</property>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow1">
-                    <property name="MemberName" />
-                    <property name="ShadowType">In</property>
-                    <property name="BorderWidth">3</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="treeStack">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowScrollbars">True</property>
-                        <property name="HeadersVisible">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label2">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Stack Trace</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
+                <property name="HeightRequest">128</property>
+                <property name="ShadowType">In</property>
                 <child>
-                  <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-                    <property name="MemberName" />
-                    <property name="ShadowType">In</property>
-                    <property name="BorderWidth">3</property>
-                    <child>
-                      <widget class="MonoDevelop.Debugger.ObjectValueTreeView" id="valueView">
+                  <widget class="MonoDevelop.Debugger.ObjectValueTreeView" id="valueView">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="ShowScrollbars">True</property>
@@ -1845,20 +1870,6 @@ Break when the hit count is a multiple of</property>
                         <property name="PinnedWatchLine">0</property>
                         <property name="CompactView">False</property>
                       </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="page1">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Details</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
                 </child>
               </widget>
               <packing>