forked from icsharpcode/SharpDevelop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request icsharpcode#593 from jogibear9988/master
Support for {x:Refrence}, Template & Namescope fixes- Loading branch information
Showing
38 changed files
with
943 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/EditStyleContextMenu.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <ContextMenu x:Class="ICSharpCode.WpfDesign.Designer.Extensions.EditStyleContextMenu" | ||
| xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:Translation="clr-namespace:ICSharpCode.WpfDesign.Designer" | ||
| > | ||
| <MenuItem Header="{Binding EditStyle, Source={x:Static Translation:Translations.Instance}}" Click="Click_EditStyle"> | ||
| <MenuItem.Icon> | ||
| <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/edit.png" /> | ||
| </MenuItem.Icon> | ||
| </MenuItem> | ||
| </ContextMenu> |
68 changes: 68 additions & 0 deletions
68
...playBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/EditStyleContextMenu.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy of this | ||
| // software and associated documentation files (the "Software"), to deal in the Software | ||
| // without restriction, including without limitation the rights to use, copy, modify, merge, | ||
| // publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons | ||
| // to whom the Software is furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all copies or | ||
| // substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
| // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
| // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE | ||
| // FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| // DEALINGS IN THE SOFTWARE. | ||
|
|
||
| using System; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Markup; | ||
| using System.Xml; | ||
| using ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.FormatedTextEditor; | ||
| using ICSharpCode.WpfDesign.Designer.Xaml; | ||
| using ICSharpCode.WpfDesign.XamlDom; | ||
|
|
||
| namespace ICSharpCode.WpfDesign.Designer.Extensions | ||
| { | ||
| public partial class EditStyleContextMenu | ||
| { | ||
| private DesignItem designItem; | ||
|
|
||
| public EditStyleContextMenu(DesignItem designItem) | ||
| { | ||
| this.designItem = designItem; | ||
|
|
||
| InitializeComponent(); | ||
| } | ||
|
|
||
| void Click_EditStyle(object sender, RoutedEventArgs e) | ||
| { | ||
| var element = designItem.View; | ||
| object defaultStyleKey = element.GetValue(FrameworkElement.DefaultStyleKeyProperty); | ||
| Style style = Application.Current.TryFindResource(defaultStyleKey) as Style; | ||
|
|
||
| var service = ((XamlComponentService) designItem.Services.Component); | ||
|
|
||
| var ms = new MemoryStream(); | ||
| XmlTextWriter writer = new XmlTextWriter(ms, System.Text.Encoding.UTF8); | ||
| writer.Formatting = Formatting.Indented; | ||
| XamlWriter.Save(style, writer); | ||
|
|
||
| var rootItem = this.designItem.Context.RootItem as XamlDesignItem; | ||
|
|
||
| ms.Position = 0; | ||
| var sr = new StreamReader(ms); | ||
| var xaml = sr.ReadToEnd(); | ||
|
|
||
| var xamlObject = XamlParser.ParseSnippet(rootItem.XamlObject, xaml, ((XamlDesignContext)this.designItem.Context).ParserSettings); | ||
|
|
||
| var styleDesignItem=service.RegisterXamlComponentRecursive(xamlObject); | ||
| designItem.Properties.GetProperty("Resources").CollectionElements.Add(styleDesignItem); | ||
| } | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...Bindings/WpfDesign/WpfDesign.Designer/Project/Extensions/EditStyleContextMenuExtension.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy of this | ||
| // software and associated documentation files (the "Software"), to deal in the Software | ||
| // without restriction, including without limitation the rights to use, copy, modify, merge, | ||
| // publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons | ||
| // to whom the Software is furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all copies or | ||
| // substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
| // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
| // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE | ||
| // FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| // DEALINGS IN THE SOFTWARE. | ||
|
|
||
| using System; | ||
| using System.Linq; | ||
| using System.Windows.Controls; | ||
| using ICSharpCode.WpfDesign.Adorners; | ||
| using ICSharpCode.WpfDesign.Extensions; | ||
|
|
||
| namespace ICSharpCode.WpfDesign.Designer.Extensions | ||
| { | ||
| [ExtensionServer(typeof (OnlyOneItemSelectedExtensionServer))] | ||
| [ExtensionFor(typeof (Control))] | ||
| [Extension(Order = 10)] | ||
| public class EditStyleContextMenuExtension : PrimarySelectionAdornerProvider | ||
| { | ||
| DesignPanel panel; | ||
| ContextMenu contextMenu; | ||
|
|
||
| protected override void OnInitialized() | ||
| { | ||
| base.OnInitialized(); | ||
|
|
||
| contextMenu = new EditStyleContextMenu(ExtendedItem); | ||
| panel = ExtendedItem.Context.Services.DesignPanel as DesignPanel; | ||
| if (panel != null) | ||
| panel.AddContextMenu(contextMenu); | ||
| } | ||
|
|
||
| protected override void OnRemove() | ||
| { | ||
| if (panel != null) | ||
| panel.RemoveContextMenu(contextMenu); | ||
|
|
||
| base.OnRemove(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.