CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

fix null exception

Browse source
This commit is contained in:
Jaex 2015-02-16 16:21:19 +02:00
parent a128cb9c0b
commit 395be0d69c
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ShareX.HelpersLib/Automate/AutomateForm.cs
View file

@ -23,6 +23,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -34,6 +35,18 @@ namespace ShareX.HelpersLib
{
public partial class AutomateForm : Form
{
public string Script
{
get
{
return rtbInput.Text;
}
set
{
rtbInput.Text = value;
}
}
private FunctionManager functionManager = new FunctionManager();
private Tokenizer tokenizer = new Tokenizer();
private bool isWorking;
@ -43,8 +56,9 @@ public AutomateForm()
InitializeComponent();
Icon = ShareXResources.Icon;
tokenizer.Keywords = FunctionManager.Functions.Select(x => x.Key).ToArray();
Tokenize();
cbFunctions.Items.AddRange(tokenizer.Keywords);
cbFunctions.SelectedIndex = 0;
Tokenize();
}
private void rtbInput_TextChanged(object sender, EventArgs e)
@ -110,8 +124,8 @@ private void btnRun_Click(object sender, EventArgs e)
btnRun.Enabled = false;
string[] lines = rtbInput.Lines;
BackgroundWorker bw = new BackgroundWorker();
bw.DoWork += new DoWorkEventHandler(bw_DoWork);
bw.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bw_RunWorkerCompleted);
bw.DoWork += bw_DoWork;
bw.RunWorkerCompleted += bw_RunWorkerCompleted;
bw.RunWorkerAsync(lines);
}
}
@ -127,7 +141,7 @@ private void bw_DoWork(object sender, DoWorkEventArgs e)
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show(ex.ToString(), Resources.ExportImportControl_Serialize_Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

4
ShareX.HelpersLib/Automate/AutomateForm.resx
View file

@ -119,9 +119,9 @@
</resheader>
<data name="rtbInput.Text" xml:space="preserve">
<value>Wait 2000
Goto TestFunction
Call TestFunction
5 KeyPress key_z
3 Goto MyFunction
3 Call MyFunction
KeyPress return
Func TestFunction

5
ShareX.HelpersLib/Automate/Function.cs
View file

@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using System;
using System.Diagnostics;
using System.Threading;
using System.Windows.Forms;
@ -44,7 +45,7 @@ public Function()
public void Run()
{
Console.WriteLine(string.Format("{0}({1})", Name, string.Join(", ", Parameters)));
Debug.WriteLine("{0}({1})", Name, string.Join(", ", Parameters));
for (int i = 0; i < Loop; i++)
{
@ -61,7 +62,7 @@ protected virtual void Method()
}
}
public class Function_Goto : Function
public class Function_Call : Function
{
public override void Prepare()
{

9
ShareX.HelpersLib/Automate/FunctionManager.cs
View file

@ -35,10 +35,10 @@ public class FunctionManager
public static readonly Dictionary<string, Type> Functions = new Dictionary<string, Type>()
{
{ "Func", typeof(Function) },
{ "Goto", typeof(Function_Goto) },
{ "Call", typeof(Function_Call) },
{ "Wait", typeof(Function_Wait) },
{ "KeyDown", typeof(Function_KeyDown) },
{ "KeyUp", typeof(Function_KeyDown) },
{ "KeyUp", typeof(Function_KeyUp) },
{ "KeyPress", typeof(Function_KeyPress) },
{ "KeyPressText", typeof(Function_KeyPressText) },
{ "MouseDown", typeof(Function_MouseDown) },
@ -124,7 +124,10 @@ public bool Compile(string[] lines)
foreach (Function function in FunctionList)
{
function.Prepare();
if (function != null)
{
function.Prepare();
}
}
return true;