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

Some code refactoring, no functional changes

This commit is contained in:
adelikat 2013-03-10 22:42:54 +00:00
parent 240a9e3a45
commit 5dc8733ae1
7 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -744,7 +744,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentROMToolStripMenuItem.DropDownItems.Clear(); recentROMToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentRoms.IsEmpty()) if (Global.Config.RecentRoms.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -753,7 +753,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentRoms.Length(); x++) for (int x = 0; x < Global.Config.RecentRoms.Count; x++)
{ {
string path = Global.Config.RecentRoms.GetRecentFileByPosition(x); string path = Global.Config.RecentRoms.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();
@ -787,7 +787,7 @@ namespace BizHawk.MultiClient
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentMovies.IsEmpty()) if (Global.Config.RecentMovies.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -796,7 +796,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentMovies.Length(); x++) for (int x = 0; x < Global.Config.RecentMovies.Count; x++)
{ {
string path = Global.Config.RecentMovies.GetRecentFileByPosition(x); string path = Global.Config.RecentMovies.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();
@ -1003,9 +1003,14 @@ namespace BizHawk.MultiClient
private void contextMenuStrip1_Opening(object sender, System.ComponentModel.CancelEventArgs e) private void contextMenuStrip1_Opening(object sender, System.ComponentModel.CancelEventArgs e)
{ {
if (EmulatorPaused) if (EmulatorPaused)
{
wasPaused = true; wasPaused = true;
}
else else
{
wasPaused = false; wasPaused = false;
}
didMenuPause = true; didMenuPause = true;
PauseEmulator(); PauseEmulator();
@ -1089,23 +1094,29 @@ namespace BizHawk.MultiClient
} }
cmiUndoSavestate.Visible = true; cmiUndoSavestate.Visible = true;
cmiSeparator20.Visible = true; cmiSeparator20.Visible = true;
cmiScreenshot.Visible = true; cmiScreenshot.Visible = true;
cmiScreenshotClipboard.Visible = true; cmiScreenshotClipboard.Visible = true;
cmiCloseRom.Visible = true; cmiCloseRom.Visible = true;
} }
if (Global.Config.RecentRoms.Length() == 0) if (Global.Config.RecentRoms.Count > 0)
cmiLoadLastRom.Enabled = false; {
else
cmiLoadLastRom.Enabled = true; cmiLoadLastRom.Enabled = true;
}
if (Global.Config.RecentMovies.Length() == 0)
cmiLoadLastMovie.Enabled = false;
else else
{
cmiLoadLastRom.Enabled = false;
}
if (Global.Config.RecentMovies.Count > 0)
{
cmiLoadLastMovie.Enabled = true; cmiLoadLastMovie.Enabled = true;
}
else
{
cmiLoadLastMovie.Enabled = false;
}
string path = PathManager.SaveStatePrefix(Global.Game) + "." + "QuickSave" + Global.Config.SaveSlot + ".State.bak"; string path = PathManager.SaveStatePrefix(Global.Game) + "." + "QuickSave" + Global.Config.SaveSlot + ".State.bak";
var file = new FileInfo(path); var file = new FileInfo(path);
@ -1140,7 +1151,9 @@ namespace BizHawk.MultiClient
cmiShowMenu.Text = "Show Menu"; cmiShowMenu.Text = "Show Menu";
} }
else else
{
cmiShowMenu.Visible = false; cmiShowMenu.Visible = false;
}
} }

8
BizHawk.MultiClient/MainForm.cs
View File

@ -228,7 +228,7 @@ namespace BizHawk.MultiClient
MessageBox.Show("Failed to load " + cmdRom + " specified on commandline"); MessageBox.Show("Failed to load " + cmdRom + " specified on commandline");
} }
} }
else if (Global.Config.AutoLoadMostRecentRom && !Global.Config.RecentRoms.IsEmpty()) else if (Global.Config.AutoLoadMostRecentRom && !Global.Config.RecentRoms.IsEmpty)
LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0)); LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0));
if (cmdMovie != null) if (cmdMovie != null)
@ -250,7 +250,7 @@ namespace BizHawk.MultiClient
Global.Config.RecentMovies.Add(cmdMovie); Global.Config.RecentMovies.Add(cmdMovie);
} }
} }
else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty()) else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty)
{ {
if (Global.Game == null) if (Global.Game == null)
{ {
@ -2245,7 +2245,7 @@ namespace BizHawk.MultiClient
//restarts the lua console if a different rom is loaded. //restarts the lua console if a different rom is loaded.
//im not really a fan of how this is done.. //im not really a fan of how this is done..
if (Global.Config.RecentRoms.IsEmpty() || Global.Config.RecentRoms.GetRecentFileByPosition(0) != file.CanonicalFullPath) if (Global.Config.RecentRoms.IsEmpty || Global.Config.RecentRoms.GetRecentFileByPosition(0) != file.CanonicalFullPath)
{ {
#if WINDOWS #if WINDOWS
LuaConsole1.Restart(); LuaConsole1.Restart();
@ -3840,7 +3840,7 @@ namespace BizHawk.MultiClient
if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed) if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed)
{ {
RamWatch1 = new RamWatch(); RamWatch1 = new RamWatch();
if (Global.Config.AutoLoadRamWatch && Global.Config.RecentWatches.Length() > 0) if (Global.Config.AutoLoadRamWatch && Global.Config.RecentWatches.Count > 0)
{ {
RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0)); RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0));
} }

28
BizHawk.MultiClient/RecentFiles.cs
View File

@ -20,17 +20,14 @@ namespace BizHawk.MultiClient
recentlist.Clear(); recentlist.Clear();
} }
public bool IsEmpty() public bool IsEmpty
{ {
if (recentlist.Count == 0) get { return recentlist.Count > 0 ? false : true; }
return true;
else
return false;
} }
public int Length() public int Count
{ {
return recentlist.Count; get { return recentlist.Count; }
} }
public void Add(string newFile) public void Add(string newFile)
@ -44,7 +41,9 @@ namespace BizHawk.MultiClient
} }
recentlist.Insert(0, newFile); recentlist.Insert(0, newFile);
if (recentlist.Count > MAX_RECENT_FILES) if (recentlist.Count > MAX_RECENT_FILES)
{
recentlist.Remove(recentlist[recentlist.Count - 1]); recentlist.Remove(recentlist[recentlist.Count - 1]);
}
} }
public bool Remove(string newFile) public bool Remove(string newFile)
@ -57,16 +56,10 @@ namespace BizHawk.MultiClient
recentlist.Remove(newFile); //intentionally keeps iterating after this to remove duplicate instances, though those should never exist in the first place recentlist.Remove(newFile); //intentionally keeps iterating after this to remove duplicate instances, though those should never exist in the first place
removed = true; removed = true;
} }
} }
return removed; return removed;
} }
public List<string> GetRecentList()
{
return recentlist;
}
public List<string> GetRecentListTruncated(int length) public List<string> GetRecentListTruncated(int length)
{ {
//iterate through list, truncating each item to length, and return the result in a List<string> //iterate through list, truncating each item to length, and return the result in a List<string>
@ -80,9 +73,14 @@ namespace BizHawk.MultiClient
public string GetRecentFileByPosition(int position) public string GetRecentFileByPosition(int position)
{ {
if (recentlist.Count == 0) if (recentlist.Count > 0)
{
return recentlist[position];
}
else
{
return ""; return "";
return recentlist[position]; }
} }
} }
} }

4
BizHawk.MultiClient/tools/Cheats.cs
View File

@ -262,7 +262,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentCheats.IsEmpty()) if (Global.Config.RecentCheats.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -271,7 +271,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentCheats.Length(); x++) for (int x = 0; x < Global.Config.RecentCheats.Count; x++)
{ {
string path = Global.Config.RecentCheats.GetRecentFileByPosition(x); string path = Global.Config.RecentCheats.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();

10
BizHawk.MultiClient/tools/LuaConsole.cs
View File

@ -97,7 +97,7 @@ namespace BizHawk.MultiClient
LoadConfigSettings(); LoadConfigSettings();
if (Global.Config.AutoLoadLuaSession) if (Global.Config.AutoLoadLuaSession)
{ {
if (!Global.Config.RecentLuaSession.IsEmpty()) if (!Global.Config.RecentLuaSession.IsEmpty)
{ {
LoadSessionFromRecent(Global.Config.RecentLuaSession.GetRecentFileByPosition(0)); LoadSessionFromRecent(Global.Config.RecentLuaSession.GetRecentFileByPosition(0));
} }
@ -548,7 +548,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentLua.IsEmpty()) if (Global.Config.RecentLua.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -557,7 +557,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentLua.Length(); x++) for (int x = 0; x < Global.Config.RecentLua.Count; x++)
{ {
string path = Global.Config.RecentLua.GetRecentFileByPosition(x); string path = Global.Config.RecentLua.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();
@ -1039,7 +1039,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentSessionsToolStripMenuItem.DropDownItems.Clear(); recentSessionsToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentLuaSession.IsEmpty()) if (Global.Config.RecentLuaSession.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -1048,7 +1048,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentLuaSession.Length(); x++) for (int x = 0; x < Global.Config.RecentLuaSession.Count; x++)
{ {
string path = Global.Config.RecentLuaSession.GetRecentFileByPosition(x); string path = Global.Config.RecentLuaSession.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();

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

@ -1842,7 +1842,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentSearches.IsEmpty()) if (Global.Config.RecentSearches.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -1851,7 +1851,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentSearches.Length(); x++) for (int x = 0; x < Global.Config.RecentSearches.Count; x++)
{ {
string path = Global.Config.RecentSearches.GetRecentFileByPosition(x); string path = Global.Config.RecentSearches.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();

4
BizHawk.MultiClient/tools/RamWatch.cs
View File

@ -732,7 +732,7 @@ namespace BizHawk.MultiClient
//repopulate it with an up to date list //repopulate it with an up to date list
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
if (Global.Config.RecentWatches.IsEmpty()) if (Global.Config.RecentWatches.IsEmpty)
{ {
var none = new ToolStripMenuItem(); var none = new ToolStripMenuItem();
none.Enabled = false; none.Enabled = false;
@ -741,7 +741,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
for (int x = 0; x < Global.Config.RecentWatches.Length(); x++) for (int x = 0; x < Global.Config.RecentWatches.Count; x++)
{ {
string path = Global.Config.RecentWatches.GetRecentFileByPosition(x); string path = Global.Config.RecentWatches.GetRecentFileByPosition(x);
var item = new ToolStripMenuItem(); var item = new ToolStripMenuItem();