[Monodevelop-patches-list] r2694 - in trunk/MonoDevelop/Core/src/MonoDevelop.Startup: . Dialogs

Lluis Sanchez <lluis@ximian.com> lluis at mono-cvs.ximian.com
Fri Jul 29 06:19:34 EDT 2005


Author: lluis
Date: 2005-07-29 06:19:34 -0400 (Fri, 29 Jul 2005)
New Revision: 2694

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Dialogs/AddinLoadErrorDialog.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.glade
Log:
2005-07-29  Lluis Sanchez Gual  <lluis at novell.com>

	* MonoDevelop.Startup.glade:
	* Dialogs/AddinLoadErrorDialog.cs: Improved the error dialog.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog	2005-07-29 10:18:30 UTC (rev 2693)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog	2005-07-29 10:19:34 UTC (rev 2694)
@@ -1,3 +1,8 @@
+2005-07-29  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.Startup.glade:
+	* Dialogs/AddinLoadErrorDialog.cs: Improved the error dialog.
+
 2005-07-18  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MonoDevelopMain.cs: Show an error dialog if there is some error

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Dialogs/AddinLoadErrorDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Dialogs/AddinLoadErrorDialog.cs	2005-07-29 10:18:30 UTC (rev 2693)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Dialogs/AddinLoadErrorDialog.cs	2005-07-29 10:19:34 UTC (rev 2694)
@@ -39,6 +39,11 @@
 {
 	public class AddinLoadErrorDialog
 	{
+		[Glade.Widget] Button noButton;
+		[Glade.Widget] Button yesButton;
+		[Glade.Widget] Button closeButton;
+		[Glade.Widget] Label labelContinue;
+		[Glade.Widget] Label labelFatal;
 		[Glade.Widget] Dialog addinLoadErrorDialog;
 		[Glade.Widget] Gtk.TreeView errorTree;
 		
@@ -51,16 +56,33 @@
 			errorTree.AppendColumn ("Addin", new CellRendererText (), "text", 0);
 			errorTree.Model = store;
 			
+			bool fatal = false;
+			
 			foreach (AddinError err in errors) {
-				TreeIter it = store.AppendValues (Path.GetFileNameWithoutExtension (err.AddinFile));
-				store.AppendValues (it, "Full path: " + err.AddinFile);
-				store.AppendValues (it, err.Exception.ToString ());
+				string name = Path.GetFileNameWithoutExtension (err.AddinFile);
+				if (err.Fatal) name += " (Fatal error)";
+				TreeIter it = store.AppendValues (name);
+				store.AppendValues (it, "Full Path: " + err.AddinFile);
+				store.AppendValues (it, "Error: " + err.Exception.Message);
+				it = store.AppendValues (it, "Exception: " + err.Exception.GetType ());
+				store.AppendValues (it, err.Exception.StackTrace.ToString ());
+				if (err.Fatal) fatal = true;
 			}
+			
+//			addinLoadErrorDialog.ShowAll ();
+
+			if (fatal) {
+				noButton.Hide ();
+				yesButton.Hide ();
+				labelContinue.Hide ();
+				closeButton.Show ();
+				labelFatal.Show ();
+			}
 		}
 		
 		public bool Run ()
 		{
-			addinLoadErrorDialog.ShowAll ();
+			addinLoadErrorDialog.Show ();
 			bool res = (((ResponseType)addinLoadErrorDialog.Run ()) == ResponseType.Yes);
 			addinLoadErrorDialog.Destroy ();
 			return res;

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.glade
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.glade	2005-07-29 10:18:30 UTC (rev 2693)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.glade	2005-07-29 10:19:34 UTC (rev 2694)
@@ -31,7 +31,7 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
+	    <widget class="GtkButton" id="noButton">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -44,7 +44,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="okbutton1">
+	    <widget class="GtkButton" id="yesButton">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -55,6 +55,18 @@
 	      <property name="response_id">-8</property>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="closeButton">
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -143,7 +155,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label5">
+		<widget class="GtkLabel" id="labelContinue">
 		  <property name="width_request">479</property>
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">You can start MonoDevelop without these addins, but the functionality they provide will be missing. Do you wish to continue?</property>
@@ -163,6 +175,26 @@
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="labelFatal">
+		  <property name="label" translatable="yes">MonoDevelop cannot start because a fatal error has ben detected.</property>
+		  <property name="use_underline">False</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</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">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>




More information about the Monodevelop-patches-list mailing list