diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 07:27:29 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 07:27:29 +0400 |
| commit | 70d9c7bc2213553ae38e4903481fcacc0377566e (patch) | |
| tree | 21c620815521b07761430eeab6c8bb9c628c66fe /main/src/core | |
| parent | 788d51c8ec1d0098ff53c2fb0980ff69e991b283 (diff) | |
* MonoDevelop.Ide.addin.xml:
* MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs:
Naming policies panel should be shown for all items that contain
DotNetProject, not just DotNetProject.
svn path=/trunk/monodevelop/; revision=160219
Diffstat (limited to 'main/src/core')
3 files changed, 28 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index 6e058e7f0a..17118a6900 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,5 +1,12 @@ 2010-07-11 Michael Hutchinson <mhutchinson@novell.com> + * MonoDevelop.Ide.addin.xml: + * MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs: + Naming policies panel should be shown for all items that + contain DotNetProject, not just DotNetProject. + +2010-07-11 Michael Hutchinson <mhutchinson@novell.com> + * gtk-gui/gui.stetic: Flsuh. * Makefile.am: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs index c41957a92f..5251683340 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs @@ -32,6 +32,7 @@ using MonoDevelop.Core; using MonoDevelop.Projects; using MonoDevelop.Projects.Policies; using MonoDevelop.Ide.Gui.Dialogs; +using System.Linq; namespace MonoDevelop.Ide.Projects.OptionPanels { @@ -40,6 +41,19 @@ namespace MonoDevelop.Ide.Projects.OptionPanels NamespaceSynchronisationPanelWidget widget; bool migrateIds; + public override bool IsVisible () + { + //FIXME: this GetAllItems lookup is kinda expensive, maybe it should be cached in ParentDialog + var item = ParentDialog.DataObject; + if (item is DotNetProject) + return true; + var slnFolder = item as SolutionFolder ?? ((item is Solution)? ((Solution)item).RootFolder : null); + if (slnFolder != null) + return slnFolder.GetAllItems<DotNetProject> ().Any (); + + return false; + } + public override Widget CreatePanelWidget () { widget = new NamespaceSynchronisationPanelWidget (this); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml index 3a1fbed291..62f8cdb025 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml @@ -614,11 +614,14 @@ </Condition> </Section> <Section id="SourceCode" _label="Source Code"> - <Condition id="ItemType" value="DotNetProject"> - <Section id="DotNetNamingPolicies" _label=".NET Naming Policies"> + <Section id="DotNetNamingPolicies" _label=".NET Naming Policies"> + <Condition id="ItemType" value="Solution"> <Panel id = "NamespaceSynchronisationPanel" class = "MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanel" /> - </Section> - </Condition> + </Condition> + <Condition id="ItemType" value="SolutionItem"> + <Panel id = "NamespaceSynchronisationPanel" class = "MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanel" /> + </Condition> + </Section> <Condition id="ItemType" value="Solution"> <Section id="CodeFormattingPolicies" _label="Code Formatting" icon="md-formatting" fill = "true" class="MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanel" /> </Condition> |