diff --git a/OnlyM/Properties/Resources.Designer.cs b/OnlyM/Properties/Resources.Designer.cs index acf933ca..e888d112 100644 --- a/OnlyM/Properties/Resources.Designer.cs +++ b/OnlyM/Properties/Resources.Designer.cs @@ -547,15 +547,6 @@ public static string MEDIA_WINDOW_FIXED_SIZE { } } - /// - /// Looks up a localized string similar to This is the recommended resolution, if you have a good internet connection.. - /// - public static string MEDIA_WINDOW_RECOMMENDED_SIZE { - get { - return ResourceManager.GetString("MEDIA_WINDOW_RECOMMENDED_SIZE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Resizable. /// diff --git a/OnlyM/Properties/Resources.resx b/OnlyM/Properties/Resources.resx index 05ab0f3b..a543c0ac 100644 --- a/OnlyM/Properties/Resources.resx +++ b/OnlyM/Properties/Resources.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 OnlyM software version: {0} See Settings => Images. Please retain the "{0}" - it's a placeholder for the version number - + ..\Resources\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -580,8 +580,4 @@ Resizable See Settings => Display - - This is the recommended resolution, if you have a good internet connection. - See Settings => Display - \ No newline at end of file diff --git a/OnlyM/ViewModel/SettingsViewModel.cs b/OnlyM/ViewModel/SettingsViewModel.cs index 2740f4af..f54015f3 100644 --- a/OnlyM/ViewModel/SettingsViewModel.cs +++ b/OnlyM/ViewModel/SettingsViewModel.cs @@ -887,6 +887,14 @@ public bool MediaWindowed } } + public bool Is360PSize => MediaWindowSize == Size360P; + + public bool Is480PSize => MediaWindowSize == Size480P; + + public bool Is720PSize => MediaWindowSize == Size720P; + + public bool Is1080PSize => MediaWindowSize == Size1080P; + public bool MediaWindowResizable { get => MediaWindowSize.IsEmpty; @@ -918,7 +926,7 @@ public int? MediaWindowWidth get => MediaWindowSize.IsEmpty ? null : (int)MediaWindowSize.Width; set => MediaWindowSize = value.HasValue ? new Size(value.Value, MediaWindowSize.Height) : Size.Empty; } - + public int? MediaWindowHeight { get => MediaWindowSize.IsEmpty ? null : (int)MediaWindowSize.Height; @@ -937,6 +945,11 @@ public Size MediaWindowSize OnPropertyChanged(nameof(MediaWindowWidth)); OnPropertyChanged(nameof(MediaWindowHeight)); + + OnPropertyChanged(nameof(Is360PSize)); + OnPropertyChanged(nameof(Is480PSize)); + OnPropertyChanged(nameof(Is720PSize)); + OnPropertyChanged(nameof(Is1080PSize)); } } diff --git a/OnlyM/Windows/SettingsPage.xaml b/OnlyM/Windows/SettingsPage.xaml index 3cdaf34b..3badc2ff 100644 --- a/OnlyM/Windows/SettingsPage.xaml +++ b/OnlyM/Windows/SettingsPage.xaml @@ -169,32 +169,38 @@ Style="{StaticResource SettingsRadioButtonStyle}" > - + + - +