[Monodevelop-patches-list] r1172 - in trunk/MonoDevelop: . src/Main/Base/Commands src/Main/Base/Gui/CompletionDatabaseWizard

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

Author: tberman
Date: 2004-03-15 12:20:43 -0500 (Mon, 15 Mar 2004)
New Revision: 1172

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
Log:
fix bug #55439
gui was being bad, and popping up when it shouldnt, now we behave properly.


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-15 16:58:13 UTC (rev 1171)
+++ trunk/MonoDevelop/ChangeLog	2004-03-15 17:20:43 UTC (rev 1172)
@@ -1,7 +1,12 @@
 2004-03-15  Todd Berman <tberman at sevenl.net>
 
 	* monodevelop.desktop: added some bugzilla info
-	* src/Main/Base/Gui/CompletionDatabaseWizard: added some titles
+	* src/Main/Base/Gui/CompletionDatabaseWizard/druis.cs: 
+		added some titles
+		fix cancel action.
+	* src/Main/Base/Commands/AutostartCommands.cs:
+		fix bug #55439, we now dont show the main gui when generating
+		the completion database.
 
 2004-03-12  Gustavo Giráldez  <gustavo.giraldez at gmx.net>
 
@@ -97,7 +102,8 @@
 2004-03-06  Martin Baulig  <martin at ximian.com>
 
 	* configure.in: AC_SUBST(debugger_prefix).
-	* src/Main/Base/Services/Makefile.am: Use full path name for Mono.Debugger.dll.
+	* src/Main/Base/Services/Makefile.am: Use full path name for 
+	Mono.Debugger.dll.
 
 	* src/Main/Base/Gui/Workbench/DefaultWorkbench.cs: connect to the
 	debugger's StoppedEvent.
@@ -111,16 +117,18 @@
 
 2004-03-05  John BouAntoun  <jba-mono at optusnet.com.au>
 	
-	* src/Main/Base/Gui/Components/OpenFileTab.cs : deleted (duplicates TabLabel)
-	* src/Main/Base/Commands/FileTabStripCommands.cs : deleted because OpenFileTab deleted
+	* src/Main/Base/Gui/Components/OpenFileTab.cs : deleted (duplicates 
+	TabLabel)
+	* src/Main/Base/Commands/FileTabStripCommands.cs : deleted because 
+	OpenFileTab deleted
 	* src/Main/Base/Makefile.am : removed file refs from compilation
 	* build/AddIns/SharpDevelopCore.addin: removed file refs from addins
 
 2004-03-05  John BouAntoun  <jba-mono at optusnet.com.au>
 	
-	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs : 
-	changed Gtk.Combo's to Gnome.Entry's to fix bug where MD would lock up with 
-	hidden "Not Found" Dialog popping up under the find dialog
+	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs :
+	changed Gtk.Combo's to Gnome.Entry's to fix bug where MD would lock up 
+	with hidden "Not Found" Dialog popping up under the find dialog
 	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs: 
 	as above
 	* data/resources/glade/texteditoraddin.glade : as above
@@ -138,10 +146,11 @@
 
 2004-03-05  John BouAntoun  <jba-mono at optusnet.com.au>
 
-	* src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs : added configuration 
-	renaming
-	* src/Main/Base/Gui/Dialogs/TreeViewOptions.cs : made InitializeComponent 
-	virtual so ProjectOptionDialog could override (see above)
+	* src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs : added 
+	configuration renaming
+	* src/Main/Base/Gui/Dialogs/TreeViewOptions.cs : made 
+	InitializeComponent virtual so ProjectOptionDialog could override (see
+	above)
 
 2004-03-04  Mike Kestner  <mkestner at ximian.com>
 

Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-03-15 16:58:13 UTC (rev 1171)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-03-15 17:20:43 UTC (rev 1172)
@@ -44,12 +44,16 @@
 			w.SetMemento((IXmlConvertable)propertyService.GetProperty(workbenchMemento, new WorkbenchMemento()));
 			w.UpdateViews(null, null);
 			WorkbenchSingleton.CreateWorkspace();
+			((Gtk.Window)w).Visible = false;
 			
 		}
 	}
 	
 	public class StartCodeCompletionWizard : AbstractCommand
 	{
+
+		public static bool generatingCompletionData = false;
+
 		public override void Run()
 		{
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
@@ -58,6 +62,7 @@
 			//Console.WriteLine("checking for existence of {0}", codeCompletionProxyFile);
 
 			if (!File.Exists (codeCompletionProxyFile)) {
+				generatingCompletionData = true;
 				RunWizard();
 				DefaultParserService parserService = (DefaultParserService)ServiceManager.Services.GetService(typeof(IParserService));
 				parserService.LoadProxyDataFile();
@@ -140,6 +145,12 @@
 		
 		public override void Run()
 		{
+
+			if (StartCodeCompletionWizard.generatingCompletionData) {
+				Gtk.Application.Run ();
+				return;
+			}
+		
 			ReflectionClass reflectionClass = new ReflectionClass(typeof(object), null);
 			
 			// register string tag provider (TODO: move to add-in tree :)
@@ -189,6 +200,7 @@
 			}
 			
 			((Gtk.Window)WorkbenchSingleton.Workbench).ShowAll ();
+			((Gtk.Window)WorkbenchSingleton.Workbench).Visible = true;
 			WorkbenchSingleton.Workbench.RedrawAllComponents ();
 		
 			// Give Gtk time to display the workbench window before showing the TOTD.

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs	2004-03-15 16:58:13 UTC (rev 1171)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs	2004-03-15 17:20:43 UTC (rev 1172)
@@ -191,6 +191,7 @@
 		if (really) {
 			this.Destroy();
 			this.Canceled(this);
+			((Gtk.Window)WorkbenchSingleton.Workbench).Visible = true;
 		}
 	}
 }