Browse Source
After this fix you can use the XamlDesigner also to Develop the XamlDesigner!!! Before that we've had Bug's because of multiple loaded Assemblies with the same Name!pull/620/head
jogibear9988
12 years ago
37 changed files with 650 additions and 207 deletions
@ -1,5 +1,5 @@ |
|||||||
<ComboBox |
<ComboBox |
||||||
x:Class="ICSharpCode.WpfDesign.PropertyGrid.Editors.ComboBoxEditor" |
x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.ComboBoxEditor" |
||||||
xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation" |
xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation" |
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||||
BorderThickness="0" |
BorderThickness="0" |
||||||
@ -1,5 +1,5 @@ |
|||||||
<TextBox |
<TextBox |
||||||
x:Class="ICSharpCode.WpfDesign.PropertyGrid.Editors.TextBoxEditor" |
x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.TextBoxEditor" |
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||||
Text="{Binding ValueString}" |
Text="{Binding ValueString}" |
||||||
@ -0,0 +1,52 @@ |
|||||||
|
// 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.ComponentModel; |
||||||
|
using System.Windows; |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Designer.themes |
||||||
|
{ |
||||||
|
public class VersionedAssemblyResourceDictionary : ResourceDictionary, ISupportInitialize |
||||||
|
{ |
||||||
|
private static readonly string _uriStart; |
||||||
|
|
||||||
|
private static readonly int _subLength; |
||||||
|
|
||||||
|
static VersionedAssemblyResourceDictionary() |
||||||
|
{ |
||||||
|
var nm = typeof(VersionedAssemblyResourceDictionary).Assembly.GetName(); |
||||||
|
_uriStart = string.Format( @"{0};v{1};component/", nm.Name, nm.Version); |
||||||
|
|
||||||
|
_subLength = "ICSharpCode.WpfDesign.Designer.".Length; |
||||||
|
} |
||||||
|
|
||||||
|
public string RelativePath {get;set;} |
||||||
|
|
||||||
|
void ISupportInitialize.EndInit() |
||||||
|
{ |
||||||
|
this.Source = new Uri(_uriStart + this.RelativePath, UriKind.Relative); |
||||||
|
base.EndInit(); |
||||||
|
} |
||||||
|
|
||||||
|
public static string GetXamlNameForType(Type t) |
||||||
|
{ |
||||||
|
return _uriStart + t.FullName.Substring(_subLength).Replace(".","/").ToLower() + ".xaml"; |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -1,10 +1,13 @@ |
|||||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
<ResourceDictionary |
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||||
|
xmlns:v="clr-namespace:ICSharpCode.WpfDesign.Designer.themes" |
||||||
|
> |
||||||
<ResourceDictionary.MergedDictionaries> |
<ResourceDictionary.MergedDictionaries> |
||||||
<ResourceDictionary Source="/ICSharpCode.WpfDesign.Designer;component/Controls/ControlStyles.xaml" /> |
<v:VersionedAssemblyResourceDictionary RelativePath="Controls/ControlStyles.xaml" /> |
||||||
<ResourceDictionary Source="/ICSharpCode.WpfDesign.Designer;component/OutlineView/OutlineView.xaml" /> |
<v:VersionedAssemblyResourceDictionary RelativePath="OutlineView/OutlineView.xaml" /> |
||||||
<ResourceDictionary Source="/ICSharpCode.WpfDesign.Designer;component/DesignSurface.xaml" /> |
<v:VersionedAssemblyResourceDictionary RelativePath="DesignSurface.xaml" /> |
||||||
<ResourceDictionary Source="/ICSharpCode.WpfDesign.Designer;component/PropertyGrid/PropertyGridView.xaml" /> |
<v:VersionedAssemblyResourceDictionary RelativePath="PropertyGrid/PropertyGridView.xaml" /> |
||||||
<ResourceDictionary Source="/ICSharpCode.WpfDesign.Designer;component/ThumbnailView/ThumbnailView.xaml" /> |
<v:VersionedAssemblyResourceDictionary RelativePath="ThumbnailView/ThumbnailView.xaml" /> |
||||||
</ResourceDictionary.MergedDictionaries> |
</ResourceDictionary.MergedDictionaries> |
||||||
</ResourceDictionary> |
</ResourceDictionary> |
||||||
|
|||||||
Loading…
Reference in new issue