From 50187fe9c1930ded27adefd1376e8aa79a41ea5e Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Tue, 4 Jun 2019 02:19:19 -0500 Subject: [PATCH] Take user control out of design mode. Fixes design view on my end. LanguagePackComboBox in DS4Form has caused massive issues in VS 2017 and 2019 since the clean Windows install --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 20 ++--- DS4Windows/DS4Forms/DS4Form.cs | 9 +++ DS4Windows/DS4Forms/DS4Form.resx | 100 +++++++++++------------- 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index 6d93140..48e5397 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -155,7 +155,6 @@ this.ckUdpServ = new System.Windows.Forms.CheckBox(); this.nUDUdpPortNum = new System.Windows.Forms.NumericUpDown(); this.tBUdpListenAddress = new System.Windows.Forms.TextBox(); - this.languagePackComboBox1 = new DS4Windows.DS4Forms.LanguagePackComboBox(); this.cBCustomSteam = new System.Windows.Forms.CheckBox(); this.tBSteamFolder = new System.Windows.Forms.TextBox(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); @@ -173,6 +172,7 @@ this.useProfileColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.useCustomColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advColorDialog = new DS4Windows.AdvancedColorDialog(); + this.langPanel = new System.Windows.Forms.Panel(); this.pnlButton.SuspendLayout(); this.cMTaskbar.SuspendLayout(); this.tabMain.SuspendLayout(); @@ -956,7 +956,7 @@ this.fLPSettings.Controls.Add(this.cBUpdate); this.fLPSettings.Controls.Add(this.pNUpdate); this.fLPSettings.Controls.Add(this.panel4); - this.fLPSettings.Controls.Add(this.languagePackComboBox1); + this.fLPSettings.Controls.Add(this.langPanel); this.fLPSettings.Controls.Add(this.cBCustomSteam); this.fLPSettings.Controls.Add(this.tBSteamFolder); this.fLPSettings.Controls.Add(this.flowLayoutPanel1); @@ -1213,15 +1213,6 @@ resources.ApplyResources(this.tBUdpListenAddress, "tBUdpListenAddress"); this.tBUdpListenAddress.Name = "tBUdpListenAddress"; // - // languagePackComboBox1 - // - this.languagePackComboBox1.AutoValidate = System.Windows.Forms.AutoValidate.Disable; - this.languagePackComboBox1.BackColor = System.Drawing.SystemColors.Window; - this.languagePackComboBox1.CausesValidation = false; - resources.ApplyResources(this.languagePackComboBox1, "languagePackComboBox1"); - this.languagePackComboBox1.Name = "languagePackComboBox1"; - this.languagePackComboBox1.SelectedValueChanged += new System.EventHandler(this.languagePackComboBox1_SelectedValueChanged); - // // cBCustomSteam // resources.ApplyResources(this.cBCustomSteam, "cBCustomSteam"); @@ -1333,6 +1324,11 @@ resources.ApplyResources(this.useCustomColorToolStripMenuItem, "useCustomColorToolStripMenuItem"); this.useCustomColorToolStripMenuItem.Click += new System.EventHandler(this.useCustomColorToolStripMenuItem_Click); // + // langPanel + // + resources.ApplyResources(this.langPanel, "langPanel"); + this.langPanel.Name = "langPanel"; + // // DS4Form // resources.ApplyResources(this, "$this"); @@ -1515,7 +1511,6 @@ private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Button exportLogTxtBtn; private System.Windows.Forms.Button btnClear; - private DS4Forms.LanguagePackComboBox languagePackComboBox1; private System.Windows.Forms.ToolStripMenuItem openProgramFolderToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem disconToolStripMenuItem; @@ -1531,6 +1526,7 @@ private System.Windows.Forms.TextBox tBUdpListenAddress; private System.Windows.Forms.CheckBox cBCustomSteam; private System.Windows.Forms.TextBox tBSteamFolder; + private System.Windows.Forms.Panel langPanel; //private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 9356336..113cc33 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -57,6 +57,7 @@ namespace DS4Windows.Forms private bool changingService; private IntPtr regHandle = new IntPtr(); private ManagementEventWatcher managementEvWatcher; + private DS4Forms.LanguagePackComboBox languagePackComboBox1; Dictionary hoverTextDict = new Dictionary(); // 0 index is used for application version text. 1 - 4 indices are used for controller status string[] notifyText = new string[5] @@ -97,6 +98,14 @@ namespace DS4Windows.Forms InitializeComponent(); + this.languagePackComboBox1 = new DS4Forms.LanguagePackComboBox(); + this.languagePackComboBox1.AutoValidate = System.Windows.Forms.AutoValidate.Disable; + this.languagePackComboBox1.BackColor = System.Drawing.SystemColors.Window; + this.languagePackComboBox1.CausesValidation = false; + this.languagePackComboBox1.Name = "languagePackComboBox1"; + this.languagePackComboBox1.SelectedValueChanged += new System.EventHandler(this.languagePackComboBox1_SelectedValueChanged); + this.langPanel.Controls.Add(languagePackComboBox1); + bnEditC1.Tag = 0; bnEditC2.Tag = 1; bnEditC3.Tag = 2; diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index 3c18b40..367ff2d 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -445,10 +445,10 @@ NoControl - 740, 89 + 739, 89 - 153, 22 + 154, 22 50 @@ -472,7 +472,7 @@ NoControl - 342, 34 + 341, 34 39, 20 @@ -574,7 +574,7 @@ NoControl - 700, 89 + 699, 89 34, 22 @@ -604,7 +604,7 @@ NoControl - 700, 117 + 699, 117 34, 22 @@ -703,7 +703,7 @@ None - 583, 33 + 582, 33 111, 21 @@ -730,7 +730,7 @@ NoControl - 700, 61 + 699, 61 34, 22 @@ -757,7 +757,7 @@ None - 583, 61 + 582, 61 111, 21 @@ -781,7 +781,7 @@ None - 583, 89 + 582, 89 111, 21 @@ -808,7 +808,7 @@ NoControl - 700, 33 + 699, 33 34, 22 @@ -835,7 +835,7 @@ None - 583, 117 + 582, 117 111, 21 @@ -868,7 +868,7 @@ NoControl - 584, 7 + 583, 7 109, 15 @@ -940,7 +940,7 @@ NoControl - 338, 7 + 337, 7 47, 15 @@ -976,7 +976,7 @@ NoControl - 430, 7 + 429, 7 51, 15 @@ -1012,7 +1012,7 @@ NoControl - 436, 36 + 435, 36 39, 15 @@ -1048,7 +1048,7 @@ NoControl - 436, 64 + 435, 64 39, 15 @@ -1084,7 +1084,7 @@ NoControl - 436, 92 + 435, 92 39, 15 @@ -1120,7 +1120,7 @@ NoControl - 436, 120 + 435, 120 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 342, 62 + 341, 62 39, 20 @@ -1180,7 +1180,7 @@ NoControl - 342, 90 + 341, 90 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 342, 118 + 341, 118 39, 20 @@ -1243,10 +1243,10 @@ NoControl - 740, 33 + 739, 33 - 153, 22 + 154, 22 50 @@ -1273,10 +1273,10 @@ NoControl - 740, 61 + 739, 61 - 153, 22 + 154, 22 51 @@ -1303,10 +1303,10 @@ NoControl - 740, 117 + 739, 117 - 153, 22 + 154, 22 52 @@ -1336,7 +1336,7 @@ NoControl - 506, 0 + 505, 0 67, 30 @@ -1375,7 +1375,7 @@ NoControl - 532, 37 + 531, 37 15, 14 @@ -1408,7 +1408,7 @@ NoControl - 532, 65 + 531, 65 15, 14 @@ -1441,7 +1441,7 @@ NoControl - 532, 93 + 531, 93 15, 14 @@ -1474,7 +1474,7 @@ NoControl - 532, 121 + 531, 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,157" /><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,159" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -2829,31 +2829,25 @@ 14 - - No (English UI) - - - Use language pack - - + 274, 111 - - 260, 27 + + 300, 25 - - 60 + + 66 - - languagePackComboBox1 + + langPanel - - DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.7.9.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + fLPSettings - + 15 @@ -2866,7 +2860,7 @@ NoControl - 274, 144 + 274, 142 147, 17 @@ -2893,7 +2887,7 @@ False - 274, 167 + 274, 165 260, 20 @@ -3040,7 +3034,7 @@ TopDown - 274, 193 + 274, 191 4, 4, 4, 4