Updates/v3.8 #41
Merged
Updates/v3.8 #41
Conversation
This file contains hidden or 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
Closed
| @@ -932,7 +932,7 @@ private void SetImageSource( MessageBoxImage image ) | |||
| } | |||
|
|
|||
| // Use this syntax for other themes to get the icons | |||
| this.ImageSource = new BitmapImage( new Uri( String.Format( "/DotNetProjects.Wpf.Extended.Toolkit;component/MessageBox/Icons/{0}", iconName ), UriKind.RelativeOrAbsolute ) ); | |||
| this.ImageSource = new BitmapImage( new Uri( String.Format( "/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ), UriKind.RelativeOrAbsolute ) ); | |||
There was a problem hiding this comment.
Will this work? As the Project is not named Xceed
| @@ -19,8 +19,8 @@ | |||
| xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"> | |||
|
|
|||
| <ResourceDictionary.MergedDictionaries> | |||
| <core:VersionResourceDictionary AssemblyName="DotNetProjects.Wpf.Extended.Toolkit" SourcePath="Themes/Aero/Brushes_NormalColor.xaml"/> | |||
| <core:VersionResourceDictionary AssemblyName="DotNetProjects.Wpf.Extended.Toolkit" | |||
| <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Aero/Brushes_NormalColor.xaml"/> | |||
| <ResourceDictionary Source="/DotNetProjects.Wpf.Extended.Toolkit;component/Wizard/Themes/Aero2.NormalColor.xaml" /> | ||
| <ResourceDictionary Source="/DotNetProjects.Wpf.Extended.Toolkit;component/Zoombox/Themes/Aero2.NormalColor.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Brushes.xaml" /> |
|
|
||
| <core:VersionResourceDictionary AssemblyName="DotNetProjects.Wpf.Extended.Toolkit" SourcePath="TokenizedTextBox/Themes/Generic.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Brushes.xaml" /> |
There was a problem hiding this comment.
I overlooked these. And also create a simple app to test, and you are right. So I made the changes, and now it works correctly :)
|
lgtm |
|
thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in the #30
Update of library to version 3.8