Remove unneeded images

victor-david · Aug 23, 2020 · e9c5f31 · e9c5f31
1 parent 95d926c
commit e9c5f31
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 80 deletions.
diff --git a/src/Camera.App/Camera.App.csproj b/src/Camera.App/Camera.App.csproj
@@ -33,14 +33,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <Resource Include="Resources\Image\Add.48.png" />
- <Resource Include="Resources\Image\Arrow.64.png" />
- <Resource Include="Resources\Image\Camera.64.png" />
- <Resource Include="Resources\Image\Chevron.Down.64.png" />
- <Resource Include="Resources\Image\Chevron.Up.64.png" />
- <Resource Include="Resources\Image\Database.64.png" />
- <Resource Include="Resources\Image\Lens.36.png" />
- <Resource Include="Resources\Image\X.Red.32.png" />
+ <Resource Include="Resources\Image\Add.48.png"/>
+ <Resource Include="Resources\Image\Lens.36.png"/>
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Camera.App/Resources/Dictionary/Image.xaml b/src/Camera.App/Resources/Dictionary/Image.xaml
@@ -4,83 +4,15 @@
 
  <BitmapImage x:Key="ImageApp" UriSource="/Resources/Image/Lens.36.png"/>
  <BitmapImage x:Key="ImageAdd" UriSource="/Resources/Image/Add.48.png"/>
- <BitmapImage x:Key="ImageArrow" UriSource="/Resources/Image/Arrow.64.png"/>
- <BitmapImage x:Key="ImageCamera" UriSource="/Resources/Image/Camera.64.png"/>
- <BitmapImage x:Key="ImageChevronDown" UriSource="/Resources/Image/Chevron.Down.64.png"/>
- <BitmapImage x:Key="ImageChevronUp" UriSource="/Resources/Image/Chevron.Up.64.png"/>
- <BitmapImage x:Key="ImageDatabase" UriSource="/Resources/Image/Database.64.png"/>
- <BitmapImage x:Key="ImageDropArrow" UriSource="/Resources/Image/DropArrow.24.png"/>
- <BitmapImage x:Key="ImageRedX" UriSource="/Resources/Image/X.Red.32.png"/>
 
  <Style TargetType="Image" x:Key="MenuItemImage">
  <Setter Property="Height" Value="18" />
  <Setter Property="Width" Value="18" />
  </Style>
 
  <Image x:Key="ImageAddMenu" Source="{StaticResource ImageAdd}" Style="{StaticResource MenuItemImage}"/>
- <Image x:Key="ImageCameraMenu" Source="{StaticResource ImageCamera}" Style="{StaticResource MenuItemImage}"/>
- <Image x:Key="ImageChevronDownMenu" Source="{StaticResource ImageChevronDown}" Style="{StaticResource MenuItemImage}"/>
- <Image x:Key="ImageChevronUpMenu" Source="{StaticResource ImageChevronUp}" Style="{StaticResource MenuItemImage}"/>
- <Image x:Key="ImageDropArrowMenu" Source="{StaticResource ImageDropArrow}" Style="{StaticResource MenuItemImage}"/>
- <Image x:Key="ImageRedXMenu" Source="{StaticResource ImageRedX}" Style="{StaticResource MenuItemImage}"/>
-
- <!-- Image styles (Navigation) -->
- <Style TargetType="Image" x:Key="ImageNavUp">
- <Setter Property="Source" Value="{StaticResource ImageArrow}"/>
- <Setter Property="Width" Value="32"/>
- </Style>
-
- <Style TargetType="Image" x:Key="ImageNavLeft" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="-90" CenterX="16" CenterY="16"/>
- </Setter.Value>
- </Setter>
- </Style>
 
- <Style TargetType="Image" x:Key="ImageNavRight" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="90" CenterX="16" CenterY="16"/>
- </Setter.Value>
- </Setter>
- </Style>
+ <Path x:Key="PathRedX" Stroke="Red" StrokeThickness="2" Height="14" Width="14" Data="M 0,0 14,14 M 14,0 0,14"/>
+ <Path x:Key="PathGrayX" Stroke="Gray" StrokeThickness="2" Height="14" Width="14" Data="M 0,0 14,14 M 14,0 0,14"/>
 
- <Style TargetType="Image" x:Key="ImageNavDown" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="180" CenterX="16" CenterY="16"/>
- </Setter.Value>
- </Setter>
- </Style>
-
- <Style TargetType="Image" x:Key="ImageNavLeftSmall" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="Width" Value="16"/>
- <Setter Property="Opacity" Value="0.65"/>
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="-90" CenterX="8" CenterY="8"/>
- </Setter.Value>
- </Setter>
-
- </Style>
-
- <Style TargetType="Image" x:Key="ImageNavRightSmall" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="Width" Value="16"/>
- <Setter Property="Opacity" Value="0.65"/>
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="90" CenterX="8" CenterY="8"/>
- </Setter.Value>
- </Setter>
- </Style>
-
- <Style TargetType="Image" x:Key="ImageNavTopLeft" BasedOn="{StaticResource ImageNavUp}">
- <Setter Property="Opacity" Value="0.5"/>
- <Setter Property="RenderTransform">
- <Setter.Value>
- <RotateTransform Angle="-45" CenterX="16" CenterY="16"/>
- </Setter.Value>
- </Setter>
- </Style>
 </ResourceDictionary>
diff --git a/src/Camera.App/Resources/Image/Arrow.64.png b/src/Camera.App/Resources/Image/Arrow.64.png
diff --git a/src/Camera.App/Resources/Image/Camera.64.png b/src/Camera.App/Resources/Image/Camera.64.png
diff --git a/src/Camera.App/Resources/Image/Chevron.Down.64.png b/src/Camera.App/Resources/Image/Chevron.Down.64.png
diff --git a/src/Camera.App/Resources/Image/Chevron.Up.64.png b/src/Camera.App/Resources/Image/Chevron.Up.64.png
diff --git a/src/Camera.App/Resources/Image/Database.64.png b/src/Camera.App/Resources/Image/Database.64.png
diff --git a/src/Camera.App/Resources/Image/DropArrow.24.png b/src/Camera.App/Resources/Image/DropArrow.24.png
diff --git a/src/Camera.App/Resources/Image/X.Red.32.png b/src/Camera.App/Resources/Image/X.Red.32.png
diff --git a/src/Camera.App/View/MainWindow.xaml b/src/Camera.App/View/MainWindow.xaml
@@ -28,7 +28,7 @@
  <MenuItem Header="File">
  <MenuItem
  Header="Exit application"
- Icon="{StaticResource ImageRedXMenu}"
+ Icon="{StaticResource PathRedX}"
  Command="{Binding CloseCommand, RelativeSource={RelativeSource AncestorType=core:AppWindow}}"/>
  </MenuItem>
  <MenuItem Header="View">
@@ -123,7 +123,7 @@
  <MenuItem Header="Manage camera" Command="{Binding Commands[ManageCamera]}"/>
  <MenuItem Header="Remove from wall" Command="{Binding Commands[RemoveCamera]}"/>
  <Separator/>
- <MenuItem Icon="{StaticResource ImageRedXMenu}" Header="Delete camera" Command="{Binding Commands[DeleteCamera]}"/>
+ <MenuItem Icon="{StaticResource PathRedX}" Header="Delete camera" Command="{Binding Commands[DeleteCamera]}"/>
  </ContextMenu>
  </core:CameraListControl.ContextMenu>
  </core:CameraListControl>