diff --git a/BizHawk.Client.Common/RomGame.cs b/BizHawk.Client.Common/RomGame.cs index b92dfbc315..6d745de961 100644 --- a/BizHawk.Client.Common/RomGame.cs +++ b/BizHawk.Client.Common/RomGame.cs @@ -2,9 +2,8 @@ using System.Globalization; using BizHawk.Common; -using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.Common { public class RomGame { diff --git a/BizHawk.MultiClient/AVOut/AviWriter.cs b/BizHawk.MultiClient/AVOut/AviWriter.cs index c0b1ebd79f..2d4850b97b 100644 --- a/BizHawk.MultiClient/AVOut/AviWriter.cs +++ b/BizHawk.MultiClient/AVOut/AviWriter.cs @@ -7,7 +7,7 @@ using BizHawk.Client.Common; //some helpful p/invoke from http://www.codeproject.com/KB/audio-video/Motion_Detection.aspx?msg=1142967 -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class AviWriter : IVideoWriter { diff --git a/BizHawk.MultiClient/AVOut/BmpVideoProvder.cs b/BizHawk.MultiClient/AVOut/BmpVideoProvder.cs index 73068a948f..415e9b6839 100644 --- a/BizHawk.MultiClient/AVOut/BmpVideoProvder.cs +++ b/BizHawk.MultiClient/AVOut/BmpVideoProvder.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Drawing; -namespace BizHawk.MultiClient.AVOut +namespace BizHawk.Client.EmuHawk { /// /// an IVideoProivder wrapping a Bitmap diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs index 07dcf31290..a52d04fbf3 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// uses pipes to launch an external ffmpeg process and encode diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs index 0ee80ae265..b2d5f5b1b0 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class FFmpegWriterForm { diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs index 8e18f84052..969267f1d4 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// configures the FFmpegWriter diff --git a/BizHawk.MultiClient/AVOut/GifWriter.cs b/BizHawk.MultiClient/AVOut/GifWriter.cs index 2029977ed2..eb4d30b2a5 100644 --- a/BizHawk.MultiClient/AVOut/GifWriter.cs +++ b/BizHawk.MultiClient/AVOut/GifWriter.cs @@ -7,7 +7,7 @@ using System.Drawing; using BizHawk.Client.Common; -namespace BizHawk.MultiClient.AVOut +namespace BizHawk.Client.EmuHawk { public class GifWriter : IVideoWriter { diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs b/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs index 30b56d7914..5a10161edc 100644 --- a/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.AVOut +namespace BizHawk.Client.EmuHawk { partial class GifWriterForm { diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.cs b/BizHawk.MultiClient/AVOut/GifWriterForm.cs index 76eb79e0d8..b01d444cfb 100644 --- a/BizHawk.MultiClient/AVOut/GifWriterForm.cs +++ b/BizHawk.MultiClient/AVOut/GifWriterForm.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient.AVOut +namespace BizHawk.Client.EmuHawk { public partial class GifWriterForm : Form { diff --git a/BizHawk.MultiClient/AVOut/IVideoWriter.cs b/BizHawk.MultiClient/AVOut/IVideoWriter.cs index d539dad857..673570f676 100644 --- a/BizHawk.MultiClient/AVOut/IVideoWriter.cs +++ b/BizHawk.MultiClient/AVOut/IVideoWriter.cs @@ -1,16 +1,15 @@ using System; using System.Collections; using System.Collections.Generic; -using BizHawk.MultiClient; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { - public interface IVideoWriter : IDisposable - { - /// - /// sets the codec token to be used for video compression - /// - void SetVideoCodecToken(IDisposable token); + public interface IVideoWriter : IDisposable + { + /// + /// sets the codec token to be used for video compression + /// + void SetVideoCodecToken(IDisposable token); /// /// sets to a default video codec token without calling any UI - for automated dumping @@ -18,68 +17,68 @@ namespace BizHawk void SetDefaultVideoCodecToken(); - // why no OpenFile(IEnumerator) ? - // different video writers may have different ideas of how and why splitting is to occur - /// - /// opens a recording stream - /// set a video codec token first. - /// - void OpenFile(string baseName); + // why no OpenFile(IEnumerator) ? + // different video writers may have different ideas of how and why splitting is to occur + /// + /// opens a recording stream + /// set a video codec token first. + /// + void OpenFile(string baseName); - /// - /// close recording stream - /// - void CloseFile(); + /// + /// close recording stream + /// + void CloseFile(); - /// - /// adds a frame to the stream - /// - void AddFrame(IVideoProvider source); + /// + /// adds a frame to the stream + /// + void AddFrame(IVideoProvider source); - /// - /// adds audio samples to the stream - /// no attempt is made to sync this to the video - /// reccomendation: try not to have the size or pacing of the audio chunks be too "weird" - /// - void AddSamples(short[] samples); + /// + /// adds audio samples to the stream + /// no attempt is made to sync this to the video + /// reccomendation: try not to have the size or pacing of the audio chunks be too "weird" + /// + void AddSamples(short[] samples); - /// - /// obtain a set of recording compression parameters - /// return null on user cancel - /// - /// hwnd to attach to if the user is shown config dialog - /// codec token, dispose of it when you're done with it - IDisposable AcquireVideoCodecToken(System.Windows.Forms.IWin32Window hwnd); + /// + /// obtain a set of recording compression parameters + /// return null on user cancel + /// + /// hwnd to attach to if the user is shown config dialog + /// codec token, dispose of it when you're done with it + IDisposable AcquireVideoCodecToken(System.Windows.Forms.IWin32Window hwnd); - /// - /// set framerate to fpsnum/fpsden (assumed to be unchanging over the life of the stream) - /// - void SetMovieParameters(int fpsnum, int fpsden); + /// + /// set framerate to fpsnum/fpsden (assumed to be unchanging over the life of the stream) + /// + void SetMovieParameters(int fpsnum, int fpsden); - /// - /// set resolution parameters (width x height) - /// must be set before file is opened - /// can be changed in future - /// should always match IVideoProvider - /// - /// - /// - void SetVideoParameters(int width, int height); + /// + /// set resolution parameters (width x height) + /// must be set before file is opened + /// can be changed in future + /// should always match IVideoProvider + /// + /// + /// + void SetVideoParameters(int width, int height); - /// - /// set audio parameters. cannot change later - /// - void SetAudioParameters(int sampleRate, int channels, int bits); + /// + /// set audio parameters. cannot change later + /// + void SetAudioParameters(int sampleRate, int channels, int bits); - /// - /// set metadata parameters; should be called before opening file - /// ok to not set at all, if not applicable - /// - /// The name of the game loaded - /// Authors on movie file - /// Length of movie file in milliseconds - /// Number of rerecords on movie file - void SetMetaData(string gameName, string authors, UInt64 lengthMS, UInt64 rerecords); + /// + /// set metadata parameters; should be called before opening file + /// ok to not set at all, if not applicable + /// + /// The name of the game loaded + /// Authors on movie file + /// Length of movie file in milliseconds + /// Number of rerecords on movie file + void SetMetaData(string gameName, string authors, UInt64 lengthMS, UInt64 rerecords); /// /// short description of this IVideoWriter @@ -94,7 +93,7 @@ namespace BizHawk /// /// string ShortName(); - } + } /// /// contains methods to find all IVideoWriter @@ -110,7 +109,7 @@ namespace BizHawk new WavWriterV(), new FFmpegWriter(), new NutWriter(), - new BizHawk.MultiClient.AVOut.GifWriter() + new GifWriter() }; return ret; } diff --git a/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs b/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs index a3fa5c65af..3bd3354d6f 100644 --- a/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class JMDForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class JMDForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.okButton = new System.Windows.Forms.Button(); this.threadsBar = new System.Windows.Forms.TrackBar(); this.compressionBar = new System.Windows.Forms.TrackBar(); @@ -163,19 +163,19 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.TrackBar threadsBar; - private System.Windows.Forms.TrackBar compressionBar; - private System.Windows.Forms.Label threadLeft; - private System.Windows.Forms.Label threadRight; - private System.Windows.Forms.Label compressionLeft; - private System.Windows.Forms.Label compressionRight; - private System.Windows.Forms.Label threadTop; - private System.Windows.Forms.Label compressionTop; - private System.Windows.Forms.Button cancelButton; - } + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.TrackBar threadsBar; + private System.Windows.Forms.TrackBar compressionBar; + private System.Windows.Forms.Label threadLeft; + private System.Windows.Forms.Label threadRight; + private System.Windows.Forms.Label compressionLeft; + private System.Windows.Forms.Label compressionRight; + private System.Windows.Forms.Label threadTop; + private System.Windows.Forms.Label compressionTop; + private System.Windows.Forms.Button cancelButton; + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/AVOut/JMDForm.cs b/BizHawk.MultiClient/AVOut/JMDForm.cs index eac2a8f4ad..5741dad1cd 100644 --- a/BizHawk.MultiClient/AVOut/JMDForm.cs +++ b/BizHawk.MultiClient/AVOut/JMDForm.cs @@ -7,80 +7,80 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - /// - /// implements a minimal dialog for configuring JMDWriter - /// - public partial class JMDForm : Form - { - public JMDForm() - { - InitializeComponent(); - } + /// + /// implements a minimal dialog for configuring JMDWriter + /// + public partial class JMDForm : Form + { + public JMDForm() + { + InitializeComponent(); + } - private void okButton_Click(object sender, EventArgs e) - { + private void okButton_Click(object sender, EventArgs e) + { - } + } - private void cancelButton_Click(object sender, EventArgs e) - { + private void cancelButton_Click(object sender, EventArgs e) + { - } + } - private void threadsBar_Scroll(object sender, EventArgs e) - { - threadTop.Text = String.Format("Number of compression threads: {0}", threadsBar.Value); - } + private void threadsBar_Scroll(object sender, EventArgs e) + { + threadTop.Text = String.Format("Number of compression threads: {0}", threadsBar.Value); + } - private void compressionBar_Scroll(object sender, EventArgs e) - { - if (compressionBar.Value == compressionBar.Minimum) - compressionTop.Text = "Compression Level: NONE"; - else - compressionTop.Text = String.Format("Compression Level: {0}", compressionBar.Value); - } + private void compressionBar_Scroll(object sender, EventArgs e) + { + if (compressionBar.Value == compressionBar.Minimum) + compressionTop.Text = "Compression Level: NONE"; + else + compressionTop.Text = String.Format("Compression Level: {0}", compressionBar.Value); + } - /// - /// Show a configuration dialog (modal) for JMDWriter - /// - /// number of threads - /// compression level - /// minimum possible number of threads - /// maximum possible number of threads - /// minimum compression level, assumed to be "no compression" - /// maximum compression level - /// hwnd of parent - /// false if user canceled; true if user consented - public static bool DoCompressionDlg(ref int threads, ref int complevel, int tmin, int tmax, int cmin, int cmax, System.Windows.Forms.IWin32Window hwnd) - { - JMDForm j = new JMDForm(); - j.threadsBar.Minimum = tmin; - j.threadsBar.Maximum = tmax; - j.compressionBar.Minimum = cmin; - j.compressionBar.Maximum = cmax; - j.threadsBar.Value = threads; - j.compressionBar.Value = complevel; - j.threadsBar_Scroll(null, null); - j.compressionBar_Scroll(null, null); - j.threadLeft.Text = String.Format("{0}", tmin); - j.threadRight.Text = String.Format("{0}", tmax); - j.compressionLeft.Text = String.Format("{0}", cmin); - j.compressionRight.Text = String.Format("{0}", cmax); + /// + /// Show a configuration dialog (modal) for JMDWriter + /// + /// number of threads + /// compression level + /// minimum possible number of threads + /// maximum possible number of threads + /// minimum compression level, assumed to be "no compression" + /// maximum compression level + /// hwnd of parent + /// false if user canceled; true if user consented + public static bool DoCompressionDlg(ref int threads, ref int complevel, int tmin, int tmax, int cmin, int cmax, System.Windows.Forms.IWin32Window hwnd) + { + JMDForm j = new JMDForm(); + j.threadsBar.Minimum = tmin; + j.threadsBar.Maximum = tmax; + j.compressionBar.Minimum = cmin; + j.compressionBar.Maximum = cmax; + j.threadsBar.Value = threads; + j.compressionBar.Value = complevel; + j.threadsBar_Scroll(null, null); + j.compressionBar_Scroll(null, null); + j.threadLeft.Text = String.Format("{0}", tmin); + j.threadRight.Text = String.Format("{0}", tmax); + j.compressionLeft.Text = String.Format("{0}", cmin); + j.compressionRight.Text = String.Format("{0}", cmax); - DialogResult d = j.ShowDialog(hwnd); + DialogResult d = j.ShowDialog(hwnd); - threads = j.threadsBar.Value; - complevel = j.compressionBar.Value; + threads = j.threadsBar.Value; + complevel = j.compressionBar.Value; - j.Dispose(); - if (d == DialogResult.OK) - return true; - else - return false; - } + j.Dispose(); + if (d == DialogResult.OK) + return true; + else + return false; + } - } + } } diff --git a/BizHawk.MultiClient/AVOut/JMDWriter.cs b/BizHawk.MultiClient/AVOut/JMDWriter.cs index fd154f2719..96b6f3769b 100644 --- a/BizHawk.MultiClient/AVOut/JMDWriter.cs +++ b/BizHawk.MultiClient/AVOut/JMDWriter.cs @@ -9,7 +9,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// implements IVideoWriter, outputting to format "JMD" diff --git a/BizHawk.MultiClient/AVOut/NumericTextBox.cs b/BizHawk.MultiClient/AVOut/NumericTextBox.cs index fc1cde62d6..b5d5162f34 100644 --- a/BizHawk.MultiClient/AVOut/NumericTextBox.cs +++ b/BizHawk.MultiClient/AVOut/NumericTextBox.cs @@ -5,7 +5,7 @@ using System.Text; using System.Windows.Forms; using System.Globalization; -namespace BizHawk.MultiClient.AVOut +namespace BizHawk.Client.EmuHawk { // http://msdn.microsoft.com/en-us/library/ms229644%28v=vs.80%29.aspx public class NumericTextBox : TextBox diff --git a/BizHawk.MultiClient/AVOut/NutMuxer.cs b/BizHawk.MultiClient/AVOut/NutMuxer.cs index 5281e9d3ca..09f26133c6 100644 --- a/BizHawk.MultiClient/AVOut/NutMuxer.cs +++ b/BizHawk.MultiClient/AVOut/NutMuxer.cs @@ -5,7 +5,7 @@ using System.Text; using System.IO; using System.Numerics; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// implements a simple muxer for the NUT media format diff --git a/BizHawk.MultiClient/AVOut/NutWriter.cs b/BizHawk.MultiClient/AVOut/NutWriter.cs index f972978278..d85fbb5175 100644 --- a/BizHawk.MultiClient/AVOut/NutWriter.cs +++ b/BizHawk.MultiClient/AVOut/NutWriter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// dumps in the "nut" container format diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs index eb30feb965..3071f2a01f 100644 --- a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VideoWriterChooserForm { @@ -36,8 +36,8 @@ this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.labelDescription = new System.Windows.Forms.Label(); this.labelDescriptionBody = new System.Windows.Forms.Label(); - this.numericTextBoxW = new BizHawk.MultiClient.AVOut.NumericTextBox(); - this.numericTextBoxH = new BizHawk.MultiClient.AVOut.NumericTextBox(); + this.numericTextBoxW = new NumericTextBox(); + this.numericTextBoxH = new NumericTextBox(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.buttonAuto = new System.Windows.Forms.Button(); @@ -224,12 +224,11 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.Label labelDescription; private System.Windows.Forms.Label labelDescriptionBody; - private AVOut.NumericTextBox numericTextBoxW; - private AVOut.NumericTextBox numericTextBoxH; + private NumericTextBox numericTextBoxW; + private NumericTextBox numericTextBoxH; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; private System.Windows.Forms.Button buttonAuto; private System.Windows.Forms.Panel panelSizeSelect; - } } \ No newline at end of file diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs index 1632ac359e..b823131965 100644 --- a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs +++ b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// implements a simple dialog which chooses an IVideoWriter to record with diff --git a/BizHawk.MultiClient/AVOut/WavWriter.cs b/BizHawk.MultiClient/AVOut/WavWriter.cs index 7dae99f6a2..71f10cb1e4 100644 --- a/BizHawk.MultiClient/AVOut/WavWriter.cs +++ b/BizHawk.MultiClient/AVOut/WavWriter.cs @@ -6,7 +6,7 @@ using System.IO; using BizHawk.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// writes MS standard riff files containing uncompressed PCM wav data diff --git a/BizHawk.MultiClient/AboutBox.Designer.cs b/BizHawk.MultiClient/AboutBox.Designer.cs index 0127a32764..b9288e6ccd 100644 --- a/BizHawk.MultiClient/AboutBox.Designer.cs +++ b/BizHawk.MultiClient/AboutBox.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class AboutBox { @@ -35,7 +35,7 @@ this.timer1 = new System.Windows.Forms.Timer(this.components); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.HR = new BizHawk.Core.HorizontalLine(); + this.HR = new HorizontalLine(); this.label5 = new System.Windows.Forms.Label(); this.mom2 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); @@ -43,7 +43,7 @@ this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox5 = new BizHawk.MultiClient.MyViewportPanel(); + this.pictureBox5 = new MyViewportPanel(); this.CloseBtn = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); @@ -243,7 +243,7 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Label label3; - private BizHawk.Core.HorizontalLine HR; + private HorizontalLine HR; private System.Windows.Forms.Label label4; private System.Windows.Forms.PictureBox mom2; private System.Windows.Forms.Label label5; diff --git a/BizHawk.MultiClient/AboutBox.cs b/BizHawk.MultiClient/AboutBox.cs index 7569cc23b4..96c9894c9c 100644 --- a/BizHawk.MultiClient/AboutBox.cs +++ b/BizHawk.MultiClient/AboutBox.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Media; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class AboutBox : Form { diff --git a/BizHawk.MultiClient/ArchiveChooser.Designer.cs b/BizHawk.MultiClient/ArchiveChooser.Designer.cs index fe048b6745..161eb697b0 100644 --- a/BizHawk.MultiClient/ArchiveChooser.Designer.cs +++ b/BizHawk.MultiClient/ArchiveChooser.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class ArchiveChooser { diff --git a/BizHawk.MultiClient/ArchiveChooser.cs b/BizHawk.MultiClient/ArchiveChooser.cs index 061462dfa1..8db1fa1dac 100644 --- a/BizHawk.MultiClient/ArchiveChooser.cs +++ b/BizHawk.MultiClient/ArchiveChooser.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class ArchiveChooser : Form { diff --git a/BizHawk.MultiClient/BizBox.Designer.cs b/BizHawk.MultiClient/BizBox.Designer.cs index f1c08cfaa8..066fe64b46 100644 --- a/BizHawk.MultiClient/BizBox.Designer.cs +++ b/BizHawk.MultiClient/BizBox.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class BizBox { @@ -96,7 +96,7 @@ // // pictureBox1 // - this.pictureBox1.Image = global::BizHawk.MultiClient.Properties.Resources.corphawk; + this.pictureBox1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.corphawk; this.pictureBox1.Location = new System.Drawing.Point(12, 12); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(164, 164); diff --git a/BizHawk.MultiClient/BizBox.cs b/BizHawk.MultiClient/BizBox.cs index 6a2124b632..0e4d0391db 100644 --- a/BizHawk.MultiClient/BizBox.cs +++ b/BizHawk.MultiClient/BizBox.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class BizBox : Form { diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj similarity index 97% rename from BizHawk.MultiClient/BizHawk.MultiClient.csproj rename to BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj index 47428f4f55..7638ff57cc 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj @@ -8,8 +8,8 @@ {DD448B37-BA3F-4544-9754-5406E8094723} WinExe Properties - BizHawk.MultiClient - BizHawk.MultiClient + BizHawk.Client.EmuHawk + EmuHawk v4.0 512 diff --git a/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs b/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs index bbd6179fff..8f35554a4b 100644 --- a/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs +++ b/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Security.Permissions; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { /// diff --git a/BizHawk.MultiClient/CustomControls/HexTextBox.cs b/BizHawk.MultiClient/CustomControls/HexTextBox.cs index 25cbb9157f..9887e4c240 100644 --- a/BizHawk.MultiClient/CustomControls/HexTextBox.cs +++ b/BizHawk.MultiClient/CustomControls/HexTextBox.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public interface INumberBox { diff --git a/BizHawk.MultiClient/CustomControls/InputConfigBase.cs b/BizHawk.MultiClient/CustomControls/InputConfigBase.cs index d8627a56f7..74318434a4 100644 --- a/BizHawk.MultiClient/CustomControls/InputConfigBase.cs +++ b/BizHawk.MultiClient/CustomControls/InputConfigBase.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public class InputConfigBase : Form { diff --git a/BizHawk.MultiClient/CustomControls/MiscControls.cs b/BizHawk.MultiClient/CustomControls/MiscControls.cs index 4ea75770b7..72fc189416 100644 --- a/BizHawk.MultiClient/CustomControls/MiscControls.cs +++ b/BizHawk.MultiClient/CustomControls/MiscControls.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace BizHawk.Core +namespace BizHawk.Client.EmuHawk { public class HorizontalLine : Control { diff --git a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs index 7094caf040..bee1d1a55b 100644 --- a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs +++ b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk +namespace BizHawk.Client.EmuHawk { partial class QuickProgressPopup { diff --git a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs index c3ac041523..3804c354a1 100644 --- a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs +++ b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public partial class QuickProgressPopup : Form { diff --git a/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs b/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs index 34d8b7b35a..1813a9feb5 100644 --- a/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs +++ b/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public class SmartTextBoxControl : TextBox { diff --git a/BizHawk.MultiClient/CustomControls/TextDebugView.cs b/BizHawk.MultiClient/CustomControls/TextDebugView.cs index 1c061cbe88..4baad2400f 100644 --- a/BizHawk.MultiClient/CustomControls/TextDebugView.cs +++ b/BizHawk.MultiClient/CustomControls/TextDebugView.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public class TextDebugView : Control { diff --git a/BizHawk.MultiClient/CustomControls/Util.cs b/BizHawk.MultiClient/CustomControls/Util.cs index d3a7f8acf0..9ee615d333 100644 --- a/BizHawk.MultiClient/CustomControls/Util.cs +++ b/BizHawk.MultiClient/CustomControls/Util.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public static class Extensions { diff --git a/BizHawk.MultiClient/CustomControls/ViewportPanel.cs b/BizHawk.MultiClient/CustomControls/ViewportPanel.cs index 12e47dcbac..37090b9962 100644 --- a/BizHawk.MultiClient/CustomControls/ViewportPanel.cs +++ b/BizHawk.MultiClient/CustomControls/ViewportPanel.cs @@ -6,7 +6,7 @@ using System.Drawing.Imaging; using System.Drawing.Drawing2D; using System.Windows.Forms; -namespace BizHawk.Core +namespace BizHawk.Client.EmuHawk { /// /// A programmatic PictureBox, really, which will paint itself using the last bitmap that was provided diff --git a/BizHawk.MultiClient/CustomControls/VirtualListView.cs b/BizHawk.MultiClient/CustomControls/VirtualListView.cs index 9cdbb42481..5cb8a3bc81 100644 --- a/BizHawk.MultiClient/CustomControls/VirtualListView.cs +++ b/BizHawk.MultiClient/CustomControls/VirtualListView.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Drawing; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { #region win32interop diff --git a/BizHawk.MultiClient/CustomControls/Win32.cs b/BizHawk.MultiClient/CustomControls/Win32.cs index 715acea454..e50ce293a3 100644 --- a/BizHawk.MultiClient/CustomControls/Win32.cs +++ b/BizHawk.MultiClient/CustomControls/Win32.cs @@ -5,11 +5,10 @@ using System.Drawing; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; -namespace BizHawk +namespace BizHawk.Client.EmuHawk { public static class Win32 { - public static bool Is64BitProcess { get { return (IntPtr.Size == 8); } } public static bool Is64BitOperatingSystem { get { return Is64BitProcess || InternalCheckIsWow64(); } } diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs index d481bace2c..1109f0c8f6 100644 --- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs +++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs @@ -14,7 +14,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// encapsulates thread-safe concept of pending/current display surfaces, reusing buffers where matching diff --git a/BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs b/BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs index 5898e59e99..fd062f1ac3 100644 --- a/BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs +++ b/BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs @@ -10,7 +10,7 @@ using System.Drawing.Imaging; //what license is this?? who knows?? //ref: http://vba-rerecording.googlecode.com/svn/trunk/src/2xsai.cpp -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class Hq2xBase_2xSai : Hq2xBase {} diff --git a/BizHawk.MultiClient/ExternalCoreSupport.cs b/BizHawk.MultiClient/ExternalCoreSupport.cs index 7b4113a3a6..3177ebb2bd 100644 --- a/BizHawk.MultiClient/ExternalCoreSupport.cs +++ b/BizHawk.MultiClient/ExternalCoreSupport.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using BizHawk; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.MultiClient/GlobalWinF.cs index 9d584d17f3..0acfe32700 100644 --- a/BizHawk.MultiClient/GlobalWinF.cs +++ b/BizHawk.MultiClient/GlobalWinF.cs @@ -3,7 +3,7 @@ using SlimDX.DirectSound; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public static class GlobalWinF { diff --git a/BizHawk.MultiClient/Input/GamePad.cs b/BizHawk.MultiClient/Input/GamePad.cs index d3d8550fc1..6954b46e32 100644 --- a/BizHawk.MultiClient/Input/GamePad.cs +++ b/BizHawk.MultiClient/Input/GamePad.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using SlimDX; using SlimDX.DirectInput; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class GamePad { diff --git a/BizHawk.MultiClient/Input/GamePad360.cs b/BizHawk.MultiClient/Input/GamePad360.cs index e3a3fcae02..6674bac9b7 100644 --- a/BizHawk.MultiClient/Input/GamePad360.cs +++ b/BizHawk.MultiClient/Input/GamePad360.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using SlimDX.XInput; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class GamePad360 { diff --git a/BizHawk.MultiClient/Input/Input.cs b/BizHawk.MultiClient/Input/Input.cs index b2c61dbb68..a691f3ad23 100644 --- a/BizHawk.MultiClient/Input/Input.cs +++ b/BizHawk.MultiClient/Input/Input.cs @@ -8,7 +8,7 @@ using SlimDX.DirectInput; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { //coalesces events back into instantaneous states public class InputCoalescer : SimpleController diff --git a/BizHawk.MultiClient/Input/Keyboard.cs b/BizHawk.MultiClient/Input/Keyboard.cs index a8bf4210cd..987d50c740 100644 --- a/BizHawk.MultiClient/Input/Keyboard.cs +++ b/BizHawk.MultiClient/Input/Keyboard.cs @@ -1,7 +1,7 @@ using SlimDX; using SlimDX.DirectInput; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public static class KeyInput { diff --git a/BizHawk.MultiClient/LogConsole.cs b/BizHawk.MultiClient/LogConsole.cs index f9de1c7591..9750518e21 100644 --- a/BizHawk.MultiClient/LogConsole.cs +++ b/BizHawk.MultiClient/LogConsole.cs @@ -14,7 +14,7 @@ using BizHawk.Client.Common; //also, collect log data independently of whether the log window is open //we also need to dice it into lines so that we can have a backlog policy -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { static class LogConsole { diff --git a/BizHawk.MultiClient/LogWindow.Designer.cs b/BizHawk.MultiClient/LogWindow.Designer.cs index 86c7d628be..7b4f91503f 100644 --- a/BizHawk.MultiClient/LogWindow.Designer.cs +++ b/BizHawk.MultiClient/LogWindow.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LogWindow { @@ -32,7 +32,7 @@ this.btnClear = new System.Windows.Forms.Button(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.buttonCopy = new System.Windows.Forms.Button(); - this.virtualListView1 = new BizHawk.VirtualListView(); + this.virtualListView1 = new VirtualListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.buttonCopyAll = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); @@ -107,7 +107,7 @@ this.virtualListView1.UseCompatibleStateImageBehavior = false; this.virtualListView1.View = System.Windows.Forms.View.Details; this.virtualListView1.VirtualMode = true; - this.virtualListView1.QueryItemText += new BizHawk.QueryItemTextHandler(this.virtualListView1_QueryItemText); + this.virtualListView1.QueryItemText += new QueryItemTextHandler(this.virtualListView1_QueryItemText); this.virtualListView1.ClientSizeChanged += new System.EventHandler(this.virtualListView1_ClientSizeChanged); // // buttonCopyAll diff --git a/BizHawk.MultiClient/LogWindow.cs b/BizHawk.MultiClient/LogWindow.cs index 9c648edc44..8130593d03 100644 --- a/BizHawk.MultiClient/LogWindow.cs +++ b/BizHawk.MultiClient/LogWindow.cs @@ -8,7 +8,7 @@ using BizHawk.Client.Common; //todo - perks - pause, copy to clipboard, backlog length limiting -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LogWindow : Form { diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 212679880c..5602faa0d0 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class MainForm { @@ -405,7 +405,7 @@ // // OpenRomMenuItem // - this.OpenRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomMenuItem.Name = "OpenRomMenuItem"; this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22); this.OpenRomMenuItem.Text = "Open ROM"; @@ -415,7 +415,7 @@ // this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); - this.RecentRomSubMenu.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Name = "RecentRomSubMenu"; this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22); this.RecentRomSubMenu.Text = "Recent ROM"; @@ -428,7 +428,7 @@ // // CloseRomMenuItem // - this.CloseRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomMenuItem.Name = "CloseRomMenuItem"; this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22); this.CloseRomMenuItem.Text = "&Close ROM"; @@ -752,7 +752,7 @@ // // PreviousSlotMenuItem // - this.PreviousSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; + this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft; this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem"; this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.PreviousSlotMenuItem.Text = "Previous Slot"; @@ -760,7 +760,7 @@ // // NextSlotMenuItem // - this.NextSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; + this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight; this.NextSlotMenuItem.Name = "NextSlotMenuItem"; this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.NextSlotMenuItem.Text = "Next Slot"; @@ -814,7 +814,7 @@ // // ReadonlyMenuItem // - this.ReadonlyMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; + this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly; this.ReadonlyMenuItem.Name = "ReadonlyMenuItem"; this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22); this.ReadonlyMenuItem.Text = "Read-only"; @@ -829,7 +829,7 @@ // this.RecentMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator16}); - this.RecentMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.RecentMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentMenuItem.Name = "RecentMenuItem"; this.RecentMenuItem.Size = new System.Drawing.Size(231, 22); this.RecentMenuItem.Text = "Recent"; @@ -842,7 +842,7 @@ // // RecordMovieMenuItem // - this.RecordMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; + this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieMenuItem.Name = "RecordMovieMenuItem"; this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.RecordMovieMenuItem.Text = "&Record Movie..."; @@ -850,7 +850,7 @@ // // PlayMovieMenuItem // - this.PlayMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; + this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieMenuItem.Name = "PlayMovieMenuItem"; this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.PlayMovieMenuItem.Text = "&Play Movie..."; @@ -858,7 +858,7 @@ // // StopMovieMenuItem // - this.StopMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieMenuItem.Name = "StopMovieMenuItem"; this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.StopMovieMenuItem.Text = "Stop Movie"; @@ -866,7 +866,7 @@ // // PlayFromBeginningMenuItem // - this.PlayFromBeginningMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem"; this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22); this.PlayFromBeginningMenuItem.Text = "Play from Beginning"; @@ -874,7 +874,7 @@ // // ImportMoviesMenuItem // - this.ImportMoviesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; + this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import; this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem"; this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22); this.ImportMoviesMenuItem.Text = "Import Movies..."; @@ -882,7 +882,7 @@ // // SaveMovieMenuItem // - this.SaveMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieMenuItem.Name = "SaveMovieMenuItem"; this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.SaveMovieMenuItem.Text = "&Save Movie"; @@ -890,7 +890,7 @@ // // StopMovieWithoutSavingMenuItem // - this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem"; this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22); this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving"; @@ -936,7 +936,7 @@ // // RecordAVMenuItem // - this.RecordAVMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; + this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI; this.RecordAVMenuItem.Name = "RecordAVMenuItem"; this.RecordAVMenuItem.Size = new System.Drawing.Size(163, 22); this.RecordAVMenuItem.Text = "Record AVI/WAV"; @@ -944,7 +944,7 @@ // // StopAVIMenuItem // - this.StopAVIMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVIMenuItem.Name = "StopAVIMenuItem"; this.StopAVIMenuItem.Size = new System.Drawing.Size(163, 22); this.StopAVIMenuItem.Text = "Stop AVI/WAV"; @@ -977,7 +977,7 @@ // // ScreenshotMenuItem // - this.ScreenshotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotMenuItem.Name = "ScreenshotMenuItem"; this.ScreenshotMenuItem.Size = new System.Drawing.Size(245, 22); this.ScreenshotMenuItem.Text = "Screenshot"; @@ -1038,7 +1038,7 @@ // // PauseMenuItem // - this.PauseMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseMenuItem.Name = "PauseMenuItem"; this.PauseMenuItem.Size = new System.Drawing.Size(140, 22); this.PauseMenuItem.Text = "&Pause"; @@ -1046,7 +1046,7 @@ // // RebootCoreMenuItem // - this.RebootCoreMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootCoreMenuItem.Name = "RebootCoreMenuItem"; this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22); this.RebootCoreMenuItem.Text = "&Reboot Core"; @@ -1190,7 +1190,7 @@ // // SwitchToFullscreenMenuItem // - this.SwitchToFullscreenMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; + this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen; this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem"; this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22); this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen"; @@ -1289,7 +1289,7 @@ // // ControllersMenuItem // - this.ControllersMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.ControllersMenuItem.Name = "ControllersMenuItem"; this.ControllersMenuItem.Size = new System.Drawing.Size(152, 22); this.ControllersMenuItem.Text = "&Controllers..."; @@ -1297,7 +1297,7 @@ // // HotkeysMenuItem // - this.HotkeysMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; + this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.HotkeysMenuItem.Name = "HotkeysMenuItem"; this.HotkeysMenuItem.Size = new System.Drawing.Size(152, 22); this.HotkeysMenuItem.Text = "&Hotkeys..."; @@ -1305,7 +1305,7 @@ // // MessagesMenuItem // - this.MessagesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; + this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.MessagesMenuItem.Name = "MessagesMenuItem"; this.MessagesMenuItem.Size = new System.Drawing.Size(152, 22); this.MessagesMenuItem.Text = "&Messages..."; @@ -1313,7 +1313,7 @@ // // PathsMenuItem // - this.PathsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; + this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.PathsMenuItem.Name = "PathsMenuItem"; this.PathsMenuItem.Size = new System.Drawing.Size(152, 22); this.PathsMenuItem.Text = "Paths..."; @@ -1321,7 +1321,7 @@ // // SoundMenuItem // - this.SoundMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; + this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.SoundMenuItem.Name = "SoundMenuItem"; this.SoundMenuItem.Size = new System.Drawing.Size(152, 22); this.SoundMenuItem.Text = "&Sound..."; @@ -1329,7 +1329,7 @@ // // AutofireMenuItem // - this.AutofireMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; + this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.AutofireMenuItem.Name = "AutofireMenuItem"; this.AutofireMenuItem.Size = new System.Drawing.Size(152, 22); this.AutofireMenuItem.Text = "&Autofire..."; @@ -1337,7 +1337,7 @@ // // RewindOptionsMenuItem // - this.RewindOptionsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; this.RewindOptionsMenuItem.Size = new System.Drawing.Size(152, 22); this.RewindOptionsMenuItem.Text = "&Rewind..."; @@ -1784,7 +1784,7 @@ // // SaveConfigMenuItem // - this.SaveConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; + this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; this.SaveConfigMenuItem.Size = new System.Drawing.Size(152, 22); this.SaveConfigMenuItem.Text = "Save Config"; @@ -1792,7 +1792,7 @@ // // LoadConfigMenuItem // - this.LoadConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; + this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; this.LoadConfigMenuItem.Size = new System.Drawing.Size(152, 22); this.LoadConfigMenuItem.Text = "Load Config"; @@ -1821,7 +1821,7 @@ // // ToolBoxMenuItem // - this.ToolBoxMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; + this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox; this.ToolBoxMenuItem.Name = "ToolBoxMenuItem"; this.ToolBoxMenuItem.Size = new System.Drawing.Size(189, 22); this.ToolBoxMenuItem.Text = "&Tool Box"; @@ -1834,7 +1834,7 @@ // // RamWatchMenuItem // - this.RamWatchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.watch; + this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch; this.RamWatchMenuItem.Name = "RamWatchMenuItem"; this.RamWatchMenuItem.Size = new System.Drawing.Size(189, 22); this.RamWatchMenuItem.Text = "RAM &Watch"; @@ -1842,7 +1842,7 @@ // // RamSearchMenuItem // - this.RamSearchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.RamSearchMenuItem.Name = "RamSearchMenuItem"; this.RamSearchMenuItem.Size = new System.Drawing.Size(189, 22); this.RamSearchMenuItem.Text = "RAM &Search"; @@ -1850,7 +1850,7 @@ // // HexEditorMenuItem // - this.HexEditorMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditorMenuItem.Name = "HexEditorMenuItem"; this.HexEditorMenuItem.Size = new System.Drawing.Size(189, 22); this.HexEditorMenuItem.Text = "&Hex Editor"; @@ -1858,7 +1858,7 @@ // // TraceLoggerMenuItem // - this.TraceLoggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; + this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem"; this.TraceLoggerMenuItem.Size = new System.Drawing.Size(189, 22); this.TraceLoggerMenuItem.Text = "Trace &Logger"; @@ -1866,7 +1866,7 @@ // // TAStudioMenuItem // - this.TAStudioMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.TAStudioMenuItem.Name = "TAStudioMenuItem"; this.TAStudioMenuItem.Size = new System.Drawing.Size(189, 22); this.TAStudioMenuItem.Text = "&TAStudio"; @@ -1874,7 +1874,7 @@ // // VirtualPadMenuItem // - this.VirtualPadMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.VirtualPadMenuItem.Name = "VirtualPadMenuItem"; this.VirtualPadMenuItem.Size = new System.Drawing.Size(189, 22); this.VirtualPadMenuItem.Text = "Virtual Pad"; @@ -1887,7 +1887,7 @@ // // CheatsMenuItem // - this.CheatsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.CheatsMenuItem.Name = "CheatsMenuItem"; this.CheatsMenuItem.Size = new System.Drawing.Size(189, 22); this.CheatsMenuItem.Text = "Cheats"; @@ -1895,7 +1895,7 @@ // // LuaConsoleMenuItem // - this.LuaConsoleMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; + this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; this.LuaConsoleMenuItem.Size = new System.Drawing.Size(189, 22); this.LuaConsoleMenuItem.Text = "Lua Console"; @@ -1930,7 +1930,7 @@ // // NESDebuggerMenuItem // - this.NESDebuggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; + this.NESDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.NESDebuggerMenuItem.Name = "NESDebuggerMenuItem"; this.NESDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); this.NESDebuggerMenuItem.Text = "&Debugger"; @@ -2128,7 +2128,7 @@ // // KeypadMenuItem // - this.KeypadMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; + this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.KeypadMenuItem.Name = "KeypadMenuItem"; this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22); this.KeypadMenuItem.Text = "Keypad"; @@ -2427,7 +2427,7 @@ // // SnesGfxDebuggerMenuItem // - this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; + this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem"; this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger"; @@ -2513,7 +2513,7 @@ // // OnlineHelpMenuItem // - this.OnlineHelpMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Help; + this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem"; this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22); this.OnlineHelpMenuItem.Text = "&Online Help..."; @@ -2521,7 +2521,7 @@ // // ForumsMenuItem // - this.ForumsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.ForumsMenuItem.Name = "ForumsMenuItem"; this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22); this.ForumsMenuItem.Text = "Forums..."; @@ -2529,7 +2529,7 @@ // // AboutMenuItem // - this.AboutMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; + this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.AboutMenuItem.Name = "AboutMenuItem"; this.AboutMenuItem.Size = new System.Drawing.Size(146, 22); this.AboutMenuItem.Text = "&About"; @@ -2569,7 +2569,7 @@ // DumpStatusButton // this.DumpStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.DumpStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.DumpStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank; this.DumpStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.DumpStatusButton.Name = "DumpStatusButton"; this.DumpStatusButton.ShowDropDownArrow = false; @@ -2585,7 +2585,7 @@ // PlayRecordStatusButton // this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PlayRecordStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PlayRecordStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank; this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.PlayRecordStatusButton.Name = "PlayRecordStatusButton"; this.PlayRecordStatusButton.ShowDropDownArrow = false; @@ -2596,7 +2596,7 @@ // this.PauseStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.PauseStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PauseStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PauseStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank; this.PauseStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.PauseStatusButton.Name = "PauseStatusButton"; this.PauseStatusButton.ShowDropDownArrow = false; @@ -2608,7 +2608,7 @@ // RebootStatusBarIcon // this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RebootStatusBarIcon.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.RebootStatusBarIcon.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootStatusBarIcon.Name = "RebootStatusBarIcon"; this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No; this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17); @@ -2619,14 +2619,14 @@ // AVIStatusLabel // this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.AVIStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank; this.AVIStatusLabel.Name = "AVIStatusLabel"; this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17); this.AVIStatusLabel.Text = "AVI Capture"; // // LedLightStatusLabel // - this.LedLightStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; + this.LedLightStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LightOff; this.LedLightStatusLabel.Name = "LedLightStatusLabel"; this.LedLightStatusLabel.Size = new System.Drawing.Size(16, 17); this.LedLightStatusLabel.ToolTipText = "Disk Drive LED Light"; @@ -2717,7 +2717,7 @@ // KeyPriorityStatusLabel // this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.KeyPriorityStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; + this.KeyPriorityStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Both; this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel"; this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 17); this.KeyPriorityStatusLabel.Text = "KeyPriority"; @@ -2756,7 +2756,7 @@ // // OpenRomContextMenuItem // - this.OpenRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem"; this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.OpenRomContextMenuItem.Text = "Open Rom"; @@ -2764,7 +2764,7 @@ // // LoadLastRomContextMenuItem // - this.LoadLastRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem"; this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.LoadLastRomContextMenuItem.Text = "Load Last ROM"; @@ -2777,7 +2777,7 @@ // // RecordMovieContextMenuItem // - this.RecordMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; + this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem"; this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.RecordMovieContextMenuItem.Text = "Record Movie"; @@ -2785,7 +2785,7 @@ // // PlayMovieContextMenuItem // - this.PlayMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; + this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem"; this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.PlayMovieContextMenuItem.Text = "Play Movie"; @@ -2793,7 +2793,7 @@ // // RestartMovieContextMenuItem // - this.RestartMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem"; this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.RestartMovieContextMenuItem.Text = "Restart Movie"; @@ -2801,7 +2801,7 @@ // // StopMovieContextMenuItem // - this.StopMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem"; this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.StopMovieContextMenuItem.Text = "Stop Movie"; @@ -2809,7 +2809,7 @@ // // LoadLastMovieContextMenuItem // - this.LoadLastMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem"; this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.LoadLastMovieContextMenuItem.Text = "Load Last Movie"; @@ -2824,7 +2824,7 @@ // // StopNoSaveContextMenuItem // - this.StopNoSaveContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem"; this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22); this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving"; @@ -2853,7 +2853,7 @@ // // SaveMovieContextMenuItem // - this.SaveMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem"; this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.SaveMovieContextMenuItem.Text = "Save Movie"; @@ -2866,7 +2866,7 @@ // // UndoSavestateContextMenuItem // - this.UndoSavestateContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem"; this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22); this.UndoSavestateContextMenuItem.Text = "Undo Savestate"; @@ -2897,7 +2897,7 @@ // // controllersToolStripMenuItem1 // - this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.controllersToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1"; this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.controllersToolStripMenuItem1.Text = "&Controllers..."; @@ -2905,7 +2905,7 @@ // // hotkeysToolStripMenuItem1 // - this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; + this.hotkeysToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1"; this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.hotkeysToolStripMenuItem1.Text = "&Hotkeys..."; @@ -2913,7 +2913,7 @@ // // messagesToolStripMenuItem1 // - this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; + this.messagesToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1"; this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.messagesToolStripMenuItem1.Text = "&Messages..."; @@ -2921,7 +2921,7 @@ // // pathsToolStripMenuItem1 // - this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; + this.pathsToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1"; this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.pathsToolStripMenuItem1.Text = "Paths..."; @@ -2929,7 +2929,7 @@ // // soundToolStripMenuItem1 // - this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; + this.soundToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1"; this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.soundToolStripMenuItem1.Text = "&Sound..."; @@ -2937,14 +2937,14 @@ // // autofireToolStripMenuItem1 // - this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; + this.autofireToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1"; this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); this.autofireToolStripMenuItem1.Text = "&Autofire..."; // // rewindToolStripMenuItem // - this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.rewindToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.rewindToolStripMenuItem.Text = "&Rewind"; @@ -2964,7 +2964,7 @@ // // toolStripMenuItem6 // - this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.Save; + this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.toolStripMenuItem6.Name = "toolStripMenuItem6"; this.toolStripMenuItem6.Size = new System.Drawing.Size(141, 22); this.toolStripMenuItem6.Text = "Save Config"; @@ -2972,7 +2972,7 @@ // // toolStripMenuItem7 // - this.toolStripMenuItem7.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; + this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.toolStripMenuItem7.Name = "toolStripMenuItem7"; this.toolStripMenuItem7.Size = new System.Drawing.Size(141, 22); this.toolStripMenuItem7.Text = "Load Config"; @@ -2980,7 +2980,7 @@ // // ScreenshotContextMenuItem // - this.ScreenshotContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem"; this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ScreenshotContextMenuItem.Text = "Screenshot"; @@ -2988,7 +2988,7 @@ // // CloseRomContextMenuItem // - this.CloseRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem"; this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.CloseRomContextMenuItem.Text = "Close ROM"; diff --git a/BizHawk.MultiClient/MainForm.Events.cs b/BizHawk.MultiClient/MainForm.Events.cs index cfa38a42f7..2fcb1293ef 100644 --- a/BizHawk.MultiClient/MainForm.Events.cs +++ b/BizHawk.MultiClient/MainForm.Events.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class MainForm { diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs index d95664b8b1..67164841c0 100644 --- a/BizHawk.MultiClient/MainForm.Movie.cs +++ b/BizHawk.MultiClient/MainForm.Movie.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class MainForm { diff --git a/BizHawk.MultiClient/MainForm.Rewind.cs b/BizHawk.MultiClient/MainForm.Rewind.cs index d34d61023e..b9b8db1ad9 100644 --- a/BizHawk.MultiClient/MainForm.Rewind.cs +++ b/BizHawk.MultiClient/MainForm.Rewind.cs @@ -6,7 +6,7 @@ using System.Collections.Concurrent; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class MainForm { diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 07f926c574..5f38ad4303 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Text; using System.Threading; using System.Windows.Forms; -using BizHawk.Core; using BizHawk.DiscSystem; using BizHawk.Emulation; using BizHawk.Emulation.Computers.Commodore64; @@ -25,7 +24,7 @@ using BizHawk.Emulation.Consoles.TurboGrafx; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class MainForm : Form { @@ -2925,19 +2924,19 @@ namespace BizHawk.MultiClient using (Graphics g = Graphics.FromImage(bmpout)) g.DrawImage(bmpin, new Rectangle(0, 0, bmpout.Width, bmpout.Height)); bmpin.Dispose(); - output = new AVOut.BmpVideoProvder(bmpout); + output = new BmpVideoProvder(bmpout); } else { if (Global.Config.AVI_CaptureOSD) - output = new AVOut.BmpVideoProvder(CaptureOSD()); + output = new BmpVideoProvder(CaptureOSD()); else output = Global.Emulator.VideoProvider; } CurrAviWriter.AddFrame(output); - if (output is AVOut.BmpVideoProvder) - (output as AVOut.BmpVideoProvder).Dispose(); + if (output is BmpVideoProvder) + (output as BmpVideoProvder).Dispose(); CurrAviWriter.AddSamples(temp); } diff --git a/BizHawk.MultiClient/NameStateForm.Designer.cs b/BizHawk.MultiClient/NameStateForm.Designer.cs index d6a829142f..929a7b1ce2 100644 --- a/BizHawk.MultiClient/NameStateForm.Designer.cs +++ b/BizHawk.MultiClient/NameStateForm.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class NameStateForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class NameStateForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.cancelButton = new System.Windows.Forms.Button(); this.saveButton = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); @@ -90,13 +90,13 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.Button cancelButton; - private System.Windows.Forms.Button saveButton; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox stateLabelTextBox; - } + private System.Windows.Forms.Button cancelButton; + private System.Windows.Forms.Button saveButton; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox stateLabelTextBox; + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/NameStateForm.cs b/BizHawk.MultiClient/NameStateForm.cs index cba7d2c04b..ab17e1356f 100644 --- a/BizHawk.MultiClient/NameStateForm.cs +++ b/BizHawk.MultiClient/NameStateForm.cs @@ -1,38 +1,38 @@ using System; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - public partial class NameStateForm : Form - { - public string Result; - public bool OK; + public partial class NameStateForm : Form + { + public string Result; + public bool OK; - public NameStateForm() - { - InitializeComponent(); - AcceptButton = saveButton; - CancelButton = cancelButton; - } + public NameStateForm() + { + InitializeComponent(); + AcceptButton = saveButton; + CancelButton = cancelButton; + } - private void cancelButton_Click(object sender, EventArgs e) - { - Close(); - } + private void cancelButton_Click(object sender, EventArgs e) + { + Close(); + } - private void saveButton_Click(object sender, EventArgs e) - { - if (stateLabelTextBox.Text.Length != 0) - { - Result = stateLabelTextBox.Text; - OK = true; - Close(); - } - } + private void saveButton_Click(object sender, EventArgs e) + { + if (stateLabelTextBox.Text.Length != 0) + { + Result = stateLabelTextBox.Text; + OK = true; + Close(); + } + } - private void NameStateForm_Shown(object sender, EventArgs e) - { - stateLabelTextBox.Focus(); - } - } + private void NameStateForm_Shown(object sender, EventArgs e) + { + stateLabelTextBox.Focus(); + } + } } diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs index 2f64b9d7e5..28c2d5732a 100644 --- a/BizHawk.MultiClient/Program.cs +++ b/BizHawk.MultiClient/Program.cs @@ -15,7 +15,7 @@ using Microsoft.VisualBasic.ApplicationServices; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { static class Program { diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 3ccd6f030e..1b8fa85796 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace BizHawk.MultiClient.Properties { +namespace BizHawk.Client.EmuHawk.Properties { using System; @@ -39,7 +39,7 @@ namespace BizHawk.MultiClient.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.MultiClient.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.Client.EmuHawk.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/BizHawk.MultiClient/Properties/Settings.Designer.cs b/BizHawk.MultiClient/Properties/Settings.Designer.cs index e540a006df..24d10c627e 100644 --- a/BizHawk.MultiClient/Properties/Settings.Designer.cs +++ b/BizHawk.MultiClient/Properties/Settings.Designer.cs @@ -1,18 +1,18 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.18052 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace BizHawk.MultiClient.Properties { +namespace BizHawk.Client.EmuHawk.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 37e1876dd2..2b116266e8 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -12,9 +12,8 @@ using d3d9font=SlimDX.Direct3D9.Font; #endif using BizHawk.Client.Common; -using BizHawk.Core; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { #if WINDOWS public class ImageTexture : IDisposable diff --git a/BizHawk.MultiClient/ScreenSaver.cs b/BizHawk.MultiClient/ScreenSaver.cs index dbdadf1c5b..dc79976347 100644 --- a/BizHawk.MultiClient/ScreenSaver.cs +++ b/BizHawk.MultiClient/ScreenSaver.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { // Derived from http://www.codeproject.com/KB/cs/ScreenSaverControl.aspx public static class ScreenSaver diff --git a/BizHawk.MultiClient/Sound.cs b/BizHawk.MultiClient/Sound.cs index c2b96726ed..9af3d46621 100644 --- a/BizHawk.MultiClient/Sound.cs +++ b/BizHawk.MultiClient/Sound.cs @@ -8,7 +8,7 @@ using SlimDX.Multimedia; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { #if WINDOWS public static class SoundEnumeration diff --git a/BizHawk.MultiClient/Throttle.cs b/BizHawk.MultiClient/Throttle.cs index 20ea680b93..915acedcc3 100644 --- a/BizHawk.MultiClient/Throttle.cs +++ b/BizHawk.MultiClient/Throttle.cs @@ -6,7 +6,7 @@ using BizHawk.Client.Common; //this throttle is nitsuja's fine-tuned techniques from desmume -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class Throttle { diff --git a/BizHawk.MultiClient/Watch.cs b/BizHawk.MultiClient/Watch.cs index 072f3f08e1..47ffd0868b 100644 --- a/BizHawk.MultiClient/Watch.cs +++ b/BizHawk.MultiClient/Watch.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { //Data structure for a watch item in the Ram Watch Dialog public enum atype { BYTE, WORD, DWORD, SEPARATOR }; //TODO: more custom types too like 12.4 and 24.12 fixed point diff --git a/BizHawk.MultiClient/config/AutofireConfig.Designer.cs b/BizHawk.MultiClient/config/AutofireConfig.Designer.cs index f7c31c3f48..fd4f6f06e6 100644 --- a/BizHawk.MultiClient/config/AutofireConfig.Designer.cs +++ b/BizHawk.MultiClient/config/AutofireConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class AutofireConfig { diff --git a/BizHawk.MultiClient/config/AutofireConfig.cs b/BizHawk.MultiClient/config/AutofireConfig.cs index 4b23d3fae0..71a0e96a64 100644 --- a/BizHawk.MultiClient/config/AutofireConfig.cs +++ b/BizHawk.MultiClient/config/AutofireConfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class AutofireConfig : Form { diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index 0467b76810..9ee9f3497f 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class ControllerConfig { diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs index fade25cc58..aec4666fa7 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class ControllerConfig : Form { diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs index eb1f707d7d..874e5f079d 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class AnalogBindControl { diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs index 61d2797747..ddc6e9d18a 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class AnalogBindControl : UserControl { diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs index ea9bafc8bc..65cc9786e3 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs @@ -7,7 +7,7 @@ using System.Drawing; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class AnalogBindPanel : UserControl { diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs index 88cb74adb5..1a17a0b9cf 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class ControllerConfigPanel { diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs index 49badb606f..a344d6fcdd 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs @@ -4,10 +4,9 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { // this is a little messy right now because of remnants of the old config system - public partial class ControllerConfigPanel : UserControl { // the dictionary that results are saved to diff --git a/BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs b/BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs index 46fd2fe017..a7bb05ddac 100644 --- a/BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs +++ b/BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class FirmwaresConfig { diff --git a/BizHawk.MultiClient/config/FirmwaresConfig.cs b/BizHawk.MultiClient/config/FirmwaresConfig.cs index f99d6b7fdb..001ebf4100 100644 --- a/BizHawk.MultiClient/config/FirmwaresConfig.cs +++ b/BizHawk.MultiClient/config/FirmwaresConfig.cs @@ -23,7 +23,7 @@ using BizHawk.Client.Common; //TODO - display some kind if [!] if you have a user-specified file which is known but defined as incompatible by the firmware DB -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class FirmwaresConfig : Form { @@ -76,7 +76,7 @@ namespace BizHawk.MultiClient InitializeComponent(); //prep imagelist for listview with 3 item states for {idUnsure, idMissing, idOk} - imageList1.Images.AddRange(new[] { MultiClient.Properties.Resources.RetroQuestion, MultiClient.Properties.Resources.ExclamationRed, MultiClient.Properties.Resources.GreenCheck }); + imageList1.Images.AddRange(new[] { EmuHawk.Properties.Resources.RetroQuestion, EmuHawk.Properties.Resources.ExclamationRed, EmuHawk.Properties.Resources.GreenCheck }); listviewSorter = new ListViewSorter(this, -1); diff --git a/BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs b/BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs index e65bff5dbe..a730127561 100644 --- a/BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs +++ b/BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class FirmwaresConfigInfo { diff --git a/BizHawk.MultiClient/config/FirmwaresConfigInfo.cs b/BizHawk.MultiClient/config/FirmwaresConfigInfo.cs index b0a5abf213..aae72d8f8e 100644 --- a/BizHawk.MultiClient/config/FirmwaresConfigInfo.cs +++ b/BizHawk.MultiClient/config/FirmwaresConfigInfo.cs @@ -11,7 +11,7 @@ using System.Windows.Forms; //todo - check(mark) the one thats selected //todo - turn top info into textboxes i guess, labels suck -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class FirmwaresConfigInfo : Form { diff --git a/BizHawk.MultiClient/config/GifAnimator.Designer.cs b/BizHawk.MultiClient/config/GifAnimator.Designer.cs index 53efb97693..52c3c7bef4 100644 --- a/BizHawk.MultiClient/config/GifAnimator.Designer.cs +++ b/BizHawk.MultiClient/config/GifAnimator.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class GifAnimator { diff --git a/BizHawk.MultiClient/config/GifAnimator.cs b/BizHawk.MultiClient/config/GifAnimator.cs index 82a6ba4cfe..663662db81 100644 --- a/BizHawk.MultiClient/config/GifAnimator.cs +++ b/BizHawk.MultiClient/config/GifAnimator.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class GifAnimator : Form { diff --git a/BizHawk.MultiClient/config/HotkeyConfig.Designer.cs b/BizHawk.MultiClient/config/HotkeyConfig.Designer.cs index e141d8b0a6..9f55697e04 100644 --- a/BizHawk.MultiClient/config/HotkeyConfig.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class HotkeyConfig { diff --git a/BizHawk.MultiClient/config/HotkeyConfig.cs b/BizHawk.MultiClient/config/HotkeyConfig.cs index 7e88f32686..9f58abda39 100644 --- a/BizHawk.MultiClient/config/HotkeyConfig.cs +++ b/BizHawk.MultiClient/config/HotkeyConfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class HotkeyConfig : Form { diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs index e2d8f5d1bf..f6192af2c2 100644 --- a/BizHawk.MultiClient/config/InputWidget.cs +++ b/BizHawk.MultiClient/config/InputWidget.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using System.Runtime.InteropServices; using System.Text; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class InputWidget : TextBox { diff --git a/BizHawk.MultiClient/config/MessageConfig.Designer.cs b/BizHawk.MultiClient/config/MessageConfig.Designer.cs index 6ba305f551..f06ac3d7c1 100644 --- a/BizHawk.MultiClient/config/MessageConfig.Designer.cs +++ b/BizHawk.MultiClient/config/MessageConfig.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class MessageConfig - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class MessageConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.OK = new System.Windows.Forms.Button(); this.MessageTypeBox = new System.Windows.Forms.GroupBox(); this.AutoholdLabel = new System.Windows.Forms.Label(); @@ -687,45 +687,45 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.Button OK; - private System.Windows.Forms.GroupBox MessageTypeBox; - private System.Windows.Forms.RadioButton MessagesRadio; - private System.Windows.Forms.RadioButton InputDisplayRadio; - private System.Windows.Forms.RadioButton LagCounterRadio; - private System.Windows.Forms.RadioButton FrameCounterRadio; - private System.Windows.Forms.RadioButton FPSRadio; + private System.Windows.Forms.Button OK; + private System.Windows.Forms.GroupBox MessageTypeBox; + private System.Windows.Forms.RadioButton MessagesRadio; + private System.Windows.Forms.RadioButton InputDisplayRadio; + private System.Windows.Forms.RadioButton LagCounterRadio; + private System.Windows.Forms.RadioButton FrameCounterRadio; + private System.Windows.Forms.RadioButton FPSRadio; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.ColorDialog MessageColorDialog; - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Label MessLabel; - private System.Windows.Forms.Label InpLabel; - private System.Windows.Forms.Label LagLabel; - private System.Windows.Forms.Label FCLabel; - private System.Windows.Forms.Label FpsPosLabel; - private System.Windows.Forms.Button ResetDefaultsButton; + private System.Windows.Forms.ColorDialog MessageColorDialog; + private System.Windows.Forms.Button Cancel; + private System.Windows.Forms.Label MessLabel; + private System.Windows.Forms.Label InpLabel; + private System.Windows.Forms.Label LagLabel; + private System.Windows.Forms.Label FCLabel; + private System.Windows.Forms.Label FpsPosLabel; + private System.Windows.Forms.Button ResetDefaultsButton; private System.Windows.Forms.TextBox ColorText; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Panel PositionPanel; - private System.Windows.Forms.NumericUpDown XNumeric; - private System.Windows.Forms.NumericUpDown YNumeric; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox PositionGroupBox; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel PositionPanel; + private System.Windows.Forms.NumericUpDown XNumeric; + private System.Windows.Forms.NumericUpDown YNumeric; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.GroupBox PositionGroupBox; + private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox AlertColorText; - private System.Windows.Forms.Panel AlertColorPanel; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label8; + private System.Windows.Forms.Panel AlertColorPanel; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; private System.Windows.Forms.TextBox LInputText; - private System.Windows.Forms.Panel LInputColorPanel; - private System.Windows.Forms.ColorDialog AlertColorDialog; - private System.Windows.Forms.ColorDialog LInputColorDialog; + private System.Windows.Forms.Panel LInputColorPanel; + private System.Windows.Forms.ColorDialog AlertColorDialog; + private System.Windows.Forms.ColorDialog LInputColorDialog; private System.Windows.Forms.RadioButton BR; private System.Windows.Forms.RadioButton BL; private System.Windows.Forms.RadioButton TR; @@ -743,5 +743,5 @@ private System.Windows.Forms.CheckBox StackMessagesCheckbox; private System.Windows.Forms.Label AutoholdLabel; private System.Windows.Forms.RadioButton AutoholdRadio; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/MessageConfig.cs b/BizHawk.MultiClient/config/MessageConfig.cs index 9fe98f2d81..fd1be87f2a 100644 --- a/BizHawk.MultiClient/config/MessageConfig.cs +++ b/BizHawk.MultiClient/config/MessageConfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class MessageConfig : Form { diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs index 49428fef3c..bd99ee15f4 100644 --- a/BizHawk.MultiClient/config/PathConfig.Designer.cs +++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class PathConfig { @@ -28,162 +28,162 @@ /// private void InitializeComponent() { - this.OK = new System.Windows.Forms.Button(); - this.Cancel = new System.Windows.Forms.Button(); - this.PathTabControl = new System.Windows.Forms.TabControl(); - this.SaveBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.RecentForROMs = new System.Windows.Forms.CheckBox(); - this.BasePathBox = new System.Windows.Forms.TextBox(); - this.BrowseBase = new System.Windows.Forms.Button(); - this.BaseDescription = new System.Windows.Forms.Label(); - this.DefaultsBtn = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // OK - // - this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OK.Location = new System.Drawing.Point(471, 411); - this.OK.Name = "OK"; - this.OK.Size = new System.Drawing.Size(75, 23); - this.OK.TabIndex = 0; - this.OK.Text = "&Ok"; - this.OK.UseVisualStyleBackColor = true; - this.OK.Click += new System.EventHandler(this.OK_Click); - // - // Cancel - // - this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(552, 411); - this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(75, 23); - this.Cancel.TabIndex = 1; - this.Cancel.Text = "&Cancel"; - this.Cancel.UseVisualStyleBackColor = true; - this.Cancel.Click += new System.EventHandler(this.Cancel_Click); - // - // PathTabControl - // - this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PathTabControl.Location = new System.Drawing.Point(12, 84); - this.PathTabControl.Multiline = true; - this.PathTabControl.Name = "PathTabControl"; - this.PathTabControl.SelectedIndex = 0; - this.PathTabControl.Size = new System.Drawing.Size(615, 321); - this.PathTabControl.TabIndex = 2; - // - // SaveBtn - // - this.SaveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SaveBtn.Location = new System.Drawing.Point(12, 411); - this.SaveBtn.Name = "SaveBtn"; - this.SaveBtn.Size = new System.Drawing.Size(75, 23); - this.SaveBtn.TabIndex = 3; - this.SaveBtn.Text = "&Save"; - this.SaveBtn.UseVisualStyleBackColor = true; - this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(527, 52); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 13); - this.label1.TabIndex = 210; - this.label1.Text = "Special Commands"; - // - // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; - this.button1.Location = new System.Drawing.Point(496, 47); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(26, 23); - this.button1.TabIndex = 209; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // RecentForROMs - // - this.RecentForROMs.AutoSize = true; - this.RecentForROMs.Location = new System.Drawing.Point(12, 51); - this.RecentForROMs.Name = "RecentForROMs"; - this.RecentForROMs.Size = new System.Drawing.Size(184, 17); - this.RecentForROMs.TabIndex = 207; - this.RecentForROMs.Text = "Always use recent path for ROMs"; - this.RecentForROMs.UseVisualStyleBackColor = true; - this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged); - // - // BasePathBox - // - this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.BasePathBox.Location = new System.Drawing.Point(12, 15); - this.BasePathBox.Name = "BasePathBox"; - this.BasePathBox.Size = new System.Drawing.Size(510, 20); - this.BasePathBox.TabIndex = 205; - // - // BrowseBase - // - this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BrowseBase.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.BrowseBase.Location = new System.Drawing.Point(530, 14); - this.BrowseBase.Name = "BrowseBase"; - this.BrowseBase.Size = new System.Drawing.Size(26, 23); - this.BrowseBase.TabIndex = 206; - this.BrowseBase.UseVisualStyleBackColor = true; - this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click); - // - // BaseDescription - // - this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BaseDescription.AutoSize = true; - this.BaseDescription.Location = new System.Drawing.Point(563, 19); - this.BaseDescription.Name = "BaseDescription"; - this.BaseDescription.Size = new System.Drawing.Size(64, 13); - this.BaseDescription.TabIndex = 208; - this.BaseDescription.Text = "Global Base"; - // - // DefaultsBtn - // - this.DefaultsBtn.Location = new System.Drawing.Point(93, 411); - this.DefaultsBtn.Name = "DefaultsBtn"; - this.DefaultsBtn.Size = new System.Drawing.Size(75, 23); - this.DefaultsBtn.TabIndex = 211; - this.DefaultsBtn.Text = "&Defaults"; - this.DefaultsBtn.UseVisualStyleBackColor = true; - this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click); - // - // NewPathConfig - // - this.AcceptButton = this.OK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(639, 446); - this.Controls.Add(this.DefaultsBtn); - this.Controls.Add(this.label1); - this.Controls.Add(this.button1); - this.Controls.Add(this.RecentForROMs); - this.Controls.Add(this.BasePathBox); - this.Controls.Add(this.BrowseBase); - this.Controls.Add(this.BaseDescription); - this.Controls.Add(this.SaveBtn); - this.Controls.Add(this.PathTabControl); - this.Controls.Add(this.Cancel); - this.Controls.Add(this.OK); - this.MinimumSize = new System.Drawing.Size(360, 250); - this.Name = "NewPathConfig"; - this.ShowIcon = false; - this.Text = "Path Configuration"; - this.Load += new System.EventHandler(this.NewPathConfig_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.OK = new System.Windows.Forms.Button(); + this.Cancel = new System.Windows.Forms.Button(); + this.PathTabControl = new System.Windows.Forms.TabControl(); + this.SaveBtn = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.RecentForROMs = new System.Windows.Forms.CheckBox(); + this.BasePathBox = new System.Windows.Forms.TextBox(); + this.BrowseBase = new System.Windows.Forms.Button(); + this.BaseDescription = new System.Windows.Forms.Label(); + this.DefaultsBtn = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // OK + // + this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OK.Location = new System.Drawing.Point(471, 411); + this.OK.Name = "OK"; + this.OK.Size = new System.Drawing.Size(75, 23); + this.OK.TabIndex = 0; + this.OK.Text = "&Ok"; + this.OK.UseVisualStyleBackColor = true; + this.OK.Click += new System.EventHandler(this.OK_Click); + // + // Cancel + // + this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.Cancel.Location = new System.Drawing.Point(552, 411); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(75, 23); + this.Cancel.TabIndex = 1; + this.Cancel.Text = "&Cancel"; + this.Cancel.UseVisualStyleBackColor = true; + this.Cancel.Click += new System.EventHandler(this.Cancel_Click); + // + // PathTabControl + // + this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.PathTabControl.Location = new System.Drawing.Point(12, 84); + this.PathTabControl.Multiline = true; + this.PathTabControl.Name = "PathTabControl"; + this.PathTabControl.SelectedIndex = 0; + this.PathTabControl.Size = new System.Drawing.Size(615, 321); + this.PathTabControl.TabIndex = 2; + // + // SaveBtn + // + this.SaveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.SaveBtn.Location = new System.Drawing.Point(12, 411); + this.SaveBtn.Name = "SaveBtn"; + this.SaveBtn.Size = new System.Drawing.Size(75, 23); + this.SaveBtn.TabIndex = 3; + this.SaveBtn.Text = "&Save"; + this.SaveBtn.UseVisualStyleBackColor = true; + this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(527, 52); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(97, 13); + this.label1.TabIndex = 210; + this.label1.Text = "Special Commands"; + // + // button1 + // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; + this.button1.Location = new System.Drawing.Point(496, 47); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(26, 23); + this.button1.TabIndex = 209; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // RecentForROMs + // + this.RecentForROMs.AutoSize = true; + this.RecentForROMs.Location = new System.Drawing.Point(12, 51); + this.RecentForROMs.Name = "RecentForROMs"; + this.RecentForROMs.Size = new System.Drawing.Size(184, 17); + this.RecentForROMs.TabIndex = 207; + this.RecentForROMs.Text = "Always use recent path for ROMs"; + this.RecentForROMs.UseVisualStyleBackColor = true; + this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged); + // + // BasePathBox + // + this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.BasePathBox.Location = new System.Drawing.Point(12, 15); + this.BasePathBox.Name = "BasePathBox"; + this.BasePathBox.Size = new System.Drawing.Size(510, 20); + this.BasePathBox.TabIndex = 205; + // + // BrowseBase + // + this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BrowseBase.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; + this.BrowseBase.Location = new System.Drawing.Point(530, 14); + this.BrowseBase.Name = "BrowseBase"; + this.BrowseBase.Size = new System.Drawing.Size(26, 23); + this.BrowseBase.TabIndex = 206; + this.BrowseBase.UseVisualStyleBackColor = true; + this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click); + // + // BaseDescription + // + this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BaseDescription.AutoSize = true; + this.BaseDescription.Location = new System.Drawing.Point(563, 19); + this.BaseDescription.Name = "BaseDescription"; + this.BaseDescription.Size = new System.Drawing.Size(64, 13); + this.BaseDescription.TabIndex = 208; + this.BaseDescription.Text = "Global Base"; + // + // DefaultsBtn + // + this.DefaultsBtn.Location = new System.Drawing.Point(93, 411); + this.DefaultsBtn.Name = "DefaultsBtn"; + this.DefaultsBtn.Size = new System.Drawing.Size(75, 23); + this.DefaultsBtn.TabIndex = 211; + this.DefaultsBtn.Text = "&Defaults"; + this.DefaultsBtn.UseVisualStyleBackColor = true; + this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click); + // + // NewPathConfig + // + this.AcceptButton = this.OK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.Cancel; + this.ClientSize = new System.Drawing.Size(639, 446); + this.Controls.Add(this.DefaultsBtn); + this.Controls.Add(this.label1); + this.Controls.Add(this.button1); + this.Controls.Add(this.RecentForROMs); + this.Controls.Add(this.BasePathBox); + this.Controls.Add(this.BrowseBase); + this.Controls.Add(this.BaseDescription); + this.Controls.Add(this.SaveBtn); + this.Controls.Add(this.PathTabControl); + this.Controls.Add(this.Cancel); + this.Controls.Add(this.OK); + this.MinimumSize = new System.Drawing.Size(360, 250); + this.Name = "NewPathConfig"; + this.ShowIcon = false; + this.Text = "Path Configuration"; + this.Load += new System.EventHandler(this.NewPathConfig_Load); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index d5b0bb0806..22ec816f12 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PathConfig : Form { @@ -149,8 +149,8 @@ namespace BizHawk.MultiClient Button btn = new Button() { - Text = "", - Image = BizHawk.MultiClient.Properties.Resources.OpenFile, + Text = String.Empty, + Image = BizHawk.Client.EmuHawk.Properties.Resources.OpenFile, Location = new Point(widget_offset, _y - 1), Width = button_width, Name = path.Type, diff --git a/BizHawk.MultiClient/config/PathInfo.Designer.cs b/BizHawk.MultiClient/config/PathInfo.Designer.cs index eacbd126ca..83c2a73a93 100644 --- a/BizHawk.MultiClient/config/PathInfo.Designer.cs +++ b/BizHawk.MultiClient/config/PathInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class PathInfo { diff --git a/BizHawk.MultiClient/config/PathInfo.cs b/BizHawk.MultiClient/config/PathInfo.cs index 1b96f3cbcc..e607f76af3 100644 --- a/BizHawk.MultiClient/config/PathInfo.cs +++ b/BizHawk.MultiClient/config/PathInfo.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PathInfo : Form { diff --git a/BizHawk.MultiClient/config/RewindConfig.Designer.cs b/BizHawk.MultiClient/config/RewindConfig.Designer.cs index 551866aa56..6a66d3f376 100644 --- a/BizHawk.MultiClient/config/RewindConfig.Designer.cs +++ b/BizHawk.MultiClient/config/RewindConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class RewindConfig { diff --git a/BizHawk.MultiClient/config/RewindConfig.cs b/BizHawk.MultiClient/config/RewindConfig.cs index ed4f1dd474..91bf7491e4 100644 --- a/BizHawk.MultiClient/config/RewindConfig.cs +++ b/BizHawk.MultiClient/config/RewindConfig.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class RewindConfig : Form { diff --git a/BizHawk.MultiClient/config/SoundConfig.Designer.cs b/BizHawk.MultiClient/config/SoundConfig.Designer.cs index 75a3affa9d..e1cad23292 100644 --- a/BizHawk.MultiClient/config/SoundConfig.Designer.cs +++ b/BizHawk.MultiClient/config/SoundConfig.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class SoundConfig - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class SoundConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); this.SoundOnCheckBox = new System.Windows.Forms.CheckBox(); @@ -131,9 +131,9 @@ // // listBoxSoundDevices // - this.listBoxSoundDevices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.listBoxSoundDevices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.listBoxSoundDevices.FormattingEnabled = true; this.listBoxSoundDevices.Location = new System.Drawing.Point(108, 108); this.listBoxSoundDevices.Name = "listBoxSoundDevices"; @@ -176,19 +176,19 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Button OK; - private System.Windows.Forms.CheckBox SoundOnCheckBox; - private System.Windows.Forms.CheckBox MuteFrameAdvance; - private System.Windows.Forms.GroupBox SoundVolGroup; - private System.Windows.Forms.NumericUpDown SoundVolNumeric; - private System.Windows.Forms.TrackBar SoundVolBar; + private System.Windows.Forms.Button Cancel; + private System.Windows.Forms.Button OK; + private System.Windows.Forms.CheckBox SoundOnCheckBox; + private System.Windows.Forms.CheckBox MuteFrameAdvance; + private System.Windows.Forms.GroupBox SoundVolGroup; + private System.Windows.Forms.NumericUpDown SoundVolNumeric; + private System.Windows.Forms.TrackBar SoundVolBar; private System.Windows.Forms.CheckBox ThrottlecheckBox; private System.Windows.Forms.ListBox listBoxSoundDevices; private System.Windows.Forms.Label label1; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/SoundConfig.cs b/BizHawk.MultiClient/config/SoundConfig.cs index 6ebb714f08..904a601d07 100644 --- a/BizHawk.MultiClient/config/SoundConfig.cs +++ b/BizHawk.MultiClient/config/SoundConfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SoundConfig : Form { diff --git a/BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs b/BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs index 0153dc9321..a18733dcb2 100644 --- a/BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs +++ b/BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class EditCommentsForm { diff --git a/BizHawk.MultiClient/movie/EditCommentsForm.cs b/BizHawk.MultiClient/movie/EditCommentsForm.cs index 67b4182344..f0a8e9daa3 100644 --- a/BizHawk.MultiClient/movie/EditCommentsForm.cs +++ b/BizHawk.MultiClient/movie/EditCommentsForm.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class EditCommentsForm : Form { diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs b/BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs index ca68fa53c9..6a08c256f7 100644 --- a/BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs +++ b/BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class EditSubtitlesForm { diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.cs b/BizHawk.MultiClient/movie/EditSubtitlesForm.cs index 14a5b6714a..33976e2067 100644 --- a/BizHawk.MultiClient/movie/EditSubtitlesForm.cs +++ b/BizHawk.MultiClient/movie/EditSubtitlesForm.cs @@ -5,7 +5,7 @@ using System.Globalization; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class EditSubtitlesForm : Form { diff --git a/BizHawk.MultiClient/movie/PlayMovie.Designer.cs b/BizHawk.MultiClient/movie/PlayMovie.Designer.cs index 3264907c32..e48667471c 100644 --- a/BizHawk.MultiClient/movie/PlayMovie.Designer.cs +++ b/BizHawk.MultiClient/movie/PlayMovie.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class PlayMovie - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class PlayMovie + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayMovie)); this.Cancel = new System.Windows.Forms.Button(); @@ -46,7 +46,7 @@ this.Scan = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.MatchGameNameCheckBox = new System.Windows.Forms.CheckBox(); - this.MovieView = new BizHawk.VirtualListView(); + this.MovieView = new VirtualListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -81,7 +81,7 @@ // BrowseMovies // this.BrowseMovies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BrowseMovies.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.BrowseMovies.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.BrowseMovies.Location = new System.Drawing.Point(12, 337); this.BrowseMovies.Name = "BrowseMovies"; this.BrowseMovies.Size = new System.Drawing.Size(31, 23); @@ -92,9 +92,9 @@ // // DetailsView // - this.DetailsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.DetailsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.DetailsView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader5, this.columnHeader6}); @@ -121,8 +121,8 @@ // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.DetailsView); @@ -206,7 +206,7 @@ // Scan // this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Scan.Image = global::BizHawk.MultiClient.Properties.Resources.Scan; + this.Scan.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Scan; this.Scan.Location = new System.Drawing.Point(49, 337); this.Scan.Name = "Scan"; this.Scan.Size = new System.Drawing.Size(27, 23); @@ -230,9 +230,9 @@ // MovieView // this.MovieView.AllowDrop = true; - this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.MovieView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2, @@ -306,30 +306,30 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Button OK; - private System.Windows.Forms.Button BrowseMovies; - private VirtualListView MovieView; - private System.Windows.Forms.ColumnHeader columnHeader1; - private System.Windows.Forms.ColumnHeader columnHeader2; - private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.ColumnHeader columnHeader4; - private System.Windows.Forms.ListView DetailsView; - private System.Windows.Forms.ColumnHeader columnHeader5; - private System.Windows.Forms.ColumnHeader columnHeader6; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label MovieCount; - private System.Windows.Forms.CheckBox ReadOnlyCheckBox; + private System.Windows.Forms.Button Cancel; + private System.Windows.Forms.Button OK; + private System.Windows.Forms.Button BrowseMovies; + private VirtualListView MovieView; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.ListView DetailsView; + private System.Windows.Forms.ColumnHeader columnHeader5; + private System.Windows.Forms.ColumnHeader columnHeader6; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label MovieCount; + private System.Windows.Forms.CheckBox ReadOnlyCheckBox; private System.Windows.Forms.CheckBox IncludeSubDirectories; private System.Windows.Forms.CheckBox ShowStateFiles; private System.Windows.Forms.Button Scan; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.CheckBox MatchGameNameCheckBox; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/movie/PlayMovie.cs b/BizHawk.MultiClient/movie/PlayMovie.cs index 788d9efb88..82fc67ebe1 100644 --- a/BizHawk.MultiClient/movie/PlayMovie.cs +++ b/BizHawk.MultiClient/movie/PlayMovie.cs @@ -9,7 +9,7 @@ using System.IO; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PlayMovie : Form { diff --git a/BizHawk.MultiClient/movie/RecordMovie.Designer.cs b/BizHawk.MultiClient/movie/RecordMovie.Designer.cs index 15481ecf81..7a77e7b9af 100644 --- a/BizHawk.MultiClient/movie/RecordMovie.Designer.cs +++ b/BizHawk.MultiClient/movie/RecordMovie.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class RecordMovie - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class RecordMovie + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RecordMovie)); this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); @@ -69,7 +69,7 @@ // Browse // this.Browse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Browse.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.Browse.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.Browse.Location = new System.Drawing.Point(423, 13); this.Browse.Name = "Browse"; this.Browse.Size = new System.Drawing.Size(25, 23); @@ -189,14 +189,14 @@ this.groupBox1.PerformLayout(); this.ResumeLayout(false); - } + } - #endregion + #endregion - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Button OK; - private System.Windows.Forms.Button Browse; - private System.Windows.Forms.TextBox RecordBox; + private System.Windows.Forms.Button Cancel; + private System.Windows.Forms.Button OK; + private System.Windows.Forms.Button Browse; + private System.Windows.Forms.TextBox RecordBox; private System.Windows.Forms.ComboBox StartFromCombo; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label label3; @@ -204,5 +204,5 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox AuthorBox; private System.Windows.Forms.CheckBox DefaultAuthorCheckBox; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/movie/RecordMovie.cs b/BizHawk.MultiClient/movie/RecordMovie.cs index c11eeacf13..c63e48e7b7 100644 --- a/BizHawk.MultiClient/movie/RecordMovie.cs +++ b/BizHawk.MultiClient/movie/RecordMovie.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Consoles.Coleco; using BizHawk.Emulation.Consoles.Nintendo.N64; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class RecordMovie : Form { diff --git a/BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs b/BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs index 4c3bb9deb7..3ce474e266 100644 --- a/BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs +++ b/BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SubtitleMaker { diff --git a/BizHawk.MultiClient/movie/SubtitleMaker.cs b/BizHawk.MultiClient/movie/SubtitleMaker.cs index edeb7080bb..cdc2bca05d 100644 --- a/BizHawk.MultiClient/movie/SubtitleMaker.cs +++ b/BizHawk.MultiClient/movie/SubtitleMaker.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SubtitleMaker : Form { diff --git a/BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs b/BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs index 06664f11eb..b2d8e2e069 100644 --- a/BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class CheatEdit { @@ -32,7 +32,7 @@ this.NameLabel = new System.Windows.Forms.Label(); this.AddressLabel = new System.Windows.Forms.Label(); this.AddressHexIndLabel = new System.Windows.Forms.Label(); - this.AddressBox = new BizHawk.HexTextBox(); + this.AddressBox = new HexTextBox(); this.ValueHexIndLabel = new System.Windows.Forms.Label(); this.ValueLabel = new System.Windows.Forms.Label(); this.CompareHexIndLabel = new System.Windows.Forms.Label(); @@ -46,8 +46,8 @@ this.BigEndianCheckBox = new System.Windows.Forms.CheckBox(); this.AddButton = new System.Windows.Forms.Button(); this.EditButton = new System.Windows.Forms.Button(); - this.CompareBox = new BizHawk.MultiClient.WatchValueBox(); - this.ValueBox = new BizHawk.MultiClient.WatchValueBox(); + this.CompareBox = new WatchValueBox(); + this.ValueBox = new WatchValueBox(); this.SuspendLayout(); // // NameBox diff --git a/BizHawk.MultiClient/tools/Cheats/CheatEdit.cs b/BizHawk.MultiClient/tools/Cheats/CheatEdit.cs index 018d31b8c8..ae3ebbf420 100644 --- a/BizHawk.MultiClient/tools/Cheats/CheatEdit.cs +++ b/BizHawk.MultiClient/tools/Cheats/CheatEdit.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class CheatEdit : UserControl { diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs b/BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs index df827e7f06..31af3a27a1 100644 --- a/BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class Cheats { @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Cheats)); - this.CheatListView = new BizHawk.VirtualListView(); + this.CheatListView = new VirtualListView(); this.CheatName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -101,7 +101,7 @@ this.TotalLabel = new System.Windows.Forms.Label(); this.MessageLabel = new System.Windows.Forms.Label(); this.CheatGroupBox = new System.Windows.Forms.GroupBox(); - this.CheatEditor = new BizHawk.MultiClient.CheatEdit(); + this.CheatEditor = new CheatEdit(); this.contextMenuStrip1.SuspendLayout(); this.CheatsMenu.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -112,9 +112,9 @@ // this.CheatListView.AllowColumnReorder = true; this.CheatListView.AllowDrop = true; - this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.CheatListView.AutoArrange = false; this.CheatListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.CheatName, @@ -186,7 +186,7 @@ // // ToggleContextMenuItem // - this.ToggleContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.ToggleContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleContextMenuItem.Name = "ToggleContextMenuItem"; this.ToggleContextMenuItem.ShortcutKeyDisplayString = "Enter"; this.ToggleContextMenuItem.Size = new System.Drawing.Size(157, 22); @@ -195,7 +195,7 @@ // // RemoveContextMenuItem // - this.RemoveContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Delete"; this.RemoveContextMenuItem.Size = new System.Drawing.Size(157, 22); @@ -204,7 +204,7 @@ // // DisableAllContextMenuItem // - this.DisableAllContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem"; this.DisableAllContextMenuItem.Size = new System.Drawing.Size(157, 22); this.DisableAllContextMenuItem.Text = "&Disable All"; @@ -242,7 +242,7 @@ // // NewMenuItem // - this.NewMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewMenuItem.Name = "NewMenuItem"; this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.NewMenuItem.Size = new System.Drawing.Size(195, 22); @@ -251,7 +251,7 @@ // // OpenMenuItem // - this.OpenMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); @@ -260,7 +260,7 @@ // // SaveMenuItem // - this.SaveMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); @@ -270,8 +270,8 @@ // SaveAsMenuItem // this.SaveAsMenuItem.Name = "SaveAsMenuItem"; - this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); + this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveAsMenuItem.Text = "Save &As..."; this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); @@ -285,8 +285,8 @@ // RecentSubMenu // this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator4}); - this.RecentSubMenu.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.toolStripSeparator4}); + this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Text = "Recent"; @@ -332,7 +332,7 @@ // // RemoveCheatMenuItem // - this.RemoveCheatMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveCheatMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveCheatMenuItem.Name = "RemoveCheatMenuItem"; this.RemoveCheatMenuItem.ShortcutKeyDisplayString = "Delete"; this.RemoveCheatMenuItem.Size = new System.Drawing.Size(233, 22); @@ -341,7 +341,7 @@ // // DuplicateMenuItem // - this.DuplicateMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.DuplicateMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.DuplicateMenuItem.Name = "DuplicateMenuItem"; this.DuplicateMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.DuplicateMenuItem.Size = new System.Drawing.Size(233, 22); @@ -350,7 +350,7 @@ // // InsertSeparatorMenuItem // - this.InsertSeparatorMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(233, 22); @@ -364,7 +364,7 @@ // // MoveUpMenuItem // - this.MoveUpMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpMenuItem.Name = "MoveUpMenuItem"; this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); this.MoveUpMenuItem.Size = new System.Drawing.Size(233, 22); @@ -373,7 +373,7 @@ // // MoveDownMenuItem // - this.MoveDownMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownMenuItem.Name = "MoveDownMenuItem"; this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.MoveDownMenuItem.Size = new System.Drawing.Size(233, 22); @@ -395,7 +395,7 @@ // // ToggleMenuItem // - this.ToggleMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.ToggleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleMenuItem.Name = "ToggleMenuItem"; this.ToggleMenuItem.ShortcutKeyDisplayString = "Enter"; this.ToggleMenuItem.Size = new System.Drawing.Size(233, 22); @@ -404,7 +404,7 @@ // // DisableAllCheatsMenuItem // - this.DisableAllCheatsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem"; this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(233, 22); this.DisableAllCheatsMenuItem.Text = "Disable all"; @@ -638,7 +638,7 @@ // RemoveToolbarItem // this.RemoveToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RemoveToolbarItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.RemoveToolbarItem.Name = "RemoveToolbarItem"; this.RemoveToolbarItem.Size = new System.Drawing.Size(23, 22); @@ -658,7 +658,7 @@ // SeparatorToolbarItem // this.SeparatorToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.SeparatorToolbarItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.SeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.SeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.SeparatorToolbarItem.Name = "SeparatorToolbarItem"; this.SeparatorToolbarItem.Size = new System.Drawing.Size(23, 22); @@ -673,7 +673,7 @@ // MoveUpToolbarItem // this.MoveUpToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.MoveUpToolbarItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveUpToolbarItem.Name = "MoveUpToolbarItem"; this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22); @@ -683,7 +683,7 @@ // MoveDownToolbarItem // this.MoveDownToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.MoveDownToolbarItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.MoveDownToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveDownToolbarItem.Name = "MoveDownToolbarItem"; this.MoveDownToolbarItem.Size = new System.Drawing.Size(23, 22); @@ -727,8 +727,8 @@ // // CheatGroupBox // - this.CheatGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); + this.CheatGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.CheatGroupBox.Controls.Add(this.CheatEditor); this.CheatGroupBox.Location = new System.Drawing.Point(432, 66); this.CheatGroupBox.Name = "CheatGroupBox"; @@ -739,9 +739,9 @@ // // CheatEditor // - this.CheatEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.CheatEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.CheatEditor.Location = new System.Drawing.Point(6, 14); this.CheatEditor.Name = "CheatEditor"; this.CheatEditor.Size = new System.Drawing.Size(190, 264); diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.cs b/BizHawk.MultiClient/tools/Cheats/CheatForm.cs index 1050d385b0..9c4dcb4941 100644 --- a/BizHawk.MultiClient/tools/Cheats/CheatForm.cs +++ b/BizHawk.MultiClient/tools/Cheats/CheatForm.cs @@ -14,7 +14,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Consoles.Sega; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class Cheats : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/GB/BmpView.cs b/BizHawk.MultiClient/tools/GB/BmpView.cs index e2a1b68f05..cc4bad48c4 100644 --- a/BizHawk.MultiClient/tools/GB/BmpView.cs +++ b/BizHawk.MultiClient/tools/GB/BmpView.cs @@ -7,7 +7,7 @@ using System.Text; using System.Drawing; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class BmpView : Control { diff --git a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs index 4ee408607e..3bbe0c9908 100644 --- a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { partial class CGBColorChooserForm { diff --git a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs index 26bb9e794f..981e4220c6 100644 --- a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs +++ b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Consoles.GB; using BizHawk.Client.Common; -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { public partial class CGBColorChooserForm : Form { diff --git a/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs b/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs index 6661924f58..e1e40964b3 100644 --- a/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { partial class ColorChooserForm { diff --git a/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs b/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs index f9abe99ca1..53b66df946 100644 --- a/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs +++ b/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs @@ -6,7 +6,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { public partial class ColorChooserForm : Form { diff --git a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs index 7ba6d69003..f8aef16748 100644 --- a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { partial class DualGBFileSelector { diff --git a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs index 2f5cf11e6e..06053c6877 100644 --- a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs +++ b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { public partial class DualGBFileSelector : UserControl { diff --git a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs index 82154a56e9..8b6ad11343 100644 --- a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { partial class DualGBXMLCreator { @@ -29,9 +29,9 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dualGBFileSelector1 = new BizHawk.MultiClient.GBtools.DualGBFileSelector(); + this.dualGBFileSelector1 = new DualGBFileSelector(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dualGBFileSelector2 = new BizHawk.MultiClient.GBtools.DualGBFileSelector(); + this.dualGBFileSelector2 = new DualGBFileSelector(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.textBoxName = new System.Windows.Forms.TextBox(); this.buttonOK = new System.Windows.Forms.Button(); diff --git a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs index dec91b4ff5..315c65e738 100644 --- a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs +++ b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs @@ -8,7 +8,7 @@ using System.Text; using System.Windows.Forms; using System.IO; -namespace BizHawk.MultiClient.GBtools +namespace BizHawk.Client.EmuHawk.GBtools { public partial class DualGBXMLCreator : Form { diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs b/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs index 984ec0c1fd..d9f1273b99 100644 --- a/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class GBGPUView { diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.cs b/BizHawk.MultiClient/tools/GB/GBGPUView.cs index 11ced99c47..bb9b85839a 100644 --- a/BizHawk.MultiClient/tools/GB/GBGPUView.cs +++ b/BizHawk.MultiClient/tools/GB/GBGPUView.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class GBGPUView : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs b/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs index 49d875f9df..eda75130c6 100644 --- a/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs +++ b/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class GBGameGenie { @@ -32,8 +32,8 @@ this.GGCodeMaskBox = new System.Windows.Forms.MaskedTextBox(); this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.ValueBox = new BizHawk.HexTextBox(); - this.AddressBox = new BizHawk.HexTextBox(); + this.ValueBox = new HexTextBox(); + this.AddressBox = new HexTextBox(); this.addcheatbt = new System.Windows.Forms.Button(); this.ButtonPanel = new System.Windows.Forms.Panel(); this.BF = new System.Windows.Forms.Button(); @@ -55,7 +55,7 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label2 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.CompareBox = new BizHawk.HexTextBox(); + this.CompareBox = new HexTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.ClearButton = new System.Windows.Forms.Button(); diff --git a/BizHawk.MultiClient/tools/GB/GBGameGenie.cs b/BizHawk.MultiClient/tools/GB/GBGameGenie.cs index 8d580205ad..8785cb001f 100644 --- a/BizHawk.MultiClient/tools/GB/GBGameGenie.cs +++ b/BizHawk.MultiClient/tools/GB/GBGameGenie.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class GBGameGenie : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs b/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs index 458a2d55e1..c29d6caf0d 100644 --- a/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs +++ b/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class GBAGPUView { diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs b/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs index 35f68ba59e..83eb18e391 100644 --- a/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs +++ b/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class GBAGPUView : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs b/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs index 00dee37eb8..6c204b0bb2 100644 --- a/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs +++ b/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class MobileBmpView { diff --git a/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs b/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs index 562da761c8..ebfcf83190 100644 --- a/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs +++ b/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class MobileBmpView : Form { diff --git a/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs b/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs index b15f129709..3100bf13fb 100644 --- a/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs +++ b/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class MobileDetailView { diff --git a/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs b/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs index ba79e4e8ec..ad95d73f3b 100644 --- a/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs +++ b/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class MobileDetailView : Form { diff --git a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs index ec4bf8b261..194162d798 100644 --- a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs +++ b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class GenGameGenie { @@ -38,8 +38,8 @@ this.addcheatbt = new System.Windows.Forms.Button(); this.GameGenieCodeBox = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.ValueBox = new BizHawk.HexTextBox(); - this.AddressBox = new BizHawk.HexTextBox(); + this.ValueBox = new HexTextBox(); + this.AddressBox = new HexTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); diff --git a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs index 9fcd8e7341..763dd3d7e7 100644 --- a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs +++ b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Consoles.Sega; #pragma warning disable 675 //TOOD: fix the potential problem this is masking -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class GenGameGenie : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs index 8c754ab143..e0884dc5f3 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class HexColors_Form { diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.cs b/BizHawk.MultiClient/tools/HexEditor/HexColor.cs index e488772771..8b8f8ada70 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexColor.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexColor.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class HexColors_Form : Form { diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs index 433f22fb3f..ed71291ab1 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class HexEditor { @@ -121,7 +121,7 @@ // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(229, 22); @@ -173,7 +173,7 @@ // // copyToolStripMenuItem // - this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.copyToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.copyToolStripMenuItem.Size = new System.Drawing.Size(146, 22); @@ -182,7 +182,7 @@ // // pasteToolStripMenuItem // - this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; + this.pasteToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Paste; this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); this.pasteToolStripMenuItem.Size = new System.Drawing.Size(146, 22); @@ -295,7 +295,7 @@ // // addToRamWatchToolStripMenuItem1 // - this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1"; this.addToRamWatchToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+W"; this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); @@ -304,7 +304,7 @@ // // freezeAddressToolStripMenuItem // - this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.freezeAddressToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; this.freezeAddressToolStripMenuItem.ShortcutKeyDisplayString = "Space"; this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22); @@ -313,7 +313,7 @@ // // unfreezeAllToolStripMenuItem // - this.unfreezeAllToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze; + this.unfreezeAllToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; this.unfreezeAllToolStripMenuItem.Name = "unfreezeAllToolStripMenuItem"; this.unfreezeAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Delete))); this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(219, 22); @@ -322,7 +322,7 @@ // // pokeAddressToolStripMenuItem // - this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.pokeAddressToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem"; this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22); @@ -426,24 +426,24 @@ // ViewerContextMenuStrip // this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.copyToolStripMenuItem1, - this.pasteToolStripMenuItem1, - this.freezeToolStripMenuItem, - this.addToRamWatchToolStripMenuItem, - this.unfreezeAllToolStripMenuItem1, - this.pokeAddressToolStripMenuItem1, - this.toolStripSeparator4, - this.incrementToolStripMenuItem, - this.decrementToolStripMenuItem, - this.toolStripSeparator5, - this.gotoAddressToolStripMenuItem1}); + this.copyToolStripMenuItem1, + this.pasteToolStripMenuItem1, + this.freezeToolStripMenuItem, + this.addToRamWatchToolStripMenuItem, + this.unfreezeAllToolStripMenuItem1, + this.pokeAddressToolStripMenuItem1, + this.toolStripSeparator4, + this.incrementToolStripMenuItem, + this.decrementToolStripMenuItem, + this.toolStripSeparator5, + this.gotoAddressToolStripMenuItem1}); this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip"; this.ViewerContextMenuStrip.Size = new System.Drawing.Size(220, 236); this.ViewerContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.ViewerContextMenuStrip_Opening); // // copyToolStripMenuItem1 // - this.copyToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.copyToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.copyToolStripMenuItem1.Name = "copyToolStripMenuItem1"; this.copyToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+C"; this.copyToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); @@ -452,7 +452,7 @@ // // pasteToolStripMenuItem1 // - this.pasteToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; + this.pasteToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Paste; this.pasteToolStripMenuItem1.Name = "pasteToolStripMenuItem1"; this.pasteToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+V"; this.pasteToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); @@ -461,7 +461,7 @@ // // freezeToolStripMenuItem // - this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.freezeToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem"; this.freezeToolStripMenuItem.ShortcutKeyDisplayString = "Space"; this.freezeToolStripMenuItem.Size = new System.Drawing.Size(219, 22); @@ -470,7 +470,7 @@ // // addToRamWatchToolStripMenuItem // - this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem"; this.addToRamWatchToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+W"; this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(219, 22); @@ -479,7 +479,7 @@ // // unfreezeAllToolStripMenuItem1 // - this.unfreezeAllToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze; + this.unfreezeAllToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; this.unfreezeAllToolStripMenuItem1.Name = "unfreezeAllToolStripMenuItem1"; this.unfreezeAllToolStripMenuItem1.ShortcutKeyDisplayString = "Shift+Del"; this.unfreezeAllToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); @@ -488,7 +488,7 @@ // // pokeAddressToolStripMenuItem1 // - this.pokeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.pokeAddressToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.pokeAddressToolStripMenuItem1.Name = "pokeAddressToolStripMenuItem1"; this.pokeAddressToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+P"; this.pokeAddressToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs index 141e40c167..dbf71d9b15 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs @@ -11,7 +11,7 @@ using System.IO; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class HexEditor : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs b/BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs index 73bdf1e4cf..72b7284ff3 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class HexFind { @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - this.FindBox = new BizHawk.HexTextBox(); + this.FindBox = new HexTextBox(); this.Find_Prev = new System.Windows.Forms.Button(); this.Find_Next = new System.Windows.Forms.Button(); this.HexRadio = new System.Windows.Forms.RadioButton(); diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.cs b/BizHawk.MultiClient/tools/HexEditor/HexFind.cs index cc6698b222..9ae067e092 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexFind.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexFind.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class HexFind : Form { diff --git a/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs b/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs index 61ba8ff484..4609011e1a 100644 --- a/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs +++ b/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs @@ -6,7 +6,7 @@ using System.Globalization; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class MemoryViewer : Panel { diff --git a/BizHawk.MultiClient/tools/IToolForm.cs b/BizHawk.MultiClient/tools/IToolForm.cs index 163230feb8..1182647cb3 100644 --- a/BizHawk.MultiClient/tools/IToolForm.cs +++ b/BizHawk.MultiClient/tools/IToolForm.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public interface IToolForm { diff --git a/BizHawk.MultiClient/tools/InputPrompt.Designer.cs b/BizHawk.MultiClient/tools/InputPrompt.Designer.cs index e22b72cf21..87b98711a2 100644 --- a/BizHawk.MultiClient/tools/InputPrompt.Designer.cs +++ b/BizHawk.MultiClient/tools/InputPrompt.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class InputPrompt { diff --git a/BizHawk.MultiClient/tools/InputPrompt.cs b/BizHawk.MultiClient/tools/InputPrompt.cs index ec438f67df..d62d467574 100644 --- a/BizHawk.MultiClient/tools/InputPrompt.cs +++ b/BizHawk.MultiClient/tools/InputPrompt.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// A simple form that prompts the user for a single line of input diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs index 54ab3f29fa..825ab10ff5 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class MultiClientLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs index 877251d872..d283523c5c 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs @@ -5,7 +5,7 @@ using System.Text; using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class ConsoleLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs index e9b98f5196..1765c57d4c 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class FormsLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs index 7e5b4e301b..0bd928c81a 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs @@ -6,7 +6,7 @@ using System.Globalization; using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class GuiLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs index 5a0177bba8..7fa44c34c2 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class InputLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs index 5b2f5ef1d9..bbbdceebdf 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs @@ -2,7 +2,7 @@ using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class SavestateLuaLibrary : LuaLibraryBase { diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs index 13da764c99..49e60df4f8 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs @@ -4,7 +4,7 @@ using System.Threading; using LuaInterface; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class EmuLuaLibrary { diff --git a/BizHawk.MultiClient/tools/Lua/LuaButton.cs b/BizHawk.MultiClient/tools/Lua/LuaButton.cs index 0134e3b29c..06b17c0551 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaButton.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaButton.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class LuaButton : Button { diff --git a/BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs index 85e49a3150..108c4034f5 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class LuaConsole - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class LuaConsole + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole)); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -94,7 +94,7 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); - this.LuaListView = new BizHawk.VirtualListView(); + this.LuaListView = new VirtualListView(); this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.contextMenuStrip1.SuspendLayout(); @@ -120,7 +120,7 @@ // // toggleScriptToolStripMenuItem // - this.toggleScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.toggleScriptToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.toggleScriptToolStripMenuItem.Name = "toggleScriptToolStripMenuItem"; this.toggleScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.toggleScriptToolStripMenuItem.Text = "&Toggle"; @@ -128,7 +128,7 @@ // // resumePauseToolStripMenuItem // - this.resumePauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.resumePauseToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.resumePauseToolStripMenuItem.Name = "resumePauseToolStripMenuItem"; this.resumePauseToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.resumePauseToolStripMenuItem.Text = "Pause or Resume"; @@ -136,7 +136,7 @@ // // editScriptToolStripMenuItem // - this.editScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.editScriptToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.editScriptToolStripMenuItem.Name = "editScriptToolStripMenuItem"; this.editScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.editScriptToolStripMenuItem.Text = "&Edit"; @@ -144,7 +144,7 @@ // // removeScriptToolStripMenuItem // - this.removeScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.removeScriptToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.removeScriptToolStripMenuItem.Name = "removeScriptToolStripMenuItem"; this.removeScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.removeScriptToolStripMenuItem.Text = "&Remove"; @@ -152,7 +152,7 @@ // // insertSeperatorToolStripMenuItem1 // - this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.insertSeperatorToolStripMenuItem1.Name = "insertSeperatorToolStripMenuItem1"; this.insertSeperatorToolStripMenuItem1.Size = new System.Drawing.Size(174, 22); this.insertSeperatorToolStripMenuItem1.Text = "Insert Seperator"; @@ -165,7 +165,7 @@ // // stopAllScriptsToolStripMenuItem // - this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.stopAllScriptsToolStripMenuItem.Name = "stopAllScriptsToolStripMenuItem"; this.stopAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.stopAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; @@ -204,27 +204,27 @@ // // newToolStripMenuItem // - this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.N))); + this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.N))); this.newToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.newToolStripMenuItem.Text = "&New Session"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // openSessionToolStripMenuItem // - this.openSessionToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openSessionToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.openSessionToolStripMenuItem.Name = "openSessionToolStripMenuItem"; - this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.O))); + this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.O))); this.openSessionToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.openSessionToolStripMenuItem.Text = "&Open Session..."; this.openSessionToolStripMenuItem.Click += new System.EventHandler(this.openSessionToolStripMenuItem_Click); // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(237, 22); @@ -234,8 +234,8 @@ // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); + this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.saveAsToolStripMenuItem.Text = "Save Session &As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); @@ -263,7 +263,7 @@ // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); - this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.recentToolStripMenuItem.Text = "Recent Scripts"; @@ -311,7 +311,7 @@ // // newScriptToolStripMenuItem // - this.newScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newScriptToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.newScriptToolStripMenuItem.Name = "newScriptToolStripMenuItem"; this.newScriptToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newScriptToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -320,7 +320,7 @@ // // openToolStripMenuItem // - this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -329,7 +329,7 @@ // // toggleToolStripMenuItem // - this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.toggleToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; this.toggleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); this.toggleToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -338,7 +338,7 @@ // // pauseResumeToolStripMenuItem // - this.pauseResumeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.pauseResumeToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.pauseResumeToolStripMenuItem.Name = "pauseResumeToolStripMenuItem"; this.pauseResumeToolStripMenuItem.Size = new System.Drawing.Size(245, 22); this.pauseResumeToolStripMenuItem.Text = "Pause or Resume"; @@ -346,7 +346,7 @@ // // editToolStripMenuItem // - this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.editToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.editToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -355,7 +355,7 @@ // // removeScriptToolStripMenuItem1 // - this.removeScriptToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.removeScriptToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.removeScriptToolStripMenuItem1.Name = "removeScriptToolStripMenuItem1"; this.removeScriptToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.removeScriptToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); @@ -364,7 +364,7 @@ // // insertSeparatorToolStripMenuItem // - this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -378,7 +378,7 @@ // // moveUpToolStripMenuItem // - this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.moveUpToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -387,7 +387,7 @@ // // moveDownToolStripMenuItem // - this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.moveDownToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(245, 22); @@ -409,7 +409,7 @@ // // turnOffAllScriptsToolStripMenuItem // - this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem"; this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; @@ -502,9 +502,9 @@ // // OutputBox // - this.OutputBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.OutputBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.OutputBox.ContextMenuStrip = this.contextMenuStrip2; this.OutputBox.Location = new System.Drawing.Point(6, 17); this.OutputBox.Name = "OutputBox"; @@ -538,8 +538,8 @@ // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.OutputBox); this.groupBox1.Location = new System.Drawing.Point(310, 71); this.groupBox1.Name = "groupBox1"; @@ -590,7 +590,7 @@ // newStripButton1 // this.newStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.newStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.newStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.newStripButton1.Name = "newStripButton1"; this.newStripButton1.Size = new System.Drawing.Size(23, 22); @@ -610,7 +610,7 @@ // copyToolStripButton // this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.copyToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.copyToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.copyToolStripButton.Name = "copyToolStripButton"; this.copyToolStripButton.Size = new System.Drawing.Size(23, 22); @@ -620,7 +620,7 @@ // resumePauseButton1 // this.resumePauseButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.resumePauseButton1.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.resumePauseButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.resumePauseButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.resumePauseButton1.Name = "resumePauseButton1"; this.resumePauseButton1.Size = new System.Drawing.Size(23, 22); @@ -630,7 +630,7 @@ // EditToolstripButton // this.EditToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.EditToolstripButton.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.EditToolstripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.EditToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.EditToolstripButton.Name = "EditToolstripButton"; this.EditToolstripButton.Size = new System.Drawing.Size(23, 22); @@ -640,7 +640,7 @@ // cutToolStripButton // this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.cutToolStripButton.Name = "cutToolStripButton"; this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); @@ -650,7 +650,7 @@ // toolStripButtonSeparator // this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.toolStripButtonSeparator.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSeparator.Name = "toolStripButtonSeparator"; this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22); @@ -665,7 +665,7 @@ // toolStripButtonMoveUp // this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.toolStripButtonMoveUp.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); @@ -675,7 +675,7 @@ // toolStripButtonMoveDown // this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.toolStripButtonMoveDown.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); @@ -684,13 +684,13 @@ // // LuaListView // - this.LuaListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.LuaListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.LuaListView.CheckBoxes = true; this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.Script, - this.PathName}); + this.Script, + this.PathName}); this.LuaListView.ContextMenuStrip = this.contextMenuStrip1; this.LuaListView.FullRowSelect = true; this.LuaListView.GridLines = true; @@ -746,31 +746,31 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private VirtualListView LuaListView; - private System.Windows.Forms.ColumnHeader PathName; + private VirtualListView LuaListView; + private System.Windows.Forms.ColumnHeader PathName; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem scriptToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem scriptToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toggleToolStripMenuItem; - public System.Windows.Forms.ColumnHeader Script; - private System.Windows.Forms.GroupBox groupBox1; + public System.Windows.Forms.ColumnHeader Script; + private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem; - private System.Windows.Forms.Label NumberOfScripts; - private System.Windows.Forms.ToolStripMenuItem insertSeparatorToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem turnOffAllScriptsToolStripMenuItem; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem; + private System.Windows.Forms.Label NumberOfScripts; + private System.Windows.Forms.ToolStripMenuItem insertSeparatorToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem turnOffAllScriptsToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem stopAllScriptsToolStripMenuItem; @@ -806,16 +806,16 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem disableScriptsOnLoadToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoloadSessionToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pauseResumeToolStripMenuItem; - private System.Windows.Forms.ToolStripButton resumePauseButton1; - private System.Windows.Forms.ToolStripMenuItem resumePauseToolStripMenuItem; - public System.Windows.Forms.RichTextBox OutputBox; - private System.Windows.Forms.Label OutputMessages; + private System.Windows.Forms.ToolStripMenuItem autoloadSessionToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pauseResumeToolStripMenuItem; + private System.Windows.Forms.ToolStripButton resumePauseButton1; + private System.Windows.Forms.ToolStripMenuItem resumePauseToolStripMenuItem; + public System.Windows.Forms.RichTextBox OutputBox; + private System.Windows.Forms.Label OutputMessages; private System.Windows.Forms.ToolStripMenuItem onlineDocumentationToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem newScriptToolStripMenuItem; private System.Windows.Forms.ToolStripButton newStripButton1; private System.Windows.Forms.ToolStripMenuItem showRegisteredFunctionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem registeredFunctionsToolStripMenuItem; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/Lua/LuaConsole.cs b/BizHawk.MultiClient/tools/Lua/LuaConsole.cs index 8c0dcc49d6..22764c559e 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaConsole.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaConsole.cs @@ -8,7 +8,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaConsole : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs index bcf65796e3..eac1f78772 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LuaFunctionsForm { diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs index dd763b1d6e..2bfc460df6 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaFunctionsForm : Form { diff --git a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs index 835b7b63b6..0052ba97b8 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LuaRegisteredFunctionsList { diff --git a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs b/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs index 1b0b1a7f61..011a9f728e 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaRegisteredFunctionsList : Form { diff --git a/BizHawk.MultiClient/tools/Lua/LuaTextBox.cs b/BizHawk.MultiClient/tools/Lua/LuaTextBox.cs index 843f05bafb..585e5af865 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaTextBox.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaTextBox.cs @@ -2,7 +2,7 @@ using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { enum BoxType { ALL, SIGNED, UNSIGNED, HEX }; class LuaTextBox : TextBox diff --git a/BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs index 3f4725fb72..86431558c1 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LuaWinform { diff --git a/BizHawk.MultiClient/tools/Lua/LuaWinform.cs b/BizHawk.MultiClient/tools/Lua/LuaWinform.cs index 6a00821f3e..91fe49ec45 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWinform.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWinform.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Windows.Forms; using LuaInterface; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaWinform : Form { diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs index f22b8ba472..9234ed82f7 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LuaWriter { @@ -61,7 +61,7 @@ this.AutoCompleteView = new System.Windows.Forms.ListView(); this.PositionLabel = new System.Windows.Forms.Label(); this.ZoomLabel = new System.Windows.Forms.Label(); - this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); + this.LuaText = new BizHawk.Client.EmuHawk.LuaWriterBox(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -96,7 +96,7 @@ // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); @@ -147,7 +147,7 @@ // // undoToolStripMenuItem // - this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.undoToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); this.undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); @@ -156,7 +156,7 @@ // // redoToolStripMenuItem // - this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; + this.redoToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); this.redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); @@ -170,7 +170,7 @@ // // cutToolStripMenuItem // - this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.cutToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); @@ -179,7 +179,7 @@ // // copyToolStripMenuItem // - this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.copyToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); @@ -188,7 +188,7 @@ // // pasteToolStripMenuItem // - this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; + this.pasteToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Paste; this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); @@ -215,7 +215,7 @@ // // searchToolStripMenuItem // - this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.searchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriter.cs b/BizHawk.MultiClient/tools/Lua/LuaWriter.cs index 6eedfcaee6..830a78b92a 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWriter.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWriter.cs @@ -9,7 +9,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaWriter : Form { diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs b/BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs index 627903aa36..11faa78fb5 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs @@ -1,7 +1,7 @@ using System.Windows.Forms; using System.Drawing; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class LuaWriterBox : RichTextBox { diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs b/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs index 6ac03000b9..5bf1603331 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class LuaWriterColorConfig { diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs b/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs index 850ce6b138..653a4921fd 100644 --- a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs +++ b/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class LuaWriterColorConfig : Form { diff --git a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs index 25cf1ac9cb..5dcb22dcd8 100644 --- a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs +++ b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class N64VideoPluginconfig { diff --git a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs index 7a3c6bfab2..91229bcecc 100644 --- a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs +++ b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class N64VideoPluginconfig : Form { diff --git a/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs b/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs index acccf58448..17ea719aa6 100644 --- a/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class NESDebugger { @@ -29,7 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESDebugger)); - this.DebugView = new BizHawk.VirtualListView(); + this.DebugView = new VirtualListView(); this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Instruction = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.menuStrip1 = new MenuStripEx(); diff --git a/BizHawk.MultiClient/tools/NES/NESDebugger.cs b/BizHawk.MultiClient/tools/NES/NESDebugger.cs index 59e070e33e..7021c6b816 100644 --- a/BizHawk.MultiClient/tools/NES/NESDebugger.cs +++ b/BizHawk.MultiClient/tools/NES/NESDebugger.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESDebugger : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs b/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs index 4168d34935..24a374d084 100644 --- a/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class NESGameGenie { @@ -33,9 +33,9 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.CompareBox = new BizHawk.HexTextBox(); - this.ValueBox = new BizHawk.HexTextBox(); - this.AddressBox = new BizHawk.HexTextBox(); + this.CompareBox = new HexTextBox(); + this.ValueBox = new HexTextBox(); + this.AddressBox = new HexTextBox(); this.AddCheat = new System.Windows.Forms.Button(); this.ButtonPanel = new System.Windows.Forms.Panel(); this.N = new System.Windows.Forms.Button(); diff --git a/BizHawk.MultiClient/tools/NES/NESGameGenie.cs b/BizHawk.MultiClient/tools/NES/NESGameGenie.cs index 0e09717c06..fa8991754b 100644 --- a/BizHawk.MultiClient/tools/NES/NESGameGenie.cs +++ b/BizHawk.MultiClient/tools/NES/NESGameGenie.cs @@ -7,7 +7,7 @@ using System.Globalization; using BizHawk.Client.Common; using BizHawk.Emulation.Consoles.Nintendo; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESGameGenie : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs index 954ab3f98f..488b25f436 100644 --- a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class NESGraphicsConfig { diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs index c2fbc9d266..9eb1ec597d 100644 --- a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs +++ b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Common; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESGraphicsConfig : Form { diff --git a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs index efe4e0292d..59412430ae 100644 --- a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class NESNameTableViewer { @@ -68,7 +68,7 @@ this.label6 = new System.Windows.Forms.Label(); this.RefreshRate = new System.Windows.Forms.TrackBar(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.NameTableView = new BizHawk.MultiClient.NameTableViewer(); + this.NameTableView = new NameTableViewer(); this.groupBox1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); diff --git a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs index 3f11050589..3a27aa09e1 100644 --- a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs +++ b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESNameTableViewer : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs b/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs index 0819e06053..42ba84628a 100644 --- a/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs @@ -1,45 +1,45 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class NESPPU - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class NESPPU + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESPPU)); this.PatternGroup = new System.Windows.Forms.GroupBox(); this.Table1PaletteLabel = new System.Windows.Forms.Label(); this.Table0PaletteLabel = new System.Windows.Forms.Label(); - this.PatternView = new BizHawk.MultiClient.PatternViewer(); + this.PatternView = new PatternViewer(); this.PatternContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.saveImageToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.imageToClipboardToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.refreshToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.PalettesGroup = new System.Windows.Forms.GroupBox(); - this.PaletteView = new BizHawk.MultiClient.PaletteViewer(); + this.PaletteView = new PaletteViewer(); this.PaletteContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageToClipboardToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); @@ -55,7 +55,7 @@ this.ValueLabel = new System.Windows.Forms.Label(); this.AddressLabel = new System.Windows.Forms.Label(); this.SpriteViewerBox = new System.Windows.Forms.GroupBox(); - this.SpriteView = new BizHawk.MultiClient.SpriteViewer(); + this.SpriteView = new SpriteViewer(); this.SpriteContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.saveImageToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.imageToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -789,21 +789,21 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.GroupBox PatternGroup; - private System.Windows.Forms.GroupBox PalettesGroup; - private PaletteViewer PaletteView; - private System.Windows.Forms.GroupBox DetailsBox; - private System.Windows.Forms.Label ValueLabel; + private System.Windows.Forms.GroupBox PatternGroup; + private System.Windows.Forms.GroupBox PalettesGroup; + private PaletteViewer PaletteView; + private System.Windows.Forms.GroupBox DetailsBox; + private System.Windows.Forms.Label ValueLabel; private System.Windows.Forms.Label AddressLabel; - private BizHawk.MultiClient.PatternViewer PatternView; - private System.Windows.Forms.Label Table1PaletteLabel; - private System.Windows.Forms.Label Table0PaletteLabel; + private PatternViewer PatternView; + private System.Windows.Forms.Label Table1PaletteLabel; + private System.Windows.Forms.Label Table0PaletteLabel; private System.Windows.Forms.Label Value2Label; - private System.Windows.Forms.GroupBox SpriteViewerBox; + private System.Windows.Forms.GroupBox SpriteViewerBox; private SpriteViewer SpriteView; private System.Windows.Forms.TextBox txtScanline; private System.Windows.Forms.GroupBox groupBox1; @@ -865,5 +865,5 @@ private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.Timer messagetimer; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/NES/NESPPU.cs b/BizHawk.MultiClient/tools/NES/NESPPU.cs index a59491a784..db5be1e316 100644 --- a/BizHawk.MultiClient/tools/NES/NESPPU.cs +++ b/BizHawk.MultiClient/tools/NES/NESPPU.cs @@ -6,7 +6,7 @@ using System.Globalization; using BizHawk.Client.Common; using BizHawk.Emulation.Consoles.Nintendo; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESPPU : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs b/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs index eee6cb2a2e..ae02011ff3 100644 --- a/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class NESSoundConfig { diff --git a/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs b/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs index b43c7ae102..6e9e62c69c 100644 --- a/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs +++ b/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class NESSoundConfig : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/NES/NameTableViewer.cs b/BizHawk.MultiClient/tools/NES/NameTableViewer.cs index 4815187a33..7ea5ba4579 100644 --- a/BizHawk.MultiClient/tools/NES/NameTableViewer.cs +++ b/BizHawk.MultiClient/tools/NES/NameTableViewer.cs @@ -5,7 +5,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public sealed class NameTableViewer : Control { diff --git a/BizHawk.MultiClient/tools/NES/PaletteViewer.cs b/BizHawk.MultiClient/tools/NES/PaletteViewer.cs index c0e9b2c542..c6ceb5dfe8 100644 --- a/BizHawk.MultiClient/tools/NES/PaletteViewer.cs +++ b/BizHawk.MultiClient/tools/NES/PaletteViewer.cs @@ -5,7 +5,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public sealed class PaletteViewer : Control { diff --git a/BizHawk.MultiClient/tools/NES/PatternViewer.cs b/BizHawk.MultiClient/tools/NES/PatternViewer.cs index 6553719bae..3c928b4f28 100644 --- a/BizHawk.MultiClient/tools/NES/PatternViewer.cs +++ b/BizHawk.MultiClient/tools/NES/PatternViewer.cs @@ -5,7 +5,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public sealed class PatternViewer : Control { diff --git a/BizHawk.MultiClient/tools/NES/SpriteViewer.cs b/BizHawk.MultiClient/tools/NES/SpriteViewer.cs index 0224b717de..5ec4417ef6 100644 --- a/BizHawk.MultiClient/tools/NES/SpriteViewer.cs +++ b/BizHawk.MultiClient/tools/NES/SpriteViewer.cs @@ -5,7 +5,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public sealed class SpriteViewer : Control { diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs b/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs index 5bd8390578..d9f73b2826 100644 --- a/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs +++ b/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs @@ -2,7 +2,7 @@ using System.Windows.Forms; using System.Drawing.Imaging; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PCEBGCanvas : Control { diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs index 37968fb017..12d3c54b23 100644 --- a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs +++ b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class PCEBGViewer { @@ -38,7 +38,7 @@ this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.canvas = new BizHawk.MultiClient.PCEBGCanvas(); + this.canvas = new PCEBGCanvas(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.label7 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs index a15728230f..fc164f3ffe 100644 --- a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs +++ b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs @@ -6,7 +6,7 @@ using System.Drawing.Imaging; using BizHawk.Client.Common; using BizHawk.Emulation.Consoles.TurboGrafx; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PCEBGViewer : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs index 6f7817ecf9..5f81ef4c1c 100644 --- a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class PCEGraphicsConfig { diff --git a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs index f004263f41..fdfdf9c7c7 100644 --- a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs +++ b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class PCEGraphicsConfig : Form { diff --git a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs index c7ad190790..35b3285086 100644 --- a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SMSGraphicsConfig { diff --git a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs index 5ee17fd91a..6595cacabb 100644 --- a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs +++ b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SMSGraphicsConfig : Form { diff --git a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs index 13fe2c1a85..e1e80b5c5b 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SNESGameGenie { @@ -32,8 +32,8 @@ this.GGCodeMaskBox = new System.Windows.Forms.MaskedTextBox(); this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.ValueBox = new BizHawk.HexTextBox(); - this.AddressBox = new BizHawk.HexTextBox(); + this.ValueBox = new HexTextBox(); + this.AddressBox = new HexTextBox(); this.addcheatbt = new System.Windows.Forms.Button(); this.ButtonPanel = new System.Windows.Forms.Panel(); this.BF = new System.Windows.Forms.Button(); diff --git a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs index 70a2ec6a37..848ff0e56d 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SNESGameGenie : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs index 35c4214f43..5b667316de 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SNESGraphicsDebugger { @@ -112,26 +112,26 @@ this.label2193813 = new System.Windows.Forms.Label(); this.txtScreenCGADSUB_AddSub = new System.Windows.Forms.TextBox(); this.label36 = new System.Windows.Forms.Label(); - this.checkTMOBJ = new BizHawk.Core.CustomCheckBox(); - this.checkTSOBJ = new BizHawk.Core.CustomCheckBox(); - this.checkMathBK = new BizHawk.Core.CustomCheckBox(); - this.label35 = new BizHawk.Core.HorizontalLine(); - this.checkMathBG4 = new BizHawk.Core.CustomCheckBox(); - this.checkMathBG3 = new BizHawk.Core.CustomCheckBox(); - this.checkMathBG2 = new BizHawk.Core.CustomCheckBox(); - this.checkMathBG1 = new BizHawk.Core.CustomCheckBox(); + this.checkTMOBJ = new CustomCheckBox(); + this.checkTSOBJ = new CustomCheckBox(); + this.checkMathBK = new CustomCheckBox(); + this.label35 = new HorizontalLine(); + this.checkMathBG4 = new CustomCheckBox(); + this.checkMathBG3 = new CustomCheckBox(); + this.checkMathBG2 = new CustomCheckBox(); + this.checkMathBG1 = new CustomCheckBox(); this.label33 = new System.Windows.Forms.Label(); - this.checkMathOBJ = new BizHawk.Core.CustomCheckBox(); + this.checkMathOBJ = new CustomCheckBox(); this.lblTS = new System.Windows.Forms.Label(); - this.checkTSBG4 = new BizHawk.Core.CustomCheckBox(); - this.checkTSBG3 = new BizHawk.Core.CustomCheckBox(); - this.checkTSBG2 = new BizHawk.Core.CustomCheckBox(); - this.checkTSBG1 = new BizHawk.Core.CustomCheckBox(); + this.checkTSBG4 = new CustomCheckBox(); + this.checkTSBG3 = new CustomCheckBox(); + this.checkTSBG2 = new CustomCheckBox(); + this.checkTSBG1 = new CustomCheckBox(); this.lblTM = new System.Windows.Forms.Label(); - this.checkTMBG4 = new BizHawk.Core.CustomCheckBox(); - this.checkTMBG3 = new BizHawk.Core.CustomCheckBox(); - this.checkTMBG2 = new BizHawk.Core.CustomCheckBox(); - this.checkTMBG1 = new BizHawk.Core.CustomCheckBox(); + this.checkTMBG4 = new CustomCheckBox(); + this.checkTMBG3 = new CustomCheckBox(); + this.checkTMBG2 = new CustomCheckBox(); + this.checkTMBG1 = new CustomCheckBox(); this.label32 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label(); @@ -189,7 +189,7 @@ this.label2 = new System.Windows.Forms.Label(); this.txtBG1SizeBits = new System.Windows.Forms.TextBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.paletteViewer = new BizHawk.MultiClient.SNESGraphicsViewer(); + this.paletteViewer = new SNESGraphicsViewer(); this.tabctrlDetails = new System.Windows.Forms.TabControl(); this.tpPalette = new System.Windows.Forms.TabPage(); this.label53 = new System.Windows.Forms.Label(); @@ -212,7 +212,7 @@ this.txtTileBpp = new System.Windows.Forms.TextBox(); this.label42 = new System.Windows.Forms.Label(); this.txtTileAddress = new System.Windows.Forms.TextBox(); - this.viewerTile = new BizHawk.MultiClient.SNESGraphicsViewer(); + this.viewerTile = new SNESGraphicsViewer(); this.tpMapEntry = new System.Windows.Forms.TabPage(); this.textBox2 = new System.Windows.Forms.TextBox(); this.checkMapEntryVFlip = new System.Windows.Forms.CheckBox(); @@ -227,7 +227,7 @@ this.txtMapEntryPrio = new System.Windows.Forms.TextBox(); this.txtMapEntryLocation = new System.Windows.Forms.TextBox(); this.txtMapEntryTileNum = new System.Windows.Forms.TextBox(); - this.viewerMapEntryTile = new BizHawk.MultiClient.SNESGraphicsViewer(); + this.viewerMapEntryTile = new SNESGraphicsViewer(); this.tpOBJ = new System.Windows.Forms.TabPage(); this.txtObjPriority = new System.Windows.Forms.TextBox(); this.label50 = new System.Windows.Forms.Label(); @@ -246,9 +246,9 @@ this.label43 = new System.Windows.Forms.Label(); this.cbObjHFlip = new System.Windows.Forms.CheckBox(); this.label44 = new System.Windows.Forms.Label(); - this.viewerObj = new BizHawk.MultiClient.SNESGraphicsViewer(); + this.viewerObj = new SNESGraphicsViewer(); this.viewerPanel = new System.Windows.Forms.Panel(); - this.viewer = new BizHawk.MultiClient.SNESGraphicsViewer(); + this.viewer = new SNESGraphicsViewer(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.messagetimer = new System.Windows.Forms.Timer(this.components); this.menuStrip1.SuspendLayout(); @@ -2858,14 +2858,14 @@ private System.Windows.Forms.Label lblTM; private System.Windows.Forms.Label label32; private System.Windows.Forms.Label label31; - private Core.CustomCheckBox checkTSBG4; - private Core.CustomCheckBox checkTSBG3; - private Core.CustomCheckBox checkTSBG2; - private Core.CustomCheckBox checkTSBG1; - private Core.CustomCheckBox checkTMBG4; - private Core.CustomCheckBox checkTMBG3; - private Core.CustomCheckBox checkTMBG2; - private Core.CustomCheckBox checkTMBG1; + private CustomCheckBox checkTSBG4; + private CustomCheckBox checkTSBG3; + private CustomCheckBox checkTSBG2; + private CustomCheckBox checkTSBG1; + private CustomCheckBox checkTMBG4; + private CustomCheckBox checkTMBG3; + private CustomCheckBox checkTMBG2; + private CustomCheckBox checkTMBG1; private System.Windows.Forms.TabPage tpMapEntry; private System.Windows.Forms.TextBox txtMapEntryTileNum; private SNESGraphicsViewer viewerMapEntryTile; @@ -2880,16 +2880,16 @@ private System.Windows.Forms.TextBox txtMapEntryTileAddr; private System.Windows.Forms.TextBox txtMapEntryPrio; private System.Windows.Forms.TextBox txtMapEntryLocation; - private Core.HorizontalLine label35; - private Core.CustomCheckBox checkMathBG4; - private Core.CustomCheckBox checkMathBG3; - private Core.CustomCheckBox checkMathBG2; - private Core.CustomCheckBox checkMathBG1; + private HorizontalLine label35; + private CustomCheckBox checkMathBG4; + private CustomCheckBox checkMathBG3; + private CustomCheckBox checkMathBG2; + private CustomCheckBox checkMathBG1; private System.Windows.Forms.Label label33; - private Core.CustomCheckBox checkMathOBJ; - private Core.CustomCheckBox checkTMOBJ; - private Core.CustomCheckBox checkTSOBJ; - private Core.CustomCheckBox checkMathBK; + private CustomCheckBox checkMathOBJ; + private CustomCheckBox checkTMOBJ; + private CustomCheckBox checkTSOBJ; + private CustomCheckBox checkMathBK; private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub; private System.Windows.Forms.Label label36; private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub_Descr; diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs index e12690ce92..8df9810b58 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs @@ -32,9 +32,9 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; using BizHawk.Emulation.Consoles.Nintendo.SNES; -using BizHawk.Core; +using BizHawk.Client.EmuHawk; //TODO: What?? -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public unsafe partial class SNESGraphicsDebugger : Form, IToolForm { @@ -1446,7 +1446,7 @@ namespace BizHawk.MultiClient } } //class SNESGraphicsDebugger -} //namespace BizHawk.MultiClient +} //namespace BizHawk.Client.EmuHawk static class ControlExtensions diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs index f60a679bfa..f37f19e706 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs @@ -1,8 +1,7 @@ using System.Drawing; using System.Windows.Forms; -using BizHawk.Core; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class SNESGraphicsViewer : RetainedViewportPanel { diff --git a/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs index 6679e01b7a..3dd8ede28e 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SNESOptions { diff --git a/BizHawk.MultiClient/tools/SNES/SNESOptions.cs b/BizHawk.MultiClient/tools/SNES/SNESOptions.cs index d17e6ea67f..bcb58c542c 100644 --- a/BizHawk.MultiClient/tools/SNES/SNESOptions.cs +++ b/BizHawk.MultiClient/tools/SNES/SNESOptions.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SNESOptions : Form { diff --git a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs index 0224ae2a20..fd4a788cf3 100644 --- a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs +++ b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class SaturnPrefs { diff --git a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs index 13469d1357..c12d2fa27d 100644 --- a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs +++ b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class SaturnPrefs : Form { diff --git a/BizHawk.MultiClient/tools/StateVisualizer.cs b/BizHawk.MultiClient/tools/StateVisualizer.cs index e8abc64d53..06e3407d0b 100644 --- a/BizHawk.MultiClient/tools/StateVisualizer.cs +++ b/BizHawk.MultiClient/tools/StateVisualizer.cs @@ -4,7 +4,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class StateVisualizer { diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs index 88152ad8b0..d4237096dd 100644 --- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs +++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs @@ -1,6 +1,6 @@ using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class TAStudio { @@ -97,7 +97,7 @@ namespace BizHawk.MultiClient this.FastFowardToEnd = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.StopButton = new System.Windows.Forms.ToolStripButton(); - this.TASView = new BizHawk.VirtualListView(); + this.TASView = new VirtualListView(); this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.VisualizerBox = new System.Windows.Forms.GroupBox(); @@ -174,7 +174,7 @@ namespace BizHawk.MultiClient this.nToolStripMenuItem, this.toolStripSeparator3, this.clearToolStripMenuItem}); - this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.recentToolStripMenuItem.Text = "Recent"; @@ -399,7 +399,7 @@ namespace BizHawk.MultiClient this.ReadOnlyCheckBox.Appearance = System.Windows.Forms.Appearance.Button; this.ReadOnlyCheckBox.AutoSize = true; this.ReadOnlyCheckBox.BackColor = System.Drawing.SystemColors.Control; - this.ReadOnlyCheckBox.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; + this.ReadOnlyCheckBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly; this.ReadOnlyCheckBox.ImageAlign = System.Drawing.ContentAlignment.BottomRight; this.ReadOnlyCheckBox.Location = new System.Drawing.Point(12, 27); this.ReadOnlyCheckBox.Name = "ReadOnlyCheckBox"; @@ -558,7 +558,7 @@ namespace BizHawk.MultiClient // RewindToBeginning // this.RewindToBeginning.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RewindToBeginning.Image = global::BizHawk.MultiClient.Properties.Resources.BackMore; + this.RewindToBeginning.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BackMore; this.RewindToBeginning.ImageTransparentColor = System.Drawing.Color.Magenta; this.RewindToBeginning.Name = "RewindToBeginning"; this.RewindToBeginning.Size = new System.Drawing.Size(23, 22); @@ -569,7 +569,7 @@ namespace BizHawk.MultiClient // RewindButton // this.RewindButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RewindButton.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.RewindButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Back; this.RewindButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.RewindButton.Name = "RewindButton"; this.RewindButton.Size = new System.Drawing.Size(23, 22); @@ -580,7 +580,7 @@ namespace BizHawk.MultiClient // PauseButton // this.PauseButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PauseButton.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.PauseButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.PauseButton.Name = "PauseButton"; this.PauseButton.Size = new System.Drawing.Size(23, 22); @@ -591,7 +591,7 @@ namespace BizHawk.MultiClient // FrameAdvanceButton // this.FrameAdvanceButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FrameAdvanceButton.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.FrameAdvanceButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Forward; this.FrameAdvanceButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.FrameAdvanceButton.Name = "FrameAdvanceButton"; this.FrameAdvanceButton.Size = new System.Drawing.Size(23, 22); @@ -602,7 +602,7 @@ namespace BizHawk.MultiClient // FastForward // this.FastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FastForward.Image = global::BizHawk.MultiClient.Properties.Resources.FastForward; + this.FastForward.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FastForward; this.FastForward.ImageTransparentColor = System.Drawing.Color.Magenta; this.FastForward.Name = "FastForward"; this.FastForward.Size = new System.Drawing.Size(23, 22); @@ -614,7 +614,7 @@ namespace BizHawk.MultiClient // this.TurboFastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.TurboFastForward.Enabled = false; - this.TurboFastForward.Image = global::BizHawk.MultiClient.Properties.Resources.TurboFastForward; + this.TurboFastForward.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TurboFastForward; this.TurboFastForward.ImageTransparentColor = System.Drawing.Color.Magenta; this.TurboFastForward.Name = "TurboFastForward"; this.TurboFastForward.Size = new System.Drawing.Size(23, 22); @@ -625,7 +625,7 @@ namespace BizHawk.MultiClient // FastFowardToEnd // this.FastFowardToEnd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FastFowardToEnd.Image = global::BizHawk.MultiClient.Properties.Resources.ForwardMore; + this.FastFowardToEnd.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ForwardMore; this.FastFowardToEnd.ImageTransparentColor = System.Drawing.Color.Magenta; this.FastFowardToEnd.Name = "FastFowardToEnd"; this.FastFowardToEnd.Size = new System.Drawing.Size(23, 22); @@ -641,7 +641,7 @@ namespace BizHawk.MultiClient // StopButton // this.StopButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.StopButton.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.StopButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.StopButton.Name = "StopButton"; this.StopButton.Size = new System.Drawing.Size(23, 22); diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index 67b1fbc67a..fae214e470 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -6,7 +6,7 @@ using System.IO; using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class TAStudio : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs index c2518431c1..df2114654f 100644 --- a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs +++ b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class TI83KeyPad { @@ -1670,7 +1670,7 @@ this.LEFT.BackColor = System.Drawing.Color.CornflowerBlue; this.LEFT.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LEFT.ForeColor = System.Drawing.Color.White; - this.LEFT.Image = global::BizHawk.MultiClient.Properties.Resources.whiteTriLeft; + this.LEFT.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriLeft; this.LEFT.Location = new System.Drawing.Point(224, 130); this.LEFT.Name = "LEFT"; this.LEFT.Size = new System.Drawing.Size(27, 53); @@ -1683,7 +1683,7 @@ this.RIGHT.BackColor = System.Drawing.Color.CornflowerBlue; this.RIGHT.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.RIGHT.ForeColor = System.Drawing.Color.White; - this.RIGHT.Image = global::BizHawk.MultiClient.Properties.Resources.whiteTriRight; + this.RIGHT.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriRight; this.RIGHT.Location = new System.Drawing.Point(307, 130); this.RIGHT.Name = "RIGHT"; this.RIGHT.Size = new System.Drawing.Size(27, 53); @@ -1697,7 +1697,7 @@ this.DOWN.BackColor = System.Drawing.Color.CornflowerBlue; this.DOWN.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DOWN.ForeColor = System.Drawing.Color.White; - this.DOWN.Image = global::BizHawk.MultiClient.Properties.Resources.whiteTriDown; + this.DOWN.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriDown; this.DOWN.Location = new System.Drawing.Point(250, 182); this.DOWN.Name = "DOWN"; this.DOWN.Size = new System.Drawing.Size(58, 21); @@ -1711,7 +1711,7 @@ this.UP.BackColor = System.Drawing.Color.CornflowerBlue; this.UP.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.UP.ForeColor = System.Drawing.Color.White; - this.UP.Image = global::BizHawk.MultiClient.Properties.Resources.whiteTriUp; + this.UP.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriUp; this.UP.Location = new System.Drawing.Point(250, 109); this.UP.Name = "UP"; this.UP.Size = new System.Drawing.Size(58, 21); diff --git a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs index 6a9ede2cde..47d73229d2 100644 --- a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs +++ b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; using BizHawk.Emulation.Consoles.Calculator; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class TI83KeyPad : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/ToolBox.Designer.cs b/BizHawk.MultiClient/tools/ToolBox.Designer.cs index 6e12e5edee..1346e41509 100644 --- a/BizHawk.MultiClient/tools/ToolBox.Designer.cs +++ b/BizHawk.MultiClient/tools/ToolBox.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class ToolBox { @@ -82,7 +82,7 @@ // // toolStripButton1 // - this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.toolStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(63, 20); @@ -91,7 +91,7 @@ // // toolStripButton2 // - this.toolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.toolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(88, 20); @@ -100,7 +100,7 @@ // // toolStripButton3 // - this.toolStripButton3.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.toolStripButton3.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Size = new System.Drawing.Size(89, 20); @@ -109,7 +109,7 @@ // // HexEditor // - this.HexEditor.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.HexEditor.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditor.ImageTransparentColor = System.Drawing.Color.Magenta; this.HexEditor.Name = "HexEditor"; this.HexEditor.Size = new System.Drawing.Size(81, 20); @@ -118,7 +118,7 @@ // // toolStripButton5 // - this.toolStripButton5.Image = global::BizHawk.MultiClient.Properties.Resources.textdoc; + this.toolStripButton5.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc; this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; this.toolStripButton5.Size = new System.Drawing.Size(92, 20); @@ -127,7 +127,7 @@ // // toolStripButton6 // - this.toolStripButton6.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.toolStripButton6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton6.Name = "toolStripButton6"; this.toolStripButton6.Size = new System.Drawing.Size(76, 20); @@ -136,7 +136,7 @@ // // TAStudioButton // - this.TAStudioButton.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.TAStudioButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.TAStudioButton.Name = "TAStudioButton"; this.TAStudioButton.Size = new System.Drawing.Size(86, 20); @@ -145,7 +145,7 @@ // // NESDebugger // - this.NESDebugger.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; + this.NESDebugger.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NESDebugger.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESDebugger.Name = "NESDebugger"; this.NESDebugger.Size = new System.Drawing.Size(79, 20); @@ -154,7 +154,7 @@ // // NESPPU // - this.NESPPU.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; + this.NESPPU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NESPPU.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESPPU.Name = "NESPPU"; this.NESPPU.Size = new System.Drawing.Size(49, 20); @@ -163,7 +163,7 @@ // // NESNameTable // - this.NESNameTable.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; + this.NESNameTable.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NESNameTable.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESNameTable.Name = "NESNameTable"; this.NESNameTable.Size = new System.Drawing.Size(85, 20); @@ -172,7 +172,7 @@ // // NESGameGenie // - this.NESGameGenie.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; + this.NESGameGenie.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESGameGenie.Name = "NESGameGenie"; this.NESGameGenie.Size = new System.Drawing.Size(91, 20); @@ -181,7 +181,7 @@ // // KeypadTool // - this.KeypadTool.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; + this.KeypadTool.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.KeypadTool.ImageTransparentColor = System.Drawing.Color.Magenta; this.KeypadTool.Name = "KeypadTool"; this.KeypadTool.Size = new System.Drawing.Size(66, 20); @@ -190,7 +190,7 @@ // // SNESGraphicsDebuggerButton // - this.SNESGraphicsDebuggerButton.Image = global::BizHawk.MultiClient.Properties.Resources.SNESControllerIcon; + this.SNESGraphicsDebuggerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon; this.SNESGraphicsDebuggerButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.SNESGraphicsDebuggerButton.Name = "SNESGraphicsDebuggerButton"; this.SNESGraphicsDebuggerButton.Size = new System.Drawing.Size(99, 20); @@ -199,7 +199,7 @@ // // SNESGameGenie // - this.SNESGameGenie.Image = global::BizHawk.MultiClient.Properties.Resources.SNESControllerIcon; + this.SNESGameGenie.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon; this.SNESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.SNESGameGenie.Name = "SNESGameGenie"; this.SNESGameGenie.Size = new System.Drawing.Size(91, 20); diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs index e605cad1b1..33f586962a 100644 --- a/BizHawk.MultiClient/tools/ToolBox.cs +++ b/BizHawk.MultiClient/tools/ToolBox.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.Consoles.Calculator; using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Sega; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class ToolBox : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/ToolHelpers.cs b/BizHawk.MultiClient/tools/ToolHelpers.cs index 414ed1984a..b91098362c 100644 --- a/BizHawk.MultiClient/tools/ToolHelpers.cs +++ b/BizHawk.MultiClient/tools/ToolHelpers.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class ToolHelpers { diff --git a/BizHawk.MultiClient/tools/ToolManager.cs b/BizHawk.MultiClient/tools/ToolManager.cs index 3d4be09519..dd8b7dcf13 100644 --- a/BizHawk.MultiClient/tools/ToolManager.cs +++ b/BizHawk.MultiClient/tools/ToolManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class ToolManager { diff --git a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs index 08c776c967..08462c42be 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs +++ b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class TraceLogger { @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TraceLogger)); this.TracerBox = new System.Windows.Forms.GroupBox(); - this.TraceView = new BizHawk.VirtualListView(); + this.TraceView = new VirtualListView(); this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.menuStrip1 = new MenuStripEx(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -128,7 +128,7 @@ // // saveLogToolStripMenuItem // - this.saveLogToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveLogToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.saveLogToolStripMenuItem.Name = "saveLogToolStripMenuItem"; this.saveLogToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveLogToolStripMenuItem.Text = "&Save Log"; diff --git a/BizHawk.MultiClient/tools/TraceLogger.cs b/BizHawk.MultiClient/tools/TraceLogger.cs index 6d28454a57..1a2474114b 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.cs +++ b/BizHawk.MultiClient/tools/TraceLogger.cs @@ -7,7 +7,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class TraceLogger : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs b/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs index 6478f1145b..1dba623f31 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public sealed class AnalogControlPanel : Panel { diff --git a/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs b/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs index d9dbd955da..fd82a148d8 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public interface IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs index 27c8a8599c..840ff5cc5a 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPad : Panel , IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs index 3bdd3d6293..60cde4a4a0 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class VirtualPadA26 : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs index a2a32c1d83..adde6f6a51 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class VirtualPadA26Control : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs index 2c077d00ab..34f7df88fe 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadA78 { @@ -40,7 +40,7 @@ // this.PL.Appearance = System.Windows.Forms.Appearance.Button; this.PL.AutoSize = true; - this.PL.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.PL.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Back; this.PL.Location = new System.Drawing.Point(32, 19); this.PL.Name = "PL"; this.PL.Size = new System.Drawing.Size(22, 22); @@ -52,7 +52,7 @@ // this.PD.Appearance = System.Windows.Forms.Appearance.Button; this.PD.AutoSize = true; - this.PD.Image = global::BizHawk.MultiClient.Properties.Resources.BlueDown; + this.PD.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueDown; this.PD.Location = new System.Drawing.Point(53, 28); this.PD.Name = "PD"; this.PD.Size = new System.Drawing.Size(22, 22); @@ -64,7 +64,7 @@ // this.PR.Appearance = System.Windows.Forms.Appearance.Button; this.PR.AutoSize = true; - this.PR.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.PR.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Forward; this.PR.Location = new System.Drawing.Point(74, 19); this.PR.Name = "PR"; this.PR.Size = new System.Drawing.Size(22, 22); @@ -76,7 +76,7 @@ // this.PU.Appearance = System.Windows.Forms.Appearance.Button; this.PU.AutoSize = true; - this.PU.Image = global::BizHawk.MultiClient.Properties.Resources.BlueUp; + this.PU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueUp; this.PU.Location = new System.Drawing.Point(53, 7); this.PU.Name = "PU"; this.PU.Size = new System.Drawing.Size(22, 22); diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs index 86dc33bc45..984edbaae4 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadA78 : UserControl, IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs index 098dc3c271..33b315673e 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadA78Control { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs index dbf86925c2..47452f2990 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadA78Control : UserControl, IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs index a4ee8a551c..30cc7b257b 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs @@ -9,7 +9,7 @@ using System.Drawing; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadButton : CheckBox { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs index e779cedcad..69f47e3f10 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadC64Keyboard { @@ -772,7 +772,7 @@ this.KCommodore.Appearance = System.Windows.Forms.Appearance.Button; this.KCommodore.AutoSize = true; this.KCommodore.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.KCommodore.Image = global::BizHawk.MultiClient.Properties.Resources.C64Symbol; + this.KCommodore.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.C64Symbol; this.KCommodore.Location = new System.Drawing.Point(7, 79); this.KCommodore.Name = "KCommodore"; this.KCommodore.Size = new System.Drawing.Size(27, 24); @@ -996,7 +996,7 @@ this.KUpArrow.Appearance = System.Windows.Forms.Appearance.Button; this.KUpArrow.AutoSize = true; this.KUpArrow.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.KUpArrow.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.KUpArrow.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.KUpArrow.Location = new System.Drawing.Point(325, 33); this.KUpArrow.Name = "KUpArrow"; this.KUpArrow.Size = new System.Drawing.Size(22, 22); @@ -1010,7 +1010,7 @@ this.KLeftArrow.Appearance = System.Windows.Forms.Appearance.Button; this.KLeftArrow.AutoSize = true; this.KLeftArrow.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.KLeftArrow.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; + this.KLeftArrow.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft; this.KLeftArrow.Location = new System.Drawing.Point(18, 10); this.KLeftArrow.Name = "KLeftArrow"; this.KLeftArrow.Size = new System.Drawing.Size(22, 22); diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs index 058cb7e312..9012e7e4bf 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadC64Keyboard : UserControl , IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs index 6b56daeae7..7ded50b434 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadColeco { @@ -52,7 +52,7 @@ // this.PU.Appearance = System.Windows.Forms.Appearance.Button; this.PU.AutoSize = true; - this.PU.Image = global::BizHawk.MultiClient.Properties.Resources.BlueUp; + this.PU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueUp; this.PU.Location = new System.Drawing.Point(43, 3); this.PU.Name = "PU"; this.PU.Size = new System.Drawing.Size(22, 22); @@ -64,7 +64,7 @@ // this.PR.Appearance = System.Windows.Forms.Appearance.Button; this.PR.AutoSize = true; - this.PR.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.PR.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Forward; this.PR.Location = new System.Drawing.Point(64, 15); this.PR.Name = "PR"; this.PR.Size = new System.Drawing.Size(22, 22); @@ -76,7 +76,7 @@ // this.PD.Appearance = System.Windows.Forms.Appearance.Button; this.PD.AutoSize = true; - this.PD.Image = global::BizHawk.MultiClient.Properties.Resources.BlueDown; + this.PD.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueDown; this.PD.Location = new System.Drawing.Point(43, 24); this.PD.Name = "PD"; this.PD.Size = new System.Drawing.Size(22, 22); @@ -88,7 +88,7 @@ // this.PL.Appearance = System.Windows.Forms.Appearance.Button; this.PL.AutoSize = true; - this.PL.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.PL.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Back; this.PL.Location = new System.Drawing.Point(22, 15); this.PL.Name = "PL"; this.PL.Size = new System.Drawing.Size(22, 22); diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs index ea6718629d..a9583fa985 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadColeco : UserControl , IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs index a4f7dac111..d779a15b94 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadForm { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs index f3f747b8a0..d71d2b0f21 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using BizHawk.Emulation.Consoles.Nintendo.N64; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadForm : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs index 591618f16f..110b6cf656 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadGB : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs index 3542a47463..1a689aaa15 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class VirtualPadGBA : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs index ec84a7cbf7..f9f269883b 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadGBControl : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs index a3642ffd4a..a85265340a 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class VirtualPadGen3Button : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs index 9157981d5a..2e6212c9b2 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadN64 { @@ -46,7 +46,7 @@ this.ManualY = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.AnalogControl1 = new BizHawk.MultiClient.AnalogControlPanel(); + this.AnalogControl1 = new AnalogControlPanel(); ((System.ComponentModel.ISupportInitialize)(this.ManualX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ManualY)).BeginInit(); this.SuspendLayout(); @@ -54,7 +54,7 @@ // PL // this.PL.AutoSize = true; - this.PL.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.PL.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Back; this.PL.Location = new System.Drawing.Point(3, 207); this.PL.Name = "PL"; this.PL.Size = new System.Drawing.Size(22, 22); @@ -64,7 +64,7 @@ // PD // this.PD.AutoSize = true; - this.PD.Image = global::BizHawk.MultiClient.Properties.Resources.BlueDown; + this.PD.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueDown; this.PD.Location = new System.Drawing.Point(24, 216); this.PD.Name = "PD"; this.PD.Size = new System.Drawing.Size(22, 22); @@ -74,7 +74,7 @@ // PR // this.PR.AutoSize = true; - this.PR.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.PR.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Forward; this.PR.Location = new System.Drawing.Point(45, 207); this.PR.Name = "PR"; this.PR.Size = new System.Drawing.Size(22, 22); @@ -84,7 +84,7 @@ // PU // this.PU.AutoSize = true; - this.PU.Image = global::BizHawk.MultiClient.Properties.Resources.BlueUp; + this.PU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueUp; this.PU.Location = new System.Drawing.Point(24, 195); this.PU.Name = "PU"; this.PU.Size = new System.Drawing.Size(22, 22); diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs index a6ab2deb44..d2fc51fd4c 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs @@ -6,7 +6,7 @@ using System.Linq; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadN64 : UserControl, IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs index 0311e4083c..f447d034b5 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadN64Control : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs index 0061fc57a0..338b607648 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadNES : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs index 15b285318a..749866331b 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadNESControl : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs index 237f25244a..6092c29b22 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadPCE : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs index 6264d4e499..eae32201ae 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadSMS : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs index b869bbd0e0..7b8378e013 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadSMSControl : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs index 9d7e3ffbda..01467e807a 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadSNES : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs index 57d4d3afea..a6fe29d9df 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs @@ -5,7 +5,7 @@ using System.Text; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public class VirtualPadSNESControl : VirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs index 5cea7ff211..4014888796 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadSaturn { @@ -131,7 +131,7 @@ // this.PL.Appearance = System.Windows.Forms.Appearance.Button; this.PL.AutoSize = true; - this.PL.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.PL.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Back; this.PL.Location = new System.Drawing.Point(6, 38); this.PL.Name = "PL"; this.PL.Size = new System.Drawing.Size(22, 22); @@ -143,7 +143,7 @@ // this.PD.Appearance = System.Windows.Forms.Appearance.Button; this.PD.AutoSize = true; - this.PD.Image = global::BizHawk.MultiClient.Properties.Resources.BlueDown; + this.PD.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueDown; this.PD.Location = new System.Drawing.Point(27, 47); this.PD.Name = "PD"; this.PD.Size = new System.Drawing.Size(22, 22); @@ -155,7 +155,7 @@ // this.PR.Appearance = System.Windows.Forms.Appearance.Button; this.PR.AutoSize = true; - this.PR.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.PR.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Forward; this.PR.Location = new System.Drawing.Point(48, 38); this.PR.Name = "PR"; this.PR.Size = new System.Drawing.Size(22, 22); @@ -167,7 +167,7 @@ // this.PU.Appearance = System.Windows.Forms.Appearance.Button; this.PU.AutoSize = true; - this.PU.Image = global::BizHawk.MultiClient.Properties.Resources.BlueUp; + this.PU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.BlueUp; this.PU.Location = new System.Drawing.Point(27, 26); this.PU.Name = "PU"; this.PU.Size = new System.Drawing.Size(22, 22); diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs index 0c43332ac5..39d0c98d44 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadSaturn : UserControl, IVirtualPad { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs index 15de7754d3..2e2c38afb5 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class VirtualPadSaturnControl { diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs index baecd48860..d3d708ef6d 100644 --- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs +++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class VirtualPadSaturnControl : UserControl, IVirtualPad { diff --git a/BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs b/BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs index 723c2da48c..6c9546f3d3 100644 --- a/BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs +++ b/BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class RamPoke { @@ -34,12 +34,12 @@ this.Cancel = new System.Windows.Forms.Button(); this.OutputLabel = new System.Windows.Forms.Label(); this.ValeLabel = new System.Windows.Forms.Label(); - this.ValueBox = new BizHawk.MultiClient.WatchValueBox(); + this.ValueBox = new WatchValueBox(); this.ValueHexLabel = new System.Windows.Forms.Label(); this.DisplayTypeLabel = new System.Windows.Forms.Label(); this.SizeLabel = new System.Windows.Forms.Label(); this.BigEndianLabel = new System.Windows.Forms.Label(); - this.AddressBox = new BizHawk.HexTextBox(); + this.AddressBox = new HexTextBox(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); diff --git a/BizHawk.MultiClient/tools/Watch/RamPoke.cs b/BizHawk.MultiClient/tools/Watch/RamPoke.cs index e0f9f77b39..28891bda6b 100644 --- a/BizHawk.MultiClient/tools/Watch/RamPoke.cs +++ b/BizHawk.MultiClient/tools/Watch/RamPoke.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class RamPoke : Form { diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs index 7d068caff9..7d576b9b85 100644 --- a/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs @@ -1,38 +1,38 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { - partial class RamSearch - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class RamSearch + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.Windows.Forms.ToolStripMenuItem SearchMenuItem; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch)); this.TotalSearchLabel = new System.Windows.Forms.Label(); - this.WatchListView = new BizHawk.VirtualListView(); + this.WatchListView = new VirtualListView(); this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.PreviousColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -117,10 +117,10 @@ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); this.CompareToBox = new System.Windows.Forms.GroupBox(); - this.DifferenceBox = new BizHawk.UnsignedIntegerBox(); + this.DifferenceBox = new UnsignedIntegerBox(); this.DifferenceRadio = new System.Windows.Forms.RadioButton(); - this.NumberOfChangesBox = new BizHawk.UnsignedIntegerBox(); - this.SpecificAddressBox = new BizHawk.HexTextBox(); + this.NumberOfChangesBox = new UnsignedIntegerBox(); + this.SpecificAddressBox = new HexTextBox(); this.NumberOfChangesRadio = new System.Windows.Forms.RadioButton(); this.SpecificAddressRadio = new System.Windows.Forms.RadioButton(); this.SpecificValueRadio = new System.Windows.Forms.RadioButton(); @@ -143,7 +143,7 @@ this.RebootToolBarSeparator = new System.Windows.Forms.ToolStripSeparator(); this.RebootToolbarButton = new System.Windows.Forms.ToolStripButton(); this.ComparisonBox = new System.Windows.Forms.GroupBox(); - this.DifferentByBox = new BizHawk.UnsignedIntegerBox(); + this.DifferentByBox = new UnsignedIntegerBox(); this.DifferentByRadio = new System.Windows.Forms.RadioButton(); this.NotEqualToRadio = new System.Windows.Forms.RadioButton(); this.EqualToRadio = new System.Windows.Forms.RadioButton(); @@ -156,7 +156,7 @@ this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox(); - this.SpecificValueBox = new BizHawk.MultiClient.WatchValueBox(); + this.SpecificValueBox = new WatchValueBox(); SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -167,7 +167,7 @@ // // SearchMenuItem // - SearchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; + SearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; SearchMenuItem.Name = "SearchMenuItem"; SearchMenuItem.Size = new System.Drawing.Size(215, 22); SearchMenuItem.Text = "&Search"; @@ -186,9 +186,9 @@ // this.WatchListView.AllowColumnReorder = true; this.WatchListView.AllowDrop = true; - this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.AddressColumn, this.ValueColumn, @@ -262,7 +262,7 @@ // // DoSearchContextMenuItem // - this.DoSearchContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.DoSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.DoSearchContextMenuItem.Name = "DoSearchContextMenuItem"; this.DoSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); this.DoSearchContextMenuItem.Text = "&Search"; @@ -270,7 +270,7 @@ // // NewSearchContextMenuItem // - this.NewSearchContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.NewSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.NewSearchContextMenuItem.Name = "NewSearchContextMenuItem"; this.NewSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); this.NewSearchContextMenuItem.Text = "&Start New Search"; @@ -283,7 +283,7 @@ // // RemoveContextMenuItem // - this.RemoveContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Del"; this.RemoveContextMenuItem.Size = new System.Drawing.Size(215, 22); @@ -292,7 +292,7 @@ // // AddToRamWatchContextMenuItem // - this.AddToRamWatchContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.AddToRamWatchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem"; this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(215, 22); @@ -301,7 +301,7 @@ // // PokeContextMenuItem // - this.PokeContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeContextMenuItem.Name = "PokeContextMenuItem"; this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; this.PokeContextMenuItem.Size = new System.Drawing.Size(215, 22); @@ -310,7 +310,7 @@ // // FreezeContextMenuItem // - this.FreezeContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; this.FreezeContextMenuItem.Size = new System.Drawing.Size(215, 22); @@ -319,7 +319,7 @@ // // UnfreezeAllContextMenuItem // - this.UnfreezeAllContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze; + this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(215, 22); this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; @@ -367,14 +367,14 @@ // fileToolStripMenuItem // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OpenMenuItem, - this.SaveMenuItem, - this.SaveAsMenuItem, - this.AppendFileMenuItem, - this.TruncateFromFileMenuItem, - this.RecentSubMenu, - this.toolStripSeparator4, - this.exitToolStripMenuItem}); + this.OpenMenuItem, + this.SaveMenuItem, + this.SaveAsMenuItem, + this.AppendFileMenuItem, + this.TruncateFromFileMenuItem, + this.RecentSubMenu, + this.toolStripSeparator4, + this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; @@ -382,7 +382,7 @@ // // OpenMenuItem // - this.OpenMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); @@ -391,7 +391,7 @@ // // SaveMenuItem // - this.SaveMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); @@ -401,8 +401,8 @@ // SaveAsMenuItem // this.SaveAsMenuItem.Name = "SaveAsMenuItem"; - this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); + this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveAsMenuItem.Text = "Save As..."; this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); @@ -416,7 +416,7 @@ // // TruncateFromFileMenuItem // - this.TruncateFromFileMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile; + this.TruncateFromFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TruncateFromFile; this.TruncateFromFileMenuItem.Name = "TruncateFromFileMenuItem"; this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(195, 22); this.TruncateFromFileMenuItem.Text = "&Truncate from File..."; @@ -426,7 +426,7 @@ // this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator2}); - this.RecentSubMenu.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Text = "Recent"; @@ -626,7 +626,7 @@ // // newSearchToolStripMenuItem // - this.newSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.newSearchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem"; this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(215, 22); this.newSearchToolStripMenuItem.Text = "&New Search"; @@ -639,7 +639,7 @@ // // UndoMenuItem // - this.UndoMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.UndoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoMenuItem.Name = "UndoMenuItem"; this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); this.UndoMenuItem.Size = new System.Drawing.Size(215, 22); @@ -648,7 +648,7 @@ // // RedoMenuItem // - this.RedoMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; + this.RedoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; this.RedoMenuItem.Name = "RedoMenuItem"; this.RedoMenuItem.ShortcutKeyDisplayString = ""; this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); @@ -658,7 +658,7 @@ // // CopyValueToPrevMenuItem // - this.CopyValueToPrevMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.CopyValueToPrevMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.CopyValueToPrevMenuItem.Name = "CopyValueToPrevMenuItem"; this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(215, 22); this.CopyValueToPrevMenuItem.Text = "Copy Value to Prev"; @@ -673,7 +673,7 @@ // // RemoveMenuItem // - this.RemoveMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveMenuItem.Name = "RemoveMenuItem"; this.RemoveMenuItem.ShortcutKeyDisplayString = "Delete"; this.RemoveMenuItem.Size = new System.Drawing.Size(215, 22); @@ -695,7 +695,7 @@ // // AddToRamWatchMenuItem // - this.AddToRamWatchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(215, 22); @@ -704,7 +704,7 @@ // // PokeAddressMenuItem // - this.PokeAddressMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.PokeAddressMenuItem.Size = new System.Drawing.Size(215, 22); @@ -713,7 +713,7 @@ // // FreezeAddressMenuItem // - this.FreezeAddressMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.FreezeAddressMenuItem.Size = new System.Drawing.Size(215, 22); @@ -878,7 +878,7 @@ this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button; this.AutoSearchCheckBox.AutoSize = true; - this.AutoSearchCheckBox.Image = global::BizHawk.MultiClient.Properties.Resources.AutoSearch; + this.AutoSearchCheckBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AutoSearch; this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410); this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22); @@ -909,8 +909,8 @@ // // DifferenceBox // - this.DifferenceBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.DifferenceBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.DifferenceBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; this.DifferenceBox.Enabled = false; this.DifferenceBox.Location = new System.Drawing.Point(114, 98); @@ -934,8 +934,8 @@ // // NumberOfChangesBox // - this.NumberOfChangesBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.NumberOfChangesBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.NumberOfChangesBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; this.NumberOfChangesBox.Enabled = false; this.NumberOfChangesBox.Location = new System.Drawing.Point(114, 78); @@ -948,8 +948,8 @@ // // SpecificAddressBox // - this.SpecificAddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.SpecificAddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.SpecificAddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; this.SpecificAddressBox.Enabled = false; this.SpecificAddressBox.Location = new System.Drawing.Point(114, 58); @@ -1049,7 +1049,7 @@ // // NewSearchToolButton // - this.NewSearchToolButton.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.NewSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.NewSearchToolButton.Name = "NewSearchToolButton"; this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22); @@ -1065,7 +1065,7 @@ // this.CopyValueToPrevToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.CopyValueToPrevToolBarItem.Enabled = false; - this.CopyValueToPrevToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.CopyValueToPrevToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.CopyValueToPrevToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.CopyValueToPrevToolBarItem.Name = "CopyValueToPrevToolBarItem"; this.CopyValueToPrevToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1092,7 +1092,7 @@ // this.RemoveToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.RemoveToolBarItem.Enabled = false; - this.RemoveToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.RemoveToolBarItem.Name = "RemoveToolBarItem"; this.RemoveToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1104,7 +1104,7 @@ // this.AddToRamWatchToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.AddToRamWatchToolBarItem.Enabled = false; - this.AddToRamWatchToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.AddToRamWatchToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.AddToRamWatchToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.AddToRamWatchToolBarItem.Name = "AddToRamWatchToolBarItem"; this.AddToRamWatchToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1115,7 +1115,7 @@ // this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.PokeAddressToolBarItem.Enabled = false; - this.PokeAddressToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1126,7 +1126,7 @@ // this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.FreezeAddressToolBarItem.Enabled = false; - this.FreezeAddressToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1142,7 +1142,7 @@ // this.UndoToolBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.UndoToolBarButton.Enabled = false; - this.UndoToolBarButton.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.UndoToolBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoToolBarButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.UndoToolBarButton.Name = "UndoToolBarButton"; this.UndoToolBarButton.Size = new System.Drawing.Size(23, 22); @@ -1153,7 +1153,7 @@ // this.RedoToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.RedoToolBarItem.Enabled = false; - this.RedoToolBarItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; + this.RedoToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; this.RedoToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.RedoToolBarItem.Name = "RedoToolBarItem"; this.RedoToolBarItem.Size = new System.Drawing.Size(23, 22); @@ -1168,7 +1168,7 @@ // RebootToolbarButton // this.RebootToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RebootToolbarButton.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.RebootToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.RebootToolbarButton.Name = "RebootToolbarButton"; this.RebootToolbarButton.Size = new System.Drawing.Size(23, 22); @@ -1287,7 +1287,7 @@ // SearchButton // this.SearchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.SearchButton.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.SearchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.SearchButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SearchButton.Location = new System.Drawing.Point(244, 409); this.SearchButton.Name = "SearchButton"; @@ -1350,8 +1350,8 @@ // // SpecificValueBox // - this.SpecificValueBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.SpecificValueBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.SpecificValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte; this.SpecificValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; this.SpecificValueBox.Enabled = false; @@ -1406,48 +1406,48 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion private System.Windows.Forms.Label TotalSearchLabel; - VirtualListView WatchListView; - private System.Windows.Forms.ColumnHeader AddressColumn; - private System.Windows.Forms.ColumnHeader ValueColumn; - private System.Windows.Forms.ColumnHeader PreviousColumn; + VirtualListView WatchListView; + private System.Windows.Forms.ColumnHeader AddressColumn; + private System.Windows.Forms.ColumnHeader ValueColumn; + private System.Windows.Forms.ColumnHeader PreviousColumn; private System.Windows.Forms.ColumnHeader ChangesColumn; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem OpenMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveMenuItem; + private System.Windows.Forms.ToolStripMenuItem OpenMenuItem; + private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem; + private System.Windows.Forms.ToolStripMenuItem SaveMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem RestoreDefaultsMenuItem; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem RestoreDefaultsMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveWinPositionMenuItem; - private System.Windows.Forms.Label MemDomainLabel; + private System.Windows.Forms.Label MemDomainLabel; private System.Windows.Forms.Label MessageLabel; private System.Windows.Forms.ToolStripMenuItem RecentSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem AppendFileMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ClearChangeCountsMenuItem; - private System.Windows.Forms.ToolStripMenuItem UndoMenuItem; - private System.Windows.Forms.ToolStripMenuItem RemoveMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; - private System.Windows.Forms.ToolStripMenuItem AddToRamWatchMenuItem; + private System.Windows.Forms.ToolStripMenuItem ClearChangeCountsMenuItem; + private System.Windows.Forms.ToolStripMenuItem UndoMenuItem; + private System.Windows.Forms.ToolStripMenuItem RemoveMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripMenuItem AddToRamWatchMenuItem; private System.Windows.Forms.ToolStripMenuItem PokeAddressMenuItem; private System.Windows.Forms.ToolStripMenuItem TruncateFromFileMenuItem; private System.Windows.Forms.ToolStripMenuItem ExcludeRamWatchMenuItem; private System.Windows.Forms.ToolStripMenuItem CopyValueToPrevMenuItem; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem NewSearchContextMenuItem; - private System.Windows.Forms.ToolStripSeparator ContextMenuSeparator1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem NewSearchContextMenuItem; + private System.Windows.Forms.ToolStripSeparator ContextMenuSeparator1; private System.Windows.Forms.ToolStripMenuItem DoSearchContextMenuItem; - private System.Windows.Forms.ToolStripMenuItem FreezeAddressMenuItem; - private System.Windows.Forms.ToolStripMenuItem RemoveContextMenuItem; - private System.Windows.Forms.ToolStripMenuItem AddToRamWatchContextMenuItem; - private System.Windows.Forms.ToolStripMenuItem PokeContextMenuItem; + private System.Windows.Forms.ToolStripMenuItem FreezeAddressMenuItem; + private System.Windows.Forms.ToolStripMenuItem RemoveContextMenuItem; + private System.Windows.Forms.ToolStripMenuItem AddToRamWatchContextMenuItem; + private System.Windows.Forms.ToolStripMenuItem PokeContextMenuItem; private System.Windows.Forms.ToolStripMenuItem FreezeContextMenuItem; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolTip toolTip1; @@ -1457,7 +1457,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripMenuItem UnfreezeAllContextMenuItem; private System.Windows.Forms.ToolStripSeparator ContextMenuSeparator3; - private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; + private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; private System.Windows.Forms.ToolStripMenuItem ClearUndoMenuItem; private System.Windows.Forms.ToolStripMenuItem UseUndoHistoryMenuItem; @@ -1486,7 +1486,7 @@ private System.Windows.Forms.ToolStripMenuItem Previous_LastSearchMenuItem; private System.Windows.Forms.ToolStripMenuItem Previous_OriginalMenuItem; private System.Windows.Forms.GroupBox CompareToBox; - private System.Windows.Forms.RadioButton DifferenceRadio; + private System.Windows.Forms.RadioButton DifferenceRadio; private UnsignedIntegerBox NumberOfChangesBox; private HexTextBox SpecificAddressBox; private WatchValueBox SpecificValueBox; @@ -1536,5 +1536,5 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox DisplayTypeDropdown; private System.Windows.Forms.ToolStripMenuItem GoToAddressMenuItem; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.cs b/BizHawk.MultiClient/tools/Watch/RamSearch.cs index 843b3a4de8..3fd9557067 100644 --- a/BizHawk.MultiClient/tools/Watch/RamSearch.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearch.cs @@ -12,7 +12,7 @@ using System.Globalization; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { /// /// A winform designed to search through ram values diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs index 8c972c11d0..0158091266 100644 --- a/BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class RamWatch { @@ -108,7 +108,7 @@ this.ShowChangesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowDiffMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowDomainMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WatchListView = new BizHawk.VirtualListView(); + this.WatchListView = new VirtualListView(); this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.PrevColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -175,7 +175,7 @@ // // EditContextMenuItem // - this.EditContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.EditContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.EditContextMenuItem.Name = "EditContextMenuItem"; this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; this.EditContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -184,7 +184,7 @@ // // RemoveContextMenuItem // - this.RemoveContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; this.RemoveContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -193,7 +193,7 @@ // // DuplicateContextMenuItem // - this.DuplicateContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.DuplicateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.DuplicateContextMenuItem.Name = "DuplicateContextMenuItem"; this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D"; this.DuplicateContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -202,7 +202,7 @@ // // PokeContextMenuItem // - this.PokeContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeContextMenuItem.Name = "PokeContextMenuItem"; this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; this.PokeContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -211,7 +211,7 @@ // // FreezeContextMenuItem // - this.FreezeContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; this.FreezeContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -220,7 +220,7 @@ // // UnfreezeAllContextMenuItem // - this.UnfreezeAllContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze; + this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(203, 22); this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; @@ -240,7 +240,7 @@ // // InsertSeperatorContextMenuItem // - this.InsertSeperatorContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.InsertSeperatorContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.InsertSeperatorContextMenuItem.Name = "InsertSeperatorContextMenuItem"; this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -249,7 +249,7 @@ // // MoveUpContextMenuItem // - this.MoveUpContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.MoveUpContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpContextMenuItem.Name = "MoveUpContextMenuItem"; this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; this.MoveUpContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -258,7 +258,7 @@ // // MoveDownContextMenuItem // - this.MoveDownContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.MoveDownContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownContextMenuItem.Name = "MoveDownContextMenuItem"; this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; this.MoveDownContextMenuItem.Size = new System.Drawing.Size(203, 22); @@ -362,7 +362,7 @@ // NewWatchStripButton1 // this.NewWatchStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.NewWatchStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.addWatch; + this.NewWatchStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; this.NewWatchStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.NewWatchStripButton1.Name = "NewWatchStripButton1"; this.NewWatchStripButton1.Size = new System.Drawing.Size(23, 22); @@ -383,7 +383,7 @@ // cutToolStripButton // this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.cutToolStripButton.Name = "cutToolStripButton"; this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); @@ -415,7 +415,7 @@ // PoketoolStripButton2 // this.PoketoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PoketoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PoketoolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PoketoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.PoketoolStripButton2.Name = "PoketoolStripButton2"; this.PoketoolStripButton2.Size = new System.Drawing.Size(23, 22); @@ -426,7 +426,7 @@ // FreezetoolStripButton2 // this.FreezetoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FreezetoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.FreezetoolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezetoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.FreezetoolStripButton2.Name = "FreezetoolStripButton2"; this.FreezetoolStripButton2.Size = new System.Drawing.Size(23, 22); @@ -436,7 +436,7 @@ // toolStripButton1 // this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.toolStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(23, 22); @@ -452,7 +452,7 @@ // MoveUpStripButton1 // this.MoveUpStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.MoveUpStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.MoveUpStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveUpStripButton1.Name = "MoveUpStripButton1"; this.MoveUpStripButton1.Size = new System.Drawing.Size(23, 22); @@ -462,7 +462,7 @@ // MoveDownStripButton1 // this.MoveDownStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.MoveDownStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.MoveDownStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveDownStripButton1.Name = "MoveDownStripButton1"; this.MoveDownStripButton1.Size = new System.Drawing.Size(23, 22); @@ -501,7 +501,7 @@ // // newListToolStripMenuItem // - this.newListToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newListToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.newListToolStripMenuItem.Name = "newListToolStripMenuItem"; this.newListToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newListToolStripMenuItem.Size = new System.Drawing.Size(195, 22); @@ -510,7 +510,7 @@ // // openToolStripMenuItem // - this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22); @@ -519,7 +519,7 @@ // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); @@ -546,7 +546,7 @@ // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem}); - this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.recentToolStripMenuItem.Text = "Recent"; @@ -574,20 +574,20 @@ // watchesToolStripMenuItem // this.watchesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.memoryDomainsToolStripMenuItem, - this.toolStripSeparator8, - this.newWatchToolStripMenuItem, - this.editWatchToolStripMenuItem, - this.removeWatchToolStripMenuItem, - this.duplicateWatchToolStripMenuItem, - this.pokeAddressToolStripMenuItem, - this.freezeAddressToolStripMenuItem, - this.insertSeparatorToolStripMenuItem, - this.clearChangeCountsToolStripMenuItem, - this.toolStripSeparator3, - this.moveUpToolStripMenuItem, - this.moveDownToolStripMenuItem, - this.selectAllToolStripMenuItem}); + this.memoryDomainsToolStripMenuItem, + this.toolStripSeparator8, + this.newWatchToolStripMenuItem, + this.editWatchToolStripMenuItem, + this.removeWatchToolStripMenuItem, + this.duplicateWatchToolStripMenuItem, + this.pokeAddressToolStripMenuItem, + this.freezeAddressToolStripMenuItem, + this.insertSeparatorToolStripMenuItem, + this.clearChangeCountsToolStripMenuItem, + this.toolStripSeparator3, + this.moveUpToolStripMenuItem, + this.moveDownToolStripMenuItem, + this.selectAllToolStripMenuItem}); this.watchesToolStripMenuItem.Name = "watchesToolStripMenuItem"; this.watchesToolStripMenuItem.Size = new System.Drawing.Size(64, 20); this.watchesToolStripMenuItem.Text = "&Watches"; @@ -614,7 +614,7 @@ // // newWatchToolStripMenuItem // - this.newWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.newWatchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.newWatchToolStripMenuItem.Name = "newWatchToolStripMenuItem"; this.newWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); this.newWatchToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -623,7 +623,7 @@ // // editWatchToolStripMenuItem // - this.editWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.editWatchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.editWatchToolStripMenuItem.Name = "editWatchToolStripMenuItem"; this.editWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.editWatchToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -632,7 +632,7 @@ // // removeWatchToolStripMenuItem // - this.removeWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.removeWatchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.removeWatchToolStripMenuItem.Name = "removeWatchToolStripMenuItem"; this.removeWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.removeWatchToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -641,7 +641,7 @@ // // duplicateWatchToolStripMenuItem // - this.duplicateWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.duplicateWatchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.duplicateWatchToolStripMenuItem.Name = "duplicateWatchToolStripMenuItem"; this.duplicateWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.duplicateWatchToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -650,7 +650,7 @@ // // pokeAddressToolStripMenuItem // - this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.pokeAddressToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem"; this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -659,7 +659,7 @@ // // freezeAddressToolStripMenuItem // - this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.freezeAddressToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; this.freezeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -668,7 +668,7 @@ // // insertSeparatorToolStripMenuItem // - this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -690,7 +690,7 @@ // // moveUpToolStripMenuItem // - this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.moveUpToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(224, 22); @@ -699,7 +699,7 @@ // // moveDownToolStripMenuItem // - this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.moveDownToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(224, 22); diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.cs b/BizHawk.MultiClient/tools/Watch/RamWatch.cs index a151052fe4..034a21fdb0 100644 --- a/BizHawk.MultiClient/tools/Watch/RamWatch.cs +++ b/BizHawk.MultiClient/tools/Watch/RamWatch.cs @@ -9,7 +9,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class RamWatch : Form, IToolForm { diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs b/BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs index 8ed5549066..c4ced4c41d 100644 --- a/BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { partial class WatchEditor { @@ -30,7 +30,7 @@ { this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.AddressBox = new BizHawk.HexTextBox(); + this.AddressBox = new HexTextBox(); this.NotesBox = new System.Windows.Forms.TextBox(); this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.cs b/BizHawk.MultiClient/tools/Watch/WatchEditor.cs index 17dea3265f..ef6c0de210 100644 --- a/BizHawk.MultiClient/tools/Watch/WatchEditor.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchEditor.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { public partial class WatchEditor : Form { diff --git a/BizHawk.MultiClient/tools/Watch/WatchValueBox.cs b/BizHawk.MultiClient/tools/Watch/WatchValueBox.cs index 83d2e832b8..9109774d85 100644 --- a/BizHawk.MultiClient/tools/Watch/WatchValueBox.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchValueBox.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; -namespace BizHawk.MultiClient +namespace BizHawk.Client.EmuHawk { class WatchValueBox : TextBox, INumberBox { diff --git a/BizHawk.sln b/BizHawk.sln index 381bbe5954..21111b50c5 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -1,16 +1,16 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.MultiClient\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,20 +37,6 @@ Global {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.ActiveCfg = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.Build.0 = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.Build.0 = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.ActiveCfg = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.Build.0 = Release|Any CPU - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.ActiveCfg = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -89,11 +75,23 @@ Global {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Win32.ActiveCfg = Release|Any CPU {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x86.ActiveCfg = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.ActiveCfg = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.Build.0 = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.ActiveCfg = Release|Any CPU + {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = BizHawk.MultiClient\BizHawk.MultiClient.csproj + StartupItem = BizHawk.MultiClient\BizHawk.Client.EmuHawk.csproj EndGlobalSection EndGlobal diff --git a/VersionInfo.cs b/VersionInfo.cs index 20c220dbd8..32214072a6 100644 --- a/VersionInfo.cs +++ b/VersionInfo.cs @@ -1,4 +1,4 @@ static class VersionInfo { - public const string MAINVERSION = "1.5.0"; + public const string MAINVERSION = "1.5.2"; }