Skip to content

Commit

Permalink
Reference MyIcons
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolás Campuzano committed Feb 17, 2015
1 parent fb081a0 commit 5cc22af
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions Tulpep.Integritul/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
<ResourceDictionary Source="/Resources/Icons.xaml" />
<ResourceDictionary Source="/Resources/MyIcons.xaml" />

</ResourceDictionary.MergedDictionaries>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
Expand Down
4 changes: 4 additions & 0 deletions Tulpep.Integritul/Tulpep.Integritul.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Resources\MyIcons.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ResultOfComparisonView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
4 changes: 2 additions & 2 deletions Tulpep.Integritul/Views/HomeView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<controls:Tile Title="Save folder status"
TiltFactor="1"
Width="150" Height="150"
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource appbar_page_search}">
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource my_appbar_page_search}">
<controls:Tile.Style>
<Style>

Expand Down Expand Up @@ -47,7 +47,7 @@
<controls:Tile Title="Validate Integrity"
TiltFactor="1"
Width="150" Height="150"
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource appbar_checkmark_thick}" >
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource my_appbar_checkmark_thick}" >
<controls:Tile.Style>
<Style>
<Style.Triggers>
Expand Down

0 comments on commit 5cc22af

Please sign in to comment.