diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2016-11-28 09:53:44 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2016-11-28 09:53:44 +0300 |
| commit | 4842da75abc056a58e3148b998f02cdf451094a8 (patch) | |
| tree | e194d9122c42c216eec5b56f088e833f2b0f05bb /main/src/core/MonoDevelop.Ide/ExtensionModel | |
| parent | 7312993020a999089f7c5476c64a45ccdc336c4a (diff) | |
| parent | 70b3b105dd003a2741dc59e0f13ad84152a4da65 (diff) | |
Merge branch 'master' into textmate
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/ExtensionModel')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml | 14 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml index ce11430353..4a059c141a 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml @@ -80,16 +80,16 @@ <Section id="Run" _label="Run"> <Section id="General" _label="Configurations"> <Condition id="ItemType" value="Project"> -<!-- <Panel id = "RunOptionsPanel" _label = "Run" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.RunOptionsPanel"/>--> <Panel id = "RunConfigurationsPanel" _label = "Run Configurations" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.RunConfigurationsPanel"/> </Condition> + <Condition id="ItemType" value="Solution"> + <!--<Section id = "StartupOptionsPanel" _label = "Startup Project" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.StartupOptionsPanel"/>--> + <Panel id = "SolutionRunConfigurationsPanel" _label = "Run Configurations" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.SolutionRunConfigurationsPanel" icon="md-prefs-startup-project" /> + </Condition> + <Condition id="ItemType" value="SolutionItem"> + <!-- <Section id = "CustomCommands" _label = "Custom Commands" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.ExecutionCustomCommandPanel" />--> + </Condition> </Section> - <Condition id="ItemType" value="Solution"> - <Section id = "StartupOptionsPanel" _label = "Startup Project" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.StartupOptionsPanel" icon="md-prefs-startup-project" /> - </Condition> - <Condition id="ItemType" value="SolutionItem"> -<!-- <Section id = "CustomCommands" _label = "Custom Commands" fill = "true" class = "MonoDevelop.Ide.Projects.OptionPanels.ExecutionCustomCommandPanel" />--> - </Condition> </Section> <Section id="SourceCode" _label="Source Code"> <Section id="DotNetNamingPolicies" _label=".NET Naming Policies" icon="md-prefs-dotnet-naming-policies"> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml index cfc07b281f..9f9ea61fbb 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml @@ -67,6 +67,7 @@ <!-- MD icons --> <StockIcon stockid="md-about" resource="about-md-16.png" size="Menu" /> <StockIcon stockid="md-add" resource="add-16.png" size="Menu" /> + <StockIcon stockid="md-add-simple" resource="add-simple-16.png" size="Menu" /> <StockIcon stockid="md-add-namespace" resource="new-namespace-16.png" /> <StockIcon stockid="md-assembly-project" resource="project-assembly-16.png" size="Menu" /> <StockIcon stockid="md-bookmark-clear-all" resource="bookmark-clear-all-16.png" size="Menu" /> @@ -99,6 +100,7 @@ <StockIcon stockid="md-console" resource="pad-application-output-16.png" size="Menu" /> <StockIcon stockid="md-delegate" resource="element-delegate-16.png" size="Menu" /> <StockIcon stockid="md-delete" resource="remove-16.png" size="Menu" /> + <StockIcon stockid="md-delete-simple" resource="remove-simple-16.png" size="Menu" /> <StockIcon stockid="md-disclose-arrow-down" resource="disclose-arrow-down-16.png" size="Menu" /> <StockIcon stockid="md-disclose-arrow-up" resource="disclose-arrow-up-16.png" size="Menu" /> <StockIcon stockid="md-done" resource="done-16.png" size="Menu" /> @@ -265,6 +267,7 @@ <StockIcon stockid="md-pad-download" resource="pad-download-16.png" size="Menu" /> <StockIcon stockid="md-pad-upload" resource="pad-upload-16.png" size="Menu" /> <StockIcon stockid="md-pad-device-deployment" resource="pad-device-deployment-16.png" size="Menu" /> + <StockIcon stockid="md-pad-execute" resource="pad-execute-16.png" size="Menu" /> <StockIcon stockid="md-service" resource="service-16.png" size="Menu" /> <StockIcon stockid="md-service" resource="service-24.png" size="Button" /> <StockIcon stockid="md-service" resource="service-24.png" size="LargeToolbar" /> |