diff --git a/FoliCon/FoliCon.csproj b/FoliCon/FoliCon.csproj index 3c316c17..343131ad 100644 --- a/FoliCon/FoliCon.csproj +++ b/FoliCon/FoliCon.csproj @@ -23,8 +23,8 @@ dineshsolanki.github.io/folicon/ - - + + @@ -54,8 +54,8 @@ dineshsolanki.github.io/folicon/ - - + + diff --git a/FoliCon/Models/GlobalVariables.cs b/FoliCon/Models/GlobalVariables.cs index 548dc8ed..ddd34a99 100644 --- a/FoliCon/Models/GlobalVariables.cs +++ b/FoliCon/Models/GlobalVariables.cs @@ -10,6 +10,8 @@ internal static class GlobalVariables { "Legacy" => IconOverlay.Legacy, "Alternate" => IconOverlay.Alternate, + "Liaher" => IconOverlay.Liaher, + "Faelpessoal" => IconOverlay.Faelpessoal, _ => IconOverlay.Alternate }; diff --git a/FoliCon/Models/IconOverlay.cs b/FoliCon/Models/IconOverlay.cs index fc650bc6..6bdc2ac9 100644 --- a/FoliCon/Models/IconOverlay.cs +++ b/FoliCon/Models/IconOverlay.cs @@ -3,6 +3,8 @@ public enum IconOverlay { Legacy, - Alternate + Alternate, + Liaher, + Faelpessoal } } \ No newline at end of file diff --git a/FoliCon/Modules/LangProvider.cs b/FoliCon/Modules/LangProvider.cs index c915b644..4c23ade3 100644 --- a/FoliCon/Modules/LangProvider.cs +++ b/FoliCon/Modules/LangProvider.cs @@ -165,6 +165,7 @@ private void UpdateLangs() OnPropertyChanged(nameof(DeleteMediaInfoTooltip)); OnPropertyChanged(nameof(DeleteMediaInfoConfirmation)); OnPropertyChanged(nameof(ConfirmMediaInfoDeletion)); + OnPropertyChanged(nameof(PosterIconOverlay)); } public string About => Lang.About; @@ -419,6 +420,7 @@ private void UpdateLangs() public string DeleteMediaInfoConfirmation => Lang.DeleteMediaInfoConfirmation; public string DeleteMediaInfoTooltip => Lang.DeleteMediaInfoTooltip; public string DeleteMediaInfo => Lang.DeleteMediaInfo; + public string PosterIconOverlay => Lang.PosterIconOverlay; public event PropertyChangedEventHandler PropertyChanged; @@ -682,5 +684,6 @@ public class LangKeys public static string DeleteMediaInfoConfirmation = nameof(DeleteMediaInfoConfirmation); public static string DeleteMediaInfoTooltip = nameof(DeleteMediaInfoTooltip); public static string DeleteMediaInfo = nameof(DeleteMediaInfo); + public static string PosterIconOverlay = nameof(PosterIconOverlay); } } \ No newline at end of file diff --git a/FoliCon/Properties/Langs/Lang.Designer.cs b/FoliCon/Properties/Langs/Lang.Designer.cs index c4c1e247..bec0c296 100644 --- a/FoliCon/Properties/Langs/Lang.Designer.cs +++ b/FoliCon/Properties/Langs/Lang.Designer.cs @@ -894,6 +894,15 @@ public static string Poster { } } + /// + /// Looks up a localized string similar to Poster Icon Overlay. + /// + public static string PosterIconOverlay { + get { + return ResourceManager.GetString("PosterIconOverlay", resourceCulture); + } + } + /// /// Looks up a localized string similar to Controls whether to use poster Overlay or Plain Posters.. /// diff --git a/FoliCon/Properties/Langs/Lang.ar.resx b/FoliCon/Properties/Langs/Lang.ar.resx index fe16d18e..ae70ae9d 100644 --- a/FoliCon/Properties/Langs/Lang.ar.resx +++ b/FoliCon/Properties/Langs/Lang.ar.resx @@ -512,4 +512,7 @@ سيؤدي هذا إلى حذف ملفات معلومات الوسائط التي يستخدمها فوليكون لتخزين معرف الوسائط بعد تحديد العنوان لأول مرة. يساعد هذا فوليكون في التعرف على الوسائط دون الحاجة إلى الاختيار من بين العناوين الغامضة. + + تراكب أيقونة الملصق + \ No newline at end of file diff --git a/FoliCon/Properties/Langs/Lang.es.resx b/FoliCon/Properties/Langs/Lang.es.resx index 6478979c..1c8dac34 100644 --- a/FoliCon/Properties/Langs/Lang.es.resx +++ b/FoliCon/Properties/Langs/Lang.es.resx @@ -512,4 +512,7 @@ y puede buscar "Juegos, películas y programas" y casi cualquier ícono de carpe Esto eliminará los archivos de información de medios utilizados por folicon para almacenar la identificación de medios después de seleccionar un título por primera vez. Esto ayuda a folicon a identificar los medios sin tener que elegir entre títulos ambiguos. + + Superposición de icono de póster + \ No newline at end of file diff --git a/FoliCon/Properties/Langs/Lang.hi.resx b/FoliCon/Properties/Langs/Lang.hi.resx index d2319533..f43e8e64 100644 --- a/FoliCon/Properties/Langs/Lang.hi.resx +++ b/FoliCon/Properties/Langs/Lang.hi.resx @@ -512,4 +512,7 @@ त्रुटी + + पोस्टर आइकन ओवरले + \ No newline at end of file diff --git a/FoliCon/Properties/Langs/Lang.resx b/FoliCon/Properties/Langs/Lang.resx index aabcb2e9..b0856978 100644 --- a/FoliCon/Properties/Langs/Lang.resx +++ b/FoliCon/Properties/Langs/Lang.resx @@ -399,6 +399,9 @@ Try Searching with Other Title Poster + + Poster Icon Overlay + Controls whether to use poster Overlay or Plain Posters. diff --git a/FoliCon/Properties/Langs/Lang.ru.resx b/FoliCon/Properties/Langs/Lang.ru.resx index 8a8420e7..8b5a9ae4 100644 --- a/FoliCon/Properties/Langs/Lang.ru.resx +++ b/FoliCon/Properties/Langs/Lang.ru.resx @@ -512,4 +512,7 @@ Это приведет к удалению файлов информации о мультимедиа, используемых folicon для хранения идентификатора мультимедиа после выбора заголовка в первый раз. Это помогает фоликону идентифицировать носители без необходимости выбирать из двусмысленных названий. + + Наложение значка плаката + \ No newline at end of file diff --git a/FoliCon/Resources/Mockup faelessoal base.png b/FoliCon/Resources/Mockup faelpessoal base.png similarity index 100% rename from FoliCon/Resources/Mockup faelessoal base.png rename to FoliCon/Resources/Mockup faelpessoal base.png diff --git a/FoliCon/Resources/mockup Faelessoal base horizontal.png b/FoliCon/Resources/mockup faelpessoal base horizontal.png similarity index 100% rename from FoliCon/Resources/mockup Faelessoal base horizontal.png rename to FoliCon/Resources/mockup faelpessoal base horizontal.png diff --git a/FoliCon/Resources/mockup Faelessoal front horizontal.png b/FoliCon/Resources/mockup faelpessoal front horizontal.png similarity index 100% rename from FoliCon/Resources/mockup Faelessoal front horizontal.png rename to FoliCon/Resources/mockup faelpessoal front horizontal.png diff --git a/FoliCon/Resources/mockup faelessoal front.png b/FoliCon/Resources/mockup faelpessoal front.png similarity index 100% rename from FoliCon/Resources/mockup faelessoal front.png rename to FoliCon/Resources/mockup faelpessoal front.png diff --git a/FoliCon/Views/PosterIconFaelessoal.xaml b/FoliCon/Views/PosterIconFaelpessoal.xaml similarity index 83% rename from FoliCon/Views/PosterIconFaelessoal.xaml rename to FoliCon/Views/PosterIconFaelpessoal.xaml index 263b2be9..6f6a55f7 100644 --- a/FoliCon/Views/PosterIconFaelessoal.xaml +++ b/FoliCon/Views/PosterIconFaelpessoal.xaml @@ -1,4 +1,4 @@ - - + @@ -18,7 +18,7 @@ - + diff --git a/FoliCon/Views/PosterIconFaelessoal.xaml.cs b/FoliCon/Views/PosterIconFaelpessoal.xaml.cs similarity index 100% rename from FoliCon/Views/PosterIconFaelessoal.xaml.cs rename to FoliCon/Views/PosterIconFaelpessoal.xaml.cs diff --git a/FoliCon/Views/PosterIconFaelessoalHorizontal.xaml b/FoliCon/Views/PosterIconFaelpessoalHorizontal.xaml similarity index 72% rename from FoliCon/Views/PosterIconFaelessoalHorizontal.xaml rename to FoliCon/Views/PosterIconFaelpessoalHorizontal.xaml index e7ed6ffb..e9333a80 100644 --- a/FoliCon/Views/PosterIconFaelessoalHorizontal.xaml +++ b/FoliCon/Views/PosterIconFaelpessoalHorizontal.xaml @@ -1,4 +1,4 @@ - - + @@ -18,7 +18,7 @@ - + @@ -26,10 +26,10 @@ - + diff --git a/FoliCon/Views/PosterIconFaelessoalHorizontal.xaml.cs b/FoliCon/Views/PosterIconFaelpessoalHorizontal.xaml.cs similarity index 100% rename from FoliCon/Views/PosterIconFaelessoalHorizontal.xaml.cs rename to FoliCon/Views/PosterIconFaelpessoalHorizontal.xaml.cs diff --git a/FoliCon/Views/posterIconConfig.xaml b/FoliCon/Views/posterIconConfig.xaml index d9f236ca..134180e7 100644 --- a/FoliCon/Views/posterIconConfig.xaml +++ b/FoliCon/Views/posterIconConfig.xaml @@ -7,6 +7,8 @@ xmlns:modules="clr-namespace:FoliCon.ViewModels" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:foliCon="clr-namespace:FoliCon" + xmlns:langExtension="clr-namespace:FoliCon.Modules.LangExtension" + xmlns:langs="clr-namespace:FoliCon.Properties.Langs" mc:Ignorable="d" prism:ViewModelLocator.AutoWireViewModel="True" d:DataContext="{d:DesignInstance modules:PosterIconConfigViewModel }"> @@ -24,7 +26,7 @@ - diff --git a/Folicon.sln.DotSettings b/Folicon.sln.DotSettings index c09c5b1d..9c24313e 100644 --- a/Folicon.sln.DotSettings +++ b/Folicon.sln.DotSettings @@ -1,2 +1,4 @@  - True \ No newline at end of file + True + True + True \ No newline at end of file