aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2019-10-07 11:05:59 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2019-10-07 11:05:59 +0300
commit0c664ab02889ac34b568ccd9a1d4aff5985f9d7a (patch)
tree4b890adb9d7b165b7401d70aaa8bedbee48d0856 /Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers
parent032b53897657f88e674d83ae06b76d0ac4d09abc (diff)
downloadTango-0c664ab02889ac34b568ccd9a1d4aff5985f9d7a.tar.gz
Tango-0c664ab02889ac34b568ccd9a1d4aff5985f9d7a.zip
Refactoring - added app.xaml files to view in designer VS
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.xaml12
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj4
2 files changed, 16 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.xaml
new file mode 100644
index 000000000..224e686a3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.xaml
@@ -0,0 +1,12 @@
+<Application x:Class="Tango.MachineStudio.Dispensers.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/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj
index 414de1e17..a2b863f9f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj
@@ -148,6 +148,10 @@
<Resource Include="Images\dispensers-title.png" />
</ItemGroup>
<ItemGroup>
+ <Page Include="App.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Views\DispensersView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>