diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs index 1482758..f5cc770 100644 --- a/DS4Windows/DS4Control/ControlService.cs +++ b/DS4Windows/DS4Control/ControlService.cs @@ -424,7 +424,6 @@ namespace DS4Windows if (!getDInputOnly(i) && device.isSynced()) { - //int xinputIndex = x360Bus.FirstController + i; LogDebug("Plugging in X360 Controller #" + (i + 1)); useDInputOnly[i] = false; x360controls[i] = new Xbox360Controller(vigemTestClient); @@ -681,7 +680,6 @@ namespace DS4Windows if (!getDInputOnly(Index) && device.isSynced()) { - //int xinputIndex = x360Bus.FirstController + Index; LogDebug("Plugging in X360 Controller #" + (Index + 1)); useDInputOnly[Index] = false; x360controls[Index] = new Xbox360Controller(vigemTestClient); diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs index f29bf7f..5632ba4 100644 --- a/DS4Windows/DS4Control/Mapping.cs +++ b/DS4Windows/DS4Control/Mapping.cs @@ -3763,7 +3763,7 @@ namespace DS4Windows // State 0=Normal mode (ie. calibration process is not running), 1=Activating calibration, 2=Calibration process running, 3=Completing calibration, 4=Cancelling calibration if (controller.WheelRecalibrateActiveState == 1) { - AppLogger.LogToGui($"Controller {ctrl.x360Bus.FirstController + device} activated re-calibration of SA steering wheel emulation", false); + AppLogger.LogToGui($"Controller {1 + device} activated re-calibration of SA steering wheel emulation", false); controller.WheelRecalibrateActiveState = 2; @@ -3785,7 +3785,7 @@ namespace DS4Windows } else if (controller.WheelRecalibrateActiveState == 3) { - AppLogger.LogToGui($"Controller {ctrl.x360Bus.FirstController + device} completed the calibration of SA steering wheel emulation. center=({controller.wheelCenterPoint.X}, {controller.wheelCenterPoint.Y}) 90L=({controller.wheel90DegPointLeft.X}, {controller.wheel90DegPointLeft.Y}) 90R=({controller.wheel90DegPointRight.X}, {controller.wheel90DegPointRight.Y})", false); + AppLogger.LogToGui($"Controller {1 + device} completed the calibration of SA steering wheel emulation. center=({controller.wheelCenterPoint.X}, {controller.wheelCenterPoint.Y}) 90L=({controller.wheel90DegPointLeft.X}, {controller.wheel90DegPointLeft.Y}) 90R=({controller.wheel90DegPointRight.X}, {controller.wheel90DegPointRight.Y})", false); // If any of the calibration points (center, left 90deg, right 90deg) are missing then reset back to default calibration values if (((controller.wheelCalibratedAxisBitmask & DS4Device.WheelCalibrationPoint.All) == DS4Device.WheelCalibrationPoint.All)) @@ -3798,7 +3798,7 @@ namespace DS4Windows } else if (controller.WheelRecalibrateActiveState == 4) { - AppLogger.LogToGui($"Controller {ctrl.x360Bus.FirstController + device} cancelled the calibration of SA steering wheel emulation.", false); + AppLogger.LogToGui($"Controller {1 + device} cancelled the calibration of SA steering wheel emulation.", false); controller.WheelRecalibrateActiveState = 0; controller.wheelPrevRecalibrateTime = DateTime.Now; @@ -3911,7 +3911,7 @@ namespace DS4Windows { if (!Global.LoadControllerConfigs(controller)) { - AppLogger.LogToGui($"Controller {ctrl.x360Bus.FirstController + device} sixaxis steering wheel calibration data missing. It is recommended to run steering wheel calibration process by pressing SASteeringWheelEmulationCalibration special action key. Using estimated values until the controller is calibrated at least once.", false); + AppLogger.LogToGui($"Controller {1 + device} sixaxis steering wheel calibration data missing. It is recommended to run steering wheel calibration process by pressing SASteeringWheelEmulationCalibration special action key. Using estimated values until the controller is calibrated at least once.", false); // Use current controller position as "center point". Assume DS4Windows was started while controller was hold in center position (yes, dangerous assumption but can't do much until controller is calibrated) controller.wheelCenterPoint.X = gyroAccelX; @@ -3929,7 +3929,7 @@ namespace DS4Windows controller.wheelCircleCenterPointLeft.X = controller.wheelCenterPoint.X; controller.wheelCircleCenterPointLeft.Y = controller.wheel90DegPointLeft.Y; - AppLogger.LogToGui($"Controller {ctrl.x360Bus.FirstController + device} steering wheel emulation calibration values. Center=({controller.wheelCenterPoint.X}, {controller.wheelCenterPoint.Y}) 90L=({controller.wheel90DegPointLeft.X}, {controller.wheel90DegPointLeft.Y}) 90R=({controller.wheel90DegPointRight.X}, {controller.wheel90DegPointRight.Y}) Range={Global.GetSASteeringWheelEmulationRange(device)}", false); + AppLogger.LogToGui($"Controller {1 + device} steering wheel emulation calibration values. Center=({controller.wheelCenterPoint.X}, {controller.wheelCenterPoint.Y}) 90L=({controller.wheel90DegPointLeft.X}, {controller.wheel90DegPointLeft.Y}) 90R=({controller.wheel90DegPointRight.X}, {controller.wheel90DegPointRight.Y}) Range={Global.GetSASteeringWheelEmulationRange(device)}", false); controller.wheelPrevRecalibrateTime = DateTime.Now; } diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs index c253543..f5ccddc 100644 --- a/DS4Windows/DS4Control/ScpUtil.cs +++ b/DS4Windows/DS4Control/ScpUtil.cs @@ -235,7 +235,6 @@ namespace DS4Windows public static bool multisavespots = false; public static string appDataPpath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Windows"; public static bool runHotPlug = false; - public const int XINPUT_UNPLUG_SETTLE_TIME = 250; // Inhibit races that occur with the asynchronous teardown of ScpVBus -> X360 driver instance. public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty }; public static bool[] useTempProfile = new bool[5] { false, false, false, false, false }; public static bool[] tempprofileDistance = new bool[5] { false, false, false, false, false }; @@ -519,12 +518,6 @@ namespace DS4Windows return m_Config.quickCharge; } - public static int FirstXinputPort - { - set { m_Config.firstXinputPort = value; } - get { return m_Config.firstXinputPort; } - } - public static bool CloseMini { set { m_Config.closeMini = value; } @@ -1594,7 +1587,6 @@ namespace DS4Windows public bool swipeProfiles = true; public bool ds4Mapping = false; public bool quickCharge = false; - public int firstXinputPort = 1; public bool closeMini = false; public List actions = new List(); public List[] ds4settings = new List[5] @@ -3186,8 +3178,6 @@ namespace DS4Windows catch { missingSetting = true; } try { Item = m_Xdoc.SelectSingleNode("/Profile/QuickCharge"); Boolean.TryParse(Item.InnerText, out quickCharge); } catch { missingSetting = true; } - try { Item = m_Xdoc.SelectSingleNode("/Profile/FirstXinputPort"); Int32.TryParse(Item.InnerText, out firstXinputPort); } - catch { missingSetting = true; } try { Item = m_Xdoc.SelectSingleNode("/Profile/CloseMinimizes"); Boolean.TryParse(Item.InnerText, out closeMini); } catch { missingSetting = true; } try { Item = m_Xdoc.SelectSingleNode("/Profile/UseLang"); useLang = Item.InnerText; } @@ -3265,7 +3255,6 @@ namespace DS4Windows 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 xmlQuickCharge = m_Xdoc.CreateNode(XmlNodeType.Element, "QuickCharge", null); xmlQuickCharge.InnerText = quickCharge.ToString(); Node.AppendChild(xmlQuickCharge); - XmlNode xmlFirstXinputPort = m_Xdoc.CreateNode(XmlNodeType.Element, "FirstXinputPort", null); xmlFirstXinputPort.InnerText = firstXinputPort.ToString(); Node.AppendChild(xmlFirstXinputPort); 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 xmlDownloadLang = m_Xdoc.CreateNode(XmlNodeType.Element, "DownloadLang", null); xmlDownloadLang.InnerText = downloadLang.ToString(); Node.AppendChild(xmlDownloadLang); diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index 5057ff0..882a1cf 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -150,10 +150,6 @@ this.cBUpdateTime = new System.Windows.Forms.ComboBox(); this.lbCheckEvery = new System.Windows.Forms.Label(); this.nUDUpdateTime = new System.Windows.Forms.NumericUpDown(); - this.pnlXIPorts = new System.Windows.Forms.Panel(); - this.lbUseXIPorts = new System.Windows.Forms.Label(); - this.nUDXIPorts = new System.Windows.Forms.NumericUpDown(); - this.lbLastXIPort = new System.Windows.Forms.Label(); this.panel4 = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); this.ckUdpServ = new System.Windows.Forms.CheckBox(); @@ -197,8 +193,6 @@ ((System.ComponentModel.ISupportInitialize)(this.nUDLatency)).BeginInit(); this.pNUpdate.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDUpdateTime)).BeginInit(); - this.pnlXIPorts.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nUDXIPorts)).BeginInit(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDUdpPortNum)).BeginInit(); this.flowLayoutPanel1.SuspendLayout(); @@ -958,7 +952,6 @@ this.fLPSettings.Controls.Add(this.cBUseWhiteIcon); this.fLPSettings.Controls.Add(this.cBUpdate); this.fLPSettings.Controls.Add(this.pNUpdate); - this.fLPSettings.Controls.Add(this.pnlXIPorts); this.fLPSettings.Controls.Add(this.panel4); this.fLPSettings.Controls.Add(this.languagePackComboBox1); this.fLPSettings.Controls.Add(this.flowLayoutPanel1); @@ -1170,47 +1163,6 @@ this.nUDUpdateTime.Name = "nUDUpdateTime"; this.nUDUpdateTime.ValueChanged += new System.EventHandler(this.nUDUpdateTime_ValueChanged); // - // pnlXIPorts - // - this.pnlXIPorts.Controls.Add(this.lbUseXIPorts); - this.pnlXIPorts.Controls.Add(this.nUDXIPorts); - this.pnlXIPorts.Controls.Add(this.lbLastXIPort); - resources.ApplyResources(this.pnlXIPorts, "pnlXIPorts"); - this.pnlXIPorts.Name = "pnlXIPorts"; - // - // lbUseXIPorts - // - resources.ApplyResources(this.lbUseXIPorts, "lbUseXIPorts"); - this.lbUseXIPorts.Name = "lbUseXIPorts"; - // - // nUDXIPorts - // - resources.ApplyResources(this.nUDXIPorts, "nUDXIPorts"); - this.nUDXIPorts.Maximum = new decimal(new int[] { - 11, - 0, - 0, - 0}); - this.nUDXIPorts.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.nUDXIPorts.Name = "nUDXIPorts"; - this.nUDXIPorts.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.nUDXIPorts.ValueChanged += new System.EventHandler(this.nUDXIPorts_ValueChanged); - this.nUDXIPorts.Enter += new System.EventHandler(this.nUDXIPorts_Enter); - this.nUDXIPorts.Leave += new System.EventHandler(this.nUDXIPorts_Leave); - // - // lbLastXIPort - // - resources.ApplyResources(this.lbLastXIPort, "lbLastXIPort"); - this.lbLastXIPort.Name = "lbLastXIPort"; - // // panel4 // this.panel4.Controls.Add(this.label2); @@ -1406,9 +1358,6 @@ this.pNUpdate.ResumeLayout(false); this.pNUpdate.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDUpdateTime)).EndInit(); - this.pnlXIPorts.ResumeLayout(false); - this.pnlXIPorts.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nUDXIPorts)).EndInit(); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDUdpPortNum)).EndInit(); @@ -1516,10 +1465,6 @@ private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem; public System.Windows.Forms.Label lbLastMessage; private System.Windows.Forms.CheckBox cBQuickCharge; - private System.Windows.Forms.Panel pnlXIPorts; - private System.Windows.Forms.Label lbUseXIPorts; - private System.Windows.Forms.NumericUpDown nUDXIPorts; - private System.Windows.Forms.Label lbLastXIPort; public System.Windows.Forms.ListBox lBProfiles; private System.Windows.Forms.CheckBox cBCloseMini; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 5ea4e79..881de03 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -199,8 +199,6 @@ namespace DS4Windows cBDisconnectBT.Checked = DCBTatStop; cBQuickCharge.Checked = QuickCharge; - nUDXIPorts.Value = FirstXinputPort; - //Program.rootHub.x360Bus.FirstController = FirstXinputPort; // New settings this.Width = FormWidth; this.Height = FormHeight; @@ -440,10 +438,6 @@ namespace DS4Windows hoverTextDict[linkUninstall] = Properties.Resources.IfRemovingDS4Windows; hoverTextDict[cBSwipeProfiles] = Properties.Resources.TwoFingerSwipe; hoverTextDict[cBQuickCharge] = Properties.Resources.QuickCharge; - hoverTextDict[pnlXIPorts] = Properties.Resources.XinputPorts; - hoverTextDict[lbUseXIPorts] = Properties.Resources.XinputPorts; - hoverTextDict[nUDXIPorts] = Properties.Resources.XinputPorts; - hoverTextDict[lbLastXIPort] = Properties.Resources.XinputPorts; hoverTextDict[cBCloseMini] = Properties.Resources.CloseMinimize; hoverTextDict[uacPictureBox] = Properties.Resources.UACTask; hoverTextDict[StartWindowsCheckBox] = Properties.Resources.RunAtStartup; @@ -2274,29 +2268,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question toolTip1.Hide(lbLastMessage); } - private void nUDXIPorts_ValueChanged(object sender, EventArgs e) - { - lbLastXIPort.Text = "- " + ((int)Math.Round(nUDXIPorts.Value, 0) + 3); - } - - private int oldxiport; - private void nUDXIPorts_Leave(object sender, EventArgs e) - { - if (oldxiport != (int)Math.Round(nUDXIPorts.Value, 0)) - { - oldxiport = (int)Math.Round(nUDXIPorts.Value, 0); - FirstXinputPort = oldxiport; - //Program.rootHub.x360Bus.FirstController = oldxiport; - BtnStartStop_Clicked(false); - finishHideDS4Check(); - } - } - - private void nUDXIPorts_Enter(object sender, EventArgs e) - { - oldxiport = (int)Math.Round(nUDXIPorts.Value, 0); - } - private void cBCloseMini_CheckedChanged(object sender, EventArgs e) { CloseMini = cBCloseMini.Checked; diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index c921cda..d39a4ad 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -445,10 +445,10 @@ NoControl - 746, 89 + 745, 89 - 147, 22 + 148, 22 50 @@ -472,7 +472,7 @@ NoControl - 347, 34 + 346, 34 39, 20 @@ -574,7 +574,7 @@ NoControl - 706, 89 + 705, 89 34, 22 @@ -604,7 +604,7 @@ NoControl - 706, 117 + 705, 117 34, 22 @@ -703,7 +703,7 @@ None - 589, 33 + 588, 33 111, 21 @@ -730,7 +730,7 @@ NoControl - 706, 61 + 705, 61 34, 22 @@ -757,7 +757,7 @@ None - 589, 61 + 588, 61 111, 21 @@ -781,7 +781,7 @@ None - 589, 89 + 588, 89 111, 21 @@ -808,7 +808,7 @@ NoControl - 706, 33 + 705, 33 34, 22 @@ -835,7 +835,7 @@ None - 589, 117 + 588, 117 111, 21 @@ -868,7 +868,7 @@ NoControl - 590, 7 + 589, 7 109, 15 @@ -940,7 +940,7 @@ NoControl - 343, 7 + 342, 7 47, 15 @@ -976,7 +976,7 @@ NoControl - 436, 7 + 435, 7 51, 15 @@ -1012,7 +1012,7 @@ NoControl - 442, 36 + 441, 36 39, 15 @@ -1048,7 +1048,7 @@ NoControl - 442, 64 + 441, 64 39, 15 @@ -1084,7 +1084,7 @@ NoControl - 442, 92 + 441, 92 39, 15 @@ -1120,7 +1120,7 @@ NoControl - 442, 120 + 441, 120 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 347, 62 + 346, 62 39, 20 @@ -1180,7 +1180,7 @@ NoControl - 347, 90 + 346, 90 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 347, 118 + 346, 118 39, 20 @@ -1243,10 +1243,10 @@ NoControl - 746, 33 + 745, 33 - 147, 22 + 148, 22 50 @@ -1273,10 +1273,10 @@ NoControl - 746, 61 + 745, 61 - 147, 22 + 148, 22 51 @@ -1303,10 +1303,10 @@ NoControl - 746, 117 + 745, 117 - 147, 22 + 148, 22 52 @@ -1336,7 +1336,7 @@ NoControl - 512, 0 + 511, 0 67, 30 @@ -1375,7 +1375,7 @@ NoControl - 538, 37 + 537, 37 15, 14 @@ -1408,7 +1408,7 @@ NoControl - 538, 65 + 537, 65 15, 14 @@ -1441,7 +1441,7 @@ NoControl - 538, 93 + 537, 93 15, 14 @@ -1474,7 +1474,7 @@ NoControl - 538, 121 + 537, 121 15, 14 @@ -1522,7 +1522,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,151" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,153" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -2700,117 +2700,6 @@ 13 - - Left - - - True - - - NoControl - - - 3, 3 - - - 86, 13 - - - 0 - - - Use Xinput Ports - - - lbUseXIPorts - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlXIPorts - - - 0 - - - Top, Right - - - 100, 1 - - - 44, 20 - - - 42 - - - nUDXIPorts - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlXIPorts - - - 1 - - - Top, Right - - - True - - - NoControl - - - 150, 3 - - - 19, 13 - - - 0 - - - - 4 - - - lbLastXIPort - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlXIPorts - - - 2 - - - 274, 82 - - - 186, 22 - - - 44 - - - pnlXIPorts - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - fLPSettings - - - 14 - True @@ -2896,7 +2785,7 @@ 2 - 274, 110 + 274, 82 219, 23 @@ -2914,7 +2803,7 @@ fLPSettings - 15 + 14 No (English UI) @@ -2923,7 +2812,7 @@ Use language pack - 274, 139 + 274, 111 260, 27 @@ -2935,13 +2824,13 @@ languagePackComboBox1 - DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.5.17.0, Culture=neutral, PublicKeyToken=null + DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.6.14.0, Culture=neutral, PublicKeyToken=null fLPSettings - 16 + 15 True @@ -3103,7 +2992,7 @@ TopDown - 274, 172 + 274, 144 4, 4, 4, 4 @@ -3124,7 +3013,7 @@ fLPSettings - 17 + 16 Fill @@ -3652,7 +3541,7 @@ advColorDialog - DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.17.0, Culture=neutral, PublicKeyToken=null + DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.6.14.0, Culture=neutral, PublicKeyToken=null DS4Form diff --git a/DS4Windows/Properties/Resources.Designer.cs b/DS4Windows/Properties/Resources.Designer.cs index 1f5d90a..431a26f 100644 --- a/DS4Windows/Properties/Resources.Designer.cs +++ b/DS4Windows/Properties/Resources.Designer.cs @@ -2200,15 +2200,6 @@ namespace DS4Windows.Properties { } } - /// - /// Looks up a localized string similar to Use higher ports if you get conflicts in other emulating X360 programs, such as SCP's tool. - /// - public static string XinputPorts { - get { - return ResourceManager.GetString("XinputPorts", resourceCulture); - } - } - /// /// Looks up a localized string similar to XML Files (*.xml). /// diff --git a/DS4Windows/Properties/Resources.resx b/DS4Windows/Properties/Resources.resx index 8da56f0..88031a2 100644 --- a/DS4Windows/Properties/Resources.resx +++ b/DS4Windows/Properties/Resources.resx @@ -799,9 +799,6 @@ ..\Resources\X.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Use higher ports if you get conflicts in other emulating X360 programs, such as SCP's tool - XML Files (*.xml)