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

View File

@ -548,6 +548,9 @@
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent> <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent> <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
</PropertyGroup> </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. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

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

View File

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

File diff suppressed because it is too large Load Diff

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;
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

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;
}
} }
} }