The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-27 23:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

Browse Source
This commit is contained in:
mika-n 2019-10-18 08:53:53 +03:00
commit 95839177ba
9 changed files with 582 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -3786,8 +3786,8 @@ namespace DS4Windows
catch { missingSetting = true; } catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/SwipeProfiles"); Boolean.TryParse(Item.InnerText, out swipeProfiles); } try { Item = m_Xdoc.SelectSingleNode("/Profile/SwipeProfiles"); Boolean.TryParse(Item.InnerText, out swipeProfiles); }
catch { missingSetting = true; } catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/UseDS4ForMapping"); Boolean.TryParse(Item.InnerText, out ds4Mapping); } //try { Item = m_Xdoc.SelectSingleNode("/Profile/UseDS4ForMapping"); Boolean.TryParse(Item.InnerText, out ds4Mapping); }
catch { missingSetting = true; } //catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/QuickCharge"); Boolean.TryParse(Item.InnerText, out quickCharge); } try { Item = m_Xdoc.SelectSingleNode("/Profile/QuickCharge"); Boolean.TryParse(Item.InnerText, out quickCharge); }
catch { missingSetting = true; } catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/CloseMinimizes"); Boolean.TryParse(Item.InnerText, out closeMini); } try { Item = m_Xdoc.SelectSingleNode("/Profile/CloseMinimizes"); Boolean.TryParse(Item.InnerText, out closeMini); }
@ -3871,7 +3871,7 @@ namespace DS4Windows
XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications); XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications);
XmlNode xmlDisconnectBT = m_Xdoc.CreateNode(XmlNodeType.Element, "DisconnectBTAtStop", null); xmlDisconnectBT.InnerText = disconnectBTAtStop.ToString(); Node.AppendChild(xmlDisconnectBT); XmlNode xmlDisconnectBT = m_Xdoc.CreateNode(XmlNodeType.Element, "DisconnectBTAtStop", null); xmlDisconnectBT.InnerText = disconnectBTAtStop.ToString(); Node.AppendChild(xmlDisconnectBT);
XmlNode xmlSwipeProfiles = m_Xdoc.CreateNode(XmlNodeType.Element, "SwipeProfiles", null); xmlSwipeProfiles.InnerText = swipeProfiles.ToString(); Node.AppendChild(xmlSwipeProfiles); XmlNode xmlSwipeProfiles = m_Xdoc.CreateNode(XmlNodeType.Element, "SwipeProfiles", null); xmlSwipeProfiles.InnerText = swipeProfiles.ToString(); Node.AppendChild(xmlSwipeProfiles);
XmlNode xmlDS4Mapping = m_Xdoc.CreateNode(XmlNodeType.Element, "UseDS4ForMapping", null); xmlDS4Mapping.InnerText = ds4Mapping.ToString(); Node.AppendChild(xmlDS4Mapping); //XmlNode xmlDS4Mapping = m_Xdoc.CreateNode(XmlNodeType.Element, "UseDS4ForMapping", null); xmlDS4Mapping.InnerText = ds4Mapping.ToString(); Node.AppendChild(xmlDS4Mapping);
XmlNode xmlQuickCharge = m_Xdoc.CreateNode(XmlNodeType.Element, "QuickCharge", null); xmlQuickCharge.InnerText = quickCharge.ToString(); Node.AppendChild(xmlQuickCharge); XmlNode xmlQuickCharge = m_Xdoc.CreateNode(XmlNodeType.Element, "QuickCharge", null); xmlQuickCharge.InnerText = quickCharge.ToString(); Node.AppendChild(xmlQuickCharge);
XmlNode xmlCloseMini = m_Xdoc.CreateNode(XmlNodeType.Element, "CloseMinimizes", null); xmlCloseMini.InnerText = closeMini.ToString(); Node.AppendChild(xmlCloseMini); XmlNode xmlCloseMini = m_Xdoc.CreateNode(XmlNodeType.Element, "CloseMinimizes", null); xmlCloseMini.InnerText = closeMini.ToString(); Node.AppendChild(xmlCloseMini);
XmlNode xmlUseLang = m_Xdoc.CreateNode(XmlNodeType.Element, "UseLang", null); xmlUseLang.InnerText = useLang.ToString(); Node.AppendChild(xmlUseLang); XmlNode xmlUseLang = m_Xdoc.CreateNode(XmlNodeType.Element, "UseLang", null); xmlUseLang.InnerText = useLang.ToString(); Node.AppendChild(xmlUseLang);
@ -4649,6 +4649,7 @@ namespace DS4Windows
trackballMode[device] = false; trackballMode[device] = false;
trackballFriction[device] = 10.0; trackballFriction[device] = 10.0;
outputDevType[device] = OutContType.X360; outputDevType[device] = OutContType.X360;
ds4Mapping = false;
} }
} }

2
DS4Windows/DS4Forms/KBM360.cs
View File

@ -39,6 +39,7 @@ namespace DS4Windows.Forms
//pnl360Controls.BackgroundImage = null; //pnl360Controls.BackgroundImage = null;
//pnl360Controls.BackgroundImageLayout = ImageLayout.None; //pnl360Controls.BackgroundImageLayout = ImageLayout.None;
use360 = true; use360 = true;
device = deviceNum;
pnl360Controls.Paint -= pnl360Controls_Paint; pnl360Controls.Paint -= pnl360Controls_Paint;
if (Global.outDevTypeTemp[device] == OutContType.DS4) if (Global.outDevTypeTemp[device] == OutContType.DS4)
{ {
@ -49,7 +50,6 @@ namespace DS4Windows.Forms
pnlDS4Controls.Show(); pnlDS4Controls.Show();
} }
device = deviceNum;
ops = ooo; ops = ooo;
button = buton; button = buton;
DS4ControlSettings dcs = Global.getDS4CSetting(device, button.Name); DS4ControlSettings dcs = Global.getDS4CSetting(device, button.Name);

4
DS4Windows/DS4Forms/Options.cs
View File

@ -1005,6 +1005,7 @@ namespace DS4Windows.Forms
if (idxSASteeringWheelEmulationRange >= 0) cBSteeringWheelEmulationRange.SelectedIndex = idxSASteeringWheelEmulationRange; if (idxSASteeringWheelEmulationRange >= 0) cBSteeringWheelEmulationRange.SelectedIndex = idxSASteeringWheelEmulationRange;
OutContType tempOutType = Global.OutContType[device]; OutContType tempOutType = Global.OutContType[device];
Global.outDevTypeTemp[device] = tempOutType;
devOutContType = tempOutType; devOutContType = tempOutType;
switch(tempOutType) switch(tempOutType)
{ {
@ -1190,6 +1191,8 @@ namespace DS4Windows.Forms
gyroMStickUseSmoothCk.Checked = false; gyroMStickUseSmoothCk.Checked = false;
gyroMStickSmoothWeightNUD.Enabled = false; gyroMStickSmoothWeightNUD.Enabled = false;
gyroMStickSmoothWeightNUD.Value = 0.5m; gyroMStickSmoothWeightNUD.Value = 0.5m;
Global.outDevTypeTemp[device] = OutContType.X360;
devOutContType = OutContType.X360;
Set(); Set();
} }
@ -3638,6 +3641,7 @@ namespace DS4Windows.Forms
default: break; default: break;
} }
Global.outDevTypeTemp[device] = tempType;
devOutContType = tempType; devOutContType = tempType;
UpdateLists(); UpdateLists();
} }

12
DS4Windows/DS4Forms/RecordBox.Designer.cs generated
View File

@ -88,6 +88,7 @@
this.lVMacros.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.lVMacros.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.cHMacro}); this.cHMacro});
this.lVMacros.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.lVMacros.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lVMacros.HideSelection = false;
this.lVMacros.LargeImageList = this.iLKeys; this.lVMacros.LargeImageList = this.iLKeys;
this.lVMacros.MultiSelect = false; this.lVMacros.MultiSelect = false;
this.lVMacros.Name = "lVMacros"; this.lVMacros.Name = "lVMacros";
@ -166,15 +167,15 @@
// //
// pBRtouch // pBRtouch
// //
resources.ApplyResources(this.pBRtouch, "pBRtouch");
this.pBRtouch.Image = global::DS4Windows.Properties.Resources.right_touch; this.pBRtouch.Image = global::DS4Windows.Properties.Resources.right_touch;
resources.ApplyResources(this.pBRtouch, "pBRtouch");
this.pBRtouch.Name = "pBRtouch"; this.pBRtouch.Name = "pBRtouch";
this.pBRtouch.TabStop = false; this.pBRtouch.TabStop = false;
// //
// pBLtouch // pBLtouch
// //
resources.ApplyResources(this.pBLtouch, "pBLtouch");
this.pBLtouch.Image = global::DS4Windows.Properties.Resources.left_touch; this.pBLtouch.Image = global::DS4Windows.Properties.Resources.left_touch;
resources.ApplyResources(this.pBLtouch, "pBLtouch");
this.pBLtouch.Name = "pBLtouch"; this.pBLtouch.Name = "pBLtouch";
this.pBLtouch.TabStop = false; this.pBLtouch.TabStop = false;
// //
@ -227,7 +228,6 @@
// //
// openPresets // openPresets
// //
this.openPresets.FileName = "openFileDialog1";
resources.ApplyResources(this.openPresets, "openPresets"); resources.ApplyResources(this.openPresets, "openPresets");
// //
// lbMacroOrder // lbMacroOrder
@ -242,24 +242,24 @@
// //
// cMSLoadPresets // cMSLoadPresets
// //
resources.ApplyResources(this.cMSLoadPresets, "cMSLoadPresets");
this.cMSLoadPresets.ImageScalingSize = new System.Drawing.Size(20, 20); this.cMSLoadPresets.ImageScalingSize = new System.Drawing.Size(20, 20);
this.cMSLoadPresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cMSLoadPresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.altTabToolStripMenuItem, this.altTabToolStripMenuItem,
this.fromFileToolStripMenuItem}); this.fromFileToolStripMenuItem});
this.cMSLoadPresets.Name = "cMSLoadPresets"; this.cMSLoadPresets.Name = "cMSLoadPresets";
this.cMSLoadPresets.ShowImageMargin = false; this.cMSLoadPresets.ShowImageMargin = false;
resources.ApplyResources(this.cMSLoadPresets, "cMSLoadPresets");
// //
// altTabToolStripMenuItem // altTabToolStripMenuItem
// //
resources.ApplyResources(this.altTabToolStripMenuItem, "altTabToolStripMenuItem");
this.altTabToolStripMenuItem.Name = "altTabToolStripMenuItem"; this.altTabToolStripMenuItem.Name = "altTabToolStripMenuItem";
resources.ApplyResources(this.altTabToolStripMenuItem, "altTabToolStripMenuItem");
this.altTabToolStripMenuItem.Click += new System.EventHandler(this.altTabToolStripMenuItem_Click); this.altTabToolStripMenuItem.Click += new System.EventHandler(this.altTabToolStripMenuItem_Click);
// //
// fromFileToolStripMenuItem // fromFileToolStripMenuItem
// //
resources.ApplyResources(this.fromFileToolStripMenuItem, "fromFileToolStripMenuItem");
this.fromFileToolStripMenuItem.Name = "fromFileToolStripMenuItem"; this.fromFileToolStripMenuItem.Name = "fromFileToolStripMenuItem";
resources.ApplyResources(this.fromFileToolStripMenuItem, "fromFileToolStripMenuItem");
this.fromFileToolStripMenuItem.Click += new System.EventHandler(this.fromFileToolStripMenuItem_Click); this.fromFileToolStripMenuItem.Click += new System.EventHandler(this.fromFileToolStripMenuItem_Click);
// //
// RecordBox // RecordBox

4
DS4Windows/DS4Forms/RecordBox.cs
View File

@ -42,7 +42,7 @@ namespace DS4Windows.Forms
AddtoDS4List(); AddtoDS4List();
//ds4.Tick += ds4_Tick; //ds4.Tick += ds4_Tick;
ds4.Elapsed += Ds4_Tick; ds4.Elapsed += Ds4_Tick;
ds4.Interval = 1; ds4.Interval = 10;
if (kbm.macrostag.Count > 0) if (kbm.macrostag.Count > 0)
{ {
macros.AddRange(kbm.macrostag); macros.AddRange(kbm.macrostag);
@ -66,7 +66,7 @@ namespace DS4Windows.Forms
//ds4.Tick += ds4_Tick; //ds4.Tick += ds4_Tick;
ds4.Elapsed += Ds4_Tick; ds4.Elapsed += Ds4_Tick;
ds4.Interval = 1; ds4.Interval = 10;
lbRecordTip.Visible = false; lbRecordTip.Visible = false;
cBStyle.Visible = false; cBStyle.Visible = false;
pnlMouseButtons.Location = new Point(pnlMouseButtons.Location.X, pnlMouseButtons.Location.Y - 75); pnlMouseButtons.Location = new Point(pnlMouseButtons.Location.X, pnlMouseButtons.Location.Y - 75);

1175
DS4Windows/DS4Forms/RecordBox.resx
View File

File diff suppressed because it is too large Load Diff

2
DS4Windows/DS4Forms/WelcomeDialog.cs
View File

@ -73,7 +73,7 @@ namespace DS4Windows.Forms
if (File.Exists(exepath + $"\\{InstFileName}")) if (File.Exists(exepath + $"\\{InstFileName}"))
{ {
bnStep1.Text = Properties.Resources.OpeningInstaller; bnStep1.Text = Properties.Resources.OpeningInstaller;
monitorProc = Process.Start(exepath + $"\\{InstFileName}"); monitorProc = Process.Start(exepath + $"\\{InstFileName}", "/exenoupdates");
bnStep1.Text = Properties.Resources.Installing; bnStep1.Text = Properties.Resources.Installing;
} }

7
DS4Windows/DS4Windows.csproj
View File

@ -117,8 +117,9 @@
<WarningLevel>1</WarningLevel> <WarningLevel>1</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.0.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL"> <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.15.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL">
<HintPath>..\packages\TaskScheduler.2.8.0\lib\net452\Microsoft.Win32.TaskScheduler.dll</HintPath> <HintPath>..\packages\TaskScheduler.2.8.15\lib\net452\Microsoft.Win32.TaskScheduler.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="Nefarius.ViGEm.Client" Condition="'$(Platform)' == 'x64'"> <Reference Include="Nefarius.ViGEm.Client" Condition="'$(Platform)' == 'x64'">
<HintPath>.\libs\x64\Nefarius.ViGEm.Client\Nefarius.ViGEm.Client.dll</HintPath> <HintPath>.\libs\x64\Nefarius.ViGEm.Client\Nefarius.ViGEm.Client.dll</HintPath>
@ -1122,7 +1123,6 @@
<EmbeddedResource Include="Properties\Resources.zh-hans.resx" /> <EmbeddedResource Include="Properties\Resources.zh-hans.resx" />
<EmbeddedResource Include="Properties\Resources.zh-Hant.resx" /> <EmbeddedResource Include="Properties\Resources.zh-Hant.resx" />
<None Include="app.manifest" /> <None Include="app.manifest" />
<None Include="packages.config" />
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
@ -1141,6 +1141,7 @@
</Content> </Content>
<Content Include="HidLibrary\LICENSE" /> <Content Include="HidLibrary\LICENSE" />
<Content Include="Resources\360 fades.png" /> <Content Include="Resources\360 fades.png" />
<None Include="packages.config" />
<None Include="Resources\360 map.png" /> <None Include="Resources\360 map.png" />
<None Include="Resources\360 highlight.png" /> <None Include="Resources\360 highlight.png" />
<Content Include="Resources\A.PNG" /> <Content Include="Resources\A.PNG" />

2
DS4Windows/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="TaskScheduler" version="2.8.0" targetFramework="net452" /> <package id="TaskScheduler" version="2.8.15" targetFramework="net462" />
</packages> </packages>