[Monodevelop-patches-list] r512 - in trunk/MonoDevelop: . src/AddIns/DisplayBindings/TextEditor/Codons src/AddIns/DisplayBindings/TextEditor/Gui/Editor src/Main/Base/Commands src/Main/Base/Gui/Components src/Main/Base/Gui/Workbench

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

Author: tberman
Date: 2004-01-17 00:28:17 -0500 (Sat, 17 Jan 2004)
New Revision: 512

Modified:
   trunk/MonoDevelop/MonoDevelopBrokenMenuItems.txt
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Codons/EditActionCodon.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs
   trunk/MonoDevelop/src/Main/Base/Commands/EditCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
Log:
lots of little fixes, plus the Schrodinger's Bugfix
cut/paste/etc should now work properly, intuitively and without horseshit


Modified: trunk/MonoDevelop/MonoDevelopBrokenMenuItems.txt
===================================================================
--- trunk/MonoDevelop/MonoDevelopBrokenMenuItems.txt	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/MonoDevelopBrokenMenuItems.txt	2004-01-17 05:28:17 UTC (rev 512)
@@ -2,12 +2,6 @@
 	Print				
 	PrintPreview
 Edit
-	Format
-		Remove Leading Ws	
-		Remove Traling Ws	
-		SortLines		
-		Leading Tab to Spaces   
-		Leading Spaces to Tabs	
 	Folding
 		Toggle folds		
 		Toggle all folds	

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Codons/EditActionCodon.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Codons/EditActionCodon.cs	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Codons/EditActionCodon.cs	2004-01-17 05:28:17 UTC (rev 512)
@@ -39,27 +39,30 @@
 		/// Condition status for this item.
 		/// </summary>
 		public override object BuildItem(object owner, ArrayList subItems, ConditionCollection conditions)
-		{/*
+		{
+			//FIXME: This code is *not* fully ported yet
 			if (subItems.Count > 0) {
 				throw new ApplicationException("more than one level of edit actions don't make sense!");
 			}
 			
 			IEditAction editAction = (IEditAction)AddIn.CreateObject(Class);
 							
-			Keys[] actionKeys = new Keys[keys.Length];
+			Gdk.Key[] actionKeys = new Gdk.Key[keys.Length];
 			for (int j = 0; j < keys.Length; ++j) {
 				string[] keydescr = keys[j].Split(new char[] { '|' });
-				Keys key = (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[0], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
+				//Keys key = (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[0], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
+				//Console.Write (keydescr[0] + " -- ");
 				for (int k = 1; k < keydescr.Length; ++k) {
-					key |= (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[k], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
+					//key |= (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[k], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
+					//Console.Write (keydescr[k] + " -- ");
 				}
-				actionKeys[j] = key;
+				//actionKeys[j] = key;
+				//Console.WriteLine ("");
 			}
 			editAction.Keys = actionKeys;
 			
 			return editAction;
-			*/
-			return null;
+		
 		}
 		
 	}

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs	2004-01-17 05:28:17 UTC (rev 512)
@@ -62,7 +62,7 @@
 		
 		void SelectionChanged(object sender, EventArgs e)
 		{
-			//((DefaultWorkbench)WorkbenchSingleton.Workbench).UpdateToolbars();
+			((DefaultWorkbench)WorkbenchSingleton.Workbench).UpdateMenu(null, null);
 		}
 		
 		void GenerateEditActions()

Modified: trunk/MonoDevelop/src/Main/Base/Commands/EditCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/EditCommands.cs	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/src/Main/Base/Commands/EditCommands.cs	2004-01-17 05:28:17 UTC (rev 512)
@@ -63,11 +63,11 @@
 		}
 		
 		public override void Run()
-		{
+		{
 			if (IsEnabled) {
 				IWorkbenchWindow window   = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
 				IEditable        editable = window != null ? window.ActiveViewContent as IEditable : null;
-				if (editable != null) {
+				if (editable != null) {
 					editable.ClipboardHandler.Cut(null, null);
 				}
 			}

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-17 05:28:17 UTC (rev 512)
@@ -65,13 +65,6 @@
 			ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof(IResourceService));
 			StringParserService parserService = (StringParserService)ServiceManager.Services.GetService (typeof(StringParserService));
 
-			//if (text.StartsWith ("${")) {
-			//	localizedText = resourceService.GetString (text);
-			//} else {
-			//	localizedText = text;
-			//}
-
-			//localizedText = localizedText.Replace ('&', '_');
 			localizedText = parserService.Parse (text);
 
 			Gtk.AccelLabel label = new Gtk.AccelLabel (localizedText);
@@ -154,6 +147,7 @@
 			}
 			if (menuCommand != null && menuCommand is IMenuCommand) {
 				Sensitive = ((IMenuCommand)menuCommand).IsEnabled;
+				ShowAll ();
 			}
 #if GTK
 			// FIXME: GTKize

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-01-17 04:22:01 UTC (rev 511)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-01-17 05:28:17 UTC (rev 512)
@@ -261,8 +261,8 @@
 			layout.ShowView(content);
 			
 			content.WorkbenchWindow.SelectWindow();
+			ShowAll ();
 			RedrawAllComponents ();
-			ShowAll ();
 		}
 		
 		public virtual void ShowPad(IPadContent content)