ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commented out unworking code for disc.DetectSegaSaturn() in MainForm.cs 

Added 'Always On Top' option to settings in hex editor/tas studio/ram search
This commit is contained in:
pasky1382 2013-06-25 08:50:42 +00:00
parent b7dbb91419
commit 23d71a3b87
9 changed files with 2412 additions and 2362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Emulation/BizHawk.Emulation.csproj
View File

@ -548,6 +548,9 @@
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>del /q "E:\Programming\Bizhawk\BizHawk.MultiClient\output*.pdb"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

5
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -1136,7 +1136,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
<Folder Include="SMStools\Resources\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@ -1147,8 +1147,7 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
<PostBuildEvent>del /q "E:\Programming\Bizhawk\BizHawk.MultiClient\output*.pdb"</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>

10
BizHawk.MultiClient/MainForm.cs
View File

@ -2102,11 +2102,11 @@ namespace BizHawk.MultiClient
game = new GameInfo { System = "PSX", Name = Path.GetFileNameWithoutExtension(file.Name), Hash = hash };
disc.Dispose();
}
else if (disc.DetectSegaSaturn())
{
Console.WriteLine("Sega Saturn disc detected!");
game = new GameInfo { System = "SAT", Name = Path.GetFileNameWithoutExtension(file.Name), Hash = hash };
}
//else if (disc.DetectSegaSaturn()) // DetectSegaSaturn does not exist
//{
// Console.WriteLine("Sega Saturn disc detected!");
// game = new GameInfo { System = "SAT", Name = Path.GetFileNameWithoutExtension(file.Name), Hash = hash };
//}
else
{
game = new GameInfo { System = "PCECD", Name = Path.GetFileNameWithoutExtension(file.Name), Hash = hash };

10
BizHawk.MultiClient/tools/HexEditor.Designer.cs generated
View File

@ -86,6 +86,7 @@
this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
this.AddressesLabel = new System.Windows.Forms.Label();
this.Header = new System.Windows.Forms.Label();
this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.ViewerContextMenuStrip.SuspendLayout();
this.MemoryViewerBox.SuspendLayout();
@ -334,6 +335,7 @@
this.customColorsToolStripMenuItem,
this.saveWindowsSettingsToolStripMenuItem,
this.toolStripSeparator3,
this.alwaysOnTopToolStripMenuItem,
this.restoreWindowSizeToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
@ -586,6 +588,13 @@
this.Header.TabIndex = 2;
this.Header.Text = "label1";
//
// alwaysOnTopToolStripMenuItem
//
this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
//
// HexEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -673,5 +682,6 @@
private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pokeAddressToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pokeAddressToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
}
}

6
BizHawk.MultiClient/tools/HexEditor.cs
View File

@ -2272,5 +2272,11 @@ namespace BizHawk.MultiClient
{
}
private void alwaysOnTopToolStripMenuItem_Click(object sender, EventArgs e)
{
alwaysOnTopToolStripMenuItem.Checked = alwaysOnTopToolStripMenuItem.Checked == false;
this.TopMost = alwaysOnTopToolStripMenuItem.Checked;
}
}
}

12
BizHawk.MultiClient/tools/RamSearch.Designer.cs generated
View File

@ -125,7 +125,7 @@
this.CompareToBox = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.NumberOfChangesBox = new System.Windows.Forms.TextBox();
this.SpecificAddressBox = new HexTextBox();
this.SpecificAddressBox = new BizHawk.HexTextBox();
this.SpecificValueBox = new System.Windows.Forms.TextBox();
this.NumberOfChangesRadio = new System.Windows.Forms.RadioButton();
this.SpecificAddressRadio = new System.Windows.Forms.RadioButton();
@ -144,6 +144,7 @@
this.MemDomainLabel = new System.Windows.Forms.Label();
this.MessageLabel = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SearchtoolStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -679,6 +680,7 @@
this.autoloadDialogToolStripMenuItem,
this.saveWindowPositionToolStripMenuItem,
this.toolStripSeparator11,
this.alwaysOnTopToolStripMenuItem,
this.restoreOriginalWindowSizeToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
@ -1243,6 +1245,13 @@
this.MessageLabel.TabIndex = 9;
this.MessageLabel.Text = " ";
//
// alwaysOnTopToolStripMenuItem
//
this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
//
// RamSearch
//
this.AllowDrop = true;
@ -1403,5 +1412,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripMenuItem unfreezeAllToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
}
}

6
BizHawk.MultiClient/tools/RamSearch.cs
View File

@ -2716,5 +2716,11 @@ namespace BizHawk.MultiClient
Global.MainForm.HexEditor1.UpdateValues();
Global.MainForm.Cheats1.UpdateValues();
}
private void alwaysOnTopToolStripMenuItem_Click(object sender, EventArgs e)
{
alwaysOnTopToolStripMenuItem.Checked = alwaysOnTopToolStripMenuItem.Checked == false;
this.TopMost = alwaysOnTopToolStripMenuItem.Checked;
}
}
}

10
BizHawk.MultiClient/tools/TAStudio.Designer.cs generated
View File

@ -100,6 +100,7 @@
this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.VisualizerBox = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.groupBox1.SuspendLayout();
@ -351,6 +352,7 @@
this.autoloadToolStripMenuItem,
this.updatePadsOnMovePlaybackToolStripMenuItem,
this.toolStripSeparator4,
this.alwaysOnTopToolStripMenuItem,
this.restoreWindowToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
@ -702,6 +704,13 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// alwaysOnTopToolStripMenuItem
//
this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
//
// TAStudio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -802,5 +811,6 @@
private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem;
private System.Windows.Forms.GroupBox VisualizerBox;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
}
}

6
BizHawk.MultiClient/tools/TAStudio.cs
View File

@ -800,5 +800,11 @@ namespace BizHawk.MultiClient
{
}
private void alwaysOnTopToolStripMenuItem_Click(object sender, EventArgs e)
{
alwaysOnTopToolStripMenuItem.Checked = alwaysOnTopToolStripMenuItem.Checked == false;
this.TopMost = alwaysOnTopToolStripMenuItem.Checked;
}
}
}