Merge pull request nefarius#640 from s-eam/bug/slider-display-value

nefarius · web-flow · commit c6079e6b3e55 · 2017-05-25T12:21:04.000+02:00
Correct Slider Display Value
diff --git a/ScpControl/Properties/Settings.Designer.cs b/ScpControl/Properties/Settings.Designer.cs
diff --git a/ScpControl/Properties/Settings.settings b/ScpControl/Properties/Settings.settings
@@ -29,7 +29,7 @@
     <Setting Name="DisableSecureSimplePairing" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="IdleTimout" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">
+    <Setting Name="IdleTimeout" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">600000</Value>
     </Setting>
     <Setting Name="Ds3RumbleLatency" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">
diff --git a/ScpControl/ScpCore/GlobalConfiguration.cs b/ScpControl/ScpCore/GlobalConfiguration.cs
@@ -135,13 +135,13 @@ public bool IsLightBarDisabled
 
         public bool IdleDisconnect
         {
-            get { return Settings.Default.IdleTimout != 0; }
+            get { return Settings.Default.IdleTimeout != 0; }
         }
 
         public int IdleTimeout
         {
-            get { return Settings.Default.IdleTimout; }
-            set { Settings.Default.IdleTimout = value; }
+            get { return Settings.Default.IdleTimeout; }
+            set { Settings.Default.IdleTimeout = value; }
         }
 
         public int Latency
diff --git a/ScpControl/app.config b/ScpControl/app.config
@@ -45,7 +45,7 @@
       <setting name="DisableSecureSimplePairing" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="IdleTimout" serializeAs="String">
+      <setting name="IdleTimeout" serializeAs="String">
         <value>600000</value>
       </setting>
       <setting name="Ds3RumbleLatency" serializeAs="String">
diff --git a/ScpServer/App.config b/ScpServer/App.config
@@ -93,7 +93,7 @@
       <setting name="DisableSecureSimplePairing" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="IdleTimout" serializeAs="String">
+      <setting name="IdleTimeout" serializeAs="String">
         <value>600000</value>
       </setting>
       <setting name="Ds3RumbleLatency" serializeAs="String">
diff --git a/ScpSettings/MainWindow.xaml b/ScpSettings/MainWindow.xaml
@@ -120,15 +120,16 @@
 
                         <!-- Idle Timeout -->
                         <GroupBox Header="Idle Timeout: 10 minutes"
-                                  x:Name="IdleTimoutGroupBox"
+                                  x:Name="IdleTimeoutGroupBox"
                                   Grid.Row="2">
                             <StackPanel>
                                 <TextBlock>
                                     Defines the timespan after the controller gets shut off automatically if no input changes are received.
                                 </TextBlock>
                                 <Slider Maximum="30"
                                         Value="{Binding Path=IdleTimeout}"
-                                        ValueChanged="IdleTimoutSlider_ValueChanged"
+                                        ValueChanged="IdleTimeoutSlider_ValueChanged"
+                                        Name= "IdleTimeoutSlider"
                                         LargeChange="5" SmallChange="1" />
                             </StackPanel>
                         </GroupBox>
@@ -184,7 +185,9 @@
                                     Defines the minimal duration the rumble request will be sent to the controller until it stops.
                                 </TextBlock>
                                 <Slider LargeChange="1" Maximum="16"
-                                        Value="{Binding Path=Latency}" ValueChanged="Slider_ValueChanged" />
+                                        Value="{Binding Path=Latency}"
+                                        ValueChanged="RumbleLatencySlider_ValueChanged"
+                                        Name= "RumbleLatencySlider" />
                             </StackPanel>
                         </GroupBox>
 
@@ -215,7 +218,8 @@
                                             IsSnapToTickEnabled="True"
                                             VerticalAlignment="Center"
                                             Value="{Binding Path=Ds3LEDsPeriod}"
-                                            ValueChanged="Slider_LEDsPeriodChanged" />
+                                            ValueChanged="LEDsFlashingPeriodSlider_ValueChanged"
+                                            Name= "LEDsFlashingPeriodSlider" />
 
                                     <!-- Maximum value -->
                                     <Label Grid.Column="2">
@@ -335,7 +339,8 @@
                         <StackPanel>
                             <Slider Maximum="255"
                                     Value="{Binding Path=Brightness}" LargeChange="16"
-                                    ValueChanged="BrightnessSlider_ValueChanged" SmallChange="1" />
+                                    ValueChanged="BrightnessSlider_ValueChanged" SmallChange="1"
+                                    Name="BrightnessSlider" />
                             <TextBlock>
                                 Hint: move the slider all the way to the left to disable the Light Bar entirely.
                             </TextBlock>
diff --git a/ScpSettings/MainWindow.xaml.cs b/ScpSettings/MainWindow.xaml.cs
@@ -72,23 +72,29 @@ private void Window_Initialized(object sender, EventArgs e)
 
             DataContext = null;
             DataContext = _config;
+
+            // Invoke Slider EventHandlers To Correctly Display GroupBox Headers
+            IdleTimeoutSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, IdleTimeoutSlider.Value));
+            RumbleLatencySlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, RumbleLatencySlider.Value));
+            LEDsFlashingPeriodSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, LEDsFlashingPeriodSlider.Value));
+            BrightnessSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, BrightnessSlider.Value));
         }
 
-        private void IdleTimoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        private void IdleTimeoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             var value = e.NewValue;
 
             if (value == 0)
             {
-                IdleTimoutGroupBox.Header = "Idle Timeout: Disabled";
+                IdleTimeoutGroupBox.Header = "Idle Timeout: Disabled";
             }
             else if (value == 1)
             {
-                IdleTimoutGroupBox.Header = "Idle Timeout: 1 minute";
+                IdleTimeoutGroupBox.Header = "Idle Timeout: 1 minute";
             }
             else
             {
-                IdleTimoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);
+                IdleTimeoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);
             }
         }
 
@@ -101,14 +107,14 @@ private void BrightnessSlider_ValueChanged(object sender, RoutedPropertyChangedE
                 : string.Format("Light Bar Brightness: {0}%", (int)((value * 100) / 255));
         }
 
-        private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        private void RumbleLatencySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             var value = ((int)e.NewValue) << 4;
 
             RumbleLatencyGroupBox.Header = string.Format("Rumble Latency: {0} ms", value);
         }
 
-        private void Slider_LEDsPeriodChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        private void LEDsFlashingPeriodSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             var value = (int)e.NewValue;
 

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,13 @@ public bool IsLightBarDisabled`
`135`	`135`
`136`	`136`	`public bool IdleDisconnect`
`137`	`137`	`{`
`138`		`- get { return Settings.Default.IdleTimout != 0; }`
	`138`	`+ get { return Settings.Default.IdleTimeout != 0; }`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`public int IdleTimeout`
`142`	`142`	`{`
`143`		`- get { return Settings.Default.IdleTimout; }`
`144`		`- set { Settings.Default.IdleTimout = value; }`
	`143`	`+ get { return Settings.Default.IdleTimeout; }`
	`144`	`+ set { Settings.Default.IdleTimeout = value; }`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public int Latency`
Original file line number	Diff line number	Diff line change
`@@ -72,23 +72,29 @@ private void Window_Initialized(object sender, EventArgs e)`
`72`	`72`
`73`	`73`	`DataContext = null;`
`74`	`74`	`DataContext = _config;`
	`75`	`+`
	`76`	`+ // Invoke Slider EventHandlers To Correctly Display GroupBox Headers`
	`77`	`+ IdleTimeoutSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, IdleTimeoutSlider.Value));`
	`78`	`+ RumbleLatencySlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, RumbleLatencySlider.Value));`
	`79`	`+ LEDsFlashingPeriodSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, LEDsFlashingPeriodSlider.Value));`
	`80`	`+ BrightnessSlider_ValueChanged(sender, new RoutedPropertyChangedEventArgs<double> (0, BrightnessSlider.Value));`
`75`	`81`	`}`
`76`	`82`
`77`		`- private void IdleTimoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
	`83`	`+ private void IdleTimeoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
`78`	`84`	`{`
`79`	`85`	`var value = e.NewValue;`
`80`	`86`
`81`	`87`	`if (value == 0)`
`82`	`88`	`{`
`83`		`- IdleTimoutGroupBox.Header = "Idle Timeout: Disabled";`
	`89`	`+ IdleTimeoutGroupBox.Header = "Idle Timeout: Disabled";`
`84`	`90`	`}`
`85`	`91`	`else if (value == 1)`
`86`	`92`	`{`
`87`		`- IdleTimoutGroupBox.Header = "Idle Timeout: 1 minute";`
	`93`	`+ IdleTimeoutGroupBox.Header = "Idle Timeout: 1 minute";`
`88`	`94`	`}`
`89`	`95`	`else`
`90`	`96`	`{`
`91`		`- IdleTimoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);`
	`97`	`+ IdleTimeoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);`
`92`	`98`	`}`
`93`	`99`	`}`
`94`	`100`
`@@ -101,14 +107,14 @@ private void BrightnessSlider_ValueChanged(object sender, RoutedPropertyChangedE`
`101`	`107`	`: string.Format("Light Bar Brightness: {0}%", (int)((value * 100) / 255));`
`102`	`108`	`}`
`103`	`109`
`104`		`- private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
	`110`	`+ private void RumbleLatencySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
`105`	`111`	`{`
`106`	`112`	`var value = ((int)e.NewValue) << 4;`
`107`	`113`
`108`	`114`	`RumbleLatencyGroupBox.Header = string.Format("Rumble Latency: {0} ms", value);`
`109`	`115`	`}`
`110`	`116`
`111`		`- private void Slider_LEDsPeriodChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
	`117`	`+ private void LEDsFlashingPeriodSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
`112`	`118`	`{`
`113`	`119`	`var value = (int)e.NewValue;`
`114`	`120`