WinGui: Experimental new Dimensions Tab Design. (Part 1 of Several). Adding the Resolution Limit on display and removing upscale limitations. (These will come back in some less restrictive than current form later) #2437

3 files changed, 66 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/Model/Picture/PictureSettingsResLimitModes.cs b/win/CS/HandBrakeWPF/Model/Picture/PictureSettingsResLimitModes.cs
new file mode 100644
index 000000000..877550470
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Picture/PictureSettingsResLimitModes.cs
@@ -0,0 +1,42 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureSettingsResLimitModes.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Picture
+{
+    using HandBrake.Interop.Attributes;
+
+    using HandBrakeWPF.Properties;
+
+    public enum PictureSettingsResLimitModes
+    {
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_8K")]
+        [ResLimit(7680, 4320)]
+        Size8K,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_4K")]
+        [ResLimit(3840, 2160)]
+        Size4K,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_1080p")]
+        [ResLimit(1920, 1080)]
+        Size1080p,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_720p")]
+        [ResLimit(1280, 720)]
+        Size720p,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_576p")]
+        [ResLimit(720, 576)]
+        Size576p,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_480p")]
+        [ResLimit(720, 480)]
+        Size480p,
+
+        [DisplayName(typeof(Resources), "PictureSettingsResLimitModes_custom")]
+        Custom,
+    }
+}
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
index 517da08ee..d4d2845c8 100644
--- a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
+++ b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Model.Picture
     /// <summary>

     /// Picture Settings Mode when adding presets

     /// </summary>

-    public enum PresetPictureSettingsMode

+    public enum PresetPictureSettingsMode2

     {

         [DisplayName(typeof(Resources), "PresetPictureSettingsMode_None")]

         None = 0,

diff --git a/win/CS/HandBrakeWPF/Model/Picture/ResLimit.cs b/win/CS/HandBrakeWPF/Model/Picture/ResLimit.cs
new file mode 100644
index 000000000..392b9d7a3
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Picture/ResLimit.cs
@@ -0,0 +1,23 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ResLimit.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Picture
+{
+    using System;
+
+    public class ResLimit : Attribute
+    {
+        public ResLimit(int width, int height)
+        {
+            this.Width = width;
+            this.Height = height;
+        }
+
+        public int Width { get; }
+
+        public int Height { get; }
+    }
+}