Skip to content

Commit 54bd409

Browse files
mpelleympelley
committed
Merge remote-tracking branch 'upstream/master' into ptx_22435
2 parents 3bc2da7 + 531ed08 commit 54bd409

File tree

29 files changed

+1385
-3
lines changed

29 files changed

+1385
-3
lines changed

‎ChapterWordle/WordCloudControl.cs

+8
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@ public override void DoLoad(IProgressInfo progress)
7272

7373
#endregion
7474

75+
#region Overridden Form methods
76+
protected override void OnHandleDestroyed(EventArgs e)
77+
{
78+
m_host.ActiveWindowSelectionChanged -= ActiveWindowSelectionChanged;
79+
base.OnHandleDestroyed(e);
80+
}
81+
#endregion
82+
7583
#region Event handlers
7684
private void Parent_VerseRefChanged(IPluginChildWindow sender, IVerseRef oldReference, IVerseRef newReference)
7785
{

‎ChapterWordle/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎Lib/WordCloud/WordCloud.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
<ErrorReport>prompt</ErrorReport>
6060
</PropertyGroup>
6161
<ItemGroup>
62+
<Reference Include="EmbeddedUiPluginInterfaces, Version=2.0.9.0, Culture=neutral, PublicKeyToken=583bede96b7c94a3, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\ParatextEmbeddedUiPluginInterfaces.2.0.9\lib\net461\EmbeddedUiPluginInterfaces.dll</HintPath>
64+
</Reference>
65+
<Reference Include="PluginInterfaces, Version=2.0.9.0, Culture=neutral, PublicKeyToken=583bede96b7c94a3, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\ParatextPluginInterfaces.2.0.9\lib\netstandard2.0\PluginInterfaces.dll</HintPath>
67+
</Reference>
6268
<Reference Include="System" />
6369
<Reference Include="System.Core">
6470
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -113,6 +119,9 @@
113119
<DependentUpon>CloudControl.cs</DependentUpon>
114120
</EmbeddedResource>
115121
</ItemGroup>
122+
<ItemGroup>
123+
<None Include="packages.config" />
124+
</ItemGroup>
116125
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
117126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
118127
Other similar extension points exist, see Microsoft.Common.targets.

‎Lib/WordCloud/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="ParatextEmbeddedUiPluginInterfaces" version="2.0.9" targetFramework="net461" />
4+
<package id="ParatextPluginInterfaces" version="2.0.9" targetFramework="net461" />
5+
</packages>

‎ParatextDemoPlugins.sln

+12-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "Paratext", "%ParatextInstal
3535
ProjectSection(DebuggerProjectSystem) = preProject
3636
PortSupplier = 00000000-0000-0000-0000-000000000000
3737
Executable = %ParatextInstallDir%\Paratext.exe
38-
RemoteMachine = HP-ELITEDESK
38+
RemoteMachine = DESKTOP-1N7JH49
3939
StartingDirectory = %ParatextInstallDir%
4040
Environment = Default
41-
LaunchingEngine = 00000000-0000-0000-0000-000000000000
41+
LaunchingEngine = fb0d4648-f776-4980-95f8-bb7f36ebc1ee
4242
UseLegacyDebugEngines = No
4343
LaunchSQLEngine = No
4444
AttachLaunchAction = No
@@ -55,6 +55,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferencePluginL", "Referen
5555
EndProject
5656
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferencePluginM", "ReferencePluginM\ReferencePluginM.csproj", "{C89E4F9E-B999-4814-936C-D39AE6FD1B68}"
5757
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferencePluginN", "ReferencePluginN\ReferencePluginN.csproj", "{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}"
59+
EndProject
5860
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferencePluginP", "ReferencePluginP\ReferencePluginP.csproj", "{D3AFDB38-9B97-4D5D-AB8C-910B81D815C5}"
5961
EndProject
6062
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferencePluginO", "ReferencePluginO\ReferencePluginO.csproj", "{D0CA0A07-A72B-4144-85E3-CFE340107E75}"
@@ -225,6 +227,14 @@ Global
225227
{C89E4F9E-B999-4814-936C-D39AE6FD1B68}.Release|Any CPU.Build.0 = Release|Any CPU
226228
{C89E4F9E-B999-4814-936C-D39AE6FD1B68}.Release|x64.ActiveCfg = Release|x64
227229
{C89E4F9E-B999-4814-936C-D39AE6FD1B68}.Release|x64.Build.0 = Release|x64
230+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
231+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
232+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Debug|x64.ActiveCfg = Debug|x64
233+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Debug|x64.Build.0 = Debug|x64
234+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
235+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Release|x64.ActiveCfg = Release|x64
237+
{5B2EC247-8076-4D98-AD0A-1EB6AAAD11DC}.Release|x64.Build.0 = Release|x64
228238
{D3AFDB38-9B97-4D5D-AB8C-910B81D815C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
229239
{D3AFDB38-9B97-4D5D-AB8C-910B81D815C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
230240
{D3AFDB38-9B97-4D5D-AB8C-910B81D815C5}.Debug|x64.ActiveCfg = Debug|x64

‎ParatextTestPlugin/EditTextControl.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void Parent_WindowClosing(IPluginChildWindow sender, System.ComponentMod
7979

8080
private void PromptAndSave(System.ComponentModel.CancelEventArgs cancelEventArgs = null)
8181
{
82-
if (lastSavedValue == EditText)
82+
if (!IsDisposed && lastSavedValue == EditText)
8383
return;
8484

8585
var result = MessageBox.Show(this, "Do you want to save the text?", ProjectTextEditorPlugin.pluginName,
@@ -127,6 +127,14 @@ protected override void OnEnter(EventArgs e)
127127
ObtainLock();
128128
}
129129

130+
protected override void OnHandleDestroyed(EventArgs e)
131+
{
132+
pluginFileLock?.Dispose();
133+
pluginFileLock = null;
134+
lastSavedValue = null;
135+
base.OnHandleDestroyed(e);
136+
}
137+
130138
private void ObtainLock()
131139
{
132140
if (pluginFileLock == null && project != null)

‎ParatextTestPlugin/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ParatextTipOfTheDayPlugin/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginA/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginB/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginC/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginE/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginF/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginG/ControlG.cs

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public override void OnAddedToParent(IPluginChildWindow parent, IWindowPluginHos
5454
}
5555

5656
m_UpdateThread = new Thread(UpdateTimeWorker);
57+
m_UpdateThread.IsBackground = true;
5758
m_UpdateThread.Start();
5859
}
5960

‎ReferencePluginG/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginH/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginI/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginJ/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginK/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginL/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎ReferencePluginM/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="PluginInterfaces" publicKeyToken="583bede96b7c94a3" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

0 commit comments

Comments
 (0)