diff --git a/.gitignore b/.gitignore
index dfcfd56..a4e7334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,14 +19,15 @@ mono_crash.*
# Build results
[Dd]ebug/
[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
+#[Rr]elease/
+#[Rr]eleases/
x64/
x86/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
-[Bb]in/
+#[Bb]in/
+bin/Debug
[Oo]bj/
[Ll]og/
[Ll]ogs/
@@ -348,3 +349,9 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
+.vs/Genie3/v17/.suo
+obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+obj/Debug/Genie3.csproj.AssemblyReference.cache
+.vs/Genie3/v17/.suo
+*.cache
+bin/Plugins.dll
diff --git a/.gitignore.bak b/.gitignore.bak
new file mode 100644
index 0000000..18e421c
--- /dev/null
+++ b/.gitignore.bak
@@ -0,0 +1,359 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+#[Rr]elease/
+#[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+#[Bb]in/
+bin/Debug
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+.vs/Genie3/v17/.suo
+obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+obj/Debug/Genie3.csproj.AssemblyReference.cache
+.vs/Genie3/v17/.suo
+*.cache
+.vs/Genie3/v17/.suo
+bin/Plugins.dll
+obj/Debug/Genie3.csproj.AssemblyReference.cache
diff --git a/.vs/Genie3/project-colors.json b/.vs/Genie3/project-colors.json
index 487db96..300ba54 100644
--- a/.vs/Genie3/project-colors.json
+++ b/.vs/Genie3/project-colors.json
@@ -10,6 +10,11 @@
"ProjectGuid": "b0882700-5eaf-4712-ade5-69dafe473a01",
"DisplayName": "Interfaces",
"ColorIndex": 1
+ },
+ "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
+ "ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
+ "DisplayName": "Miscellaneous Files",
+ "ColorIndex": -1
}
},
"NextColorIndex": 2
diff --git a/.vs/Genie3/v16/.suo b/.vs/Genie3/v16/.suo
index 5a9cbbd..aa4ae9e 100644
Binary files a/.vs/Genie3/v16/.suo and b/.vs/Genie3/v16/.suo differ
diff --git a/.vs/Genie3/v17/.suo b/.vs/Genie3/v17/.suo
deleted file mode 100644
index f68ac5d..0000000
Binary files a/.vs/Genie3/v17/.suo and /dev/null differ
diff --git a/Core/Command.cs b/Core/Command.cs
index 49345f9..c6d2c22 100644
--- a/Core/Command.cs
+++ b/Core/Command.cs
@@ -60,7 +60,7 @@ public class Command
public delegate void EventStatusBarEventHandler(string sText, int iIndex);
- public event EventCopyDataEventHandler EventCopyData;
+ // public event EventCopyDataEventHandler EventCopyData;
public delegate void EventCopyDataEventHandler(string sDestination, string sData);
@@ -992,7 +992,9 @@ public string ParseCommand(string sText, bool bSendToGame = false, bool bUserInp
string argsVariable3 = "$" + oArgs[1].ToString();
VariableChanged(argsVariable3);
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
EchoText("Invalid #math expression: " + Utility.ArrayToString(oArgs, 1));
}
@@ -2314,7 +2316,11 @@ public string ParseCommand(string sText, bool bSendToGame = false, bool bUserInp
}
case "goto":
+ case "go":
+ case "g":
case "walk":
+ case "walkto":
+ case "path":
{
EventMapperCommand?.Invoke(sRow.Replace("#", "#mapper "));
break;
@@ -2322,6 +2328,7 @@ public string ParseCommand(string sText, bool bSendToGame = false, bool bUserInp
case "mapper":
case "map":
+ case "m":
{
EventMapperCommand?.Invoke(sRow);
break;
@@ -2568,7 +2575,9 @@ private void ShowHelp(string sFile = "index.txt")
objFile.Close();
}
}
+ #pragma warning disable CS0168
catch (FileNotFoundException ex)
+ #pragma warning restore CS0168
{
EchoText("Topic does not exist.");
}
@@ -2794,10 +2803,10 @@ private void ListVariables(string sPattern)
private void ListSubstitutes(string sPattern)
{
EchoText(Constants.vbNewLine + "Active substitutes: " + Constants.vbNewLine);
- bool bUsePattern = false;
+ // bool bUsePattern = false;
if (sPattern.Length > 0)
{
- bUsePattern = true;
+ // bUsePattern = true;
EchoText("Filter: " + sPattern + Constants.vbNewLine);
}
@@ -2833,10 +2842,10 @@ private void ListSubstitutes(string sPattern)
private void ListGags(string sPattern)
{
EchoText(Constants.vbNewLine + "Active gags: " + Constants.vbNewLine);
- bool bUsePattern = false;
+ // bool bUsePattern = false;
if (sPattern.Length > 0)
{
- bUsePattern = true;
+ // bUsePattern = true;
EchoText("Filter: " + sPattern + Constants.vbNewLine);
}
diff --git a/Core/Game.cs b/Core/Game.cs
index 0f3eb75..4242cd1 100644
--- a/Core/Game.cs
+++ b/Core/Game.cs
@@ -24,9 +24,6 @@ public Game(ref Globals cl)
{
m_oSocket = new Connection();
m_oGlobals = cl;
- // m_oBanned.Add("A92A093E4352F6B0B9FDAAF23B1E600CC1C4546A6206E1F8CF0EA59DFF324AB9", True)
- // m_oBanned.Add("DB7D3A74709A222515C6B8FAFEA9A6EE9E7593BA91733D0776AFD87A4B14B4E8", True)
- // m_oBanned.Add("D9198B4AB9EC86B4E2EC55596881A07AF8FCAC57C6BB6086463A6990E3015EFC", True)
}
public event EventPrintTextEventHandler EventPrintText;
@@ -193,7 +190,7 @@ private Globals m_oGlobals
private bool m_bUpdatingRoom = false;
private bool m_bUpdateRoomOnStreamEnd = false;
private string m_sRoomTitle = string.Empty;
- private Match m_oRegMatch;
+ // private Match m_oRegMatch;
private Hashtable m_oIndicatorHash = new Hashtable();
private Hashtable m_oCompassHash = new Hashtable();
private WindowTarget m_oTargetWindow = WindowTarget.Main;
@@ -207,6 +204,7 @@ private Globals m_oGlobals
public enum WindowTarget
{
Unknown,
+ Combat,
Main,
Inv,
Familiar,
@@ -450,6 +448,10 @@ public void SendText(string sText, bool bUserInput = false, string sOrigin = "")
sShowText = "[" + sOrigin + "]: " + sShowText;
}
+ // Maybe not needed
+ if (sOrigin.Equals("") && sShowText.Equals(""))
+ sShowText = sText;
+
if (bHideOutput == false)
{
Color color;
@@ -764,7 +766,9 @@ public string ProcessXML(string sXML)
{
oDocument.LoadXml("" + sXML + "");
}
+ #pragma warning disable CS0168
catch (XmlException ex)
+ #pragma warning restore CS0168
{
/* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */
return sReturn;
@@ -900,6 +904,7 @@ private void ParseRow(string sText)
case ConnectStates.ConnectedGameHandshake:
{
m_oConnectState = ConnectStates.ConnectedGame;
+ Thread.Sleep(1000);
m_oSocket.Send(Constants.vbLf + Constants.vbLf);
break;
}
@@ -995,7 +1000,7 @@ private void ParseKeyRow(string sText)
string argtext4 = "Listing characters:";
PrintError(argtext4);
string strUserKey = string.Empty;
- bool blnFoundMatch = false;
+ // bool blnFoundMatch = false;
for (int i = 5, loopTo = oData.Count - 1; i <= loopTo; i++)
{
if (i % 2 == 0)
@@ -1318,6 +1323,11 @@ private string ProcessXMLNodeElement(XmlNode oXmlNode)
var switchExpr3 = GetAttributeData(oXmlNode, argstrAttributeName13);
switch (switchExpr3)
{
+ case "combat":
+ {
+ m_oTargetWindow = WindowTarget.Combat;
+ break;
+ }
case "main":
{
m_oTargetWindow = WindowTarget.Main;
@@ -2647,6 +2657,12 @@ private void PrintTextToWindow(string text, Color color, Color bgcolor, WindowTa
break;
}
+ case WindowTarget.Combat:
+ {
+ sTargetWindowString = "combat";
+ break;
+ }
+
case WindowTarget.Familiar:
{
sTargetWindowString = "familiar";
@@ -2804,16 +2820,17 @@ private void PrintTextToWindow(string text, Color color, Color bgcolor, WindowTa
}
}
- if (targetwindow == WindowTarget.Main | targetwindow == WindowTarget.Thoughts)
+ if (targetwindow == WindowTarget.Main | targetwindow == WindowTarget.Thoughts | targetwindow == WindowTarget.Combat)
{
if (m_oGlobals.Config.bAutoLog == true)
{
- if (m_bLastRowWasPrompt == true)
- {
- m_oGlobals.Log?.LogText(Constants.vbNewLine, Conversions.ToString(m_oGlobals.VariableList["charactername"]), Conversions.ToString(m_oGlobals.VariableList["game"]));
- }
+ m_oGlobals.Log?.LogText(text, Conversions.ToString(m_oGlobals.VariableList["charactername"]), Conversions.ToString(m_oGlobals.VariableList["game"]));
+ //if (m_bLastRowWasPrompt == true)
+ //{
+ // m_oGlobals.Log?.LogText(text + System.Environment.NewLine, Conversions.ToString(m_oGlobals.VariableList["charactername"]), Conversions.ToString(m_oGlobals.VariableList["game"]));
+ //}
- //m_oGlobals.Log.LogText(text, Conversions.ToString(m_oGlobals.VariableList["charactername"]), Conversions.ToString(m_oGlobals.VariableList["game"]));
+ // m_oGlobals.Log.LogText(text, Conversions.ToString(m_oGlobals.VariableList["charactername"]), Conversions.ToString(m_oGlobals.VariableList["game"]));
}
}
diff --git a/Core/PluginHost.cs b/Core/PluginHost.cs
index edde1e7..5ddd87a 100644
--- a/Core/PluginHost.cs
+++ b/Core/PluginHost.cs
@@ -34,7 +34,6 @@ public void SendText(string Text)
public string get_Variable(string Var)
{
- string PluginKey = "";
if ((Var ?? "") == "GenieKey")
{
return m_oGlobals.GenieKey;
diff --git a/Forms/Components/ComponentIconBar.cs b/Forms/Components/ComponentIconBar.cs
index e225073..fc289df 100644
--- a/Forms/Components/ComponentIconBar.cs
+++ b/Forms/Components/ComponentIconBar.cs
@@ -112,7 +112,7 @@ private void AddImage(string sName)
private Bitmap ImageToGrayScale(Bitmap b)
{
- int iColor = 0;
+ // int iColor = 0;
var oOutput = new Bitmap(b.Width, b.Height);
for (int X = 0, loopTo = b.Width - 1; X <= loopTo; X++)
{
diff --git a/Forms/Components/ComponentPluginItem.Designer.cs b/Forms/Components/ComponentPluginItem.Designer.cs
index 8794f11..eb89cd7 100644
--- a/Forms/Components/ComponentPluginItem.Designer.cs
+++ b/Forms/Components/ComponentPluginItem.Designer.cs
@@ -29,7 +29,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/Components/ComponentRichTextBox.cs b/Forms/Components/ComponentRichTextBox.cs
index edbc73e..0bf8167 100644
--- a/Forms/Components/ComponentRichTextBox.cs
+++ b/Forms/Components/ComponentRichTextBox.cs
@@ -126,7 +126,7 @@ private struct CHARFORMAT2_STRUCT
/* TODO ERROR: Skipped EndRegionDirectiveTrivia */
/* TODO ERROR: Skipped EndRegionDirectiveTrivia */
private Win32Utility Win32Utility = new Win32Utility();
- private int m_iMaxScroll = int.MinValue;
+ // private int m_iMaxScroll = int.MinValue;
private int m_iEndLine = int.MinValue;
private FormSkin m_oParentForm;
private RichTextBox m_oRichTextBuffer = new RichTextBox();
@@ -388,8 +388,9 @@ private void AddToBuffer(string sText, Color oColor, Color oBgColor, bool bMono
if (sText.Length > 0)
{
- m_oRichTextBuffer.SelectedText = sText;
- ParseLineHighlight(iStart, sText);
+ m_oRichTextBuffer.SelectedText = sText;
+ //ParseLineHighlight(iStart, sText);
+ ParseLineHighlight(m_oRichTextBuffer.SelectionStart, sText);
}
}
@@ -673,7 +674,10 @@ private void InvokeAddRTF(string text)
SelectionStart = int.MaxValue;
SelectionLength = 0;
- SelectedRtf = text;
+
+ if (text != "")
+ SelectedRtf = text;
+
bool bScroll = true;
if (iFirstLineVisible + 2 >= m_iEndLine) // +2 extra lines
{
@@ -776,7 +780,7 @@ private void InvokeClearWindow()
m_bPendingNewLine = false;
}
- private void ComponentRichTextBox_GotFocus(object sender, EventArgs e)
+ public void ComponentRichTextBox_GotFocus(object sender, EventArgs e)
{
m_oParentForm.Focus();
}
@@ -785,7 +789,7 @@ private void ComponentRichTextBox_GotFocus(object sender, EventArgs e)
public delegate void EventKeyDownEventHandler(KeyEventArgs e);
- private void ComponentRichTextBox_KeyDown(object sender, KeyEventArgs e)
+ public void ComponentRichTextBox_KeyDown(object sender, KeyEventArgs e)
{
if (!(e.KeyData == Keys.PageUp | e.KeyData == Keys.PageDown))
{
@@ -798,7 +802,7 @@ private void ComponentRichTextBox_KeyDown(object sender, KeyEventArgs e)
public delegate void EventKeyPressEventHandler(KeyPressEventArgs e);
- private void ComponentRichTextBox_KeyPress(object sender, KeyPressEventArgs e)
+ public void ComponentRichTextBox_KeyPress(object sender, KeyPressEventArgs e)
{
EventKeyPress?.Invoke(e);
e.Handled = true;
@@ -806,12 +810,12 @@ private void ComponentRichTextBox_KeyPress(object sender, KeyPressEventArgs e)
private bool m_bMouseDown = false;
- private void ComponentRichTextBox_MouseDown(object sender, MouseEventArgs e)
+ public void ComponentRichTextBox_MouseDown(object sender, MouseEventArgs e)
{
m_bMouseDown = true;
}
- private void ComponentRichTextBox_MouseUp(object sender, MouseEventArgs e)
+ public void ComponentRichTextBox_MouseUp(object sender, MouseEventArgs e)
{
try
{
@@ -828,7 +832,9 @@ private void ComponentRichTextBox_MouseUp(object sender, MouseEventArgs e)
FlushBuffer();
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
}
// Ignore
diff --git a/Forms/ConfigPanels/UCPreset.Designer.cs b/Forms/ConfigPanels/UCPreset.Designer.cs
index 8c40bf7..1a687c7 100644
--- a/Forms/ConfigPanels/UCPreset.Designer.cs
+++ b/Forms/ConfigPanels/UCPreset.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/ConfigPanels/UCSettings.Designer.cs b/Forms/ConfigPanels/UCSettings.Designer.cs
index ea69f29..8e3cae7 100644
--- a/Forms/ConfigPanels/UCSettings.Designer.cs
+++ b/Forms/ConfigPanels/UCSettings.Designer.cs
@@ -23,7 +23,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/ConfigPanels/UCWindowSettings.Designer.cs b/Forms/ConfigPanels/UCWindowSettings.Designer.cs
index ba3bbc8..c5bf4e1 100644
--- a/Forms/ConfigPanels/UCWindowSettings.Designer.cs
+++ b/Forms/ConfigPanels/UCWindowSettings.Designer.cs
@@ -23,7 +23,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/ConfigPanels/UCWindowSettings.cs b/Forms/ConfigPanels/UCWindowSettings.cs
index 456b56b..76a9335 100644
--- a/Forms/ConfigPanels/UCWindowSettings.cs
+++ b/Forms/ConfigPanels/UCWindowSettings.cs
@@ -63,8 +63,11 @@ private void ButtonMonoFont_Click(object sender, EventArgs e)
m_ItemChanged = true;
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
+
TextBoxMonoFont.Text = "";
TextBoxMonoFont.Tag = null;
Interaction.MsgBox("Invalid font selected. Please select a TrueType font.", MsgBoxStyle.Critical);
@@ -87,7 +90,9 @@ private void ButtonInputFont_Click(object sender, EventArgs e)
m_ItemChanged = true;
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
TextBoxInputFont.Text = "";
TextBoxInputFont.Tag = null;
diff --git a/Forms/ConfigPanels/UCWindows.cs b/Forms/ConfigPanels/UCWindows.cs
index 09ef13f..496e313 100644
--- a/Forms/ConfigPanels/UCWindows.cs
+++ b/Forms/ConfigPanels/UCWindows.cs
@@ -372,7 +372,9 @@ private void ButtonFont_Click(object sender, EventArgs e)
m_ItemChanged = true;
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
TextBoxFont.Text = "";
TextBoxFont.Tag = null;
diff --git a/Forms/DialogChangelog.Designer.cs b/Forms/DialogChangelog.Designer.cs
index 70eeb50..0674975 100644
--- a/Forms/DialogChangelog.Designer.cs
+++ b/Forms/DialogChangelog.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogConnect.Designer.cs b/Forms/DialogConnect.Designer.cs
index f152cfc..cf66dbd 100644
--- a/Forms/DialogConnect.Designer.cs
+++ b/Forms/DialogConnect.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogDownload.Designer.cs b/Forms/DialogDownload.Designer.cs
index cb92387..1da97b9 100644
--- a/Forms/DialogDownload.Designer.cs
+++ b/Forms/DialogDownload.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogEdit.Designer.cs b/Forms/DialogEdit.Designer.cs
index 4a01ced..3fbaa40 100644
--- a/Forms/DialogEdit.Designer.cs
+++ b/Forms/DialogEdit.Designer.cs
@@ -29,7 +29,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogException.Designer.cs b/Forms/DialogException.Designer.cs
index e71dd69..1a1ae35 100644
--- a/Forms/DialogException.Designer.cs
+++ b/Forms/DialogException.Designer.cs
@@ -29,7 +29,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogKey.Designer.cs b/Forms/DialogKey.Designer.cs
index 6618618..d3f71ea 100644
--- a/Forms/DialogKey.Designer.cs
+++ b/Forms/DialogKey.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogProfileConnect.Designer.cs b/Forms/DialogProfileConnect.Designer.cs
index fcb2bf2..7a0db3f 100644
--- a/Forms/DialogProfileConnect.Designer.cs
+++ b/Forms/DialogProfileConnect.Designer.cs
@@ -29,7 +29,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogReconnect.Designer.cs b/Forms/DialogReconnect.Designer.cs
index 6fe15f2..8ccaf69 100644
--- a/Forms/DialogReconnect.Designer.cs
+++ b/Forms/DialogReconnect.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/DialogScriptName.Designer.cs b/Forms/DialogScriptName.Designer.cs
index 8c718f1..9be071f 100644
--- a/Forms/DialogScriptName.Designer.cs
+++ b/Forms/DialogScriptName.Designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/FormConfig.designer.cs b/Forms/FormConfig.designer.cs
index 9048275..fb168a3 100644
--- a/Forms/FormConfig.designer.cs
+++ b/Forms/FormConfig.designer.cs
@@ -24,7 +24,9 @@ protected override void Dispose(bool disposing)
}
// Required by the Windows Form Designer
+ #pragma warning disable 0649
private System.ComponentModel.IContainer components;
+ #pragma warning restore 0649
// NOTE: The following procedure is required by the Windows Form Designer
// It can be modified using the Windows Form Designer.
diff --git a/Forms/FormMain.cs b/Forms/FormMain.cs
index cd52cbe..1d10c2b 100644
--- a/Forms/FormMain.cs
+++ b/Forms/FormMain.cs
@@ -103,7 +103,9 @@ public FormMain()
{
File.Move(m_oGlobals.Config.ConfigDir + @"\config.xml", m_sConfigFile);
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
Interaction.MsgBox("Error: Unable to move config.xml to default.layout");
}
@@ -140,6 +142,7 @@ public Genie.Globals m_oGlobals
if (_m_oGlobals != null)
{
GenieError.EventGenieError -= HandleGenieException;
+ _m_oGlobals.Config.ConfigChanged -= Config_ConfigChanged;
_m_oGlobals.ConfigChanged -= Config_ConfigChanged;
}
@@ -147,7 +150,9 @@ public Genie.Globals m_oGlobals
if (_m_oGlobals != null)
{
GenieError.EventGenieError += HandleGenieException;
+ _m_oGlobals.Config.ConfigChanged += Config_ConfigChanged;
_m_oGlobals.ConfigChanged += Config_ConfigChanged;
+
}
}
}
@@ -422,8 +427,8 @@ private FormSkin m_oOutputMain
private FormSkin m_oOutputLog;
private ArrayList m_oFormList = new ArrayList();
private string m_sConfigFile = string.Empty;
- private string m_sUpdateVersion = string.Empty;
- private bool m_bIsUpdateMajor = false;
+ // private string m_sUpdateVersion = string.Empty;
+ // private bool m_bIsUpdateMajor = false;
private string m_sGenieKey = string.Empty;
private System.Text.RegularExpressions.Match m_oRegMatch;
@@ -552,7 +557,9 @@ private void LoadPlugin(string filename)
{
filename = Path.Combine(sPluginPath, filename);
}
+ #pragma warning disable CS0168
catch (ArgumentException ex)
+ #pragma warning restore CS0168
{
AppendText("Plugin not found: " + filename + Constants.vbNewLine);
return;
@@ -1164,8 +1171,7 @@ private void FormMain_KeyDown(object sender, KeyEventArgs e)
{
if (m_oGlobals.MacroList.Contains(e.KeyData) == true)
{
- m_oCommand.ParseCommand(((Genie.Macros.Macro)m_oGlobals.MacroList[e.KeyData]).sAction, true, true);
- string argsText = "";
+ string argsText = m_oCommand.ParseCommand(((Genie.Macros.Macro)m_oGlobals.MacroList[e.KeyData]).sAction, true, true);
var argoColor = Color.Transparent;
var argoBgColor = Color.Transparent;
Genie.Game.WindowTarget argoTargetWindow = Genie.Game.WindowTarget.Main;
@@ -2393,7 +2399,9 @@ private void SafeRemoveExitedScripts()
RemoveExitedScripts();
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
} // Don't care. Close
}
@@ -2968,7 +2976,9 @@ private void SafeAddScripts()
AddScripts();
}
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
} // Don't care
}
@@ -3329,13 +3339,18 @@ private void TextBoxInput_SendText(string sText)
try
{
m_CommandSent = true;
- m_oCommand.ParseCommand(sText, true, true);
string argsText = "";
+
+
+ //argsText += Constants.vbNewLine;
var argoColor = Color.Transparent;
var argoBgColor = Color.Transparent;
Genie.Game.WindowTarget argoTargetWindow = Genie.Game.WindowTarget.Main;
string argsTargetWindow = "";
- AddText(argsText, argoColor, argoBgColor, oTargetWindow: argoTargetWindow, sTargetWindow: argsTargetWindow); // For some stupid reason we need this. Probably because EndUpdate is fired before we are ready in the other thread.
+ m_oCommand.ParseCommand(sText, true, true);
+ AddText(argsText, argoColor, argoBgColor, oTargetWindow: argoTargetWindow, sTargetWindow: argsTargetWindow);
+
+ // AddText(argsText, argoColor, argoBgColor, oTargetWindow: argoTargetWindow, sTargetWindow: argsTargetWindow); // For some stupid reason we need this. Probably because EndUpdate is fired before we are ready in the other thread.
EndUpdate();
}
/* TODO ERROR: Skipped IfDirectiveTrivia */
@@ -3750,7 +3765,9 @@ private void TriggerAction(string sAction, ArrayList oArgs)
{
m_oCommand.ParseCommand(sAction, true, false, "Trigger");
}
+ #pragma warning disable CS0168
catch (Exception ex)
+ #pragma warning restore CS0168
{
string argsText = "Trigger action failed: " + sAction;
PrintError(argsText);
@@ -4143,6 +4160,8 @@ private void AddText(string sText, [Optional, DefaultParameterValue(Genie.Game.W
private void AddText(string sText, Color oColor, Color oBgColor, FormSkin oTargetWindow, bool bNoCache = true, bool bMono = false, bool bPrompt = false, bool bInput = false)
{
+ bPrompt = false;
+
if (IsDisposed)
{
return;
@@ -5395,8 +5414,7 @@ private void Game_EventRoundtime(int iTime)
{
if (InvokeRequired == true)
{
- var parameters = new[] { iTime };
- Invoke(new SetRoundtimeDelegate(SetRoundTime), parameters);
+ Invoke(new SetRoundtimeDelegate(SetRoundTime), iTime);
}
else
{
diff --git a/Forms/FormSkin.Designer.cs b/Forms/FormSkin.Designer.cs
index 40fcb14..fe8207d 100644
--- a/Forms/FormSkin.Designer.cs
+++ b/Forms/FormSkin.Designer.cs
@@ -32,123 +32,144 @@ protected override void Dispose(bool disposing)
[DebuggerStepThrough()]
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- _PanelContents = new Panel();
- _PanelContents.MouseEnter += new EventHandler(PanelContents_MouseEnter);
- _ContextMenuStripOutput = new ContextMenuStrip(components);
- _ClearToolStripMenuItem = new ToolStripMenuItem();
- _ClearToolStripMenuItem.Click += new EventHandler(ClearToolStripMenuItem_Click);
- _TimeStampToolStripMenuItem = new ToolStripMenuItem();
- _TimeStampToolStripMenuItem.Click += new EventHandler(TimeStampToolStripMenuItem_Click);
- _NameListOnlyToolStripMenuItem = new ToolStripMenuItem();
- _NameListOnlyToolStripMenuItem.Click += new EventHandler(NameListOnlyToolStripMenuItem_Click);
- _ToolStripSeparator1 = new ToolStripSeparator();
- _CloseWindowToolStripMenuItem = new ToolStripMenuItem();
- _CloseWindowToolStripMenuItem.Click += new EventHandler(CloseWindowToolStripMenuItem_Click);
- _RichTextBoxOutput = new ComponentRichTextBox();
- _RichTextBoxOutput.EventKeyDown += new ComponentRichTextBox.EventKeyDownEventHandler(MyKeyDown);
- _RichTextBoxOutput.EventKeyPress += new ComponentRichTextBox.EventKeyPressEventHandler(MyKeyPress);
- _RichTextBoxOutput.LinkClicked += new LinkClickedEventHandler(RichTextBoxOutput_LinkClicked);
- _PanelContents.SuspendLayout();
- _ContextMenuStripOutput.SuspendLayout();
- SuspendLayout();
+ this.components = new System.ComponentModel.Container();
+ this._PanelContents = new System.Windows.Forms.Panel();
+ this._RichTextBoxOutput = new GenieClient.ComponentRichTextBox();
+ this._ContextMenuStripOutput = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this._ClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this._TimeStampToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this._NameListOnlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this._ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this._CloseWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this._PanelContents.SuspendLayout();
+ this._ContextMenuStripOutput.SuspendLayout();
+ this.SuspendLayout();
//
- // PanelContents
+ // _PanelContents
//
- _PanelContents.BackColor = Color.Black;
- _PanelContents.Controls.Add(_RichTextBoxOutput);
- _PanelContents.Dock = DockStyle.Fill;
- _PanelContents.Location = new Point(0, 0);
- _PanelContents.Name = "PanelContents";
- _PanelContents.Size = new Size(300, 200);
- _PanelContents.TabIndex = 2;
- _PanelContents.Visible = false;
+ this._PanelContents.BackColor = System.Drawing.Color.Black;
+ this._PanelContents.Controls.Add(this._RichTextBoxOutput);
+ this._PanelContents.Dock = System.Windows.Forms.DockStyle.Fill;
+ this._PanelContents.Location = new System.Drawing.Point(0, 0);
+ this._PanelContents.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this._PanelContents.Name = "_PanelContents";
+ this._PanelContents.Size = new System.Drawing.Size(500, 385);
+ this._PanelContents.TabIndex = 2;
+ this._PanelContents.Visible = false;
+ this._PanelContents.MouseEnter += new System.EventHandler(this.PanelContents_MouseEnter);
//
- // ContextMenuStripOutput
+ // _RichTextBoxOutput
//
- _ContextMenuStripOutput.Items.AddRange(new ToolStripItem[] { _ClearToolStripMenuItem, _TimeStampToolStripMenuItem, _NameListOnlyToolStripMenuItem, _ToolStripSeparator1, _CloseWindowToolStripMenuItem });
- _ContextMenuStripOutput.Name = "ContextMenuStripOutput";
- _ContextMenuStripOutput.Size = new Size(156, 98);
+ this._RichTextBoxOutput.BackColor = System.Drawing.Color.Black;
+ this._RichTextBoxOutput.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this._RichTextBoxOutput.ContextMenuStrip = this._ContextMenuStripOutput;
+ this._RichTextBoxOutput.DetectUrls = false;
+ this._RichTextBoxOutput.Dock = System.Windows.Forms.DockStyle.Fill;
+ this._RichTextBoxOutput.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ this._RichTextBoxOutput.ForeColor = System.Drawing.Color.WhiteSmoke;
+ this._RichTextBoxOutput.FormParent = null;
+ this._RichTextBoxOutput.HideSelection = false;
+ this._RichTextBoxOutput.IsMainWindow = false;
+ this._RichTextBoxOutput.Location = new System.Drawing.Point(0, 0);
+ this._RichTextBoxOutput.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this._RichTextBoxOutput.MaxBufferSize = 500000;
+ this._RichTextBoxOutput.MonoFont = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ this._RichTextBoxOutput.Name = "_RichTextBoxOutput";
+ this._RichTextBoxOutput.NameListOnly = false;
+ this._RichTextBoxOutput.ReadOnly = true;
+ this._RichTextBoxOutput.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical;
+ this._RichTextBoxOutput.ShowSelectionMargin = true;
+ this._RichTextBoxOutput.Size = new System.Drawing.Size(500, 385);
+ this._RichTextBoxOutput.TabIndex = 7;
+ this._RichTextBoxOutput.Text = "";
+ this._RichTextBoxOutput.TimeStamp = false;
+ this._RichTextBoxOutput.Visible = false;
+ this._RichTextBoxOutput.EventKeyDown += new GenieClient.ComponentRichTextBox.EventKeyDownEventHandler(this.MyKeyDown);
+ this._RichTextBoxOutput.EventKeyPress += new GenieClient.ComponentRichTextBox.EventKeyPressEventHandler(this.MyKeyPress);
+ this._RichTextBoxOutput.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBoxOutput_LinkClicked);
+ this._RichTextBoxOutput.KeyDown += new System.Windows.Forms.KeyEventHandler(this._RichTextBoxOutput_KeyDown);
+ this._RichTextBoxOutput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this._RichTextBoxOutput_KeyPress);
+ this._RichTextBoxOutput.MouseUp += new System.Windows.Forms.MouseEventHandler(this._RichTextBoxOutput_MouseUp);
+ this._RichTextBoxOutput.MouseDown += new System.Windows.Forms.MouseEventHandler(_RichTextBoxOutput_MouseDown);
+
//
- // ClearToolStripMenuItem
+ // _ContextMenuStripOutput
//
- _ClearToolStripMenuItem.Name = "ClearToolStripMenuItem";
- _ClearToolStripMenuItem.Size = new Size(155, 22);
- _ClearToolStripMenuItem.Text = "Clear";
+ this._ContextMenuStripOutput.ImageScalingSize = new System.Drawing.Size(24, 24);
+ this._ContextMenuStripOutput.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this._ClearToolStripMenuItem,
+ this._TimeStampToolStripMenuItem,
+ this._NameListOnlyToolStripMenuItem,
+ this._ToolStripSeparator1,
+ this._CloseWindowToolStripMenuItem});
+ this._ContextMenuStripOutput.Name = "ContextMenuStripOutput";
+ this._ContextMenuStripOutput.Size = new System.Drawing.Size(205, 138);
//
- // TimeStampToolStripMenuItem
+ // _ClearToolStripMenuItem
//
- _TimeStampToolStripMenuItem.Name = "TimeStampToolStripMenuItem";
- _TimeStampToolStripMenuItem.Size = new Size(155, 22);
- _TimeStampToolStripMenuItem.Text = "Time Stamp";
+ this._ClearToolStripMenuItem.Name = "_ClearToolStripMenuItem";
+ this._ClearToolStripMenuItem.Size = new System.Drawing.Size(204, 32);
+ this._ClearToolStripMenuItem.Text = "Clear";
+ this._ClearToolStripMenuItem.Click += new System.EventHandler(this.ClearToolStripMenuItem_Click);
//
- // NameListOnlyToolStripMenuItem
+ // _TimeStampToolStripMenuItem
//
- _NameListOnlyToolStripMenuItem.Name = "NameListOnlyToolStripMenuItem";
- _NameListOnlyToolStripMenuItem.Size = new Size(155, 22);
- _NameListOnlyToolStripMenuItem.Text = "Name List Only";
+ this._TimeStampToolStripMenuItem.Name = "_TimeStampToolStripMenuItem";
+ this._TimeStampToolStripMenuItem.Size = new System.Drawing.Size(204, 32);
+ this._TimeStampToolStripMenuItem.Text = "Time Stamp";
+ this._TimeStampToolStripMenuItem.Click += new System.EventHandler(this.TimeStampToolStripMenuItem_Click);
//
- // ToolStripSeparator1
+ // _NameListOnlyToolStripMenuItem
//
- _ToolStripSeparator1.Name = "ToolStripSeparator1";
- _ToolStripSeparator1.Size = new Size(152, 6);
+ this._NameListOnlyToolStripMenuItem.Name = "_NameListOnlyToolStripMenuItem";
+ this._NameListOnlyToolStripMenuItem.Size = new System.Drawing.Size(204, 32);
+ this._NameListOnlyToolStripMenuItem.Text = "Name List Only";
+ this._NameListOnlyToolStripMenuItem.Click += new System.EventHandler(this.NameListOnlyToolStripMenuItem_Click);
//
- // CloseWindowToolStripMenuItem
+ // _ToolStripSeparator1
//
- _CloseWindowToolStripMenuItem.Name = "CloseWindowToolStripMenuItem";
- _CloseWindowToolStripMenuItem.Size = new Size(155, 22);
- _CloseWindowToolStripMenuItem.Text = "Close Window";
+ this._ToolStripSeparator1.Name = "_ToolStripSeparator1";
+ this._ToolStripSeparator1.Size = new System.Drawing.Size(201, 6);
//
- // RichTextBoxOutput
+ // _CloseWindowToolStripMenuItem
//
- _RichTextBoxOutput.BackColor = Color.Black;
- _RichTextBoxOutput.BorderStyle = BorderStyle.None;
- _RichTextBoxOutput.ContextMenuStrip = _ContextMenuStripOutput;
- _RichTextBoxOutput.DetectUrls = false;
- _RichTextBoxOutput.Dock = DockStyle.Fill;
- _RichTextBoxOutput.Font = new Font("Verdana", 9.0F, FontStyle.Regular, GraphicsUnit.Point, Conversions.ToByte(0));
- _RichTextBoxOutput.ForeColor = Color.WhiteSmoke;
- _RichTextBoxOutput.FormParent = null;
- _RichTextBoxOutput.HideSelection = false;
- _RichTextBoxOutput.IsMainWindow = false;
- _RichTextBoxOutput.Location = new Point(0, 0);
- _RichTextBoxOutput.MaxBufferSize = 500000;
- _RichTextBoxOutput.MonoFont = new Font("Courier New", 9.0F);
- _RichTextBoxOutput.Name = "RichTextBoxOutput";
- _RichTextBoxOutput.NameListOnly = false;
- _RichTextBoxOutput.ReadOnly = true;
- _RichTextBoxOutput.ScrollBars = RichTextBoxScrollBars.ForcedVertical;
- _RichTextBoxOutput.ShowSelectionMargin = true;
- _RichTextBoxOutput.Size = new Size(300, 200);
- _RichTextBoxOutput.TabIndex = 7;
- _RichTextBoxOutput.Text = "";
- _RichTextBoxOutput.TimeStamp = false;
- _RichTextBoxOutput.Visible = false;
+ this._CloseWindowToolStripMenuItem.Name = "_CloseWindowToolStripMenuItem";
+ this._CloseWindowToolStripMenuItem.Size = new System.Drawing.Size(204, 32);
+ this._CloseWindowToolStripMenuItem.Text = "Close Window";
+ this._CloseWindowToolStripMenuItem.Click += new System.EventHandler(this.CloseWindowToolStripMenuItem_Click);
//
// FormSkin
//
- AutoScaleDimensions = new SizeF(6.0F, 13.0F);
- AutoScaleMode = AutoScaleMode.Font;
- BackColor = Color.Black;
- ClientSize = new Size(300, 200);
- Controls.Add(_PanelContents);
- DoubleBuffered = true;
- FormBorderStyle = FormBorderStyle.None;
- MinimumSize = new Size(50, 50);
- Name = "FormSkin";
- StartPosition = FormStartPosition.Manual;
- _PanelContents.ResumeLayout(false);
- _ContextMenuStripOutput.ResumeLayout(false);
- DoubleClick += new EventHandler(FormSkin_DoubleClick);
- Load += new EventHandler(FormSkin_Load);
- Paint += new PaintEventHandler(FormSkin_Paint);
- MouseDown += new MouseEventHandler(FormSkin_MouseDown);
- MouseMove += new MouseEventHandler(FormSkin_MouseMove);
- Resize += new EventHandler(FormSkin_Resize);
- Enter += new EventHandler(FormSkin_Enter);
- VisibleChanged += new EventHandler(FormSkin_VisibleChanged);
- Shown += new EventHandler(FormSkin_Shown);
- ResumeLayout(false);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Black;
+ this.ClientSize = new System.Drawing.Size(500, 385);
+ this.Controls.Add(this._PanelContents);
+ this.DoubleBuffered = true;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.MinimumSize = new System.Drawing.Size(83, 96);
+ this.Name = "FormSkin";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+ this.Load += new System.EventHandler(this.FormSkin_Load);
+ this.Shown += new System.EventHandler(this.FormSkin_Shown);
+ this.VisibleChanged += new System.EventHandler(this.FormSkin_VisibleChanged);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.FormSkin_Paint);
+ this.DoubleClick += new System.EventHandler(this.FormSkin_DoubleClick);
+ this.Enter += new System.EventHandler(this.FormSkin_Enter);
+ this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FormSkin_MouseDown);
+ this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FormSkin_MouseMove);
+ this.GotFocus += FormSkin_GotFocus;
+ this.Resize += new System.EventHandler(this.FormSkin_Resize);
+ this._PanelContents.ResumeLayout(false);
+ this._ContextMenuStripOutput.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ private void FormSkin_GotFocus(object sender, EventArgs e)
+ {
+ this._RichTextBoxOutput.ComponentRichTextBox_GotFocus(sender, e);
}
private Panel _PanelContents;
diff --git a/Forms/FormSkin.cs b/Forms/FormSkin.cs
index 21bf3e6..ca6a115 100644
--- a/Forms/FormSkin.cs
+++ b/Forms/FormSkin.cs
@@ -793,5 +793,25 @@ private void RichTextBoxOutput_LinkClicked(object sender, LinkClickedEventArgs e
{
EventLinkClicked?.Invoke(e.LinkText);
}
+
+ private void _RichTextBoxOutput_KeyDown(object sender, KeyEventArgs e)
+ {
+ this._RichTextBoxOutput.ComponentRichTextBox_KeyDown(sender, e);
+ }
+
+ private void _RichTextBoxOutput_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ this._RichTextBoxOutput.ComponentRichTextBox_KeyPress(sender,e);
+ }
+
+ private void _RichTextBoxOutput_MouseUp(object sender, MouseEventArgs e)
+ {
+ this._RichTextBoxOutput.ComponentRichTextBox_MouseUp(sender, e);
+ }
+
+ private void _RichTextBoxOutput_MouseDown(object sender, MouseEventArgs e)
+ {
+ this._RichTextBoxOutput.ComponentRichTextBox_MouseDown(sender, e);
+ }
}
}
\ No newline at end of file
diff --git a/Forms/FormSkin.resx b/Forms/FormSkin.resx
index ff8aaf4..5a9610c 100644
--- a/Forms/FormSkin.resx
+++ b/Forms/FormSkin.resx
@@ -1,64 +1,4 @@
-
-
@@ -117,7 +57,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
\ No newline at end of file
diff --git a/Forms/ScriptExplorer.cs b/Forms/ScriptExplorer.cs
index d192ab1..d56a21b 100644
--- a/Forms/ScriptExplorer.cs
+++ b/Forms/ScriptExplorer.cs
@@ -83,7 +83,9 @@ private void AddDirectories(TreeNode tn, string sScriptDir)
// Get an array of all sub-directories as DirectoryInfo objects
adiDirectories = diDirectory.GetDirectories();
}
+ #pragma warning disable CS0168
catch (Exception exp)
+ #pragma warning restore CS0168
{
return;
}
@@ -112,7 +114,9 @@ private void AddFiles(TreeNode tn, string sScriptDir)
// Get an array of all files as FileInfo objects
adiFiles = diDirectory.GetFiles();
}
+ #pragma warning disable CS0168
catch (Exception exp)
+ #pragma warning restore CS0168
{
return;
}
diff --git a/Genie3.csproj b/Genie3.csproj
index 62b73b1..706c8d1 100644
--- a/Genie3.csproj
+++ b/Genie3.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -24,8 +24,9 @@
3.5
- Plugin\GenieStrongKey2020.pfx
- v4.0
+
+
+ v4.8
$(DefaultItemExcludes);$(ProjectDir)**\*.vb
latest
@@ -59,6 +60,7 @@
AllRules.ruleset
+ false
None
@@ -71,13 +73,25 @@
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355
AnyCPU
AllRules.ruleset
+ false
-
+
+ False
+ Libs\Antlr3.Runtime.dll
+ False
+
+
+ False
+ Libs\Interfaces.dll
+ False
+
False
Libs\Jint.dll
+ False
+
@@ -301,17 +315,13 @@
-
- True
- True
- Settings.settings
-
+
@@ -509,7 +519,6 @@
ScriptExplorer.cs
-
SettingsSingleFileGenerator
@@ -594,12 +603,6 @@
-
-
- {B0882700-5EAF-4712-ADE5-69DAFE473A01}
- Interfaces
-
-
UCWindowSettings.cs
@@ -653,6 +656,20 @@
+
+
+ {b0882700-5eaf-4712-ade5-69dafe473a01}
+ Plugins
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bin/Plugins.xml b/bin/Plugins.xml
new file mode 100644
index 0000000..2853e87
--- /dev/null
+++ b/bin/Plugins.xml
@@ -0,0 +1,10 @@
+
+
+
+
+Plugins
+
+
+
+
+
diff --git a/bin/Release/Genie.exe b/bin/Release/Genie.exe
new file mode 100644
index 0000000..ebcede8
Binary files /dev/null and b/bin/Release/Genie.exe differ
diff --git a/bin/Release/Genie.exe.config b/bin/Release/Genie.exe.config
new file mode 100644
index 0000000..506bf6e
--- /dev/null
+++ b/bin/Release/Genie.exe.config
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/Release/Plugins.dll b/bin/Release/Plugins.dll
new file mode 100644
index 0000000..28814fb
Binary files /dev/null and b/bin/Release/Plugins.dll differ
diff --git a/bin/Release/Plugins.xml b/bin/Release/Plugins.xml
new file mode 100644
index 0000000..2853e87
--- /dev/null
+++ b/bin/Release/Plugins.xml
@@ -0,0 +1,10 @@
+
+
+
+
+Plugins
+
+
+
+
+
diff --git a/genie3 b/genie3
deleted file mode 160000
index d504ed9..0000000
--- a/genie3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d504ed9ec82abe7797fe79be5ff0efb00e10ce60
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 0cb2c6a..39a8fb2 100644
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/obj/Debug/Genie3.csproj.AssemblyReference.cache b/obj/Debug/Genie3.csproj.AssemblyReference.cache
deleted file mode 100644
index b9bbb13..0000000
Binary files a/obj/Debug/Genie3.csproj.AssemblyReference.cache and /dev/null differ