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

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

Author: jluke
Date: 2004-01-17 14:25:23 -0500 (Sat, 17 Jan 2004)
New Revision: 519

Modified:
   trunk/MonoDevelop/README
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
Log:
do not emit response for Next and Back
(I thought I already did this)


Modified: trunk/MonoDevelop/README
===================================================================
--- trunk/MonoDevelop/README	2004-01-17 18:27:49 UTC (rev 518)
+++ trunk/MonoDevelop/README	2004-01-17 19:25:23 UTC (rev 519)
@@ -1,4 +1,10 @@
 This is a port of SharpDevelop to Gtk# and Mono.
 To compile simply run make, or 'make run' to compile and run it.
 You need Mono and Gtk# cvs.
+
+You will also need GtkMozEmbed# installed.  If you do not have a recent version. Do this once:
+cd ./gtkmozembed-sharp && ./autogen.sh --prefix=/usr/local && make && make install
+
+(replace /usr/local with the same prefix as the rest of Gtk#)
+
 Mono must be installed with ICU enabled.

Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-01-17 18:27:49 UTC (rev 518)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-01-17 19:25:23 UTC (rev 519)
@@ -78,16 +78,13 @@
 			
 			WizardDialog wizard = new WizardDialog("Initialize Code Completion Database", customizer, "/SharpDevelop/CompletionDatabaseWizard");
 			propertyService.SetProperty("SharpDevelop.CodeCompletion.DataDirectory", customizer.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", String.Empty));
-			int response = wizard.Run ();
-			if (response == (int) Gtk.ResponseType.Cancel || response == (int) Gtk.ResponseType.Close)
-				wizard.Hide ();
+			wizard.Run ();
+			wizard.Hide ();
 
-			Gtk.Application.Run ();
 			// restart  & exit 
 			Console.WriteLine ("generated, exiting");
 			ServiceManager.Services.UnloadAllServices();
-			Console.WriteLine ("Services stoped");
-			//System.Diagnostics.Process.Start(Path.Combine(Application.StartupPath, "SharpDevelop.exe"));
+			//System.Diagnostics.Process.Start(Path.Combine (Application.StartupPath, "SharpDevelop.exe"));
 			System.Environment.Exit(0);
 			
 		}

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-01-17 18:27:49 UTC (rev 518)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-01-17 19:25:23 UTC (rev 519)
@@ -16,7 +16,7 @@
 
 using ICSharpCode.Core.Properties;
 using ICSharpCode.Core.AddIns.Codons;
-using Gtk;
+using Gtk;
 namespace ICSharpCode.SharpDevelop.Gui.Dialogs
 {
 	/// <summary>
@@ -26,7 +26,7 @@
 	public class WizardDialog : Dialog
 	{
 		StatusPanel       statusPanel  = null;
-		//CurrentPanelPanel curPanel     = null;
+		CurrentPanelPanel curPanel     = null;
 		
 		Gtk.Frame             dialogPanel  = new Gtk.Frame();
 
@@ -188,10 +188,7 @@
 				statusPanel.GdkWindow.InvalidateRect (new Rectangle (0, 0, 400, 400), true);
 				dialogPanel.Remove (dialogPanel.Child);
 			}
-			//curPanel.Refresh();
-			
 			//Control panelControl = CurrentWizardPane.Control;
-			//panelControl.Dock    = DockStyle.Fill;
 			dialogPanel.Add(CurrentWizardPane.Control);
 
 			this.ShowAll ();
@@ -224,10 +221,6 @@
 			panel.IsLastPanel = false;
 			ShowNextPanelEvent(sender, e);
 			panel.IsLastPanel = isLast;
-			this.Hide ();
-			//ShowMustRestart ();
-			//Application.Quit ();
-			
 		}
 		
 		void ShowNextPanelEvent(object sender, EventArgs e)
@@ -308,9 +301,10 @@
 			cancelButton = new Button (Stock.Cancel);
 			cancelButton.Clicked += new EventHandler(CancelEvent);
 			
-			this.AddActionWidget (backButton, 1);
-			this.AddActionWidget (nextButton, 2);
-			this.AddActionWidget (finishButton, 3);
+			// don't emit response for back and next
+			this.ActionArea.PackStart (backButton);
+			this.ActionArea.PackStart (nextButton);
+			this.AddActionWidget (finishButton, (int) ResponseType.Close);
 			this.AddActionWidget (cancelButton, (int) ResponseType.Cancel);
 			
 //			helpButton.Text = resourceService.GetString("Global.HelpButtonText");
@@ -324,12 +318,5 @@
 
 			this.VBox.PackStart (topbox);
 		}
-		
-		private void ShowMustRestart ()
-		{
-			MessageDialog md = new MessageDialog (this, DialogFlags.Modal | DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, "You must restart MonoDevelop now.");
-			md.Run ();
-			md.Hide ();
-		}
 	}
 }