From dabc4d0f4b820f74554e57a8ceb7413b795438a0 Mon Sep 17 00:00:00 2001 From: dt Date: Sun, 9 Aug 2020 11:17:12 -0700 Subject: [PATCH] Added assembly resolution system to permit DLLs to live in subfolder --- Babel/App.config | 4 +- Babel/Babel.cs | 34 ++++++++++++---- Babel/Babel.csproj | 4 +- Babel/Help/Images/_vti_cnf/autophrase.png | 9 ----- Babel/Help/Images/_vti_cnf/camera.png | 9 ----- Babel/Help/Images/_vti_cnf/crosshair.png | 9 ----- Babel/Help/Images/_vti_cnf/img11.gif | 9 ----- Babel/Help/Images/_vti_cnf/img17.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img18.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1B.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1C.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1E.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1E_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1F.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img1F_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img24.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img24_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img28.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img29.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img2C.gif | 12 ------ Babel/Help/Images/_vti_cnf/img3.jpg | 9 ----- Babel/Help/Images/_vti_cnf/img32.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img32_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img35.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img35_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img38.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img38_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img3B.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img3B_small.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img5.jpg | 9 ----- Babel/Help/Images/_vti_cnf/img6.jpg | 9 ----- Babel/Help/Images/_vti_cnf/img7.jpg | 12 ------ Babel/Help/Images/_vti_cnf/img7_small.jpg | 9 ----- Babel/Help/Images/_vti_cnf/imgA.gif | 9 ----- Babel/Help/Images/_vti_cnf/imgC.gif | 9 ----- Babel/Help/Images/_vti_cnf/imgE.jpg | 9 ----- Babel/Help/Images/_vti_cnf/imgF.gif | 9 ----- Babel/Help/Images/_vti_cnf/search-image.png | 9 ----- Babel/Help/google.html | 16 ++++---- Babel/Properties/Resources.Designer.cs | 44 +++++++++------------ Babel/packages.config | 2 +- 41 files changed, 59 insertions(+), 426 deletions(-) delete mode 100644 Babel/Help/Images/_vti_cnf/autophrase.png delete mode 100644 Babel/Help/Images/_vti_cnf/camera.png delete mode 100644 Babel/Help/Images/_vti_cnf/crosshair.png delete mode 100644 Babel/Help/Images/_vti_cnf/img11.gif delete mode 100644 Babel/Help/Images/_vti_cnf/img17.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img18.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1B.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1C.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1E.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1E_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1F.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img1F_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img24.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img24_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img28.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img29.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img2C.gif delete mode 100644 Babel/Help/Images/_vti_cnf/img3.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img32.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img32_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img35.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img35_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img38.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img38_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img3B.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img3B_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img5.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img6.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img7.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/img7_small.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/imgA.gif delete mode 100644 Babel/Help/Images/_vti_cnf/imgC.gif delete mode 100644 Babel/Help/Images/_vti_cnf/imgE.jpg delete mode 100644 Babel/Help/Images/_vti_cnf/imgF.gif delete mode 100644 Babel/Help/Images/_vti_cnf/search-image.png diff --git a/Babel/App.config b/Babel/App.config index 5fca069..20dcbeb 100644 --- a/Babel/App.config +++ b/Babel/App.config @@ -6,7 +6,7 @@ - + @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/Babel/Babel.cs b/Babel/Babel.cs index a507f45..bd719bd 100644 --- a/Babel/Babel.cs +++ b/Babel/Babel.cs @@ -8,7 +8,8 @@ using Babel.Google; using System.Windows.Input; using System.Configuration; -//using System.Runtime.Extensions; +using System.Reflection; +using System.IO; namespace Babel { @@ -82,11 +83,30 @@ public frmBabel() InitializeComponent(); } - /*private static Assembly MyResolveEventHandler(object sender, ResolveEventArgs args) + private static Assembly MyResolveEventHandler(object sender, ResolveEventArgs args) { - Console.WriteLine("Resolving..."); - return typeof(MyType).Assembly; - }*/ + string AssName = args.Name.Split(',')[0]; + string AssPath = Application.StartupPath + "\\DLLs\\" + AssName + ".dll"; + if (File.Exists(AssPath)) + { + return (Assembly.LoadFile(AssPath)); + } else + { + String[] IgnoredModules = + { + "Xamarin", + "Unity", + "Mono", + ".resources" + }; + bool IgnoredModule = false; + foreach(string module in IgnoredModules) + { if (args.Name.Contains(module)) IgnoredModule = true; } + if (!IgnoredModule) DebugLog.Log("Couldn't find assembly: " + args.Name); + return null; + } + //return typeof(MyType).Assembly; + } private void Viewfinder_Load(object sender, EventArgs e) { @@ -94,9 +114,9 @@ private void Viewfinder_Load(object sender, EventArgs e) DebugLog.Log("Babel starting"); LoadSettings(); - //AppDomain currentDomain = AppDomain.CurrentDomain; + AppDomain currentDomain = AppDomain.CurrentDomain; - //currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler); + currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler); if (Properties.Settings.Default.WaiverSigned != true) diff --git a/Babel/Babel.csproj b/Babel/Babel.csproj index dffa2d3..70f068b 100644 --- a/Babel/Babel.csproj +++ b/Babel/Babel.csproj @@ -8,7 +8,7 @@ WinExe Babel Babel - v4.6.1 + v4.7.1 512 true true @@ -29,6 +29,7 @@ false false true + AnyCPU @@ -237,6 +238,7 @@ True Resources.resx + True diff --git a/Babel/Help/Images/_vti_cnf/autophrase.png b/Babel/Help/Images/_vti_cnf/autophrase.png deleted file mode 100644 index 833d288..0000000 --- a/Babel/Help/Images/_vti_cnf/autophrase.png +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 04:15:27 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 04:15:27 -0000 -vti_cacheddtm:TX|08 Aug 2020 04:15:27 -0000 -vti_filesize:IR|1225 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/camera.png b/Babel/Help/Images/_vti_cnf/camera.png deleted file mode 100644 index 7b79949..0000000 --- a/Babel/Help/Images/_vti_cnf/camera.png +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 04:15:27 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 04:15:27 -0000 -vti_cacheddtm:TX|08 Aug 2020 04:15:27 -0000 -vti_filesize:IR|1628 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/crosshair.png b/Babel/Help/Images/_vti_cnf/crosshair.png deleted file mode 100644 index 273d73f..0000000 --- a/Babel/Help/Images/_vti_cnf/crosshair.png +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 04:15:27 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 04:15:27 -0000 -vti_cacheddtm:TX|08 Aug 2020 04:15:27 -0000 -vti_filesize:IR|459 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img11.gif b/Babel/Help/Images/_vti_cnf/img11.gif deleted file mode 100644 index f357e44..0000000 --- a/Babel/Help/Images/_vti_cnf/img11.gif +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 21:20:23 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 21:20:23 -0000 -vti_cacheddtm:TX|08 Aug 2020 21:20:23 -0000 -vti_filesize:IR|1381 diff --git a/Babel/Help/Images/_vti_cnf/img17.jpg b/Babel/Help/Images/_vti_cnf/img17.jpg deleted file mode 100644 index 1f4df56..0000000 --- a/Babel/Help/Images/_vti_cnf/img17.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 02:50:10 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 02:50:10 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:49 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:49 -0000 -vti_filesize:IR|8715 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|459 -vti_lastheight:IX|72 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img18.jpg b/Babel/Help/Images/_vti_cnf/img18.jpg deleted file mode 100644 index 20abec6..0000000 --- a/Babel/Help/Images/_vti_cnf/img18.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 02:51:12 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 02:51:12 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|24291 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|771 -vti_lastheight:IX|253 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1B.jpg b/Babel/Help/Images/_vti_cnf/img1B.jpg deleted file mode 100644 index ce8218f..0000000 --- a/Babel/Help/Images/_vti_cnf/img1B.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 02:52:50 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 02:52:50 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|6857 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|265 -vti_lastheight:IX|132 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1C.jpg b/Babel/Help/Images/_vti_cnf/img1C.jpg deleted file mode 100644 index 87a74b3..0000000 --- a/Babel/Help/Images/_vti_cnf/img1C.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 02:53:07 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 02:53:07 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|10389 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|404 -vti_lastheight:IX|208 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1E.jpg b/Babel/Help/Images/_vti_cnf/img1E.jpg deleted file mode 100644 index abeae28..0000000 --- a/Babel/Help/Images/_vti_cnf/img1E.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:31:01 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:31:01 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|49203 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|445 -vti_lastheight:IX|587 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1E_small.jpg b/Babel/Help/Images/_vti_cnf/img1E_small.jpg deleted file mode 100644 index 3348974..0000000 --- a/Babel/Help/Images/_vti_cnf/img1E_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:32:46 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:32:46 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|17719 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|242 -vti_lastheight:IX|320 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1F.jpg b/Babel/Help/Images/_vti_cnf/img1F.jpg deleted file mode 100644 index b10ec7b..0000000 --- a/Babel/Help/Images/_vti_cnf/img1F.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:32:36 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:32:36 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|23062 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|554 -vti_lastheight:IX|268 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img1F_small.jpg b/Babel/Help/Images/_vti_cnf/img1F_small.jpg deleted file mode 100644 index 77aee0a..0000000 --- a/Babel/Help/Images/_vti_cnf/img1F_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:32:43 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:32:43 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|7986 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|154 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img24.jpg b/Babel/Help/Images/_vti_cnf/img24.jpg deleted file mode 100644 index 4b1c6b4..0000000 --- a/Babel/Help/Images/_vti_cnf/img24.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:33:51 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:33:51 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|36072 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|448 -vti_lastheight:IX|360 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img24_small.jpg b/Babel/Help/Images/_vti_cnf/img24_small.jpg deleted file mode 100644 index 7c8d374..0000000 --- a/Babel/Help/Images/_vti_cnf/img24_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:33:54 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:33:54 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|18870 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|257 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img28.jpg b/Babel/Help/Images/_vti_cnf/img28.jpg deleted file mode 100644 index e2a406f..0000000 --- a/Babel/Help/Images/_vti_cnf/img28.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:35:18 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:35:18 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|10516 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|512 -vti_lastheight:IX|127 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img29.jpg b/Babel/Help/Images/_vti_cnf/img29.jpg deleted file mode 100644 index d0f02f3..0000000 --- a/Babel/Help/Images/_vti_cnf/img29.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:35:54 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:35:54 -0000 -vti_timecreated:TR|09 Aug 2020 03:36:50 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:36:50 -0000 -vti_filesize:IR|8320 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|233 -vti_lastheight:IX|175 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img2C.gif b/Babel/Help/Images/_vti_cnf/img2C.gif deleted file mode 100644 index d423d7a..0000000 --- a/Babel/Help/Images/_vti_cnf/img2C.gif +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 03:41:18 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 03:41:18 -0000 -vti_timecreated:TR|09 Aug 2020 03:51:13 -0000 -vti_cacheddtm:TX|09 Aug 2020 03:51:13 -0000 -vti_filesize:IR|5199 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|489 -vti_lastheight:IX|130 -vti_backlinkinfo:VX|BabelHelp/google.html diff --git a/Babel/Help/Images/_vti_cnf/img3.jpg b/Babel/Help/Images/_vti_cnf/img3.jpg deleted file mode 100644 index e6e848d..0000000 --- a/Babel/Help/Images/_vti_cnf/img3.jpg +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 20:01:15 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 20:01:15 -0000 -vti_cacheddtm:TX|08 Aug 2020 20:01:15 -0000 -vti_filesize:IR|76798 diff --git a/Babel/Help/Images/_vti_cnf/img32.jpg b/Babel/Help/Images/_vti_cnf/img32.jpg deleted file mode 100644 index 5654726..0000000 --- a/Babel/Help/Images/_vti_cnf/img32.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:51:17 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:51:17 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|101498 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|972 -vti_lastheight:IX|677 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img32_small.jpg b/Babel/Help/Images/_vti_cnf/img32_small.jpg deleted file mode 100644 index 58bfaf3..0000000 --- a/Babel/Help/Images/_vti_cnf/img32_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:51:19 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:51:19 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|15386 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|222 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img35.jpg b/Babel/Help/Images/_vti_cnf/img35.jpg deleted file mode 100644 index 0c96d0f..0000000 --- a/Babel/Help/Images/_vti_cnf/img35.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:52:22 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:52:22 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|102383 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|960 -vti_lastheight:IX|432 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img35_small.jpg b/Babel/Help/Images/_vti_cnf/img35_small.jpg deleted file mode 100644 index eceb860..0000000 --- a/Babel/Help/Images/_vti_cnf/img35_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:52:24 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:52:24 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|13217 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|144 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img38.jpg b/Babel/Help/Images/_vti_cnf/img38.jpg deleted file mode 100644 index c9f1dd4..0000000 --- a/Babel/Help/Images/_vti_cnf/img38.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:54:12 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:54:12 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|215739 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|974 -vti_lastheight:IX|671 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img38_small.jpg b/Babel/Help/Images/_vti_cnf/img38_small.jpg deleted file mode 100644 index 6a104f0..0000000 --- a/Babel/Help/Images/_vti_cnf/img38_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:55:04 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:55:04 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|30074 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|220 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img3B.jpg b/Babel/Help/Images/_vti_cnf/img3B.jpg deleted file mode 100644 index 63dfd5e..0000000 --- a/Babel/Help/Images/_vti_cnf/img3B.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:55:18 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:55:18 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|183823 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|964 -vti_lastheight:IX|670 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img3B_small.jpg b/Babel/Help/Images/_vti_cnf/img3B_small.jpg deleted file mode 100644 index 4ca45b0..0000000 --- a/Babel/Help/Images/_vti_cnf/img3B_small.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|09 Aug 2020 15:55:21 -0000 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_nexttolasttimemodified:TW|09 Aug 2020 15:55:21 -0000 -vti_timecreated:TR|09 Aug 2020 15:58:18 -0000 -vti_cacheddtm:TX|09 Aug 2020 15:58:18 -0000 -vti_filesize:IR|28647 -vti_extenderversion:SR|12.0.0.0 -vti_lastwidth:IX|320 -vti_lastheight:IX|222 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/Images/_vti_cnf/img5.jpg b/Babel/Help/Images/_vti_cnf/img5.jpg deleted file mode 100644 index 1e33c53..0000000 --- a/Babel/Help/Images/_vti_cnf/img5.jpg +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 20:13:08 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 20:13:08 -0000 -vti_cacheddtm:TX|08 Aug 2020 20:13:08 -0000 -vti_filesize:IR|21520 diff --git a/Babel/Help/Images/_vti_cnf/img6.jpg b/Babel/Help/Images/_vti_cnf/img6.jpg deleted file mode 100644 index fc3a188..0000000 --- a/Babel/Help/Images/_vti_cnf/img6.jpg +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 20:13:35 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 20:13:35 -0000 -vti_cacheddtm:TX|08 Aug 2020 20:13:35 -0000 -vti_filesize:IR|23264 diff --git a/Babel/Help/Images/_vti_cnf/img7.jpg b/Babel/Help/Images/_vti_cnf/img7.jpg deleted file mode 100644 index a35f86e..0000000 --- a/Babel/Help/Images/_vti_cnf/img7.jpg +++ /dev/null @@ -1,12 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TW|08 Aug 2020 20:55:58 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 20:55:58 -0000 -vti_nexttolasttimemodified:TW|08 Aug 2020 20:55:58 -0000 -vti_cacheddtm:TX|08 Aug 2020 20:55:58 -0000 -vti_filesize:IR|64962 -vti_lastwidth:IX|670 -vti_lastheight:IX|585 diff --git a/Babel/Help/Images/_vti_cnf/img7_small.jpg b/Babel/Help/Images/_vti_cnf/img7_small.jpg deleted file mode 100644 index a3e25e0..0000000 --- a/Babel/Help/Images/_vti_cnf/img7_small.jpg +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 20:56:00 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 20:56:00 -0000 -vti_cacheddtm:TX|08 Aug 2020 20:56:00 -0000 -vti_filesize:IR|16401 diff --git a/Babel/Help/Images/_vti_cnf/imgA.gif b/Babel/Help/Images/_vti_cnf/imgA.gif deleted file mode 100644 index 3a153c5..0000000 --- a/Babel/Help/Images/_vti_cnf/imgA.gif +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 21:06:29 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 21:06:29 -0000 -vti_cacheddtm:TX|08 Aug 2020 21:06:29 -0000 -vti_filesize:IR|3188 diff --git a/Babel/Help/Images/_vti_cnf/imgC.gif b/Babel/Help/Images/_vti_cnf/imgC.gif deleted file mode 100644 index 5d69c98..0000000 --- a/Babel/Help/Images/_vti_cnf/imgC.gif +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 21:10:49 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 21:10:49 -0000 -vti_cacheddtm:TX|08 Aug 2020 21:10:49 -0000 -vti_filesize:IR|1163 diff --git a/Babel/Help/Images/_vti_cnf/imgE.jpg b/Babel/Help/Images/_vti_cnf/imgE.jpg deleted file mode 100644 index f1d6a66..0000000 --- a/Babel/Help/Images/_vti_cnf/imgE.jpg +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 21:18:35 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 21:18:35 -0000 -vti_cacheddtm:TX|08 Aug 2020 21:18:35 -0000 -vti_filesize:IR|1946 diff --git a/Babel/Help/Images/_vti_cnf/imgF.gif b/Babel/Help/Images/_vti_cnf/imgF.gif deleted file mode 100644 index fb52887..0000000 --- a/Babel/Help/Images/_vti_cnf/imgF.gif +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 21:20:09 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_backlinkinfo:VX|BabelHelp/index.html -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 21:20:09 -0000 -vti_cacheddtm:TX|08 Aug 2020 21:20:09 -0000 -vti_filesize:IR|1408 diff --git a/Babel/Help/Images/_vti_cnf/search-image.png b/Babel/Help/Images/_vti_cnf/search-image.png deleted file mode 100644 index 5b0c08f..0000000 --- a/Babel/Help/Images/_vti_cnf/search-image.png +++ /dev/null @@ -1,9 +0,0 @@ -vti_encoding:SR|utf8-nl -vti_timelastmodified:TR|08 Aug 2020 04:15:27 -0000 -vti_extenderversion:SR|12.0.0.0 -vti_author:SR|MILO\\dthom -vti_modifiedby:SR|MILO\\dthom -vti_timecreated:TR|08 Aug 2020 04:15:27 -0000 -vti_cacheddtm:TX|08 Aug 2020 04:15:27 -0000 -vti_filesize:IR|1168 -vti_backlinkinfo:VX|BabelHelp/index.html diff --git a/Babel/Help/google.html b/Babel/Help/google.html index bb4f4cb..7fcfc6b 100644 --- a/Babel/Help/google.html +++ b/Babel/Help/google.html @@ -69,11 +69,11 @@

Create a Project

one.

You'll notice the ID field is highlighted here. That's the "Project Name" that you'll need later. If you make a new project, make sure you find this ID -and make a note of it. You can close this window now.

+and make a note of it. Close this window now.

Enable APIs

You need to enable two APIs, Cloud Vision and Cloud Translation. The easiest way to do this is to type their names in the search field at the -top:

+top (the one that says "Search products and resources":

Search field

Click on the API result and you should see this page:

API enable page

@@ -84,22 +84,22 @@

Create a Service Account

left, select IAM & Admin, and then Service Accounts:

Service account menu

-

From here, click Add Service Account:

+

From here, click Create Service Account:

Adding a service account

Put in whatever you like for the name and click Create.

Selecting roles

-

Now you need to specify the Roles to be assigned. Select Cloud -Translation API User as shown above, then click Add Another Role -and select Cloud Vision API User.

+

Now you need to specify the Roles to be assigned. Click the Select a +role box, then select Cloud +Translation API User as shown above.

Click Done on the next page. You should then see your new account:

New service account

Click on the name of the account, then Add New Key, and then Create New Key:

Create new key

-

Pick JSON in the popup. This will download a file. This is +

Pick JSON in the popup and click Create. This will download a file. This is your JSON keyfile. Put it in your Babel folder.

This absolutely cannot be stressed enough: This file will give a hacker @@ -110,7 +110,7 @@

Create a Service Account

Configure Babel with keyfile

Babel Settings dialog

Open Babel, go to the Settings, and configure as above. Use the Browse button -to select the keyfile you saved, and put the Project Name in the appropriate +to select the keyfile you saved, and put the Project Name in the appropriate field.

Click OK, and you're ready to use Babel!

diff --git a/Babel/Properties/Resources.Designer.cs b/Babel/Properties/Resources.Designer.cs index fd3939d..509fd77 100644 --- a/Babel/Properties/Resources.Designer.cs +++ b/Babel/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Babel.Properties -{ - - +namespace Babel.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace Babel.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Babel.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Babel/packages.config b/Babel/packages.config index fb8e6f4..657fa82 100644 --- a/Babel/packages.config +++ b/Babel/packages.config @@ -20,7 +20,7 @@ - + \ No newline at end of file