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

spaces to tabs, good ol whitespace commit

This commit is contained in:
adelikat 2015-01-27 23:18:48 +00:00
parent 36e4ceca93
commit 3b13ea4a8f
1 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -23,8 +23,8 @@ namespace BizHawk.Client.EmuHawk
private bool _sortReverse;
private string _lastColumnSorted;
private List<string> _consoleCommandHistory = new List<string>();
private int _consoleCommandHistoryIndex = -1;
private List<string> _consoleCommandHistory = new List<string>();
private int _consoleCommandHistoryIndex = -1;
public LuaConsole()
{
@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
LuaListView.QueryItemBkColor += LuaListView_QueryItemBkColor;
LuaListView.VirtualMode = true;
InputBox.AutoCompleteCustomSource.AddRange(LuaImp.Docs.Select(a=> a.Library + "."+ a.Name).ToArray());
InputBox.AutoCompleteCustomSource.AddRange(LuaImp.Docs.Select(a => a.Library + "." + a.Name).ToArray());
}
public EmuLuaLibrary LuaImp { get; set; }
@ -115,11 +115,11 @@ namespace BizHawk.Client.EmuHawk
if (LuaAlreadyInSession(processedPath) == false)
{
var luaFile = new LuaFile(string.Empty, processedPath);
_luaList.Add(luaFile);
LuaListView.ItemCount = _luaList.Count;
Global.Config.RecentLua.Add(processedPath);
if (!Global.Config.DisableLuaScriptsOnLoad)
{
@ -130,7 +130,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception e)
{
if (e.GetType() == typeof(LuaInterface.LuaScriptException))
if (e.GetType() == typeof(LuaInterface.LuaScriptException))
{
luaFile.Enabled = false;
ConsoleLog(e.Message);
@ -182,7 +182,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception e)
{
if (e is LuaScriptException)
if (e is LuaScriptException)
{
file.Enabled = false;
ConsoleLog(e.Message);
@ -518,13 +518,13 @@ namespace BizHawk.Client.EmuHawk
return true;
}
if (result == DialogResult.No)
{
_luaList.Changes = false;
return true;
}
if (result == DialogResult.Cancel)
{
return false;
@ -642,14 +642,14 @@ namespace BizHawk.Client.EmuHawk
{
var sfd = new SaveFileDialog
{
InitialDirectory = !string.IsNullOrWhiteSpace(_luaList.Filename) ?
InitialDirectory = !string.IsNullOrWhiteSpace(_luaList.Filename) ?
Path.GetDirectoryName(_luaList.Filename) :
PathManager.MakeAbsolutePath(Global.Config.PathEntries.LuaPathFragment, null),
DefaultExt = ".lua",
FileName = !string.IsNullOrWhiteSpace(_luaList.Filename) ?
Path.GetFileNameWithoutExtension(_luaList.Filename) :
Path.GetFileNameWithoutExtension(Global.Game.Name),
OverwritePrompt = true,
OverwritePrompt = true,
Filter = "Lua Scripts (*.lua)|*.lua|All Files (*.*)|*.*"
};
@ -967,7 +967,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception ex)
{
if (ex is LuaScriptException || ex is LuaException)
if (ex is LuaScriptException || ex is LuaException)
{
ConsoleLog(ex.Message);
}
@ -1079,68 +1079,68 @@ namespace BizHawk.Client.EmuHawk
ToggleScriptMenuItem_Click(sender, e);
}
private void InputBox_KeyDown(object sender, KeyEventArgs e)
{
if(e.KeyCode == Keys.Enter)
{
string consoleBeforeCall = OutputBox.Text;
// TODO: Maybe make these try-catches more general
if (InputBox.Text != "")
{
try
{
LuaImp.ExecuteString(InputBox.Text);
private void InputBox_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
string consoleBeforeCall = OutputBox.Text;
// TODO: Maybe make these try-catches more general
if (InputBox.Text != "")
{
try
{
LuaImp.ExecuteString(InputBox.Text);
// TODO: This isn't exactly optimal
if (OutputBox.Text == consoleBeforeCall)
ConsoleLog("Command successfully executed");
}
catch (LuaScriptException ex)
{
ConsoleLog(ex.ToString());
}
_consoleCommandHistory.Insert(0, InputBox.Text);
_consoleCommandHistoryIndex = -1;
InputBox.Clear();
}
}
else if(e.KeyCode == Keys.Up)
{
if (_consoleCommandHistoryIndex < _consoleCommandHistory.Count-1)
{
_consoleCommandHistoryIndex++;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if(e.KeyCode == Keys.Down)
{
if (_consoleCommandHistoryIndex == 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = "";
}
else if (_consoleCommandHistoryIndex > 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if(e.KeyCode == Keys.Tab)
{
this.ProcessTabKey(false);
e.Handled = true;
}
}
// TODO: This isn't exactly optimal
if (OutputBox.Text == consoleBeforeCall)
ConsoleLog("Command successfully executed");
}
catch (LuaScriptException ex)
{
ConsoleLog(ex.ToString());
}
_consoleCommandHistory.Insert(0, InputBox.Text);
_consoleCommandHistoryIndex = -1;
InputBox.Clear();
}
}
else if (e.KeyCode == Keys.Up)
{
if (_consoleCommandHistoryIndex < _consoleCommandHistory.Count - 1)
{
_consoleCommandHistoryIndex++;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if (e.KeyCode == Keys.Down)
{
if (_consoleCommandHistoryIndex == 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = "";
}
else if (_consoleCommandHistoryIndex > 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if (e.KeyCode == Keys.Tab)
{
this.ProcessTabKey(false);
e.Handled = true;
}
}
protected override bool ProcessTabKey(bool forward)
{
// TODO: Make me less dirty (please)
return false;
}
protected override bool ProcessTabKey(bool forward)
{
// TODO: Make me less dirty (please)
return false;
}
#endregion