diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-10 13:31:15 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-10 13:31:15 +0300 |
| commit | 25590d26751fbc1d72575f35571f3f0a50da6113 (patch) | |
| tree | 52e025c0b5f1187554ca85a11311761cf1f0c20b /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage | |
| parent | 48561099b141773d71438dcdf09c65ace4138b8b (diff) | |
| parent | 07280066f97510892838c451bee6c066a7591131 (diff) | |
| download | Tango-25590d26751fbc1d72575f35571f3f0a50da6113.tar.gz Tango-25590d26751fbc1d72575f35571f3f0a50da6113.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage')
2 files changed, 16 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/App.xaml new file mode 100644 index 000000000..255016d18 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/App.xaml @@ -0,0 +1,12 @@ +<Application x:Class="Tango.MachineStudio.Storage.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" /> + <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" /> + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Application.Resources> +</Application> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj index 15958f019..cd110ca6d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj @@ -142,6 +142,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <Page Include="App.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Views\MainView.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> |