diff --git a/DS4Windows/DS4Forms/RecordBox.Designer.cs b/DS4Windows/DS4Forms/RecordBox.Designer.cs index 1756388..aec95a8 100644 --- a/DS4Windows/DS4Forms/RecordBox.Designer.cs +++ b/DS4Windows/DS4Forms/RecordBox.Designer.cs @@ -88,6 +88,7 @@ this.lVMacros.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.cHMacro}); this.lVMacros.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.lVMacros.HideSelection = false; this.lVMacros.LargeImageList = this.iLKeys; this.lVMacros.MultiSelect = false; this.lVMacros.Name = "lVMacros"; @@ -166,15 +167,15 @@ // // pBRtouch // - resources.ApplyResources(this.pBRtouch, "pBRtouch"); this.pBRtouch.Image = global::DS4Windows.Properties.Resources.right_touch; + resources.ApplyResources(this.pBRtouch, "pBRtouch"); this.pBRtouch.Name = "pBRtouch"; this.pBRtouch.TabStop = false; // // pBLtouch // - resources.ApplyResources(this.pBLtouch, "pBLtouch"); this.pBLtouch.Image = global::DS4Windows.Properties.Resources.left_touch; + resources.ApplyResources(this.pBLtouch, "pBLtouch"); this.pBLtouch.Name = "pBLtouch"; this.pBLtouch.TabStop = false; // @@ -227,7 +228,6 @@ // // openPresets // - this.openPresets.FileName = "openFileDialog1"; resources.ApplyResources(this.openPresets, "openPresets"); // // lbMacroOrder @@ -242,24 +242,24 @@ // // cMSLoadPresets // - resources.ApplyResources(this.cMSLoadPresets, "cMSLoadPresets"); this.cMSLoadPresets.ImageScalingSize = new System.Drawing.Size(20, 20); this.cMSLoadPresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.altTabToolStripMenuItem, this.fromFileToolStripMenuItem}); this.cMSLoadPresets.Name = "cMSLoadPresets"; this.cMSLoadPresets.ShowImageMargin = false; + resources.ApplyResources(this.cMSLoadPresets, "cMSLoadPresets"); // // altTabToolStripMenuItem // - resources.ApplyResources(this.altTabToolStripMenuItem, "altTabToolStripMenuItem"); this.altTabToolStripMenuItem.Name = "altTabToolStripMenuItem"; + resources.ApplyResources(this.altTabToolStripMenuItem, "altTabToolStripMenuItem"); this.altTabToolStripMenuItem.Click += new System.EventHandler(this.altTabToolStripMenuItem_Click); // // fromFileToolStripMenuItem // - resources.ApplyResources(this.fromFileToolStripMenuItem, "fromFileToolStripMenuItem"); this.fromFileToolStripMenuItem.Name = "fromFileToolStripMenuItem"; + resources.ApplyResources(this.fromFileToolStripMenuItem, "fromFileToolStripMenuItem"); this.fromFileToolStripMenuItem.Click += new System.EventHandler(this.fromFileToolStripMenuItem_Click); // // RecordBox diff --git a/DS4Windows/DS4Forms/RecordBox.cs b/DS4Windows/DS4Forms/RecordBox.cs index 18b7ff6..8df818c 100644 --- a/DS4Windows/DS4Forms/RecordBox.cs +++ b/DS4Windows/DS4Forms/RecordBox.cs @@ -42,7 +42,7 @@ namespace DS4Windows.Forms AddtoDS4List(); //ds4.Tick += ds4_Tick; ds4.Elapsed += Ds4_Tick; - ds4.Interval = 1; + ds4.Interval = 10; if (kbm.macrostag.Count > 0) { macros.AddRange(kbm.macrostag); @@ -66,7 +66,7 @@ namespace DS4Windows.Forms //ds4.Tick += ds4_Tick; ds4.Elapsed += Ds4_Tick; - ds4.Interval = 1; + ds4.Interval = 10; lbRecordTip.Visible = false; cBStyle.Visible = false; pnlMouseButtons.Location = new Point(pnlMouseButtons.Location.X, pnlMouseButtons.Location.Y - 75); diff --git a/DS4Windows/DS4Forms/RecordBox.resx b/DS4Windows/DS4Forms/RecordBox.resx index 211e8b6..9874e99 100644 --- a/DS4Windows/DS4Forms/RecordBox.resx +++ b/DS4Windows/DS4Forms/RecordBox.resx @@ -117,630 +117,90 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - + Top, Right - - lVMacros - - - 57, 28 - - - Top, Right - - - 4, 4, 4, 4 - - - Macro Order - - - 3 - - - $this - - - 4, 4, 4, 4 - - - 4, 10 - - - 715, 175 - - - 0 - - - 4, 4, 4, 4 - - - - False - - - btnSave - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Save Preset - - - 155, 26 - - - Text Document (*.txt)|*.txt - - - btn4th - - - $this - - - Zoom - - - 2 - - - 23, 130 - - - 4, 4, 4, 4 - - - pnlMouseButtons - - - 4, 0, 4, 0 - - - btnLightbar - - - iLKeys - - - 8 - - - 283, 41 - - - 861, 100 - - - Record a Macro - - - 3 - - - 175, 28 - - - Top, Right - - - 88, 17 - - - 4, 4, 4, 4 - - - 137, 28 - - - 160, 24 - - - btn5th - - - 715, 100 - - - 1 - - - fromFileToolStripMenuItem - - - 2 - - - 8, 16 - - - Top - - - Play once - - - 1 - - - pBLtouch - - - Top, Right - - - pBRtouch - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4th Mouse Button Down - - - Change Lightbar Color - - - 139, 28 - - - MiddleCenter - - - 4, 4, 4, 4 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 5 - - - 4, 4, 4, 4 - - - 332 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMouseButtons - - - 4, 4, 4, 4 - - - Top, Right - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 4, 4, 4 - - - 57, 28 - - - Zoom - - - NoControl - - - 719, 277 - - - 3 - - - True - - - 4, 4, 4, 4 - - - Repeat while held - - - savePresets - - - RecordBox - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 326 - - - 4, 4, 4, 4 - - - 284, 57 - - - 6 - - - lbDelayTip - - - 4, 0, 4, 0 - - - 0 - - - 347, 252 - - - 328 - - - pnlMouseButtons - - - 771, 220 - - - 701, 420 - - - 52, 12 - - - 5th Mouse Button Down - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 10 - - - 23, 95 - - - Load Preset - - - 4, 4, 4, 4 - - - Top, Right - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 200 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - lbMacroOrder - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMouseButtons - - - 322 - - - cHMacro - - - 329 - - - Top - - - cMSLoadPresets - - - Cycle Programs - - - NoControl - - - $this - - - $this - - - 4, 0, 4, 0 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openPresets - - - 332 - - - 156, 56 - - - Top, Bottom, Left, Right - - - 4 - - - 333 - MiddleLeft - - System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - 328 - - - Save - - - Top - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnCancel - - - True - - - 123, 21 - - - False - - - 4, 36 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 4, 4, 4 - - - btnRecord - - - Cancel - - - 175, 28 - - - Top, Right - - - From File... - - - 175, 28 - - - 155, 26 - - - 793, 149 - - - 4, 4, 4, 4 - - - NoControl - - - lbRecordTip - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 329 - - - 137, 28 - - - Top - - - Text Document (*.txt)|*.txt - - - Top, Right - - - 7 - - - cBStyle - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMouseButtons - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - NoControl - 715, 36 + 536, 29 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 213, 46 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - 412, 9 - - - 52, 48 - - - 715, 2 + + + 322 Record + + btnRecord + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - MiddleCenter + + Top, Right - - cBRecordDelays + + True - - 4, 4, 4, 4 + + 591, 121 - - 203, 130 - - - $this - - - Add Rumble + + 96, 17 324 - - $this - - - $this - - - pnlMouseButtons - - - Double click on a wait to edit the time - - - btnLoadP - - - altTabToolStripMenuItem - - - Macro Order - - - 1000, 462 - - - 203, 95 - - - btnRumble - - - pnlMouseButtons - - - $this - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 327 - Record Delays - - 0 + + cBRecordDelays - - 4, 4, 4, 4 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 861, 2 + + $this - - btnSaveP + + 4 - - 9 + + Top, Bottom, Left, Right - - Use Keyboard/Mouse + Controller 1 to record + + Macro Order + + 200 + + + 17, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ - CgAAAk1TRnQBSQFMAgEBAwEAAZwBAQHIAQEBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAAdABAQHQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -782,71 +242,554 @@ AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAT/AYcB4QIAAf4BfwH+AT8BgAEB AgAB/AE/Af4BPwHAAQMCAAH4AR8B/gE/AcABAwIAAfABDwH+AT8BgAEBAgAB8AEHAf4BPwGAAQECAAHy AQcB/gE/AYABAQIAAfYBJwH2ATcBgAEBAgAB/gE/AfIBJwGAAQECAAH+AT8B8AEHAYABAQIAAf4BPwHw - AQcBgAEBAgAB/gE/AfgBDwQAAf4BPwH8AR8EAAH+AT8B/gE/BAAB/gE/Af8BfwEAAQECAAT/AYMBwxgA + AQcBgAEBAgAB/gE/AfgBDwQAAf4BPwH8AR8EAAH+AT8B/gE/BAAB/gE/Af8BfwEAAQECAAT/AYMBwwIA Cw== - + + 3, 29 + + + 527, 342 + + + 326 + + + lVMacros + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - NoControl + + 9 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Right - - 175, 28 + + Play once - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Repeat while held - - 331 + + 578, 179 - - NoControl + + 121, 21 + + + 327 + + + cBStyle + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Right + + + 536, 2 - 139, 28 + 104, 23 - - Edit the Wait to change the cycle rate + + 328 - - 280, 170 + + Save - - Top, Right + + btnSave - - 12 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Right - - + $this 11 + + Top, Right + + + 646, 2 + + + 103, 23 + + + 328 + + + Cancel + + + btnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + Top, Right + + + NoControl + + + 646, 81 + + + 103, 23 + + + 332 + + + Save Preset + + + btnSaveP + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Right + + + True + + + 309, 7 + - 294, 17 + 221, 13 + + + 329 + + + Use Keyboard/Mouse + Controller 1 to record + + + MiddleCenter + + + lbRecordTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Right + + + NoControl + + + 152, 106 + + + 43, 23 + + + Zoom + + + 4 + + + pBRtouch + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 0 + + + 152, 77 + + + 43, 23 + + + Zoom + + + 3 + + + pBLtouch + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 1 + + + Top + + + NoControl + + + 17, 106 + + + 131, 23 + + + 1 + + + Change Lightbar Color + + + btnLightbar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 2 + + + Top + + + NoControl + + + 17, 77 + + + 131, 23 + + + 2 + + + Add Rumble + + + btnRumble + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 3 + + + Top + + + 39, 39 + + + 131, 23 + + + 0 + + + 5th Mouse Button Down + + + btn5th + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 4 + + + Top + + + 39, 10 + + + 131, 23 + + + 0 + + + 4th Mouse Button Down + + + btn4th + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMouseButtons + + + 5 + + + 539, 225 + + + 210, 138 + + + 331 + + + False + + + pnlMouseButtons + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + Top, Right + + + 536, 81 + + + 104, 23 + + + 332 + + + Load Preset + + + btnLoadP + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 102, 17 + + + Text Document (*.txt)|*.txt 238, 17 - - 102, 17 - + + Text Document (*.txt)|*.txt + + + True + + + 3, 8 + + + 66, 13 + + + 333 + + + Macro Order + + + lbMacroOrder + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Right + + + NoControl + + + 536, 142 + + + 212, 33 + + + 329 + + + Double click on a wait to edit the time + + + MiddleCenter + + + False + + + lbDelayTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + 356, 17 - - 17, 17 - + + 132, 22 + + + Cycle Programs + + + Edit the Wait to change the cycle rate + + + 132, 22 + + + From File... + + + 133, 48 + + + cMSLoadPresets + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True + + 6, 13 + + + 750, 375 + + + 260, 205 + + + Record a Macro + + + cHMacro + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iLKeys + + + System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + savePresets + + + System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openPresets + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + altTabToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fromFileToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + RecordBox + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/DS4Windows/DS4Forms/WelcomeDialog.cs b/DS4Windows/DS4Forms/WelcomeDialog.cs index aa9bfff..c51c24a 100644 --- a/DS4Windows/DS4Forms/WelcomeDialog.cs +++ b/DS4Windows/DS4Forms/WelcomeDialog.cs @@ -73,7 +73,7 @@ namespace DS4Windows.Forms if (File.Exists(exepath + $"\\{InstFileName}")) { bnStep1.Text = Properties.Resources.OpeningInstaller; - monitorProc = Process.Start(exepath + $"\\{InstFileName}"); + monitorProc = Process.Start(exepath + $"\\{InstFileName}", "/exenoupdates"); bnStep1.Text = Properties.Resources.Installing; }