diff --git a/AdvancedGeneralSettingsDlg.Designer.cs b/AdvancedGeneralSettingsDlg.Designer.cs index 0bf7fe4..446ff5a 100644 --- a/AdvancedGeneralSettingsDlg.Designer.cs +++ b/AdvancedGeneralSettingsDlg.Designer.cs @@ -82,11 +82,12 @@ private void InitializeComponent() this.tbHotKeyStopStart = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); - this.ok_button = new System.Windows.Forms.Button(); - this.cancel_button = new System.Windows.Forms.Button(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.checkBox3 = new System.Windows.Forms.CheckBox(); this.cbCaptureOpeningScenes = new System.Windows.Forms.CheckBox(); + this.ok_button = new System.Windows.Forms.Button(); + this.cancel_button = new System.Windows.Forms.Button(); + this.checkBox_RemoveNumbersFromNames = new System.Windows.Forms.CheckBox(); this.incidents_settings_tab.SuspendLayout(); this.tabPageTiming.SuspendLayout(); this.grpBox_Timing_Settings.SuspendLayout(); @@ -122,11 +123,11 @@ private void InitializeComponent() // this.tabPageTiming.Controls.Add(this.grpBox_Timing_Settings); this.tabPageTiming.Controls.Add(this.groupBox2); - this.tabPageTiming.Location = new System.Drawing.Point(4, 28); + this.tabPageTiming.Location = new System.Drawing.Point(4, 33); this.tabPageTiming.Margin = new System.Windows.Forms.Padding(4); this.tabPageTiming.Name = "tabPageTiming"; this.tabPageTiming.Padding = new System.Windows.Forms.Padding(4); - this.tabPageTiming.Size = new System.Drawing.Size(578, 541); + this.tabPageTiming.Size = new System.Drawing.Size(578, 536); this.tabPageTiming.TabIndex = 0; this.tabPageTiming.Text = "Timing"; this.tabPageTiming.UseVisualStyleBackColor = true; @@ -169,7 +170,7 @@ private void InitializeComponent() this.label14.Location = new System.Drawing.Point(449, 184); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(77, 19); + this.label14.Size = new System.Drawing.Size(96, 24); this.label14.TabIndex = 4; this.label14.Text = "HH:MM:SS"; // @@ -179,7 +180,7 @@ private void InitializeComponent() this.label13.Location = new System.Drawing.Point(449, 222); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(77, 19); + this.label13.Size = new System.Drawing.Size(96, 24); this.label13.TabIndex = 4; this.label13.Text = "HH:MM:SS"; // @@ -189,7 +190,7 @@ private void InitializeComponent() this.label16.Location = new System.Drawing.Point(449, 146); this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(77, 19); + this.label16.Size = new System.Drawing.Size(96, 24); this.label16.TabIndex = 4; this.label16.Text = "HH:MM:SS"; // @@ -199,7 +200,7 @@ private void InitializeComponent() this.label15.Location = new System.Drawing.Point(455, 146); this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(77, 19); + this.label15.Size = new System.Drawing.Size(96, 24); this.label15.TabIndex = 4; this.label15.Text = "HH:MM:SS"; // @@ -209,7 +210,7 @@ private void InitializeComponent() this.label12.Location = new System.Drawing.Point(449, 104); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(77, 19); + this.label12.Size = new System.Drawing.Size(96, 24); this.label12.TabIndex = 4; this.label12.Text = "HH:MM:SS"; // @@ -219,7 +220,7 @@ private void InitializeComponent() this.label11.Location = new System.Drawing.Point(449, 109); this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(77, 19); + this.label11.Size = new System.Drawing.Size(96, 24); this.label11.TabIndex = 4; this.label11.Text = "HH:MM:SS"; // @@ -229,7 +230,7 @@ private void InitializeComponent() this.label9.Location = new System.Drawing.Point(449, 64); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(77, 19); + this.label9.Size = new System.Drawing.Size(96, 24); this.label9.TabIndex = 4; this.label9.Text = "HH:MM:SS"; // @@ -239,7 +240,7 @@ private void InitializeComponent() this.label8.Location = new System.Drawing.Point(449, 26); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(77, 19); + this.label8.Size = new System.Drawing.Size(96, 24); this.label8.TabIndex = 4; this.label8.Text = "HH:MM:SS"; // @@ -249,7 +250,7 @@ private void InitializeComponent() this.tbHighlightVideoTargetDuration.Margin = new System.Windows.Forms.Padding(4); this.tbHighlightVideoTargetDuration.Mask = "00:00:00"; this.tbHighlightVideoTargetDuration.Name = "tbHighlightVideoTargetDuration"; - this.tbHighlightVideoTargetDuration.Size = new System.Drawing.Size(132, 27); + this.tbHighlightVideoTargetDuration.Size = new System.Drawing.Size(132, 32); this.tbHighlightVideoTargetDuration.TabIndex = 3; this.tbHighlightVideoTargetDuration.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -259,7 +260,7 @@ private void InitializeComponent() this.tbFollowLeaderBeforeRaceEndPeriod.Margin = new System.Windows.Forms.Padding(4); this.tbFollowLeaderBeforeRaceEndPeriod.Mask = "00:00:00"; this.tbFollowLeaderBeforeRaceEndPeriod.Name = "tbFollowLeaderBeforeRaceEndPeriod"; - this.tbFollowLeaderBeforeRaceEndPeriod.Size = new System.Drawing.Size(132, 27); + this.tbFollowLeaderBeforeRaceEndPeriod.Size = new System.Drawing.Size(132, 32); this.tbFollowLeaderBeforeRaceEndPeriod.TabIndex = 3; this.tbFollowLeaderBeforeRaceEndPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -269,7 +270,7 @@ private void InitializeComponent() this.tbBattleGap.Margin = new System.Windows.Forms.Padding(4); this.tbBattleGap.Mask = "00:00:00"; this.tbBattleGap.Name = "tbBattleGap"; - this.tbBattleGap.Size = new System.Drawing.Size(132, 27); + this.tbBattleGap.Size = new System.Drawing.Size(132, 32); this.tbBattleGap.TabIndex = 3; this.tbBattleGap.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbBattleGap.MaskInputRejected += new System.Windows.Forms.MaskInputRejectedEventHandler(this.tbBattleGap_MaskInputRejected); @@ -280,7 +281,7 @@ private void InitializeComponent() this.tbFollowLeaderAtRaceStartPeriod.Margin = new System.Windows.Forms.Padding(4); this.tbFollowLeaderAtRaceStartPeriod.Mask = "00:00:00"; this.tbFollowLeaderAtRaceStartPeriod.Name = "tbFollowLeaderAtRaceStartPeriod"; - this.tbFollowLeaderAtRaceStartPeriod.Size = new System.Drawing.Size(132, 27); + this.tbFollowLeaderAtRaceStartPeriod.Size = new System.Drawing.Size(132, 32); this.tbFollowLeaderAtRaceStartPeriod.TabIndex = 3; this.tbFollowLeaderAtRaceStartPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -290,7 +291,7 @@ private void InitializeComponent() this.tbBattleStickyPeriod.Margin = new System.Windows.Forms.Padding(4); this.tbBattleStickyPeriod.Mask = "00:00:00"; this.tbBattleStickyPeriod.Name = "tbBattleStickyPeriod"; - this.tbBattleStickyPeriod.Size = new System.Drawing.Size(132, 27); + this.tbBattleStickyPeriod.Size = new System.Drawing.Size(132, 32); this.tbBattleStickyPeriod.TabIndex = 3; this.tbBattleStickyPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbBattleStickyPeriod.MouseLeave += new System.EventHandler(this.tbBattleStickyPeriod_MouseLeave); @@ -302,7 +303,7 @@ private void InitializeComponent() this.tbCameraStickyPeriod.Margin = new System.Windows.Forms.Padding(4); this.tbCameraStickyPeriod.Mask = "00:00:00"; this.tbCameraStickyPeriod.Name = "tbCameraStickyPeriod"; - this.tbCameraStickyPeriod.Size = new System.Drawing.Size(132, 27); + this.tbCameraStickyPeriod.Size = new System.Drawing.Size(132, 32); this.tbCameraStickyPeriod.TabIndex = 3; this.tbCameraStickyPeriod.Tag = "45.0"; this.tbCameraStickyPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -315,7 +316,7 @@ private void InitializeComponent() this.label5.Location = new System.Drawing.Point(11, 230); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(186, 19); + this.label5.Size = new System.Drawing.Size(237, 24); this.label5.TabIndex = 1; this.label5.Text = "Duration of Highlight Video"; this.label5.Click += new System.EventHandler(this.label1_Click); @@ -326,7 +327,7 @@ private void InitializeComponent() this.label4.Location = new System.Drawing.Point(11, 190); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(211, 19); + this.label4.Size = new System.Drawing.Size(271, 24); this.label4.TabIndex = 1; this.label4.Text = "Time to track leader on last lap"; this.label4.Click += new System.EventHandler(this.label1_Click); @@ -337,7 +338,7 @@ private void InitializeComponent() this.label10.Location = new System.Drawing.Point(11, 109); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(228, 19); + this.label10.Size = new System.Drawing.Size(290, 24); this.label10.TabIndex = 1; this.label10.Text = "Time gap between cars for battle:"; this.label10.Click += new System.EventHandler(this.label1_Click); @@ -348,7 +349,7 @@ private void InitializeComponent() this.label3.Location = new System.Drawing.Point(11, 151); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(222, 19); + this.label3.Size = new System.Drawing.Size(284, 24); this.label3.TabIndex = 1; this.label3.Text = "Time to track leader at race start"; this.label3.Click += new System.EventHandler(this.label1_Click); @@ -359,7 +360,7 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(11, 67); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(204, 19); + this.label2.Size = new System.Drawing.Size(259, 24); this.label2.TabIndex = 1; this.label2.Text = "Time between battle switches"; this.label2.Click += new System.EventHandler(this.label1_Click); @@ -370,7 +371,7 @@ private void InitializeComponent() this.label1.Location = new System.Drawing.Point(11, 28); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(214, 19); + this.label1.Size = new System.Drawing.Size(271, 24); this.label1.TabIndex = 1; this.label1.Text = "Time between camera switches"; this.label1.Click += new System.EventHandler(this.label1_Click); @@ -403,11 +404,11 @@ private void InitializeComponent() this.tabPageIncidents.Controls.Add(this.groupBox5); this.tabPageIncidents.Controls.Add(this.groupBox4); this.tabPageIncidents.Controls.Add(this.groupBox3); - this.tabPageIncidents.Location = new System.Drawing.Point(4, 28); + this.tabPageIncidents.Location = new System.Drawing.Point(4, 33); this.tabPageIncidents.Margin = new System.Windows.Forms.Padding(4); this.tabPageIncidents.Name = "tabPageIncidents"; this.tabPageIncidents.Padding = new System.Windows.Forms.Padding(4); - this.tabPageIncidents.Size = new System.Drawing.Size(578, 541); + this.tabPageIncidents.Size = new System.Drawing.Size(578, 536); this.tabPageIncidents.TabIndex = 1; this.tabPageIncidents.Text = "Incidents"; this.tabPageIncidents.UseVisualStyleBackColor = true; @@ -431,7 +432,7 @@ private void InitializeComponent() this.input_IgnoreIncidentBelow.Margin = new System.Windows.Forms.Padding(4); this.input_IgnoreIncidentBelow.Mask = "000"; this.input_IgnoreIncidentBelow.Name = "input_IgnoreIncidentBelow"; - this.input_IgnoreIncidentBelow.Size = new System.Drawing.Size(132, 27); + this.input_IgnoreIncidentBelow.Size = new System.Drawing.Size(132, 32); this.input_IgnoreIncidentBelow.TabIndex = 5; this.input_IgnoreIncidentBelow.Tag = "150"; this.input_IgnoreIncidentBelow.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -443,7 +444,7 @@ private void InitializeComponent() this.input_IncidentScanWait.Margin = new System.Windows.Forms.Padding(4); this.input_IncidentScanWait.Mask = "000"; this.input_IncidentScanWait.Name = "input_IncidentScanWait"; - this.input_IncidentScanWait.Size = new System.Drawing.Size(132, 27); + this.input_IncidentScanWait.Size = new System.Drawing.Size(132, 32); this.input_IncidentScanWait.TabIndex = 5; this.input_IncidentScanWait.Tag = "150"; this.input_IncidentScanWait.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -454,7 +455,7 @@ private void InitializeComponent() this.label7.Location = new System.Drawing.Point(15, 66); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(150, 19); + this.label7.Size = new System.Drawing.Size(192, 24); this.label7.TabIndex = 4; this.label7.Text = "Ignore Incident Below"; this.label7.Click += new System.EventHandler(this.label6_Click); @@ -465,7 +466,7 @@ private void InitializeComponent() this.label6.Location = new System.Drawing.Point(15, 32); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(129, 19); + this.label6.Size = new System.Drawing.Size(165, 24); this.label6.TabIndex = 4; this.label6.Text = "Incident Scan Wait"; this.label6.Click += new System.EventHandler(this.label6_Click); @@ -510,7 +511,7 @@ private void InitializeComponent() this.checkBoxIgnoreCarsInPitsDuringStart.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxIgnoreCarsInPitsDuringStart.Location = new System.Drawing.Point(15, 26); this.checkBoxIgnoreCarsInPitsDuringStart.Name = "checkBoxIgnoreCarsInPitsDuringStart"; - this.checkBoxIgnoreCarsInPitsDuringStart.Size = new System.Drawing.Size(225, 23); + this.checkBoxIgnoreCarsInPitsDuringStart.Size = new System.Drawing.Size(286, 28); this.checkBoxIgnoreCarsInPitsDuringStart.TabIndex = 0; this.checkBoxIgnoreCarsInPitsDuringStart.Text = "Ingore Cars in Pits during Start"; this.checkBoxIgnoreCarsInPitsDuringStart.UseVisualStyleBackColor = true; @@ -522,7 +523,7 @@ private void InitializeComponent() this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBox1.Location = new System.Drawing.Point(15, 55); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(249, 23); + this.checkBox1.Size = new System.Drawing.Size(315, 28); this.checkBox1.TabIndex = 0; this.checkBox1.Text = "Ingore Incidents During Race Start"; this.checkBox1.UseVisualStyleBackColor = true; @@ -532,7 +533,7 @@ private void InitializeComponent() this.checkBox_IgnoreIncidentsCapture.AutoSize = true; this.checkBox_IgnoreIncidentsCapture.Location = new System.Drawing.Point(15, 84); this.checkBox_IgnoreIncidentsCapture.Name = "checkBox_IgnoreIncidentsCapture"; - this.checkBox_IgnoreIncidentsCapture.Size = new System.Drawing.Size(187, 23); + this.checkBox_IgnoreIncidentsCapture.Size = new System.Drawing.Size(238, 28); this.checkBox_IgnoreIncidentsCapture.TabIndex = 0; this.checkBox_IgnoreIncidentsCapture.Text = "Ingore Incidents Capture"; this.checkBox_IgnoreIncidentsCapture.UseVisualStyleBackColor = true; @@ -542,11 +543,11 @@ private void InitializeComponent() this.tabPageDrivers.Controls.Add(this.groupBox1); this.tabPageDrivers.Controls.Add(this.groupBox_Drivers); this.tabPageDrivers.Controls.Add(this.groupBox6); - this.tabPageDrivers.Location = new System.Drawing.Point(4, 28); + this.tabPageDrivers.Location = new System.Drawing.Point(4, 33); this.tabPageDrivers.Margin = new System.Windows.Forms.Padding(4); this.tabPageDrivers.Name = "tabPageDrivers"; this.tabPageDrivers.Padding = new System.Windows.Forms.Padding(4); - this.tabPageDrivers.Size = new System.Drawing.Size(578, 541); + this.tabPageDrivers.Size = new System.Drawing.Size(578, 536); this.tabPageDrivers.TabIndex = 2; this.tabPageDrivers.Text = "Drivers"; this.tabPageDrivers.UseVisualStyleBackColor = true; @@ -558,7 +559,7 @@ private void InitializeComponent() this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(545, 164); + this.groupBox1.Size = new System.Drawing.Size(545, 152); this.groupBox1.TabIndex = 7; this.groupBox1.TabStop = false; this.groupBox1.Text = "Description of Setting"; @@ -569,7 +570,7 @@ private void InitializeComponent() this.tbDescriptionDriversTab.Margin = new System.Windows.Forms.Padding(4); this.tbDescriptionDriversTab.Multiline = true; this.tbDescriptionDriversTab.Name = "tbDescriptionDriversTab"; - this.tbDescriptionDriversTab.Size = new System.Drawing.Size(509, 124); + this.tbDescriptionDriversTab.Size = new System.Drawing.Size(509, 115); this.tbDescriptionDriversTab.TabIndex = 0; // // groupBox_Drivers @@ -577,7 +578,7 @@ private void InitializeComponent() this.groupBox_Drivers.Controls.Add(this.listBox_PreferedDriverNames); this.groupBox_Drivers.Controls.Add(this.checkedListBox1); this.groupBox_Drivers.Enabled = false; - this.groupBox_Drivers.Location = new System.Drawing.Point(7, 103); + this.groupBox_Drivers.Location = new System.Drawing.Point(6, 110); this.groupBox_Drivers.Name = "groupBox_Drivers"; this.groupBox_Drivers.Size = new System.Drawing.Size(546, 258); this.groupBox_Drivers.TabIndex = 1; @@ -587,10 +588,10 @@ private void InitializeComponent() // listBox_PreferedDriverNames // this.listBox_PreferedDriverNames.FormattingEnabled = true; - this.listBox_PreferedDriverNames.ItemHeight = 19; + this.listBox_PreferedDriverNames.ItemHeight = 24; this.listBox_PreferedDriverNames.Location = new System.Drawing.Point(15, 154); this.listBox_PreferedDriverNames.Name = "listBox_PreferedDriverNames"; - this.listBox_PreferedDriverNames.Size = new System.Drawing.Size(511, 80); + this.listBox_PreferedDriverNames.Size = new System.Drawing.Size(511, 76); this.listBox_PreferedDriverNames.TabIndex = 1; // // checkedListBox1 @@ -598,15 +599,16 @@ private void InitializeComponent() this.checkedListBox1.FormattingEnabled = true; this.checkedListBox1.Location = new System.Drawing.Point(15, 44); this.checkedListBox1.Name = "checkedListBox1"; - this.checkedListBox1.Size = new System.Drawing.Size(511, 92); + this.checkedListBox1.Size = new System.Drawing.Size(511, 85); this.checkedListBox1.TabIndex = 0; // // groupBox6 // + this.groupBox6.Controls.Add(this.checkBox_RemoveNumbersFromNames); this.groupBox6.Controls.Add(this.checkBox_PerferedDriversOnly); this.groupBox6.Location = new System.Drawing.Point(7, 18); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(546, 79); + this.groupBox6.Size = new System.Drawing.Size(546, 95); this.groupBox6.TabIndex = 1; this.groupBox6.TabStop = false; this.groupBox6.Text = "General"; @@ -616,7 +618,7 @@ private void InitializeComponent() this.checkBox_PerferedDriversOnly.AutoSize = true; this.checkBox_PerferedDriversOnly.Location = new System.Drawing.Point(15, 26); this.checkBox_PerferedDriversOnly.Name = "checkBox_PerferedDriversOnly"; - this.checkBox_PerferedDriversOnly.Size = new System.Drawing.Size(229, 23); + this.checkBox_PerferedDriversOnly.Size = new System.Drawing.Size(291, 28); this.checkBox_PerferedDriversOnly.TabIndex = 0; this.checkBox_PerferedDriversOnly.Text = "Battles of prefered drivers only"; this.checkBox_PerferedDriversOnly.UseVisualStyleBackColor = true; @@ -631,10 +633,10 @@ private void InitializeComponent() this.tabPageShortKeys.Controls.Add(this.tbHotKeyStopStart); this.tabPageShortKeys.Controls.Add(this.label18); this.tabPageShortKeys.Controls.Add(this.label17); - this.tabPageShortKeys.Location = new System.Drawing.Point(4, 28); + this.tabPageShortKeys.Location = new System.Drawing.Point(4, 33); this.tabPageShortKeys.Name = "tabPageShortKeys"; this.tabPageShortKeys.Padding = new System.Windows.Forms.Padding(3); - this.tabPageShortKeys.Size = new System.Drawing.Size(578, 541); + this.tabPageShortKeys.Size = new System.Drawing.Size(578, 536); this.tabPageShortKeys.TabIndex = 3; this.tabPageShortKeys.Text = "Hot Keys"; this.tabPageShortKeys.UseVisualStyleBackColor = true; @@ -685,14 +687,14 @@ private void InitializeComponent() // this.tbHotKeyPauseResume.Location = new System.Drawing.Point(327, 87); this.tbHotKeyPauseResume.Name = "tbHotKeyPauseResume"; - this.tbHotKeyPauseResume.Size = new System.Drawing.Size(136, 27); + this.tbHotKeyPauseResume.Size = new System.Drawing.Size(136, 32); this.tbHotKeyPauseResume.TabIndex = 2; // // tbHotKeyStopStart // this.tbHotKeyStopStart.Location = new System.Drawing.Point(327, 44); this.tbHotKeyStopStart.Name = "tbHotKeyStopStart"; - this.tbHotKeyStopStart.Size = new System.Drawing.Size(136, 27); + this.tbHotKeyStopStart.Size = new System.Drawing.Size(136, 32); this.tbHotKeyStopStart.TabIndex = 2; this.tbHotKeyStopStart.TextChanged += new System.EventHandler(this.tbHotKeyStopStart_TextChanged); // @@ -701,7 +703,7 @@ private void InitializeComponent() this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(32, 90); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(270, 19); + this.label18.Size = new System.Drawing.Size(345, 24); this.label18.TabIndex = 1; this.label18.Text = "Hot-Key to Pause/Resume video capture"; // @@ -710,41 +712,18 @@ private void InitializeComponent() this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(32, 47); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(237, 19); + this.label17.Size = new System.Drawing.Size(308, 24); this.label17.TabIndex = 1; this.label17.Text = "Hot-Key to Stop/Start video capture"; // - // ok_button - // - this.ok_button.Location = new System.Drawing.Point(626, 46); - this.ok_button.Margin = new System.Windows.Forms.Padding(4); - this.ok_button.Name = "ok_button"; - this.ok_button.Size = new System.Drawing.Size(137, 45); - this.ok_button.TabIndex = 1; - this.ok_button.Text = "OK"; - this.ok_button.UseVisualStyleBackColor = true; - this.ok_button.Click += new System.EventHandler(this.ok_button_Click); - // - // cancel_button - // - this.cancel_button.Enabled = false; - this.cancel_button.Location = new System.Drawing.Point(626, 110); - this.cancel_button.Margin = new System.Windows.Forms.Padding(4); - this.cancel_button.Name = "cancel_button"; - this.cancel_button.Size = new System.Drawing.Size(137, 45); - this.cancel_button.TabIndex = 1; - this.cancel_button.Text = "Cancel"; - this.cancel_button.UseVisualStyleBackColor = true; - this.cancel_button.Click += new System.EventHandler(this.cancel_button_Click); - // // tabPage1 // this.tabPage1.Controls.Add(this.checkBox3); this.tabPage1.Controls.Add(this.cbCaptureOpeningScenes); - this.tabPage1.Location = new System.Drawing.Point(4, 28); + this.tabPage1.Location = new System.Drawing.Point(4, 33); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(578, 541); + this.tabPage1.Size = new System.Drawing.Size(578, 536); this.tabPage1.TabIndex = 4; this.tabPage1.Text = "Capture Control"; this.tabPage1.UseVisualStyleBackColor = true; @@ -754,7 +733,7 @@ private void InitializeComponent() this.checkBox3.AutoSize = true; this.checkBox3.Location = new System.Drawing.Point(20, 51); this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(409, 23); + this.checkBox3.Size = new System.Drawing.Size(529, 28); this.checkBox3.TabIndex = 1; this.checkBox3.Text = "User to confirm start of next phaase (not implemented yet)"; this.checkBox3.UseVisualStyleBackColor = true; @@ -765,17 +744,50 @@ private void InitializeComponent() this.cbCaptureOpeningScenes.Checked = global::iRacingReplayDirector.Properties.Settings.Default.bCaptureOpeningScene; this.cbCaptureOpeningScenes.Location = new System.Drawing.Point(20, 22); this.cbCaptureOpeningScenes.Name = "cbCaptureOpeningScenes"; - this.cbCaptureOpeningScenes.Size = new System.Drawing.Size(187, 23); + this.cbCaptureOpeningScenes.Size = new System.Drawing.Size(235, 28); this.cbCaptureOpeningScenes.TabIndex = 1; this.cbCaptureOpeningScenes.Text = "Capture Opening Scenes"; this.cbCaptureOpeningScenes.UseVisualStyleBackColor = true; this.cbCaptureOpeningScenes.CheckedChanged += new System.EventHandler(this.cbCaptureOpeningScenes_CheckedChanged); // + // ok_button + // + this.ok_button.Location = new System.Drawing.Point(626, 46); + this.ok_button.Margin = new System.Windows.Forms.Padding(4); + this.ok_button.Name = "ok_button"; + this.ok_button.Size = new System.Drawing.Size(137, 45); + this.ok_button.TabIndex = 1; + this.ok_button.Text = "OK"; + this.ok_button.UseVisualStyleBackColor = true; + this.ok_button.Click += new System.EventHandler(this.ok_button_Click); + // + // cancel_button + // + this.cancel_button.Enabled = false; + this.cancel_button.Location = new System.Drawing.Point(626, 110); + this.cancel_button.Margin = new System.Windows.Forms.Padding(4); + this.cancel_button.Name = "cancel_button"; + this.cancel_button.Size = new System.Drawing.Size(137, 45); + this.cancel_button.TabIndex = 1; + this.cancel_button.Text = "Cancel"; + this.cancel_button.UseVisualStyleBackColor = true; + this.cancel_button.Click += new System.EventHandler(this.cancel_button_Click); + // + // checkBox_RemoveNumbersFromNames + // + this.checkBox_RemoveNumbersFromNames.AutoSize = true; + this.checkBox_RemoveNumbersFromNames.Location = new System.Drawing.Point(15, 58); + this.checkBox_RemoveNumbersFromNames.Name = "checkBox_RemoveNumbersFromNames"; + this.checkBox_RemoveNumbersFromNames.Size = new System.Drawing.Size(465, 28); + this.checkBox_RemoveNumbersFromNames.TabIndex = 1; + this.checkBox_RemoveNumbersFromNames.Text = "Remove numbers from the end of driver usernames"; + this.checkBox_RemoveNumbersFromNames.UseVisualStyleBackColor = true; + // // AdvancedGeneralSettingsDlg // this.AccessibleDescription = "General_Settings_Dialog"; this.AccessibleName = "GeneralSettingsDlg"; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 19F); + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.ClientSize = new System.Drawing.Size(792, 615); @@ -877,5 +889,6 @@ private void InitializeComponent() private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.CheckBox checkBox3; private System.Windows.Forms.CheckBox cbCaptureOpeningScenes; + private System.Windows.Forms.CheckBox checkBox_RemoveNumbersFromNames; } } \ No newline at end of file diff --git a/App.config b/App.config index 250e672..9d424ab 100644 --- a/App.config +++ b/App.config @@ -80,7 +80,10 @@ False - + + False + + False diff --git a/ConfigureGeneralSettings.cs b/ConfigureGeneralSettings.cs index 79c2349..a24d0ba 100644 --- a/ConfigureGeneralSettings.cs +++ b/ConfigureGeneralSettings.cs @@ -80,6 +80,9 @@ void AddPanelComponents() If not selected, then all battles can be selected, but your perferred drivers will be prioritised", "FocusOnPreferedDriver"); + f.AddCheckboxField("Removed numbers from driver names", + @"Remove numbers from the end of driver usernames", + "RemoveNumbersFromNames"); f.AddBlankRow(); f.AddIntField("Show Results after nth position", "Show the results flash cards, after the driver in the selected position finishes.", "ResultsFlashCardPosition"); diff --git a/Phases/Capturing/CaptureLeaderBoard.cs b/Phases/Capturing/CaptureLeaderBoard.cs index e231f32..f1bb06e 100644 --- a/Phases/Capturing/CaptureLeaderBoard.cs +++ b/Phases/Capturing/CaptureLeaderBoard.cs @@ -19,6 +19,7 @@ using iRacingReplayDirector.Phases.Capturing.LeaderBoard; using iRacingSDK; using System; +using System.Text.RegularExpressions; namespace iRacingReplayDirector.Phases.Capturing { @@ -45,6 +46,14 @@ public void Process(DataSample data, TimeSpan relativeTime) if (raceStartTimeOffset == 0 && data.Telemetry.SessionState == SessionState.Racing) raceStartTimeOffset = data.Telemetry.SessionTime; + if (Settings.Default.RemoveNumbersFromNames) + { + foreach (var driver in data.SessionData.DriverInfo.Drivers) + { + driver.UserName = Regex.Replace(driver.UserName, "[0-9]*$", ""); + } + } + if (ProcessForStarting(data)) { captureLeaderBoardFirstLap.Process(data, relativeTime, ref leaderBoard); diff --git a/Settings.Designer.cs b/Settings.Designer.cs index 52bef7f..bb87694 100644 --- a/Settings.Designer.cs +++ b/Settings.Designer.cs @@ -223,6 +223,20 @@ public bool FocusOnPreferedDriver } } + [UserScopedSetting] + [DebuggerNonUserCode] + [DefaultSettingValue("False")] + public bool RemoveNumbersFromNames + { + get + { + return (bool)this["RemoveNumbersFromNames"]; + } + set + { + this["RemoveNumbersFromNames"] = value; + } + } [UserScopedSetting] [DebuggerNonUserCode] [DefaultSettingValue("False")]