From f0d3a55bd0ff4fa37eb2b18b8ac5cdbe7bef82e9 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Mon, 3 Apr 2017 20:07:56 -0700 Subject: [PATCH] Change toolstrip controls depending on selected profile. Make selection use fill listbox width --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 16 ++-- DS4Windows/DS4Forms/DS4Form.cs | 23 ++++++ DS4Windows/DS4Forms/DS4Form.resx | 103 +++++++++++++++--------- 3 files changed, 96 insertions(+), 46 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index 2039ae0..dfd674d 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -129,6 +129,7 @@ this.cBFlashWhenLate = new System.Windows.Forms.CheckBox(); this.cBCloseMini = new System.Windows.Forms.CheckBox(); this.cBQuickCharge = new System.Windows.Forms.CheckBox(); + this.cBUseWhiteIcon = new System.Windows.Forms.CheckBox(); this.cBDownloadLangauge = new System.Windows.Forms.CheckBox(); this.cBUpdate = new System.Windows.Forms.CheckBox(); this.pNUpdate = new System.Windows.Forms.Panel(); @@ -137,7 +138,6 @@ this.nUDUpdateTime = new System.Windows.Forms.NumericUpDown(); this.pnlXIPorts = new System.Windows.Forms.Panel(); this.lbUseXIPorts = new System.Windows.Forms.Label(); - this.cBUseWhiteIcon = new System.Windows.Forms.CheckBox(); this.nUDXIPorts = new System.Windows.Forms.NumericUpDown(); this.lbLastXIPort = new System.Windows.Forms.Label(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); @@ -152,7 +152,7 @@ this.cMCustomLed = new System.Windows.Forms.ContextMenuStrip(this.components); this.useProfileColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.useCustomColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.advColorDialog = new AdvancedColorDialog(); + this.advColorDialog = new DS4Windows.AdvancedColorDialog(); this.pnlButton.SuspendLayout(); this.cMTaskbar.SuspendLayout(); this.tabMain.SuspendLayout(); @@ -632,8 +632,8 @@ this.lBProfiles.ContextMenuStrip = this.cMProfile; resources.ApplyResources(this.lBProfiles, "lBProfiles"); this.lBProfiles.FormattingEnabled = true; - this.lBProfiles.MultiColumn = true; this.lBProfiles.Name = "lBProfiles"; + this.lBProfiles.SelectedIndexChanged += new System.EventHandler(this.lBProfiles_SelectedIndexChanged); this.lBProfiles.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lBProfiles_KeyDown); this.lBProfiles.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lBProfiles_MouseDoubleClick); this.lBProfiles.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lBProfiles_MouseDown); @@ -795,36 +795,36 @@ // // tsBEditProfile // - this.tsBEditProfile.Image = global::DS4Windows.Properties.Resources.edit; resources.ApplyResources(this.tsBEditProfile, "tsBEditProfile"); + this.tsBEditProfile.Image = global::DS4Windows.Properties.Resources.edit; this.tsBEditProfile.Name = "tsBEditProfile"; this.tsBEditProfile.Click += new System.EventHandler(this.tsBNEditProfile_Click); // // tsBDeleteProfile // - this.tsBDeleteProfile.Image = global::DS4Windows.Properties.Resources.delete; resources.ApplyResources(this.tsBDeleteProfile, "tsBDeleteProfile"); + this.tsBDeleteProfile.Image = global::DS4Windows.Properties.Resources.delete; this.tsBDeleteProfile.Name = "tsBDeleteProfile"; this.tsBDeleteProfile.Click += new System.EventHandler(this.tsBDeleteProfle_Click); // // tSBDupProfile // - this.tSBDupProfile.Image = global::DS4Windows.Properties.Resources.copy; resources.ApplyResources(this.tSBDupProfile, "tSBDupProfile"); + this.tSBDupProfile.Image = global::DS4Windows.Properties.Resources.copy; this.tSBDupProfile.Name = "tSBDupProfile"; this.tSBDupProfile.Click += new System.EventHandler(this.tSBDupProfile_Click); // // tSBImportProfile // - this.tSBImportProfile.Image = global::DS4Windows.Properties.Resources.import; resources.ApplyResources(this.tSBImportProfile, "tSBImportProfile"); + this.tSBImportProfile.Image = global::DS4Windows.Properties.Resources.import; this.tSBImportProfile.Name = "tSBImportProfile"; this.tSBImportProfile.Click += new System.EventHandler(this.tSBImportProfile_Click); // // tSBExportProfile // - this.tSBExportProfile.Image = global::DS4Windows.Properties.Resources.export; resources.ApplyResources(this.tSBExportProfile, "tSBExportProfile"); + this.tSBExportProfile.Image = global::DS4Windows.Properties.Resources.export; this.tSBExportProfile.Name = "tSBExportProfile"; this.tSBExportProfile.Click += new System.EventHandler(this.tSBExportProfile_Click); // diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index e664c91..7f113dd 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -1765,6 +1765,29 @@ namespace DS4Windows } } + private void lBProfiles_SelectedIndexChanged(object sender, EventArgs e) + { + int index = lBProfiles.SelectedIndex; + if (index >= 0) + { + tsBNewProfle.Enabled = true; + tsBEditProfile.Enabled = true; + tsBDeleteProfile.Enabled = true; + tSBDupProfile.Enabled = true; + tSBImportProfile.Enabled = true; + tSBExportProfile.Enabled = true; + } + else + { + tsBNewProfle.Enabled = true; + tsBEditProfile.Enabled = false; + tsBDeleteProfile.Enabled = false; + tSBDupProfile.Enabled = false; + tSBImportProfile.Enabled = false; + tSBExportProfile.Enabled = false; + } + } + private void cBDownloadLangauge_CheckedChanged(object sender, EventArgs e) { DownloadLang = cBDownloadLangauge.Checked; diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index d0005c1..793e394 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -160,7 +160,7 @@ 0 - 17, 17 + 153, 17 Bottom, Right @@ -349,13 +349,13 @@ 1 - 226, 17 + 264, 17 Scp server - 339, 17 + 377, 17 214, 22 @@ -424,7 +424,7 @@ 211, 6 - 449, 17 + 487, 17 XML Files (*.xml)|*.xml @@ -475,10 +475,10 @@ NoControl - 848, 74 + 845, 74 - 45, 22 + 48, 22 50 @@ -502,7 +502,7 @@ NoControl - 407, 19 + 406, 19 39, 20 @@ -604,7 +604,7 @@ NoControl - 805, 74 + 802, 74 37, 22 @@ -634,7 +634,7 @@ NoControl - 805, 102 + 802, 102 37, 22 @@ -733,7 +733,7 @@ None - 688, 18 + 685, 18 111, 21 @@ -760,7 +760,7 @@ NoControl - 805, 46 + 802, 46 37, 22 @@ -787,7 +787,7 @@ None - 688, 46 + 685, 46 111, 21 @@ -811,7 +811,7 @@ None - 688, 74 + 685, 74 111, 21 @@ -838,7 +838,7 @@ NoControl - 805, 18 + 802, 18 37, 22 @@ -865,7 +865,7 @@ None - 688, 102 + 685, 102 111, 21 @@ -898,7 +898,7 @@ NoControl - 689, 0 + 686, 0 109, 15 @@ -970,7 +970,7 @@ NoControl - 403, 0 + 402, 0 47, 15 @@ -1006,7 +1006,7 @@ NoControl - 576, 0 + 574, 0 51, 15 @@ -1042,7 +1042,7 @@ NoControl - 582, 21 + 580, 21 39, 15 @@ -1078,7 +1078,7 @@ NoControl - 582, 49 + 580, 49 39, 15 @@ -1114,7 +1114,7 @@ NoControl - 582, 77 + 580, 77 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 582, 105 + 580, 105 39, 15 @@ -1180,7 +1180,7 @@ NoControl - 407, 47 + 406, 47 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 407, 75 + 406, 75 39, 20 @@ -1240,7 +1240,7 @@ NoControl - 407, 103 + 406, 103 39, 20 @@ -1273,10 +1273,10 @@ NoControl - 848, 18 + 845, 18 - 45, 22 + 48, 22 50 @@ -1303,10 +1303,10 @@ NoControl - 848, 46 + 845, 46 - 45, 22 + 48, 22 51 @@ -1333,10 +1333,10 @@ NoControl - 848, 102 + 845, 102 - 45, 22 + 48, 22 52 @@ -1381,7 +1381,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="5" 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="4" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="4" 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="3" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="3" 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="5" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /></Controls><Columns Styles="Percent,48.95498,Percent,26.82658,Percent,24.21844,AutoSize,0,AutoSize,0,Absolute,50" /><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="5" 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="4" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="4" 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="3" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="3" 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="5" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /></Controls><Columns Styles="Percent,48.95498,Percent,26.82658,Percent,24.21844,AutoSize,0,AutoSize,0,Absolute,53" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -1444,7 +1444,7 @@ 0 - 788, 17 + 826, 17 Segoe UI, 9pt, style=Bold @@ -1549,7 +1549,7 @@ 0 - 891, 17 + 17, 56 79, 24 @@ -1618,7 +1618,7 @@ 1 - 568, 17 + 606, 17 Magenta @@ -1632,6 +1632,9 @@ Make a New Profile + + False + Magenta @@ -1644,6 +1647,9 @@ Edit Selected Profile (Enter) + + False + Magenta @@ -1656,6 +1662,9 @@ Delete Selected Profle (Delete) + + False + Magenta @@ -1668,6 +1677,9 @@ Dupliacate Selected Profile (Ctrl+D) + + False + Magenta @@ -1680,6 +1692,9 @@ Import Profile or Profiles + + False + Magenta @@ -2779,16 +2794,16 @@ 3 - 673, 17 + 711, 17 XML Files (*.xml)|*.xml - 997, 17 + 123, 56 - 1110, 17 + 220, 56 170, 22 @@ -2811,6 +2826,9 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + True @@ -2820,6 +2838,9 @@ 904, 415 + + NoControl + 459, 229 @@ -3066,6 +3087,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + advColorDialog + + + DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.57.0, Culture=neutral, PublicKeyToken=null + DS4Form