diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj index e5e69b5..a59395d 100644 --- a/AuthenticationExample/AuthenticationExample.csproj +++ b/AuthenticationExample/AuthenticationExample.csproj @@ -89,8 +89,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.5.3.0\lib\net452\Finsemble.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll diff --git a/AuthenticationExample/Properties/AssemblyInfo.cs b/AuthenticationExample/Properties/AssemblyInfo.cs index 9cdc56f..8d94662 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("5.2.0.0")] -[assembly: AssemblyFileVersion("5.2.0.0")] +[assembly: AssemblyVersion("5.3.0.0")] +[assembly: AssemblyFileVersion("5.3.0.0")] diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config index 7cab62a..16c9458 100644 --- a/AuthenticationExample/packages.config +++ b/AuthenticationExample/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/MultiWindowExample/App.xaml.cs b/MultiWindowExample/App.xaml.cs index ecb5484..be85146 100644 --- a/MultiWindowExample/App.xaml.cs +++ b/MultiWindowExample/App.xaml.cs @@ -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 { /// @@ -138,7 +137,7 @@ private static bool LaunchWindow(IList args) if (window == null) { - Debug.Write($"Could not create window: {name}"); + Debug.Print($"Could not create window: {name}"); } else { @@ -150,7 +149,7 @@ private static bool LaunchWindow(IList 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 { diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj index 17e1acb..2159dcc 100644 --- a/MultiWindowExample/MultiWindowExample.csproj +++ b/MultiWindowExample/MultiWindowExample.csproj @@ -49,8 +49,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.5.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.5.3.0\lib\net452\Finsemble.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll diff --git a/MultiWindowExample/Properties/AssemblyInfo.cs b/MultiWindowExample/Properties/AssemblyInfo.cs index 5a7809a..c2230f4 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("5.2.0.0")] +[assembly: AssemblyVersion("5.3.0.0")] [assembly: AssemblyFileVersion("5.2.0.0")] diff --git a/MultiWindowExample/packages.config b/MultiWindowExample/packages.config index 3baf63b..a2d66ee 100644 --- a/MultiWindowExample/packages.config +++ b/MultiWindowExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WPFExample/Assets/ic_WPFLogo.png b/WPFExample/Assets/ic_WPFLogo.png new file mode 100644 index 0000000..039888f Binary files /dev/null and b/WPFExample/Assets/ic_WPFLogo.png differ diff --git a/WPFExample/CustomControls/FinsembleButton.xaml b/WPFExample/CustomControls/FinsembleButton.xaml new file mode 100644 index 0000000..d8074fe --- /dev/null +++ b/WPFExample/CustomControls/FinsembleButton.xaml @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/WPFExample/CustomControls/FinsembleButton.xaml.cs b/WPFExample/CustomControls/FinsembleButton.xaml.cs new file mode 100644 index 0000000..7b99872 --- /dev/null +++ b/WPFExample/CustomControls/FinsembleButton.xaml.cs @@ -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 +{ + /// + /// Interaction logic for FinsembleButton.xaml + /// + public partial class FinsembleButton : UserControl + { + public event EventHandler 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); + } + } +} diff --git a/WPFExample/CustomControls/FinsembleDropDown.xaml b/WPFExample/CustomControls/FinsembleDropDown.xaml new file mode 100644 index 0000000..44504bc --- /dev/null +++ b/WPFExample/CustomControls/FinsembleDropDown.xaml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WPFExample/CustomControls/FinsembleDropDown.xaml.cs b/WPFExample/CustomControls/FinsembleDropDown.xaml.cs new file mode 100644 index 0000000..8b14000 --- /dev/null +++ b/WPFExample/CustomControls/FinsembleDropDown.xaml.cs @@ -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 +{ + /// + /// Interaction logic for FinsembleDropDown.xaml + /// + public partial class FinsembleDropDown : UserControl + { + public FinsembleDropDown() + { + InitializeComponent(); + } + } +} diff --git a/WPFExample/CustomControls/FinsembleInput.xaml b/WPFExample/CustomControls/FinsembleInput.xaml new file mode 100644 index 0000000..2c70480 --- /dev/null +++ b/WPFExample/CustomControls/FinsembleInput.xaml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + diff --git a/WPFExample/CustomControls/FinsembleInput.xaml.cs b/WPFExample/CustomControls/FinsembleInput.xaml.cs new file mode 100644 index 0000000..2fe927d --- /dev/null +++ b/WPFExample/CustomControls/FinsembleInput.xaml.cs @@ -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 +{ + /// + /// Interaction logic for FinsembleInput.xaml + /// + public partial class FinsembleInput : UserControl + { + public FinsembleInput() + { + InitializeComponent(); + } + } +} diff --git a/WPFExample/MainWindow.xaml b/WPFExample/MainWindow.xaml index 3c2ac7c..d575f52 100644 --- a/WPFExample/MainWindow.xaml +++ b/WPFExample/MainWindow.xaml @@ -5,33 +5,71 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:WPFExample" xmlns:Finsemble="clr-namespace:ChartIQ.Finsemble;assembly=Finsemble" + xmlns:customControls="clr-namespace:WPFExample.CustomControls" xmlns:Custom="http://schemas.microsoft.com/winfx/2006/xaml/presentation/ribbon" x:Class="WPFExample.MainWindow" mc:Ignorable="d" - Title="MainWindow" Height="350" - Width="525" WindowStyle="None" Background="{x:Null}" + Title="MainWindow" Height="600" + Width="600" WindowStyle="None" Background="{x:Null}" AllowsTransparency="True"> - - + - - - - -