diff --git a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs index 14fd192bb6c..3d13bed92ab 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs @@ -136,7 +136,6 @@ private void InitializeComponent() this.Name = "FFmpegWriterForm"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Choose Video Format"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs index 8072258f239..6ecb900a4af 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs @@ -7,8 +7,10 @@ namespace BizHawk.Client.EmuHawk /// /// configures the FFmpegWriter /// - public partial class FFmpegWriterForm : Form + public partial class FFmpegWriterForm : FormBase { + protected override string WindowTitleStatic => "Choose Video Format"; + /// /// stores a single format preset /// diff --git a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs index ef3bf9ba298..9ae40caac5e 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs @@ -121,7 +121,6 @@ private void InitializeComponent() this.Name = "GifWriterForm"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "GIF Writer Options"; ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); this.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs index 908ca35fbc6..31d34d82749 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs @@ -3,8 +3,10 @@ namespace BizHawk.Client.EmuHawk { - public partial class GifWriterForm : Form + public partial class GifWriterForm : FormBase { + protected override string WindowTitleStatic => "GIF Writer Options"; + public GifWriterForm() { InitializeComponent(); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs index 8858ac94880..31ee9e37a22 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs @@ -138,7 +138,6 @@ private void InitializeComponent() this.Name = "JmdForm"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "JMD Compression Options"; ((System.ComponentModel.ISupportInitialize)(this.threadsBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.compressionBar)).EndInit(); this.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs index 86d6a57982f..4f4d8ad36ce 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs @@ -5,8 +5,10 @@ namespace BizHawk.Client.EmuHawk /// /// implements a minimal dialog for configuring JMDWriter /// - public partial class JmdForm : Form + public partial class JmdForm : FormBase { + protected override string WindowTitleStatic => "JMD Compression Options"; + public JmdForm() { InitializeComponent(); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.Designer.cs index 1a10f9fee25..b6c51aa5436 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.Designer.cs @@ -51,7 +51,6 @@ private void InitializeComponent() this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SynclessRecordingTools"; - this.Text = "Syncless Recording"; this.ResumeLayout(false); } diff --git a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs index 6fd652477ae..f0547f5d639 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs @@ -10,8 +10,10 @@ namespace BizHawk.Client.EmuHawk { - public partial class SynclessRecordingTools : Form, IDialogParent + public partial class SynclessRecordingTools : FormBase, IDialogParent { + protected override string WindowTitleStatic => "Syncless Recording"; + private readonly Config _config; private readonly IGameInfo _game; diff --git a/src/BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs b/src/BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs index e0362982e80..9b678a6006b 100644 --- a/src/BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs @@ -225,7 +225,6 @@ private void InitializeComponent() this.Name = "ArchiveChooser"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Choose File From Archive"; this.Load += new System.EventHandler(this.ArchiveChooser_Load); this.flowLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/ArchiveChooser.cs b/src/BizHawk.Client.EmuHawk/ArchiveChooser.cs index 19dd9fa6d2d..4abbdbf184a 100644 --- a/src/BizHawk.Client.EmuHawk/ArchiveChooser.cs +++ b/src/BizHawk.Client.EmuHawk/ArchiveChooser.cs @@ -9,8 +9,10 @@ namespace BizHawk.Client.EmuHawk { - public partial class ArchiveChooser : Form + public partial class ArchiveChooser : FormBase { + protected override string WindowTitleStatic => "Choose File From Archive"; + private readonly IList _archiveItems = new List(); private readonly ToolTip _errorBalloon = new ToolTip(); diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs index 4c86d6d76e6..69928a0292f 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs @@ -146,7 +146,6 @@ private void InitializeComponent() this.MinimumSize = new System.Drawing.Size(339, 129); this.Name = "AutofireConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Autofire Configuration"; this.Load += new System.EventHandler(this.AutofireConfig_Load); ((System.ComponentModel.ISupportInitialize)(this.nudPatternOn)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudPatternOff)).EndInit(); diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs index e5f66ea647b..1888b5fa3ce 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs @@ -3,8 +3,10 @@ namespace BizHawk.Client.EmuHawk { - public partial class AutofireConfig : Form + public partial class AutofireConfig : FormBase { + protected override string WindowTitleStatic => "Autofire Configuration"; + private readonly Config _config; private readonly AutofireController _autoFireController; private readonly StickyAutofireController _stickyAutofireController; diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs index 885cf0be904..c76e5097c46 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs @@ -282,7 +282,6 @@ private void InitializeComponent() this.MinimumSize = new System.Drawing.Size(948, 611); this.Name = "ControllerConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Controller Config"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ControllerConfig_FormClosed); this.Load += new System.EventHandler(this.ControllerConfig_Load); this.tabControl1.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 483b3db3b47..8d3aac4d1ac 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -12,8 +12,10 @@ namespace BizHawk.Client.EmuHawk { - public partial class ControllerConfig : Form, IDialogParent + public partial class ControllerConfig : FormBase, IDialogParent { + protected override string WindowTitleStatic => "Controller Config"; + private static readonly Dictionary> ControllerImages = new Dictionary>(); private readonly IEmulator _emulator; private readonly Config _config;