Renamed setting

Updated version
nefarius · Apr 10, 2016 · 3f8d562 · 3f8d562
1 parent 9ffa944
commit 3f8d562
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 40 deletions.
diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip
@@ -15,10 +15,10 @@
     <ROW Property="AppLogoIcon" Value="applogoicon" MultiBuildValue="DefaultBuild:DualShock.png" Type="1" MsiKey="AppLogoIcon"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="Nefarius Software Solutions"/>
-    <ROW Property="ProductCode" Value="1033:{8316FD79-8AC5-40F5-AB18-91FDDBA3D12C} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{730D2D63-4863-49A9-876F-9A69320C6DB1} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ScpToolkit"/>
-    <ROW Property="ProductVersion" Value="1.7.275.16101" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.7.276.16101" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{541750FB-F05E-4F6A-AB9A-69A633D3D681}"/>

diff --git a/ScpCleanWipe/Properties/CommonInfo.cs b/ScpCleanWipe/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpControl/Properties/CommonInfo.cs b/ScpControl/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
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
@@ -131,7 +131,7 @@
     <Setting Name="IsVBusDisabled" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="AlwaysDisconnectVirtualBusDevice" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="AlwaysUnPlugVirtualBusDevice" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="UseAsyncHidReportProcessing" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">

diff --git a/ScpControl/RootHub.cs b/ScpControl/RootHub.cs
@@ -595,7 +595,7 @@ protected override void OnHidReportReceived(object sender, ScpHidReport e)
                 _vibration[serial][0] = _vibration[serial][1] = 0;
                 _mNative[serial][0] = _mNative[serial][1] = 0;
 
-                if (GlobalConfiguration.Instance.AlwaysDisconnectVirtualBusDevice)
+                if (GlobalConfiguration.Instance.AlwaysUnPlugVirtualBusDevice)
                 {
                     _scpBus.Unplug(_scpBus.IndexToSerial((byte)e.PadId));
                 }

diff --git a/ScpControl/ScpControl.csproj b/ScpControl/ScpControl.csproj
@@ -23,7 +23,7 @@
     <AssemblyInfoVersionSettings>
     </AssemblyInfoVersionSettings>
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
-    <AssemblyVersion>1.7.275.16101</AssemblyVersion>
+    <AssemblyVersion>1.7.276.16101</AssemblyVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/ScpControl/ScpCore/GlobalConfiguration.cs b/ScpControl/ScpCore/GlobalConfiguration.cs
@@ -245,10 +245,10 @@ public bool IsVBusDisabled
             set { Settings.Default.IsVBusDisabled = value; }
         }
 
-        public bool AlwaysDisconnectVirtualBusDevice
+        public bool AlwaysUnPlugVirtualBusDevice
         {
-            get { return Settings.Default.AlwaysDisconnectVirtualBusDevice; }
-            set { Settings.Default.AlwaysDisconnectVirtualBusDevice = value; }
+            get { return Settings.Default.AlwaysUnPlugVirtualBusDevice; }
+            set { Settings.Default.AlwaysUnPlugVirtualBusDevice = value; }
         }
 
         public bool ReservePadSlot

diff --git a/ScpControl/app.config b/ScpControl/app.config
@@ -144,7 +144,7 @@
       <setting name="IsVBusDisabled" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="AlwaysDisconnectVirtualBusDevice" serializeAs="String">
+      <setting name="AlwaysUnPlugVirtualBusDevice" serializeAs="String">
         <value>True</value>
       </setting>
       <setting name="UseAsyncHidReportProcessing" serializeAs="String">

diff --git a/ScpDebugInfoCollector/Properties/CommonInfo.cs b/ScpDebugInfoCollector/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpDriverInstaller/Properties/CommonInfo.cs b/ScpDriverInstaller/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpGamepadAnalyzer/Properties/CommonInfo.cs b/ScpGamepadAnalyzer/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpMonitor/Properties/CommonInfo.cs b/ScpMonitor/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpPair/Properties/CommonInfo.cs b/ScpPair/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpProfiler/Properties/CommonInfo.cs b/ScpProfiler/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpServer/Properties/CommonInfo.cs b/ScpServer/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpService/Properties/CommonInfo.cs b/ScpService/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpSettings/MainWindow.xaml b/ScpSettings/MainWindow.xaml
@@ -362,7 +362,7 @@
                                   Grid.Row="0" Margin="0,0,0,10">
                             <StackPanel>
                                 <TextBlock>
-                                    By checking one or more of the checkboxes below the service will check you device drivers on every start-up and re-applies the correct driver on your Bluetooth dongle or Usb-wired DualShock controllers to ensure proper communication with the software.
+                                    By checking one or more of the check-boxes below the service will check you device drivers on every start-up and re-applies the correct driver on your Bluetooth dongle or Usb-wired DualShock controllers to ensure proper communication with the software.
                                 </TextBlock>
                                 <CheckBox IsChecked="{Binding Path=ForceBluetoothDriverReinstallation}">Force Bluetooth driver installation</CheckBox>
                                 <CheckBox IsChecked="{Binding Path=ForceDs3DriverReinstallation}">Force DualShock 3 driver installation</CheckBox>
@@ -378,11 +378,11 @@
                                 </TextBlock>
                                 <CheckBox IsChecked="{Binding Path=IsVBusDisabled}">Disable Virtual Bus events</CheckBox>
                                 <TextBlock>
-                                    The default behavior of the virtual Xbox 360 controller device created by the virtual bus is to linger in a connected state even if the physical gamepad gets disconnected (turned off). If you'd like the virtual Xbox 360 controller to "disconnect" from the system when the physical pad gets shut off, tick the box below.
+                                    The default behavior of the virtual Xbox 360 controller device created by the virtual bus is to linger in a connected state even if the physical game-pad gets disconnected (turned off). If you'd like the virtual Xbox 360 controller to "disconnect" from the system when the physical pad gets shut off, tick the box below.
                                 </TextBlock>
-                                <CheckBox IsChecked="{Binding Path=AlwaysDisconnectVirtualBusDevice}">Always unplug virtual controller</CheckBox>
+                                <CheckBox IsChecked="{Binding Path=AlwaysUnPlugVirtualBusDevice}">Always unplug virtual controller</CheckBox>
                                 <TextBlock>
-                                    Reserves the slot of the controller to its MAC address if enabled. Usefull if you have a DualShock-only environment and want a fixed slot index for your pad.
+                                    Reserves the slot of the controller to its MAC address if enabled. Useful if you have a DualShock-only environment and want a fixed slot index for your pad.
                                 </TextBlock>
                                 <CheckBox IsChecked="{Binding Path=ReservePadSlot}">Reserve controller slot</CheckBox>
                             </StackPanel>

diff --git a/ScpSettings/Properties/CommonInfo.cs b/ScpSettings/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]
diff --git a/ScpXInputBridge/Properties/CommonInfo.cs b/ScpXInputBridge/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.275.16101")]
-[assembly: AssemblyFileVersion("1.7.275.16101")]
+[assembly: AssemblyVersion("1.7.276.16101")]
+[assembly: AssemblyFileVersion("1.7.276.16101")]