If User Opens A Script That Is Currently On The Session, It Will Toggle It On.
If User Deletes The Script From The Session, It Will Stop. Script Counter Now Updates On More Circumstances.
This commit is contained in:
parent
22feb43b78
commit
652fea7392
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -97,6 +97,7 @@ namespace BizHawk.MultiClient
|
|||
LuaImp.Close();
|
||||
LuaImp = new LuaImplementation(this);
|
||||
changes = true;
|
||||
UpdateNumberOfScripts();
|
||||
}
|
||||
|
||||
public void Restart()
|
||||
|
@ -162,18 +163,35 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void LoadLuaFile(string path)
|
||||
{
|
||||
bool enabled = true;
|
||||
if (Global.Config.DisableLuaScriptsOnLoad)
|
||||
enabled = false;
|
||||
LuaFiles l = new LuaFiles("", path, enabled);
|
||||
luaList.Add(l);
|
||||
LuaListView.ItemCount = luaList.Count;
|
||||
LuaListView.Refresh();
|
||||
Global.Config.RecentLua.Add(path);
|
||||
if (LuaAlreadyInSession(path) == false)
|
||||
{
|
||||
bool enabled = true;
|
||||
if (Global.Config.DisableLuaScriptsOnLoad)
|
||||
enabled = false;
|
||||
LuaFiles l = new LuaFiles("", path, enabled);
|
||||
luaList.Add(l);
|
||||
LuaListView.ItemCount = luaList.Count;
|
||||
LuaListView.Refresh();
|
||||
Global.Config.RecentLua.Add(path);
|
||||
|
||||
if (!Global.Config.DisableLuaScriptsOnLoad)
|
||||
LuaImp.DoLuaFile(path);
|
||||
changes = true;
|
||||
if (!Global.Config.DisableLuaScriptsOnLoad)
|
||||
LuaImp.DoLuaFile(path);
|
||||
changes = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < luaList.Count; i++)
|
||||
{
|
||||
if (path == luaList[i].Path && luaList[i].Enabled == false)
|
||||
{
|
||||
luaList[i].Toggle();
|
||||
LuaListView.Refresh();
|
||||
RunLuaScripts();
|
||||
changes = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OpenLuaFile()
|
||||
|
@ -262,17 +280,6 @@ namespace BizHawk.MultiClient
|
|||
NumberOfScripts.Text = message;
|
||||
}
|
||||
|
||||
private void LuaListView_DoubleClick(object sender, EventArgs e)
|
||||
{
|
||||
MessageBox.Show("");
|
||||
//Toggle();
|
||||
}
|
||||
|
||||
private void LuaListView_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void moveUpToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
MoveUp();
|
||||
|
@ -354,6 +361,7 @@ namespace BizHawk.MultiClient
|
|||
indexes.Clear();
|
||||
DisplayLuaList();
|
||||
}
|
||||
UpdateNumberOfScripts();
|
||||
}
|
||||
|
||||
private void removeScriptToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
|
@ -491,9 +499,24 @@ namespace BizHawk.MultiClient
|
|||
private void LoadLuaFromRecent(string path)
|
||||
{
|
||||
LoadLuaFile(path);
|
||||
UpdateNumberOfScripts();
|
||||
}
|
||||
|
||||
private void LuaConsole_DragDrop(object sender, DragEventArgs e)
|
||||
private bool LuaAlreadyInSession(string path)
|
||||
{
|
||||
bool Validated = false;
|
||||
for (int i = 0; i < luaList.Count; i++)
|
||||
{
|
||||
if (path == luaList[i].Path)
|
||||
{
|
||||
Validated = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return Validated;
|
||||
}
|
||||
|
||||
private void LuaConsole_DragDrop(object sender, DragEventArgs e)
|
||||
{
|
||||
string[] filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
|
||||
if (Path.GetExtension(filePaths[0]) == (".lua") || Path.GetExtension(filePaths[0]) == (".txt"))
|
||||
|
@ -591,6 +614,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void cutToolStripButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
Toggle();
|
||||
RemoveScript();
|
||||
}
|
||||
|
||||
|
|
|
@ -133,17 +133,18 @@
|
|||
<data name="openToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp
|
||||
olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc
|
||||
8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5
|
||||
u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc
|
||||
08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3
|
||||
DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i
|
||||
l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM
|
||||
PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/
|
||||
hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU
|
||||
pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp
|
||||
41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC
|
||||
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
|
||||
k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
|
||||
TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
|
||||
AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
|
||||
BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
|
||||
UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
|
||||
CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
|
||||
F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
|
||||
rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
|
||||
NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
|
||||
59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
|
||||
AAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
|
Loading…
Reference in New Issue