Skip to content

Commit

Permalink
Release 5.2.0 (#44)
Browse files Browse the repository at this point in the history
* 5.1.0 Release

* 5.2.0 changes part 1

* Updated version fo fsbl for 5.2.0 release

* updates for 5.2.0 part 2

Co-authored-by: kkirkeide <[email protected]>
  • Loading branch information
sgd2z and kyle-ciq authored Dec 22, 2020
1 parent a0a989b commit 7b2f0b9
Show file tree
Hide file tree
Showing 37 changed files with 619 additions and 420 deletions.
10 changes: 5 additions & 5 deletions AuthenticationExample/AuthenticationExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,8 @@
<Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
</Reference>
<Reference Include="Finsemble, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.4.5.0\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Reference Include="Finsemble, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand All @@ -116,6 +113,9 @@
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
</Reference>
<Reference Include="PInvoke.Windows.Core, Version=0.6.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
<HintPath>..\packages\PInvoke.Windows.Core.0.6.49\lib\net20\PInvoke.Windows.Core.dll</HintPath>
</Reference>
<Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
</Reference>
Expand Down
52 changes: 48 additions & 4 deletions AuthenticationExample/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,56 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:AuthenticationExample"
mc:Ignorable="d"
Title="MainWindow" Height="350" Width="525"
Title="MainWindow" Height="300" Width="350"
Closing="Window_Closing">
<Window.Resources>
<Style TargetType="TextBox">
<Setter Property="Margin" Value="5" />
</Style>
<Style TargetType="Button" >
<Setter Property="Margin" Value="5" />
</Style>
</Window.Resources>
<Grid>
<TextBox Name="UserName" HorizontalAlignment="Left" Height="23" Margin="177,72,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="120"/>
<TextBox Name="Password" HorizontalAlignment="Left" Height="23" Margin="177,113,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="120"/>
<Button Content="Button" HorizontalAlignment="Left" Margin="177,162,0,0" VerticalAlignment="Top" Width="120" Click="Button_Click"/>
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="0.5*"></RowDefinition>
<RowDefinition Height="0.5*"></RowDefinition>
<RowDefinition Height="0.5*"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBox Grid.Row="1" Grid.Column="1" Name="UserName" />
<TextBlock Grid.Row="1" Grid.Column="1" IsHitTestVisible="False" TextWrapping="Wrap" Margin="10, 5" Text="Username" Foreground="DarkGray">
<TextBlock.Style>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Text, ElementName=UserName}" Value="">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<TextBox Grid.Row="2" Grid.Column="1" Name="Password" />
<TextBlock Grid.Row="2" Grid.Column="1" IsHitTestVisible="False" TextWrapping="Wrap" Margin="10, 5" Text="Password" Foreground="DarkGray">
<TextBlock.Style>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Text, ElementName=Password}" Value="">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<Button Grid.Row="3" Grid.Column="1" Click="PublishCredentials_Click">Publish credentials</Button>

</Grid>
</Window>
20 changes: 4 additions & 16 deletions AuthenticationExample/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using ChartIQ.Finsemble;
using ChartIQ.Finsemble;
using Newtonsoft.Json.Linq;
using System;
using System.Windows;

namespace AuthenticationExample
{
Expand Down Expand Up @@ -50,7 +38,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
});
}

private void Button_Click(object sender, RoutedEventArgs e)
private void PublishCredentials_Click(object sender, RoutedEventArgs e)
{
finsemble.AuthenticationClient.PublishAuthorization(UserName.Text, JObject.FromObject(new Credentials(Guid.NewGuid().ToString())));
}
Expand Down
4 changes: 2 additions & 2 deletions AuthenticationExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("4.5.0.0")]
[assembly: AssemblyFileVersion("4.5.0.0")]
[assembly: AssemblyVersion("5.2.0.0")]
[assembly: AssemblyFileVersion("5.2.0.0")]
6 changes: 3 additions & 3 deletions AuthenticationExample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="4.5.0" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
<package id="Finsemble" version="5.2.0" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
<package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net452" />
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net452" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net452" />
Expand Down
8 changes: 0 additions & 8 deletions MultiWindowExample/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
<assemblyIdentity name="WebSocket4Net" publicKeyToken="eb4e154b696bf72a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.15.2.11" newVersion="0.15.2.11" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Openfin.WinForm" publicKeyToken="18a277d64dddd680" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.3.3" newVersion="8.1.3.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="OpenfinDesktop" publicKeyToken="18a277d64dddd680" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.1.1.0" newVersion="14.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
Expand Down
12 changes: 2 additions & 10 deletions MultiWindowExample/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Windows;
using System.Windows.Threading;
using ChartIQ.Finsemble;
using log4net;
using Microsoft.Shell;

namespace MultiWindowExample
Expand All @@ -17,10 +16,6 @@ namespace MultiWindowExample
/// </summary>
public partial class App : Application, ISingleInstanceApp
{
/// <summary>
/// The logger
/// </summary>
private static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

private static readonly object lockObj = new object();

Expand Down Expand Up @@ -67,7 +62,6 @@ public static void Main(string[] args)
// then ensure that we always release the mutex
if (SingleInstance<App>.InitializeAsFirstInstance(Unique))
{

application = new App();

// If window type passed for initial launch, add listener to launch window when connected.
Expand All @@ -94,9 +88,7 @@ public static void Main(string[] args)
// Allow single instance code to perform cleanup operations
SingleInstance<App>.Cleanup();
}

}

}

/// <summary>
Expand Down Expand Up @@ -146,7 +138,7 @@ private static bool LaunchWindow(IList<string> args)

if (window == null)
{
Logger.Error($"Could not create window: {name}");
Debug.Write($"Could not create window: {name}");
}
else
{
Expand All @@ -158,7 +150,7 @@ private static bool LaunchWindow(IList<string> args)
IIntegratable fsblWin = window as IIntegratable;
if (fsblWin == null)
{
Logger.Warn($"The window \"{name}\" is not a window that can be integrated into Finsemble.");
Debug.Write($"The window \"{name}\" is not a window that can be integrated into Finsemble.");
}
else
{
Expand Down
10 changes: 5 additions & 5 deletions MultiWindowExample/MultiWindowExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
</Reference>
<Reference Include="Finsemble, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.4.5.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
Expand All @@ -76,6 +76,9 @@
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
</Reference>
<Reference Include="PInvoke.Windows.Core, Version=0.6.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
<HintPath>..\packages\PInvoke.Windows.Core.0.6.49\lib\net20\PInvoke.Windows.Core.dll</HintPath>
</Reference>
<Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -163,9 +166,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="log4net.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("4.5.0.0")]
[assembly: AssemblyFileVersion("4.5.0.0")]
[assembly: AssemblyVersion("5.2.0.0")]
[assembly: AssemblyFileVersion("5.2.0.0")]
46 changes: 26 additions & 20 deletions MultiWindowExample/Window1.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System.Reflection;
using ChartIQ.Finsemble;
using System.Windows;
using System.Windows.Media;
using ChartIQ.Finsemble;
using log4net;
using ChartIQ.Finsemble.Models;

namespace MultiWindowExample
{
Expand All @@ -11,11 +10,6 @@ namespace MultiWindowExample
/// </summary>
public partial class Window1 : Window, IIntegratable
{
/// <summary>
/// The logger
/// </summary>
private static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

private Finsemble fsbl;

public Window1()
Expand All @@ -32,18 +26,30 @@ public void SetFinsemble(Finsemble fsbl)
FinsembleHeader.SetBridge(fsbl); // The Header Control needs a connected finsemble instance

//Styling the Finsemble Header
FinsembleHeader.SetActiveBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F")));
FinsembleHeader.SetInactiveBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F")));
FinsembleHeader.SetButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetInactiveButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetCloseButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666")));
FinsembleHeader.SetInactiveCloseButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666")));
FinsembleHeader.SetDockingButtonDockedBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetTitleForeground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0")));
FinsembleHeader.SetButtonForeground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0")));

FinsembleHeader.SetButtonFont(null, 8, FontStyles.Normal, FontWeights.Normal);
FinsembleHeader.SetTitleFont(null, 12, FontStyles.Normal, FontWeights.SemiBold);
FinsembleHeader.GetHandlingService().ActiveBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F"));
FinsembleHeader.GetHandlingService().InactiveBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F"));
FinsembleHeader.GetHandlingService().ButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().InactiveButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().CloseButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666"));
FinsembleHeader.GetHandlingService().InactiveCloseButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666"));
FinsembleHeader.GetHandlingService().DockingButtonDockedBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().TitleForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0"));
FinsembleHeader.GetHandlingService().ButtonForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0"));

FinsembleHeader.GetHandlingService().ButtonFont = new TitlebarFontConfiguration()
{
FontFamily = null,
FontSize = 8,
FontStyle = FontStyles.Normal,
FontWeight = FontWeights.Normal
};
FinsembleHeader.GetHandlingService().TitleFont = new TitlebarFontConfiguration()
{
FontFamily = null,
FontSize = 12,
FontStyle = FontStyles.Normal,
FontWeight = FontWeights.SemiBold
};

fsbl.DragAndDropClient.SetScrim(Scrim); // The Scrim Label Control is used for drag and drop.

Expand Down
37 changes: 25 additions & 12 deletions MultiWindowExample/Window2.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Windows;
using System.Windows.Media;
using ChartIQ.Finsemble;
using ChartIQ.Finsemble.Models;

namespace MultiWindowExample
{
Expand All @@ -25,18 +26,30 @@ public void SetFinsemble(Finsemble fsbl)
FinsembleHeader.SetBridge(fsbl); // The Header Control needs a connected finsemble instance

//Styling the Finsemble Header
FinsembleHeader.SetActiveBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F")));
FinsembleHeader.SetInactiveBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F")));
FinsembleHeader.SetButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetInactiveButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetCloseButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666")));
FinsembleHeader.SetInactiveCloseButtonHoverBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666")));
FinsembleHeader.SetDockingButtonDockedBackground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4")));
FinsembleHeader.SetTitleForeground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0")));
FinsembleHeader.SetButtonForeground(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0")));

FinsembleHeader.SetButtonFont(null, 8, FontStyles.Normal, FontWeights.Normal);
FinsembleHeader.SetTitleFont(null, 12, FontStyles.Normal, FontWeights.SemiBold);
FinsembleHeader.GetHandlingService().ActiveBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F"));
FinsembleHeader.GetHandlingService().InactiveBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22262F"));
FinsembleHeader.GetHandlingService().ButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().InactiveButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().CloseButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666"));
FinsembleHeader.GetHandlingService().InactiveCloseButtonHoverBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#F26666"));
FinsembleHeader.GetHandlingService().DockingButtonDockedBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#0A8CF4"));
FinsembleHeader.GetHandlingService().TitleForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0"));
FinsembleHeader.GetHandlingService().ButtonForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ACB2C0"));

FinsembleHeader.GetHandlingService().ButtonFont = new TitlebarFontConfiguration()
{
FontFamily = null,
FontSize = 8,
FontStyle = FontStyles.Normal,
FontWeight = FontWeights.Normal
};
FinsembleHeader.GetHandlingService().TitleFont = new TitlebarFontConfiguration()
{
FontFamily = null,
FontSize = 12,
FontStyle = FontStyles.Normal,
FontWeight = FontWeights.SemiBold
};

fsbl.DragAndDropClient.SetScrim(Scrim); // The Scrim Label Control is used for drag and drop.

Expand Down
Loading

0 comments on commit 7b2f0b9

Please sign in to comment.