Skip to content
This repository was archived by the owner on Dec 10, 2024. It is now read-only.

Commit 3f8d562

Browse files
nefariusnefarius
committed
Renamed setting
Updated version
1 parent 9ffa944 commit 3f8d562

File tree

20 files changed

+40
-40
lines changed

20 files changed

+40
-40
lines changed

‎Installer/ScpToolkit Setup.aip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<ROW Property="AppLogoIcon" Value="applogoicon" MultiBuildValue="DefaultBuild:DualShock.png" Type="1" MsiKey="AppLogoIcon"/>
1616
<ROW Property="CTRLS" Value="2"/>
1717
<ROW Property="Manufacturer" Value="Nefarius Software Solutions"/>
18-
<ROW Property="ProductCode" Value="1033:{8316FD79-8AC5-40F5-AB18-91FDDBA3D12C} " Type="16"/>
18+
<ROW Property="ProductCode" Value="1033:{730D2D63-4863-49A9-876F-9A69320C6DB1} " Type="16"/>
1919
<ROW Property="ProductLanguage" Value="1033"/>
2020
<ROW Property="ProductName" Value="ScpToolkit"/>
21-
<ROW Property="ProductVersion" Value="1.7.275.16101" Type="32"/>
21+
<ROW Property="ProductVersion" Value="1.7.276.16101" Type="32"/>
2222
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
2323
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
2424
<ROW Property="UpgradeCode" Value="{541750FB-F05E-4F6A-AB9A-69A633D3D681}"/>

‎ScpCleanWipe/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpControl/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpControl/Properties/Settings.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpControl/Properties/Settings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<Setting Name="IsVBusDisabled" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
132132
<Value Profile="(Default)">False</Value>
133133
</Setting>
134-
<Setting Name="AlwaysDisconnectVirtualBusDevice" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
134+
<Setting Name="AlwaysUnPlugVirtualBusDevice" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
135135
<Value Profile="(Default)">True</Value>
136136
</Setting>
137137
<Setting Name="UseAsyncHidReportProcessing" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">

‎ScpControl/RootHub.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ protected override void OnHidReportReceived(object sender, ScpHidReport e)
595595
_vibration[serial][0] = _vibration[serial][1] = 0;
596596
_mNative[serial][0] = _mNative[serial][1] = 0;
597597

598-
if (GlobalConfiguration.Instance.AlwaysDisconnectVirtualBusDevice)
598+
if (GlobalConfiguration.Instance.AlwaysUnPlugVirtualBusDevice)
599599
{
600600
_scpBus.Unplug(_scpBus.IndexToSerial((byte)e.PadId));
601601
}

‎ScpControl/ScpControl.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<AssemblyInfoVersionSettings>
2424
</AssemblyInfoVersionSettings>
2525
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
26-
<AssemblyVersion>1.7.275.16101</AssemblyVersion>
26+
<AssemblyVersion>1.7.276.16101</AssemblyVersion>
2727
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎ScpControl/ScpCore/GlobalConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ public bool IsVBusDisabled
245245
set { Settings.Default.IsVBusDisabled = value; }
246246
}
247247

248-
public bool AlwaysDisconnectVirtualBusDevice
248+
public bool AlwaysUnPlugVirtualBusDevice
249249
{
250-
get { return Settings.Default.AlwaysDisconnectVirtualBusDevice; }
251-
set { Settings.Default.AlwaysDisconnectVirtualBusDevice = value; }
250+
get { return Settings.Default.AlwaysUnPlugVirtualBusDevice; }
251+
set { Settings.Default.AlwaysUnPlugVirtualBusDevice = value; }
252252
}
253253

254254
public bool ReservePadSlot

‎ScpControl/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<setting name="IsVBusDisabled" serializeAs="String">
145145
<value>False</value>
146146
</setting>
147-
<setting name="AlwaysDisconnectVirtualBusDevice" serializeAs="String">
147+
<setting name="AlwaysUnPlugVirtualBusDevice" serializeAs="String">
148148
<value>True</value>
149149
</setting>
150150
<setting name="UseAsyncHidReportProcessing" serializeAs="String">

‎ScpDebugInfoCollector/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpDriverInstaller/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpGamepadAnalyzer/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpMonitor/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpPair/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpProfiler/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpServer/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpService/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpSettings/MainWindow.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
Grid.Row="0" Margin="0,0,0,10">
363363
<StackPanel>
364364
<TextBlock>
365-
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.
365+
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.
366366
</TextBlock>
367367
<CheckBox IsChecked="{Binding Path=ForceBluetoothDriverReinstallation}">Force Bluetooth driver installation</CheckBox>
368368
<CheckBox IsChecked="{Binding Path=ForceDs3DriverReinstallation}">Force DualShock 3 driver installation</CheckBox>
@@ -378,11 +378,11 @@
378378
</TextBlock>
379379
<CheckBox IsChecked="{Binding Path=IsVBusDisabled}">Disable Virtual Bus events</CheckBox>
380380
<TextBlock>
381-
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.
381+
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.
382382
</TextBlock>
383-
<CheckBox IsChecked="{Binding Path=AlwaysDisconnectVirtualBusDevice}">Always unplug virtual controller</CheckBox>
383+
<CheckBox IsChecked="{Binding Path=AlwaysUnPlugVirtualBusDevice}">Always unplug virtual controller</CheckBox>
384384
<TextBlock>
385-
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.
385+
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.
386386
</TextBlock>
387387
<CheckBox IsChecked="{Binding Path=ReservePadSlot}">Reserve controller slot</CheckBox>
388388
</StackPanel>

‎ScpSettings/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

‎ScpXInputBridge/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.275.16101")]
15-
[assembly: AssemblyFileVersion("1.7.275.16101")]
14+
[assembly: AssemblyVersion("1.7.276.16101")]
15+
[assembly: AssemblyFileVersion("1.7.276.16101")]

0 commit comments

Comments
 (0)