diff options
| author | Eric Maupin <me@ermau.com> | 2018-02-16 20:25:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 20:25:03 +0300 |
| commit | 33a22d03473d585b180c63968dfe8fddac90fc93 (patch) | |
| tree | 5cb5c70c4b8a173b51cb6ac338603777ee14263e /Xamarin.PropertyEditing.Windows.Standalone | |
| parent | 9445eb588025d37a39bd3654fbdc8df62a9f5e34 (diff) | |
| parent | 8e324a288528e2235dd515b95d8b019ca1761122 (diff) | |
Merge pull request #202 from xamarin/bleroy-vs-icons-in-standalone
Enable the Windows standalone app to use VS icons
Diffstat (limited to 'Xamarin.PropertyEditing.Windows.Standalone')
| -rw-r--r-- | Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs | 5 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs index 1028f08..654b0c6 100644 --- a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs +++ b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs @@ -26,6 +26,11 @@ namespace Xamarin.PropertyEditing.Windows.Standalone this.panel.EditorProvider = new MockEditorProvider (); this.panel.ResourceProvider = new MockResourceProvider (); +#if USE_VS_ICONS + this.panel.Resources.MergedDictionaries.Add (new ResourceDictionary { + Source = new Uri ("pack://application:,,,/ProppyIcons.xaml", UriKind.RelativeOrAbsolute) + }); +#endif } private async void Button_Click (object sender, RoutedEventArgs e) diff --git a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj index 0f2ed58..0bdf749 100644 --- a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj +++ b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj @@ -33,6 +33,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml')"> + <DefineConstants>$(DefineConstants);USE_VS_ICONS</DefineConstants> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -68,6 +71,13 @@ <SubType>Code</SubType> </Compile> </ItemGroup> + <!-- Conditionally include resource file with icons when the file exists. To be replaced later with default open icons. --> + <ItemGroup Condition="Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml')"> + <Page Include="..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> + </ItemGroup> <ItemGroup> <Compile Include="MockedControlButton.cs" /> <Compile Include="MockedSampleControlButton.cs" /> |