[Monodevelop-patches-list] r791 - in trunk/MonoDevelop/src/Main/Base: Commands Gui/Dialogs/Wizard Gui/Pads

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-02-05 15:27:37 -0500 (Thu, 05 Feb 2004)
New Revision: 791

Modified:
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
Log:
use wizard.Run () so it will close on cancel, close etc.
fixes bug #53709 


Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-02-05 06:40:03 UTC (rev 790)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-02-05 20:27:37 UTC (rev 791)
@@ -78,16 +78,17 @@
 			
 			WizardDialog wizard = new WizardDialog("Initialize Code Completion Database", customizer, "/SharpDevelop/CompletionDatabaseWizard");
 			propertyService.SetProperty("SharpDevelop.CodeCompletion.DataDirectory", customizer.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", String.Empty));
-			//wizard.Run ();
-			Gtk.Application.Run ();
+			
+			wizard.Run ();
 			wizard.Hide ();
+			wizard.Destroy ();
 
 			// restart  & exit 
-			Console.WriteLine ("generated, exiting");
 			ServiceManager.Services.UnloadAllServices();
+			// FIXME: handle this elegantly
+			// is it really necessary to restart here?
 			//System.Diagnostics.Process.Start(Path.Combine (Application.StartupPath, "SharpDevelop.exe"));
-			System.Environment.Exit(0);
-			
+			Gtk.Application.Quit ();
 		}
 	}
 	

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-02-05 06:40:03 UTC (rev 790)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-02-05 20:27:37 UTC (rev 791)
@@ -13,10 +13,10 @@
 
 using ICSharpCode.Core.Services;
 using ICSharpCode.Core.AddIns;
-
 using ICSharpCode.Core.Properties;
 using ICSharpCode.Core.AddIns.Codons;
 using Gtk;
+
 namespace ICSharpCode.SharpDevelop.Gui.Dialogs
 {
 	/// <summary>

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs	2004-02-05 06:40:03 UTC (rev 790)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs	2004-02-05 20:27:37 UTC (rev 791)
@@ -392,7 +392,7 @@
 			hbox.PackStart (pathEntry);
 			Gtk.Button homeButton = new Gtk.Button ();
 			Gdk.Pixbuf pix = FileIconLoader.GetPixbufForType ("gnome-home");
-			homeButton.Child = new Gtk.Image (pix.ScaleSimple (20, 20, Gdk.InterpType.Bilinear));
+			homeButton.Add (new Gtk.Image (pix.ScaleSimple (20, 20, Gdk.InterpType.Bilinear)));
 			homeButton.Relief = Gtk.ReliefStyle.None;
 			homeButton.Clicked += new EventHandler (OnHomeClicked);
 			hbox.PackStart (homeButton, false, false, 0);
@@ -407,6 +407,8 @@
 			
 			Pack1(treef, true, true);
 			Pack2(listf, true, true);
+
+			//OnDirChanged (fb, new EventArgs ());
 		}
 
 		void OnHomeClicked (object sender, EventArgs args)
@@ -417,7 +419,7 @@
 
 		void OnPathEntryActivated (object sender, EventArgs args)
 		{
-			if (Directory.Exists (pathEntry.Text))
+			if (Directory.Exists (pathEntry.Text.Trim ()))
 			{
 				fb.CurrentDir = pathEntry.Text;
 				OnDirChanged (sender, args);