From 179e6b1c303939ac7a3dbc53e92cd5f0b8b02d63 Mon Sep 17 00:00:00 2001 From: Michael Hutchinson Date: Wed, 16 Jun 2010 00:06:02 +0000 Subject: Backported r 158988, 158977, 158972, 158970, 158969, 158968, 158967, 158966, 158959 svn path=/branches/monodevelop/2.4/; revision=158990 --- .../MonoDevelop.IPhone/ChangeLog | 5 ++++ .../MonoDevelop.IPhone/Gui/IPhoneOptionsPanel.cs | 1 + main/build/MacOSX/Makefile.am | 1 + main/src/addins/CSharpBinding/ChangeLog | 5 ++++ .../CSharpFormattingPolicy.cs | 4 +-- main/src/core/MonoDevelop.Ide/ChangeLog | 34 ++++++++++++++++++++++ .../CompletionListWindow.cs | 10 +++---- .../MonoDevelop.Ide.Desktop/PlatformService.cs | 4 +++ .../CodeFormattingPanel.cs | 14 ++++++--- .../core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml | 9 ++---- .../MonoDevelop.Ide/RootWorkspace.cs | 3 +- 11 files changed, 72 insertions(+), 18 deletions(-) diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog index ca09cda45c..83ae5510c1 100644 --- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog +++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog @@ -1,3 +1,8 @@ +2010-06-15 Michael Hutchinson + + * Gui/IPhoneOptionsPanel.cs: Fix Bug 614551 - Cannot clear + icon selection once made in Project Settings. + 2010-06-10 Michael Hutchinson * IPhoneBuildExtension.cs: Better build output. diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneOptionsPanel.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneOptionsPanel.cs index fe92e9873d..850e3bd7a1 100644 --- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneOptionsPanel.cs +++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneOptionsPanel.cs @@ -183,6 +183,7 @@ namespace MonoDevelop.IPhone.Gui foreach (var p in pickers) { p.Project = proj; p.DefaultFilter = "*.png"; + p.EntryIsEditable = true; p.DialogTitle = GettextCatalog.GetString ("Select icon..."); } diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index dee951b140..9b70db16e2 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -55,6 +55,7 @@ MonoDevelop.app: rm -rf $(MACOS)/lib/monodevelop/bin/UnitTests.dll* \ $(MACOS)/lib/monodevelop/bin/TestResult.xml \ $(MACOS)/lib/monodevelop/bin/addin-db* \ + $(MACOS)/lib/monodevelop/bin/local \ $(MACOS)/lib/monodevelop/bin/repository-cache* \ $(MACOS)/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.Tests* diff --git a/main/src/addins/CSharpBinding/ChangeLog b/main/src/addins/CSharpBinding/ChangeLog index 167c830548..87a7922aa0 100644 --- a/main/src/addins/CSharpBinding/ChangeLog +++ b/main/src/addins/CSharpBinding/ChangeLog @@ -1,3 +1,8 @@ +2010-06-15 Michael Hutchinson + + * MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs: + Remove debug writelines. + 2010-06-14 Lluis Sanchez Gual * MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Track diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs index a5da64a896..92e3f0a65e 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs @@ -691,11 +691,11 @@ namespace MonoDevelop.CSharp.Formatting object val = info.GetValue (this, null); object otherVal = info.GetValue (other, null); if (!val.Equals (otherVal)) { - Console.WriteLine ("!equal"); + //Console.WriteLine ("!equal"); return false; } } - Console.WriteLine ("== equal"); + //Console.WriteLine ("== equal"); return true; } } diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index d963ae2a1a..eda9afee52 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,37 @@ +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide/RootWorkspace.cs: Disabled + OnRunProjectChecks timeout because it churns disk, wastes + power on laptop. + +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide.addin.xml: Set icon for the default code + formatting policies panel group to match the per-item one. + + * MonoDevelop.Ide.Desktop/PlatformService.cs: Handle icon for + text/plain mimetype. + +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide.Desktop/PlatformService.cs: Add a + description for the text/plain mimetype. + +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide.addin.xml: Remove nonexistent icon. + +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs: + Only show mimetypes with policies. + +2010-06-15 Michael Hutchinson + + * MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs: + Remove debug writelines. Disable + process-enter-on-exact-match behaviour change or now. + 2010-06-15 Lluis Sanchez Gual * MonoDevelop.Components.DockToolbars/DockToolbar.cs: Reset diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs index b5f9a754ce..ffd57cd87d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs @@ -123,11 +123,11 @@ namespace MonoDevelop.Ide.CodeCompletion if ((ka & KeyActions.Complete) != 0) { bool completed = CompleteWord (); - Console.WriteLine ("completed:" + completed); - if (!completed) { - CompletionWindowManager.HideWindow (); - return false; - } + //NOTE: this passes the enter keystroke through to the editor if the current item is an exact match + //if (!completed) { + // CompletionWindowManager.HideWindow (); + // return false; + //} } if ((ka & KeyActions.CloseWindow) != 0) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs index 7003cd163b..dfe2037a5d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs @@ -79,6 +79,8 @@ namespace MonoDevelop.Ide.Desktop public string GetMimeTypeDescription (string mimeType) { + if (mimeType == "text/plain") + return GettextCatalog.GetString ("Text file"); MimeTypeNode mt = FindMimeType (mimeType); if (mt != null && mt.Description != null) return mt.Description; @@ -202,6 +204,8 @@ namespace MonoDevelop.Ide.Desktop string GetIconForType (string type) { + if (type == "text/plain") + return "md-text-file-icon"; MimeTypeNode mt = FindMimeType (type); if (mt != null) return mt.Icon; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs index adf013eef4..30179fde58 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs @@ -34,6 +34,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core; using MonoDevelop.Projects.Policies; using MonoDevelop.Components; +using System.Linq; namespace MonoDevelop.Ide.Projects.OptionPanels { @@ -42,11 +43,15 @@ namespace MonoDevelop.Ide.Projects.OptionPanels PolicyContainer policyContainer; Dictionary typeSections = new Dictionary (); List globalMimeTypes; + HashSet mimeTypesWithPolicies = new HashSet (); public override void Initialize (MonoDevelop.Ide.Gui.Dialogs.OptionsDialog dialog, object dataObject) { base.Initialize (dialog, dataObject); + foreach (MimeTypeOptionsPanelNode node in AddinManager.GetExtensionNodes ("/MonoDevelop/ProjectModel/Gui/MimeTypePolicyPanels")) + mimeTypesWithPolicies.Add (node.MimeType); + if (dataObject is SolutionItem) { policyContainer = ((SolutionItem)dataObject).Policies; } else if (dataObject is Solution) { @@ -64,6 +69,9 @@ namespace MonoDevelop.Ide.Projects.OptionPanels MimeTypePanelData AddPanel (string mt) { + var chain = new List (DesktopService.GetMimeTypeInheritanceChain (mt).Where (x => mimeTypesWithPolicies.Contains (x))); + if (chain.Count == 0) + return null; MimeTypePanelData data = new MimeTypePanelData (); OptionsDialogSection sec = new OptionsDialogSection (typeof(MimeTypePolicyOptionsSection)); sec.Fill = true; @@ -77,7 +85,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels data.DataObject = DataObject; data.PolicyContainer = policyContainer; sec.Label = data.TypeDescription; - LoadPolicyTypeData (data, mt); + LoadPolicyTypeData (data, mt, chain); typeSections [mt] = data; ParentDialog.AddChildSection (this, sec, data); return data; @@ -114,10 +122,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels get { return policyContainer; } } - void LoadPolicyTypeData (MimeTypePanelData data, string mimeType) + void LoadPolicyTypeData (MimeTypePanelData data, string mimeType, List types) { - List types = new List (); - types.AddRange (DesktopService.GetMimeTypeInheritanceChain (mimeType)); List panels = new List (); bool useParentPolicy = false; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml index ccd424b091..a3aa87ef29 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml @@ -468,7 +468,6 @@ - @@ -640,7 +639,7 @@
-
+
@@ -803,8 +802,7 @@ icon = "md-new-project" /> + _description = "Add a new child workspace to the selected workspace" />