Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions FoliCon/FoliCon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ dineshsolanki.github.io/folicon/</Description>
<Resource Include="Resources\mockup_demos\liaher\PosterIconLiaher.ico" />
<Resource Include="Resources\mockup_demos\liaher\PosterIconLiaher2.ico" />
<Resource Include="Resources\mockup_demos\simple\PosterIcon.ico" />
<Resource Include="Resources\mockup_demos\windows11\PosterIconWindows11.ico" />
<Resource Include="Resources\poster_mockups\dvd\mockup cover cropped.png" />
<Resource Include="Resources\poster_mockups\dvd\mockup2base.png" />
<Resource Include="Resources\poster_mockups\faelpessoal\mockup faelpessoal base horizontal.png" />
Expand All @@ -69,6 +70,8 @@ dineshsolanki.github.io/folicon/</Description>
<Resource Include="Resources\poster_mockups\liaher\mockup liaher base.png" />
<Resource Include="Resources\poster_mockups\liaher\mockup liaher front.png" />
<Resource Include="Resources\poster_mockups\simple\PosterMockup.png" />
<Resource Include="Resources\poster_mockups\win11\base.png" />
<Resource Include="Resources\poster_mockups\win11\front.png" />
<Resource Include="Resources\rating_mockup\shield.png" />
<Resource Include="Resources\posterDummy.png" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions FoliCon/Models/Constants/GlobalVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public static IconOverlay IconOverlayType()
"Liaher" => IconOverlay.Liaher,
"Faelpessoal" => IconOverlay.Faelpessoal,
"FaelpessoalHorizontal" => IconOverlay.FaelpessoalHorizontal,
"Windows11" => IconOverlay.Windows11,
_ => IconOverlay.Alternate
};
}
Expand Down
3 changes: 2 additions & 1 deletion FoliCon/Models/Enums/IconOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ public enum IconOverlay
Alternate,
Liaher,
Faelpessoal,
FaelpessoalHorizontal
FaelpessoalHorizontal,
Windows11
}
3 changes: 3 additions & 0 deletions FoliCon/Modules/utils/IconUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ private static async Task BuildFolderIco(IconProperties iconProperties, IconOver
new PosterIcon(
filmFolderPath, rating,
ratingVisibility, mockupVisibility, mediaTitle)).RenderToBitmap()),
IconOverlay.Windows11 => StaTask.Start(() =>
new PosterIconWindows11(new PosterIcon(filmFolderPath, rating, ratingVisibility, mockupVisibility))
.RenderToBitmap()),
_ => StaTask.Start(() =>
new Views.PosterIcon(new PosterIcon(filmFolderPath, rating, ratingVisibility, mockupVisibility))
.RenderToBitmap())
Expand Down
Binary file not shown.
Binary file added FoliCon/Resources/poster_mockups/win11/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FoliCon/Resources/poster_mockups/win11/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions FoliCon/Views/PosterIconWindows11.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<data:PosterIconBase x:Class="FoliCon.Views.PosterIconWindows11"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:prism="http://prismlibrary.com/"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:data="clr-namespace:FoliCon.Models.Data"
prism:ViewModelLocator.AutoWireViewModel="False" Width="265" Height="256"
d:DataContext="{d:DesignInstance Type=data:PosterIcon, IsDesignTimeCreatable=True}">
<Grid Margin="0,0,0,-11">
<Image Source="/Resources/poster_mockups/win11/base.png" RenderOptions.BitmapScalingMode="HighQuality"
Margin="5,0,5,10" Visibility="{Binding MockupVisibility}" />

<Image Source="{Binding FolderJpg}" Stretch="Fill" Margin="5,58,5,32" Visibility="{Binding MockupVisibility}"
RenderOptions.BitmapScalingMode="HighQuality">
<Image.OpacityMask>
<ImageBrush ImageSource="/Resources/poster_mockups/win11/front.png" Stretch="Fill" />
</Image.OpacityMask>
</Image>

<!-- Rating badge -->
<Grid Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="100" />
<RowDefinition Height="100" />
</Grid.RowDefinitions>
<Image x:Name="Shield" Source="/Resources/rating_mockup/shield.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="183,97,-17,5" Panel.ZIndex="2" Visibility="{Binding RatingVisibility}" Grid.Row="1"
Grid.RowSpan="2" />
<TextBlock x:Name="Ratingtext" Text="{Binding Rating}" HorizontalAlignment="Left"
VerticalAlignment="Top" FontFamily="Castellar" FontStyle="Italic"
Visibility="{Binding RatingVisibility}" FontSize="25" Margin="209,30,0,0" Panel.ZIndex="3"
Grid.Row="2" Width="55" Height="46" Foreground="Black" />
</Grid>
</Grid>
</data:PosterIconBase>
17 changes: 17 additions & 0 deletions FoliCon/Views/PosterIconWindows11.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace FoliCon.Views;

/// <summary>
/// Interaction logic for PosterIconWindows11.xaml
/// </summary>
public partial class PosterIconWindows11
{
public PosterIconWindows11()
{
InitializeComponent();
}

public PosterIconWindows11(object dataContext) : base(dataContext)
{
InitializeComponent();
}
}
8 changes: 8 additions & 0 deletions FoliCon/Views/Previewer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
<view:PosterIconFaelpessoalHorizontal DataContext="{Binding PosterIconInstance}"/>
<TextBlock Grid.Row="1" Text="Faelpessoal Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom"/>
</Grid>
<Grid HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<view:PosterIconWindows11 DataContext="{Binding PosterIconInstance}"/>
<TextBlock Grid.Row="1" Text="Windows 11" HorizontalAlignment="Center" VerticalAlignment="Bottom"/>
</Grid>
<hc:ColorPicker x:Name="ColorPicker" Margin="32" SelectedBrush="{DynamicResource RegionBrush}"/>
</hc:FlexPanel>
</Grid>
Expand Down
12 changes: 11 additions & 1 deletion FoliCon/Views/posterIconConfig.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Style TargetType="Window">
<Setter Property="Height" Value="300" />
<!-- <Setter Property="Background" Value="{DynamicResource RegionBrush}" /> -->
<Setter Property="Width" Value="1066" />
<Setter Property="Width" Value="1266" />
<Setter Property="WindowStyle" Value="SingleBorderWindow" />
<Setter Property="prism:Dialog.WindowStartupLocation" Value="CenterOwner" />
</Style>
Expand All @@ -38,6 +38,7 @@
<ColumnDefinition Width="200" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<RadioButton x:Name="RPoster" Grid.Column="0" GroupName="PosterOverlay"
Command="{Binding IconOverlayChangedCommand}"
Expand Down Expand Up @@ -87,6 +88,15 @@
<Image Source="/Resources/mockup_demos/faelpessoal/PosterIconFaelpessoalHorizontal.ico" />
</RadioButton.Content>
</RadioButton>
<RadioButton x:Name="RPosterWindows11" Grid.Column="5" GroupName="PosterOverlay"
Command="{Binding IconOverlayChangedCommand}"
CommandParameter="Windows11" FontSize="16" hc:Poptip.Content="Windows 11" hc:Poptip.Placement="LeftTop"
HorizontalAlignment="Left" VerticalAlignment="Stretch"
IsChecked="{Binding IconOverlay, ConverterParameter= Windows11, Converter={StaticResource StringToBooleanConvertor}}">
<RadioButton.Content>
<Image Source="/Resources/mockup_demos/windows11/PosterIconWindows11.ico" />
</RadioButton.Content>
</RadioButton>
</Grid>
</GroupBox>
</UserControl>
Loading