From 6f27ea047c81ef5558fea527c2f1a163073a8450 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Fri, 13 Sep 2019 22:08:26 -0500 Subject: [PATCH] Moved some event hooking to Options cs file --- DS4Windows/DS4Forms/Options.Designer.cs | 6 ------ DS4Windows/DS4Forms/Options.cs | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DS4Windows/DS4Forms/Options.Designer.cs b/DS4Windows/DS4Forms/Options.Designer.cs index 8bdd616..f9abc62 100644 --- a/DS4Windows/DS4Forms/Options.Designer.cs +++ b/DS4Windows/DS4Forms/Options.Designer.cs @@ -2819,7 +2819,6 @@ resources.ApplyResources(this.btnRSCurveEditor, "btnRSCurveEditor"); this.btnRSCurveEditor.Name = "btnRSCurveEditor"; this.btnRSCurveEditor.UseVisualStyleBackColor = true; - this.btnRSCurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // lbRSCurvePercent // @@ -2846,7 +2845,6 @@ resources.ApplyResources(this.BtnLSCurveEditor, "BtnLSCurveEditor"); this.BtnLSCurveEditor.Name = "BtnLSCurveEditor"; this.BtnLSCurveEditor.UseVisualStyleBackColor = true; - this.BtnLSCurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // label3 // @@ -3224,14 +3222,12 @@ resources.ApplyResources(this.btnR2CurveEditor, "btnR2CurveEditor"); this.btnR2CurveEditor.Name = "btnR2CurveEditor"; this.btnR2CurveEditor.UseVisualStyleBackColor = true; - this.btnR2CurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // btnL2CurveEditor // resources.ApplyResources(this.btnL2CurveEditor, "btnL2CurveEditor"); this.btnL2CurveEditor.Name = "btnL2CurveEditor"; this.btnL2CurveEditor.UseVisualStyleBackColor = true; - this.btnL2CurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // tBR2CustomOutputCurve // @@ -3500,14 +3496,12 @@ resources.ApplyResources(this.btnSixZCurveEditor, "btnSixZCurveEditor"); this.btnSixZCurveEditor.Name = "btnSixZCurveEditor"; this.btnSixZCurveEditor.UseVisualStyleBackColor = true; - this.btnSixZCurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // btnSixXCurveEditor // resources.ApplyResources(this.btnSixXCurveEditor, "btnSixXCurveEditor"); this.btnSixXCurveEditor.Name = "btnSixXCurveEditor"; this.btnSixXCurveEditor.UseVisualStyleBackColor = true; - this.btnSixXCurveEditor.Click += new System.EventHandler(this.BtnCurveEditor_Click); // // label8 // diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs index ac10bed..e76893a 100644 --- a/DS4Windows/DS4Forms/Options.cs +++ b/DS4Windows/DS4Forms/Options.cs @@ -341,12 +341,14 @@ namespace DS4Windows.Forms nUDLSCurve.ValueChanged += nUDLSCurve_ValueChanged; nUDLSRotation.ValueChanged += nUDLSRotation_ValueChanged; tBLSCustomOutputCurve.Leave += tBCustomOutputCurve_Leave; + BtnLSCurveEditor.Click += BtnCurveEditor_Click; nUDRS.ValueChanged += numUDRS_ValueChanged; nUDRSMaxZone.ValueChanged += nUDRSMaxZone_ValueChanged; nUDRSAntiDead.ValueChanged += nUDRSAntiDead_ValueChanged; nUDRSS.ValueChanged += nUDRSSens_ValueChanged; rsOutCurveComboBox.SelectedIndexChanged += rsOutCurveComboBox_SelectedIndexChanged; tBRSCustomOutputCurve.Leave += TBRSCustomOutputCurve_Leave; + btnRSCurveEditor.Click += BtnCurveEditor_Click; rsSquStickCk.Click += rsSquStickCk_Click; nUDRSCurve.ValueChanged += nUDRSCurve_ValueChanged; nUDRSRotation.ValueChanged += nUDRSRotation_ValueChanged; @@ -356,12 +358,14 @@ namespace DS4Windows.Forms nUDL2S.ValueChanged += nUDL2Sens_ValueChanged; cBL2OutputCurve.SelectedIndexChanged += cBL2OutputCurve_SelectedIndexChanged; tBL2CustomOutputCurve.Leave += TBL2CustomOutputCurve_Leave; + btnL2CurveEditor.Click += BtnCurveEditor_Click; nUDR2.ValueChanged += numUDR2_ValueChanged; nUDR2Maxzone.ValueChanged += nUDR2Maxzone_ValueChanged; nUDR2AntiDead.ValueChanged += nUDR2AntiDead_ValueChanged; nUDR2S.ValueChanged += nUDR2Sens_ValueChanged; cBR2OutputCurve.SelectedIndexChanged += cBR2OutputCurve_SelectedIndexChanged; tBR2CustomOutputCurve.Leave += TBR2CustomOutputCurve_Leave; + btnR2CurveEditor.Click += BtnCurveEditor_Click; nUDSX.ValueChanged += nUDSX_ValueChanged; nUDSZ.ValueChanged += nUDSZ_ValueChanged; nUDSixAxisXMaxZone.ValueChanged += nUDSixAxisXMaxZone_ValueChanged; @@ -372,8 +376,10 @@ namespace DS4Windows.Forms nUDSZS.ValueChanged += nUDSZSens_ValueChanged; cBSixaxisXOutputCurve.SelectedIndexChanged += cBSixaxisXOutputCurve_SelectedIndexChanged; tBSixXCustomOutputCurve.Leave += TBSixXCustomOutputCurve_Leave; + btnSixXCurveEditor.Click += BtnCurveEditor_Click; cBSixaxisZOutputCurve.SelectedIndexChanged += cBSixaxisZOutputCurve_SelectedIndexChanged; tBSixZCustomOutputCurve.Leave += TBSixZCustomOutputCurve_Leave; + btnSixZCurveEditor.Click += BtnCurveEditor_Click; // Gyro events gyroOutputMode.SelectedIndexChanged += GyroOutputMode_SelectedIndexChanged;