VIX-3366 Fix pause minimum interval

* Set the minimum value of pause to 1 second. * Set the maximum value to be 900 seconds instead of just 100. * Initialize the default value for new pause items to be 1.
VixenLights · Sep 21, 2023 · 57e37a8 · 57e37a8
1 parent c1295b6
commit 57e37a8
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 95 deletions.
diff --git a/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.Designer.cs b/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.Designer.cs
diff --git a/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.cs b/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.cs
@@ -6,7 +6,7 @@ namespace VixenModules.App.Shows
 	public partial class PauseTypeEditor : TypeEditorBase
 	{
 		private readonly ShowItem _showItem;
-		
+
 		public PauseTypeEditor(ShowItem showItem)
 		{
 			InitializeComponent();

diff --git a/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.resx b/src/Vixen.Modules/App/Shows/Editors/PauseTypeEditor.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

diff --git a/src/Vixen.Modules/App/Shows/ShowItem.cs b/src/Vixen.Modules/App/Shows/ShowItem.cs
@@ -84,8 +84,8 @@ public string SequencePath
 		public string Website_URL { get; set; }
 
 		// Pause
-		[DataMember(EmitDefaultValue = false)]
-		public int Pause_Seconds { get; set; }
+		[DataMember] 
+		public int Pause_Seconds { get; set; } = 1;
 
 		// Show
 		[DataMember(EmitDefaultValue = false)]