diff --git a/.gitignore b/.gitignore index e37fc227..f83ffb81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,398 @@ +## 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/main/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/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ [Bb]in/ [Oo]bj/ +[Ll]og/ +[Ll]ogs/ -Localization/ja-JP/.vs/ +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ -Localization/ja-JP/Advanced Combat Tracker.exe +# Visual Studio 2017 auto generated files +Generated\ Files/ -*.user +# 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/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# 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 +*.tlog +*.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 + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# 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 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# 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/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# 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/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/Localization/en-US/ActLocalization.csproj b/Localization/en-US/ActLocalization.csproj index a4d84c6f..8f47aa6f 100644 --- a/Localization/en-US/ActLocalization.csproj +++ b/Localization/en-US/ActLocalization.csproj @@ -9,8 +9,9 @@ Properties ActLocalization ActLocalization_en-US - v4.0 + v4.7.2 512 + true @@ -20,6 +21,7 @@ TRACE;DEBUG;XMLINCLUDED prompt 4 + false pdbonly @@ -28,10 +30,11 @@ TRACE;XMLINCLUDED prompt 4 + false - C:\Program Files (x86)\Advanced Combat Tracker\Advanced Combat Tracker.exe + $(MSBuildProgramFiles32)\Advanced Combat Tracker\Advanced Combat Tracker.exe @@ -71,4 +74,8 @@ - + + IF NOT EXIST "$(APPDATA)\Advanced Combat Tracker\Plugins" mkdir "$(APPDATA)\Advanced Combat Tracker\Plugins" +IF Debug==$(ConfigurationName) copy /Y $(TargetPath) "$(APPDATA)\Advanced Combat Tracker\Plugins" + + \ No newline at end of file diff --git a/Localization/en-US/ActLocalizationPlugin.cs b/Localization/en-US/ActLocalizationPlugin.cs index 25d677b6..aa7399d9 100644 --- a/Localization/en-US/ActLocalizationPlugin.cs +++ b/Localization/en-US/ActLocalizationPlugin.cs @@ -7,12 +7,22 @@ [assembly: AssemblyTitle("ActLocalization en-US")] [assembly: AssemblyDescription("A sample of an ACT plugin that changes localization strings using XML resources.")] -[assembly: AssemblyVersion("276.0.0.0")] +[assembly: AssemblyVersion("276.0.1.0")] namespace ActLocalization { class ActLocalizationPlugin : IActPluginV1 { + void pluginScreenSpaceRemove(TabPage screenSpace) + { + Action removeControl = new Action(() => { screenSpace.Parent.Controls.Remove(screenSpace); }); + if (screenSpace.InvokeRequired) + { + screenSpace.Invoke(removeControl); + } + else + removeControl.Invoke(); + } public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) { //ActLocalization.InternalStrings.EditLocalizations(); @@ -74,8 +84,8 @@ public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) using (Stream s = asm.GetManifestResourceStream("ActLocalization.Advanced Combat Tracker.exe.FormXmlSettingsIO.xml")) ActGlobals.oFormXmlSettingsIO.ImportControlTextXML(s); } - pluginStatusText.Text = "Localization Complete"; - pluginScreenSpace.Parent.Controls.Remove(pluginScreenSpace); + ChangeLblStatus(pluginStatusText, "Localization Complete"); + pluginScreenSpaceRemove(pluginScreenSpace); } internal static bool TryEditLocalization(string Key, string Value) { @@ -91,5 +101,24 @@ internal static bool TryEditLocalization(string Key, string Value) public void DeInitPlugin() { } + + void ChangeLblStatus(Label label, String status) + { + + switch (label.InvokeRequired) + { + case true: + label.Invoke(new Action(() => + { + label.Text = status; + })); + break; + case false: + label.Text = status; + break; + default: + break; + } + } } } diff --git a/Localization/ja-JP/ActLocalization.csproj b/Localization/ja-JP/ActLocalization.csproj index a2b54831..6febca3e 100644 --- a/Localization/ja-JP/ActLocalization.csproj +++ b/Localization/ja-JP/ActLocalization.csproj @@ -7,10 +7,11 @@ {E8253A9D-199D-46A9-A017-572CD97701A0} Library Properties - ActLocalization - ActLocalization - v4.0 + ActLocalization_ja_JP + ActLocalization_ja_JP + v4.7.2 512 + true @@ -20,6 +21,7 @@ TRACE;DEBUG;XMLINCLUDED prompt 4 + false none @@ -28,10 +30,12 @@ TRACE;XMLINCLUDED prompt 4 + false - - .\Advanced Combat Tracker.exe + + False + $(MSBuildProgramFiles32)\Advanced Combat Tracker\Advanced Combat Tracker.exe False @@ -73,4 +77,8 @@ + + IF NOT EXIST "$(APPDATA)\Advanced Combat Tracker\Plugins" mkdir "$(APPDATA)\Advanced Combat Tracker\Plugins" +IF Debug==$(ConfigurationName) copy /Y $(TargetPath) "$(APPDATA)\Advanced Combat Tracker\Plugins" + \ No newline at end of file diff --git a/Localization/ja-JP/ActLocalizationPlugin.cs b/Localization/ja-JP/ActLocalizationPlugin.cs index 9efb5611..81553be5 100644 --- a/Localization/ja-JP/ActLocalizationPlugin.cs +++ b/Localization/ja-JP/ActLocalizationPlugin.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using System.Reflection; using System.Windows.Forms; using Advanced_Combat_Tracker; @@ -7,6 +8,17 @@ namespace ActLocalization { internal class ActLocalizationPlugin : IActPluginV1 { + void pluginScreenSpaceRemove(TabPage screenSpace) + { + Action removeControl = new Action(() => { screenSpace.Parent.Controls.Remove(screenSpace); }); + if (screenSpace.InvokeRequired) + { + screenSpace.Invoke(removeControl); + } + else + removeControl.Invoke(); + } + public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) { ActLocalization.InternalStrings.EditLocalizations(); @@ -57,12 +69,31 @@ public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) ActGlobals.oFormXmlSettingsIO.ImportControlTextXML(s); } - pluginStatusText.Text = "Localization Complete"; - pluginScreenSpace.Parent.Controls.Remove(pluginScreenSpace); + ChangeLblStatus(pluginStatusText, "Localization Complete"); + pluginScreenSpaceRemove(pluginScreenSpace); } public void DeInitPlugin() { } + + void ChangeLblStatus(Label label, String status) + { + + switch (label.InvokeRequired) + { + case true: + label.Invoke(new Action(() => + { + label.Text = status; + })); + break; + case false: + label.Text = status; + break; + default: + break; + } + } } } diff --git a/Plugins/ACT_Plugin_Sample/ACT_Plugin.csproj b/Plugins/ACT_Plugin_Sample/ACT_Plugin.csproj index 01c091fa..f06bda8b 100644 --- a/Plugins/ACT_Plugin_Sample/ACT_Plugin.csproj +++ b/Plugins/ACT_Plugin_Sample/ACT_Plugin.csproj @@ -1,4 +1,4 @@ - + Debug @@ -31,8 +31,8 @@ prompt 4 Program - C:\Program Files (x86)\Advanced Combat Tracker\Advanced Combat Tracker.exe - C:\Program Files (x86)\Advanced Combat Tracker\ + $(MSBuildProgramFiles32)\Advanced Combat Tracker\Advanced Combat Tracker.exe + $(MSBuildProgramFiles32)\Advanced Combat Tracker\ pdbonly @@ -52,7 +52,7 @@ --> - C:\Program Files (x86)\Advanced Combat Tracker\Advanced Combat Tracker.exe + $(MSBuildProgramFiles32)\Advanced Combat Tracker\Advanced Combat Tracker.exe False @@ -62,8 +62,10 @@ - - UserControl - + + + IF NOT EXIST "$(APPDATA)\Advanced Combat Tracker\Plugins" mkdir "$(APPDATA)\Advanced Combat Tracker\Plugins" +IF Debug==$(ConfigurationName) copy /Y $(TargetPath) "$(APPDATA)\Advanced Combat Tracker\Plugins" + diff --git a/Plugins/ACT_Plugin_Sample/PluginSample.cs b/Plugins/ACT_Plugin_Sample/PluginSample.cs index 6ba933bc..dae8f581 100644 --- a/Plugins/ACT_Plugin_Sample/PluginSample.cs +++ b/Plugins/ACT_Plugin_Sample/PluginSample.cs @@ -13,7 +13,7 @@ [assembly: AssemblyTitle("Sample Plugin")] [assembly: AssemblyDescription("A sample of an ACT plugin that is a UserControl and uses a settings file")] [assembly: AssemblyCompany("EQAditu")] -[assembly: AssemblyVersion("1.0.0.2")] +[assembly: AssemblyVersion("1.0.1.0")] namespace ACT_Plugin { @@ -94,14 +94,25 @@ public PluginSample() } Label lblStatus; // The status label that appears in ACT's Plugin tab - string settingsFile = Path.Combine(ActGlobals.oFormActMain.AppDataFolder.FullName, "Config\\PluginSample.config.xml"); + string settingsFile = Path.Combine(ActGlobals.oFormActMain.AppDataFolder.FullName, $"Config{Path.DirectorySeparatorChar}PluginSample.config.xml"); SettingsSerializer xmlSettings; + void pluginScreenSpaceAdd(TabPage screenSpace, Control control) + { + Action addControl = new Action(() => { screenSpace.Controls.Add(control); }); + if (screenSpace.InvokeRequired) + { + screenSpace.Invoke(addControl); + } + else + addControl.Invoke(); + } + #region IActPluginV1 Members public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) { lblStatus = pluginStatusText; // Hand the status label's reference to our local var - pluginScreenSpace.Controls.Add(this); // Add this UserControl to the tab ACT provides + pluginScreenSpaceAdd(pluginScreenSpace, this); // Add this UserControl to the tab ACT provides this.Dock = DockStyle.Fill; // Expand the UserControl to fill the tab's client space xmlSettings = new SettingsSerializer(this); // Create a new settings serializer and pass it this instance LoadSettings(); @@ -109,7 +120,7 @@ public void InitPlugin(TabPage pluginScreenSpace, Label pluginStatusText) // Create some sort of parsing event handler. After the "+=" hit TAB twice and the code will be generated for you. ActGlobals.oFormActMain.AfterCombatAction += new CombatActionDelegate(oFormActMain_AfterCombatAction); - lblStatus.Text = "Plugin Started"; + ChangeLblStatus("Plugin Started"); } public void DeInitPlugin() { @@ -133,45 +144,64 @@ void LoadSettings() if (File.Exists(settingsFile)) { - FileStream fs = new FileStream(settingsFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - XmlTextReader xReader = new XmlTextReader(fs); - - try + using(FileStream fs = new FileStream(settingsFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using(XmlTextReader xReader = new XmlTextReader(fs)) { - while (xReader.Read()) - { - if (xReader.NodeType == XmlNodeType.Element) + try { + while (xReader.Read()) { - if (xReader.LocalName == "SettingsSerializer") + if (xReader.NodeType == XmlNodeType.Element) { - xmlSettings.ImportFromXml(xReader); + if (xReader.LocalName == "SettingsSerializer") + { + xmlSettings.ImportFromXml(xReader); + } } } } + catch (Exception ex) + { + ChangeLblStatus($"Error loading settings: {ex.Message}"); + } } - catch (Exception ex) - { - lblStatus.Text = "Error loading settings: " + ex.Message; - } - xReader.Close(); } } + void SaveSettings() { - FileStream fs = new FileStream(settingsFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite); - XmlTextWriter xWriter = new XmlTextWriter(fs, Encoding.UTF8); - xWriter.Formatting = Formatting.Indented; - xWriter.Indentation = 1; - xWriter.IndentChar = '\t'; - xWriter.WriteStartDocument(true); - xWriter.WriteStartElement("Config"); // - xWriter.WriteStartElement("SettingsSerializer"); // - xmlSettings.ExportToXml(xWriter); // Fill the SettingsSerializer XML - xWriter.WriteEndElement(); // - xWriter.WriteEndElement(); // - xWriter.WriteEndDocument(); // Tie up loose ends (shouldn't be any) - xWriter.Flush(); // Flush the file buffer to disk - xWriter.Close(); + using(FileStream fs = new FileStream(settingsFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)) + using(XmlTextWriter xWriter = new XmlTextWriter(fs, Encoding.UTF8)) + { + xWriter.Formatting = Formatting.Indented; + xWriter.Indentation = 1; + xWriter.IndentChar = '\t'; + xWriter.WriteStartDocument(true); + xWriter.WriteStartElement("Config"); // + xWriter.WriteStartElement("SettingsSerializer"); // + xmlSettings.ExportToXml(xWriter); // Fill the SettingsSerializer XML + xWriter.WriteEndElement(); // + xWriter.WriteEndElement(); // + xWriter.WriteEndDocument(); // Tie up loose ends (shouldn't be any) + } } + + void ChangeLblStatus(String status) + { + + switch (lblStatus.InvokeRequired) + { + case true: + this.lblStatus.Invoke(new Action(() => + { + this.lblStatus.Text = status; + })); + break; + case false: + this.lblStatus.Text = status; + break; + default: + break; + } + } } }