Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.3.0 #49

Merged
merged 6 commits into from
Mar 25, 2021
Merged

Release 5.3.0 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8317ff6
5.1.0 Release
Nov 6, 2020
7504afc
5.2.0 changes part 1
Dec 22, 2020
2d5b35b
Updated version fo fsbl for 5.2.0 release
kyle-ciq Dec 22, 2020
d41b7a4
updates for 5.2.0 part 2
Dec 22, 2020
9cf792d
Release 5.3.0 updates
Feb 18, 2021
ff937bc
Merge remote-tracking branch 'origin/master' into release/5.3.0
Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AuthenticationExample/AuthenticationExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +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=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.3.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 Down
4 changes: 2 additions & 2 deletions AuthenticationExample/Properties/AssemblyInfo.cs
View file
Open in desktop
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("5.2.0.0")]
[assembly: AssemblyFileVersion("5.2.0.0")]
[assembly: AssemblyVersion("5.3.0.0")]
[assembly: AssemblyFileVersion("5.3.0.0")]
4 changes: 2 additions & 2 deletions AuthenticationExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<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="5.2.0" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
<package id="Finsemble" version="5.3.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" />
Expand Down
13 changes: 6 additions & 7 deletions MultiWindowExample/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
using System;
using ChartIQ.Finsemble;
using Microsoft.Shell;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;

using System.Threading;
using System.Windows;
using System.Windows.Threading;
using ChartIQ.Finsemble;
using Microsoft.Shell;

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

if (window == null)
{
Debug.Write($"Could not create window: {name}");
Debug.Print($"Could not create window: {name}");
}
else
{
Expand All @@ -150,7 +149,7 @@ private static bool LaunchWindow(IList<string> args)
IIntegratable fsblWin = window as IIntegratable;
if (fsblWin == null)
{
Debug.Write($"The window \"{name}\" is not a window that can be integrated into Finsemble.");
Debug.Print($"The window \"{name}\" is not a window that can be integrated into Finsemble.");
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/MultiWindowExample.csproj
View file
Open in desktop
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=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.5.3.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 Down
2 changes: 1 addition & 1 deletion MultiWindowExample/Properties/AssemblyInfo.cs
View file
Open in desktop
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("5.2.0.0")]
[assembly: AssemblyVersion("5.3.0.0")]
[assembly: AssemblyFileVersion("5.2.0.0")]
2 changes: 1 addition & 1 deletion MultiWindowExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<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="5.2.0" targetFramework="net452" />
<package id="Finsemble" version="5.3.0" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
Expand Down
Binary file added WPFExample/Assets/ic_WPFLogo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions WPFExample/CustomControls/FinsembleButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<UserControl x:Class="WPFExample.CustomControls.FinsembleButton"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WPFExample.CustomControls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>

<Style x:Key="FinsembleButton" TargetType="{x:Type Button}">
<Setter Property="Background" Value="#22262f"></Setter>
<Setter Property="BorderThickness" Value="0"></Setter>
<Setter Property="Foreground" Value="White"></Setter>
<Setter Property="FontSize" Value="14"></Setter>
<Setter Property="Padding" Value="0"></Setter>
<Setter Property="FontWeight" Value="Bold"></Setter>

<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#171a20"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="FinsembleButtonBorder" TargetType="{x:Type Border}">
<Setter Property="Margin" Value="5"></Setter>
<Setter Property="CornerRadius" Value="25"></Setter>
<Setter Property="Padding" Value="10"></Setter>
<Setter Property="Background" Value="#22262f"></Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=Button }" Value="True">
<Setter Property="Background" Value="#171a20"/>
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Border Name="ButtonBorder" Style="{StaticResource FinsembleButtonBorder}">
<Button Style="{StaticResource FinsembleButton}" Name="Button" Click="Button_OnClick" Content="{Binding ButtonContent, Mode=TwoWay}"></Button>
</Border>
</UserControl>
39 changes: 39 additions & 0 deletions WPFExample/CustomControls/FinsembleButton.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
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;

namespace WPFExample.CustomControls
{
/// <summary>
/// Interaction logic for FinsembleButton.xaml
/// </summary>
public partial class FinsembleButton : UserControl
{
public event EventHandler<RoutedEventArgs> Click;

public string ButtonContent { get; set; }
public FinsembleButton()
{
InitializeComponent();
this.DataContext = this;
}

private void Button_OnClick(object sender, RoutedEventArgs e)
{
var eventHandler = this.Click;

eventHandler?.Invoke(this, e);
}
}
}
149 changes: 149 additions & 0 deletions WPFExample/CustomControls/FinsembleDropDown.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<UserControl x:Class="WPFExample.CustomControls.FinsembleDropDown"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WPFExample.CustomControls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="20" />
</Grid.ColumnDefinitions>
<Border
x:Name="Border"
Grid.ColumnSpan="2"
CornerRadius="0"
Background="#22262f" />
<Path
x:Name="Arrow"
Grid.Column="1"
Fill="White"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z"
/>
</Grid>
</ControlTemplate>

<ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
<Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}" />
</ControlTemplate>

<Style x:Key="{x:Type ComboBox}" TargetType="{x:Type ComboBox}">
<Setter Property="SnapsToDevicePixels" Value="true"/>
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="FontSize" Value="14"></Setter>
<Setter Property="FontWeight" Value="Bold"></Setter>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Background" Value="#22262f"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBox}">
<Grid>
<ToggleButton
Name="ToggleButton"
Template="{StaticResource ComboBoxToggleButton}"
Grid.Column="2"
Focusable="false"
IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
ClickMode="Press">
</ToggleButton>
<ContentPresenter Name="ContentSite" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
Margin="3,3,23,3"
VerticalAlignment="Center"
HorizontalAlignment="Left" />
<Popup
Name="Popup"
Placement="Bottom"
IsOpen="{TemplateBinding IsDropDownOpen}"
AllowsTransparency="True"
Focusable="False"
PopupAnimation="Slide">

<Grid Name="DropDown"
SnapsToDevicePixels="True"
MinWidth="{TemplateBinding ActualWidth}"
MaxHeight="{TemplateBinding MaxDropDownHeight}">
<Border
x:Name="DropDownBorder"
Background="#22262f"
BorderThickness="1"
BorderBrush="#888888"/>
<ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer>
</Grid>
</Popup>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="HasItems" Value="false">
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="#22262f"/>
</Trigger>
<Trigger Property="IsGrouping" Value="true">
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</Trigger>
<Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true">
<Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/>
<Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/>
</Trigger>
<Trigger Property="IsEditable" Value="true">
<Setter Property="IsTabStop" Value="false"/>
<Setter TargetName="ContentSite" Property="Visibility" Value="Hidden"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<!-- SimpleStyles: ComboBoxItem -->
<Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
<Setter Property="SnapsToDevicePixels" Value="true"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Background" Value="#22262f"/>
<Setter Property="FontSize" Value="12"></Setter>
<Setter Property="FontWeight" Value="Bold"></Setter>
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBoxItem}">
<Border Name="Border"
Padding="2"
SnapsToDevicePixels="true">
<ContentPresenter />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsHighlighted" Value="true">
<Setter TargetName="Border" Property="Background" Value="#171a20"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="#22262f"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>


<Grid>
<Border Margin="5" CornerRadius="20" Padding="10" Background="#22262f">
<ComboBox Name="ItemsComboBox">
</ComboBox>
</Border>

</Grid>
</UserControl>
28 changes: 28 additions & 0 deletions WPFExample/CustomControls/FinsembleDropDown.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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;

namespace WPFExample.CustomControls
{
/// <summary>
/// Interaction logic for FinsembleDropDown.xaml
/// </summary>
public partial class FinsembleDropDown : UserControl
{
public FinsembleDropDown()
{
InitializeComponent();
}
}
}
Loading