diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj index 9f0cd3d..7b36cfa 100644 --- a/AuthenticationExample/AuthenticationExample.csproj +++ b/AuthenticationExample/AuthenticationExample.csproj @@ -14,6 +14,21 @@ 4 true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true @@ -57,8 +72,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll @@ -162,6 +177,18 @@ + + + False + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + diff --git a/AuthenticationExample/Properties/AssemblyInfo.cs b/AuthenticationExample/Properties/AssemblyInfo.cs index f4860bc..74aa330 100644 --- a/AuthenticationExample/Properties/AssemblyInfo.cs +++ b/AuthenticationExample/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config index 8d4209f..98a5b6b 100644 --- a/AuthenticationExample/packages.config +++ b/AuthenticationExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj index 180f200..b611311 100644 --- a/FDC3WPFExample/FDC3WPFExample.csproj +++ b/FDC3WPFExample/FDC3WPFExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/FDC3WPFExample/Properties/AssemblyInfo.cs b/FDC3WPFExample/Properties/AssemblyInfo.cs index f57f53a..334c1c8 100644 --- a/FDC3WPFExample/Properties/AssemblyInfo.cs +++ b/FDC3WPFExample/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/FDC3WPFExample/packages.config b/FDC3WPFExample/packages.config index 8d4209f..98a5b6b 100644 --- a/FDC3WPFExample/packages.config +++ b/FDC3WPFExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/FreestandingWPFExample/FreestandingWPFExample.csproj b/FreestandingWPFExample/FreestandingWPFExample.csproj index 8a032f7..4b39b0b 100644 --- a/FreestandingWPFExample/FreestandingWPFExample.csproj +++ b/FreestandingWPFExample/FreestandingWPFExample.csproj @@ -5,9 +5,9 @@ net5.0-windows true AnyCPU;x64 - 6.5.0.0 - 6.5.0.0 - 6.5.0 + 6.6.0.0 + 6.6.0.0 + 6.6.0 diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj index 8720074..74222f7 100644 --- a/MultiWindowExample/MultiWindowExample.csproj +++ b/MultiWindowExample/MultiWindowExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/MultiWindowExample/Properties/AssemblyInfo.cs b/MultiWindowExample/Properties/AssemblyInfo.cs index 4989d18..726913c 100644 --- a/MultiWindowExample/Properties/AssemblyInfo.cs +++ b/MultiWindowExample/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/MultiWindowExample/packages.config b/MultiWindowExample/packages.config index 8d4209f..98a5b6b 100644 --- a/MultiWindowExample/packages.config +++ b/MultiWindowExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WPFExample/Properties/AssemblyInfo.cs b/WPFExample/Properties/AssemblyInfo.cs index bfba6e3..f574271 100644 --- a/WPFExample/Properties/AssemblyInfo.cs +++ b/WPFExample/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/WPFExample/WPFExample.csproj b/WPFExample/WPFExample.csproj index 088bcf7..97d42f4 100644 --- a/WPFExample/WPFExample.csproj +++ b/WPFExample/WPFExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WPFExample/packages.config b/WPFExample/packages.config index 8d4209f..98a5b6b 100644 --- a/WPFExample/packages.config +++ b/WPFExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WPFExampleCore/WPFExampleCore.csproj b/WPFExampleCore/WPFExampleCore.csproj index 3896a81..e5f637e 100644 --- a/WPFExampleCore/WPFExampleCore.csproj +++ b/WPFExampleCore/WPFExampleCore.csproj @@ -5,7 +5,7 @@ net5.0-windows true AnyCPU;x64 - 6.5.0 + 6.6.0 @@ -13,7 +13,7 @@ - + diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj index 09b0ba1..fc99ef2 100644 --- a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj +++ b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj @@ -6,11 +6,11 @@ true WPFMultiWindowExampleCore.AppStartup AnyCPU;x64 - 6.5.0 + 6.6.0 - + diff --git a/WindowlessExample.Core/WindowlessExample.Core.csproj b/WindowlessExample.Core/WindowlessExample.Core.csproj index 5b63fd6..36b0fad 100644 --- a/WindowlessExample.Core/WindowlessExample.Core.csproj +++ b/WindowlessExample.Core/WindowlessExample.Core.csproj @@ -4,11 +4,11 @@ WinExe net5.0 AnyCPU;x64 - 6.5.0 + 6.6.0 - + diff --git a/WindowlessExample/Properties/AssemblyInfo.cs b/WindowlessExample/Properties/AssemblyInfo.cs index 84c7722..f1566df 100644 --- a/WindowlessExample/Properties/AssemblyInfo.cs +++ b/WindowlessExample/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj index 7666255..a03addb 100644 --- a/WindowlessExample/WindowlessExample.csproj +++ b/WindowlessExample/WindowlessExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config index 8d4209f..98a5b6b 100644 --- a/WindowlessExample/packages.config +++ b/WindowlessExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformExample/FormExample.cs b/WinformExample/FormExample.cs index 1c17c3c..fb6eca2 100644 --- a/WinformExample/FormExample.cs +++ b/WinformExample/FormExample.cs @@ -9,7 +9,6 @@ using System.Windows.Threading; using ChartIQ.Finsemble.DragAndDrop; using ChartIQ.Finsemble.Router; -using Newtonsoft.Json.Bson; using WinformExample.Controls; using Color = System.Drawing.Color; using ChartIQ.Finsemble.FDC3.Types; @@ -146,6 +145,13 @@ private async void FinsembleConnected(object sender, EventArgs e) FSBL.ConfigClient.GetValue(new JObject { ["field"] = "finsemble.components" }, HandleComponentsList); SetInitialWindowGrouping(FSBL.WindowClient.GetWindowGroups()); + SetInitialAlwaysOnTop(); + } + + private async void SetInitialAlwaysOnTop() + { + var isAlwaysOnTop = (await FSBL.FinsembleWindow.IsAlwaysOnTop(new JObject()))?["data"]?.ToObject() == true; + UpdateAlwaysOnTopButton(isAlwaysOnTop); } private void HandleContext(Context context) @@ -605,14 +611,9 @@ private void LinkerButton_Click(object sender, EventArgs e) } } - private async void AlwaysOnTopButton_Click(object sender, EventArgs e) + private void UpdateAlwaysOnTopButton(bool isAlwaysOnTop) { - var isAlwaysOnTop = await FSBL.WindowClient.IsAlwaysOnTop(); - - var newAlwaysOnTop = !isAlwaysOnTop; - await FSBL.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); - - if (newAlwaysOnTop) + if (isAlwaysOnTop) { AlwaysOnTopButton.ButtonColor = Color.FromArgb(3, 155, 255); AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); @@ -624,6 +625,16 @@ private async void AlwaysOnTopButton_Click(object sender, EventArgs e) } } + private async void AlwaysOnTopButton_Click(object sender, EventArgs e) + { + var isAlwaysOnTop = await FSBL.WindowClient.IsAlwaysOnTop(); + + var newAlwaysOnTop = !isAlwaysOnTop; + await FSBL.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); + + UpdateAlwaysOnTopButton(newAlwaysOnTop); + } + private void DockingButton_Click(object sender, EventArgs e) { var currentWindowName = FSBL.WindowClient.GetWindowIdentifier()["windowName"].ToString(); @@ -670,11 +681,6 @@ private void DragNDropEmittingButton_MouseDown(object sender, MouseEventArgs e) FSBL.DragAndDropClient.DragStartWithData(sender); } - private void DragNDropEmittingButton_Click(object sender, EventArgs e) - { - - } - protected override void OnFormClosing(FormClosingEventArgs e) { //Dispose of the FSSBL object when the form is closed so that Finsemble is aware we've closed diff --git a/WinformExample/Properties/AssemblyInfo.cs b/WinformExample/Properties/AssemblyInfo.cs index 73f381e..500c363 100644 --- a/WinformExample/Properties/AssemblyInfo.cs +++ b/WinformExample/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj index fdd5b39..7c1b556 100644 --- a/WinformExample/WinformExample.csproj +++ b/WinformExample/WinformExample.csproj @@ -56,8 +56,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformExample/packages.config b/WinformExample/packages.config index 9ff87f4..c0966e3 100644 --- a/WinformExample/packages.config +++ b/WinformExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformExampleCore/MainForm.cs b/WinformExampleCore/MainForm.cs index 48f2c2d..c17a01a 100644 --- a/WinformExampleCore/MainForm.cs +++ b/WinformExampleCore/MainForm.cs @@ -111,9 +111,16 @@ private async void Finsemble_Connected(object sender, EventArgs e) SetInitialWindowGrouping(_bridge.Clients.WindowClient.GetWindowGroups()); LoadAndSetButtonsFont(); + SetInitialAlwaysOnTop(); this.Visible = true; } + private async void SetInitialAlwaysOnTop() + { + var isAlwaysOnTop = (await _bridge.Clients.FinsembleWindow.IsAlwaysOnTop(new JObject())).response?["data"]?.ToObject() == true; + UpdateAlwaysOnTopButton(isAlwaysOnTop); + } + private void SetInitialWindowGrouping(JArray groupdWindowBelongsTo) { this.Invoke(new Action(() => @@ -469,12 +476,9 @@ private void SendButton_Click(object sender, EventArgs e) _bridge.Clients.Fdc3Client.DesktopAgentClient.Broadcast(new Context(param)); } - private async void AlwaysOnTopButton_Click(object sender, EventArgs e) + private void UpdateAlwaysOnTopButton(bool isAlwaysOnTop) { - var newAlwaysOnTop = !await _bridge.Clients.WindowClient.IsAlwaysOnTop(); - await _bridge.Clients.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); - - if (newAlwaysOnTop) + if (isAlwaysOnTop) { AlwaysOnTopButton.ButtonColor = Color.FromArgb(3, 155, 255); AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); @@ -486,6 +490,14 @@ private async void AlwaysOnTopButton_Click(object sender, EventArgs e) } } + private async void AlwaysOnTopButton_Click(object sender, EventArgs e) + { + var newAlwaysOnTop = !await _bridge.Clients.WindowClient.IsAlwaysOnTop(); + await _bridge.Clients.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); + + UpdateAlwaysOnTopButton(newAlwaysOnTop); + } + private void DockingButton_Click(object sender, EventArgs args) { diff --git a/WinformExampleCore/WinformExampleCore.csproj b/WinformExampleCore/WinformExampleCore.csproj index 06d9ae9..3d0ce32 100644 --- a/WinformExampleCore/WinformExampleCore.csproj +++ b/WinformExampleCore/WinformExampleCore.csproj @@ -5,7 +5,7 @@ net5.0-windows true AnyCPU;x64 - 6.5.0 + 6.6.0 @@ -23,7 +23,7 @@ - + diff --git a/WinformMultiWindowExample/Properties/AssemblyInfo.cs b/WinformMultiWindowExample/Properties/AssemblyInfo.cs index 28e3b28..dea527a 100644 --- a/WinformMultiWindowExample/Properties/AssemblyInfo.cs +++ b/WinformMultiWindowExample/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.5.0.0")] -[assembly: AssemblyFileVersion("6.5.0.0")] +[assembly: AssemblyVersion("6.6.0.0")] +[assembly: AssemblyFileVersion("6.6.0.0")] diff --git a/WinformMultiWindowExample/WinformMultiWindowExample.csproj b/WinformMultiWindowExample/WinformMultiWindowExample.csproj index c6fd0eb..aea5a94 100644 --- a/WinformMultiWindowExample/WinformMultiWindowExample.csproj +++ b/WinformMultiWindowExample/WinformMultiWindowExample.csproj @@ -56,8 +56,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformMultiWindowExample/packages.config b/WinformMultiWindowExample/packages.config index 8d4209f..98a5b6b 100644 --- a/WinformMultiWindowExample/packages.config +++ b/WinformMultiWindowExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj index ed1c16b..02aadef 100644 --- a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj +++ b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj @@ -5,11 +5,11 @@ net5.0-windows true AnyCPU;x64 - 6.5.0 + 6.6.0 - +