[Monodevelop-patches-list] r1424 - in trunk/MonoDevelop/src/Main/Base: . Commands Gui/HtmlControl Gui/Pads

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Fri Apr 9 14:35:03 EDT 2004


Author: jluke
Date: 2004-04-09 14:35:02 -0400 (Fri, 09 Apr 2004)
New Revision: 1424

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Pads/TerminalPad.cs
Log:
2004-04-09  John Luke  <jluke at cfl.rr.com>
 
        * Commands/AutostartCommands: remove dead code
        * Gui/Pads/TerminalPad.cs: update and rename from 'Output' to 'Terminal'
        * Gui/HtmlControl/MozillaControl.cs: remove CWL



Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-09 17:57:38 UTC (rev 1423)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-09 18:35:02 UTC (rev 1424)
@@ -1,3 +1,9 @@
+2004-04-09  John Luke  <jluke at cfl.rr.com>
+
+	* Commands/AutostartCommands: remove dead code
+	* Gui/Pads/TerminalPad.cs: update and rename from 'Output' to 'Terminal'
+	* Gui/HtmlControl/MozillaControl.cs: remove CWL
+
 2004-04-09  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/Dialogs/SharpDevelopAboutPanels.cs: closing per bug #55955.

Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-04-09 17:57:38 UTC (rev 1423)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-04-09 18:35:02 UTC (rev 1424)
@@ -210,10 +210,7 @@
 			ShowTipOfTheDay (null, null);
 		
 			// finally run the workbench window ...
-			Gtk.Application.Run();
-			
-			// save the workbench memento in the ide properties
-			//propertyService.SetProperty(workbenchMemento, WorkbenchSingleton.Workbench.CreateMemento());
+			Gtk.Application.Run ();
 		}
 	}
 }

Modified: trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs	2004-04-09 17:57:38 UTC (rev 1423)
+++ trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/MozillaControl.cs	2004-04-09 18:35:02 UTC (rev 1424)
@@ -1,5 +1,5 @@
 //
-// MozillaControl - An Html widget that uses GtkMozEmbed#
+// MozillaControl - An Html widget that uses Gecko#
 //
 // Author: John Luke  <jluke at cfl.rr.com>
 //
@@ -94,7 +94,7 @@
 
 		public void InitializeWithBase (string base_uri)
 		{
-			Console.WriteLine (base_uri);
+			//Console.WriteLine (base_uri);
 			if (html.Length > 0)
 			{
 				this.RenderData (html, base_uri, "text/html");

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/TerminalPad.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/TerminalPad.cs	2004-04-09 17:57:38 UTC (rev 1423)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/TerminalPad.cs	2004-04-09 18:35:02 UTC (rev 1424)
@@ -13,7 +13,6 @@
 	public class TerminalPad : IPadContent
 	{
 		Frame frame = new Frame ();
-		VScrollbar vscroll;
 		Terminal term;
 
 		ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof(IResourceService));
@@ -30,7 +29,7 @@
 		public string Title {
 			get {
 				//FIXME: check the string
-				return GettextCatalog.GetString ("Output");
+				return GettextCatalog.GetString ("Terminal");
 			}
 		}
 		
@@ -57,7 +56,7 @@
 			term.ScrollOnKeystroke = true;
 			term.CursorBlinks = true;
 			term.MouseAutohide = true;
-			term.FontFromString = "monospace 12";
+			term.FontFromString = "monospace 10";
 			term.Encoding = "UTF-8";
 			term.BackspaceBinding = TerminalEraseBinding.Auto;
 			term.DeleteBinding = TerminalEraseBinding.Auto;
@@ -69,23 +68,25 @@
 			colormap.AllocColor (ref fgcolor, true, true);
 			colormap.AllocColor (ref bgcolor, true, true);
 			term.SetColors (fgcolor, bgcolor, fgcolor, 16);
-			term.SetSize (50, 5);
 
-			term.Commit += new Vte.CommitHandler (OnTermCommit);
-			term.RestoreWindow += new EventHandler (OnRestoreWindow);
+			//FIXME: whats a good default here
+			//term.SetSize (80, 5);
+
+			// FIXME: pass the environment along
+			term.ForkCommand (Environment.GetEnvironmentVariable ("SHELL"), Environment.GetCommandLineArgs (), new string[] {""}, Environment.GetEnvironmentVariable ("HOME"), false, true, true);
+
 			term.ChildExited += new EventHandler (OnChildExited);
-			term.LowerWindow += new EventHandler (OnTermLower);
-			term.RaiseWindow += new EventHandler (OnTermRaise);
-//			term.TextModified += new EventHandler (OnTermTextModified);
 
-			vscroll = new VScrollbar (term.Adjustment);
+			VScrollbar vscroll = new VScrollbar (term.Adjustment);
 
 			HBox hbox = new HBox ();
 			hbox.PackStart (term, true, true, 0);
 			hbox.PackStart (vscroll, false, true, 0);
 
 			frame.ShadowType = Gtk.ShadowType.In;
-			frame.Add (hbox);
+			ScrolledWindow sw = new ScrolledWindow ();
+			sw.Add (hbox);
+			frame.Add (sw);
 			
 			taskService.CompilerOutputChanged += new EventHandler (SetOutput);
 			projectService.StartBuild += new EventHandler (SelectMessageView);
@@ -93,53 +94,20 @@
 			projectService.CombineOpened += new CombineEventHandler (OnCombineOpen);
 		}
 
-/*
-		void OnTermTextModified (object o, EventArgs args)
-		{
-		}
-*/
 		void OnChildExited (object o, EventArgs args)
 		{
 			// full reset
 			term.Reset (true, true);
 		}
 
-		void OnTermLower (object o, EventArgs args)
-		{
-			Console.WriteLine ("term lower");
-		}
-
-		void OnTermRaise (object o, EventArgs args)
-		{
-			Console.WriteLine ("term raise");
-		}
-
-		void OnRestoreWindow (object o, EventArgs args)
-		{
-			Console.WriteLine ("restore window");
-		}
-
-		void OnTermCommit (object o, Vte.CommitArgs args)
-		{
-			Terminal t = (Terminal) o;
-        	if (args.P0 == "\r")
-        	{
-            	//FIXME: maybe a setting somewhere
-            	t.Feed ("\r\n");
-        	    return;
-    	    }
-                                                                         
-	        t.Feed (args.P0);
-		}
-		
 		void OnCombineOpen (object sender, CombineEventArgs e)
 		{
-			term.Reset (true, true);
+			term.Reset (false, false);
 		}
 		
 		void OnCombineClosed (object sender, CombineEventArgs e)
 		{
-			term.Reset (true, false);
+			term.Reset (false, true);
 		}
 		
 		void SelectMessageView (object sender, EventArgs e)
@@ -154,7 +122,12 @@
 				}
 			}
 		}
-		
+
+		public void RunCommand (string command)
+		{
+			term.FeedChild (command + "\n");
+		}
+
 		void SetOutput2 ()
 		{
 			term.Feed (taskService.CompilerOutput.Replace ("\n", "\r\n"));




More information about the Monodevelop-patches-list mailing list