From 3669c1a19d1c992f26ac4981e1c11536eddf47d6 Mon Sep 17 00:00:00 2001 From: Bastian Schmidt Date: Wed, 6 Jan 2016 17:42:58 +0100 Subject: [PATCH] Fixes #238 by updating to newest ControlzEx version and also updates copyright and nuget informations --- Changelog.md | 1 + Fluent.Ribbon.nuspec | 8 ++++---- Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj | 4 ++-- Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj | 4 ++-- Fluent.Ribbon/packages.config | 2 +- Shared/GlobalAssemblyInfo.cs | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5dddb7d8a..b4119dadc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -31,6 +31,7 @@ - [#235](../../issues/235) - Items of invisble tab are shown - [#236](../../issues/236) - Window size is wrong when window is maximized, backstage is closed and window should be restored to normal size - [#237](../../issues/237) - Ribbon Buttons with large text cut off a few pixels + - [#238](../../issues/238) - New WindowChrome does not work correctly on Windows 7 - OpenBackstage command was not acting on the correct backstage in a multiple backstage scenario (thanks to @maurosampietro) - ### Enhancements diff --git a/Fluent.Ribbon.nuspec b/Fluent.Ribbon.nuspec index a24e2d585..595726fdc 100644 --- a/Fluent.Ribbon.nuspec +++ b/Fluent.Ribbon.nuspec @@ -5,16 +5,16 @@ $Version$ Fluent Ribbon Control Suite Fluent Ribbon Control Suite is a library that implements an Office-like Ribbon for WPF. - Fluent Ribbon Control Suite is a library that implements an Office-like user interface for the Windows Presentation Foundation (WPF). It provides well-customized controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on. It is bundled with the most up-to-date Office 2010, Office 2013 and Windows 8 styles. + Fluent Ribbon Control Suite is a library that implements an Office-like user interface for the Windows Presentation Foundation (WPF). It provides controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on. It is bundled with Office 2010, Office 2013 and Windows 8 themes. You can read the changelog at: https://github.com/fluentribbon/Fluent.Ribbon/blob/master/Changelog.md - daVinci,SableRaven,batzen,LastElb,firehirsch + batzen https://github.com/fluentribbon/Fluent.Ribbon/blob/master/License.txt https://github.com/fluentribbon/Fluent.Ribbon https://raw.githubusercontent.com/fluentribbon/Fluent.Ribbon/master/Images/Logo/Logo_32x32.png false - ribbon fluent ribbonwindow office2010 office2013 windows8 backstage + ribbon fluent ribbon ribbonwindow office2010 office2013 windows8 backstage - + diff --git a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj index cd25fde80..3255bf18b 100644 --- a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj +++ b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj @@ -53,7 +53,7 @@ - ..\packages\ControlzEx.2.0.0-dev021\lib\net40\ControlzEx.dll + ..\packages\ControlzEx.2.0.0-dev023\lib\net40\ControlzEx.dll True @@ -61,7 +61,7 @@ - ..\packages\ControlzEx.2.0.0-dev021\lib\net40\System.Windows.Interactivity.dll + ..\packages\ControlzEx.2.0.0-dev023\lib\net40\System.Windows.Interactivity.dll True diff --git a/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj b/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj index 5a4e938a5..ab7b6bb36 100644 --- a/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj +++ b/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj @@ -53,7 +53,7 @@ - ..\packages\ControlzEx.2.0.0-dev021\lib\net45\ControlzEx.dll + ..\packages\ControlzEx.2.0.0-dev023\lib\net45\ControlzEx.dll True @@ -61,7 +61,7 @@ - ..\packages\ControlzEx.2.0.0-dev021\lib\net45\System.Windows.Interactivity.dll + ..\packages\ControlzEx.2.0.0-dev023\lib\net45\System.Windows.Interactivity.dll True diff --git a/Fluent.Ribbon/packages.config b/Fluent.Ribbon/packages.config index f9f3ba188..ee7a0aba9 100644 --- a/Fluent.Ribbon/packages.config +++ b/Fluent.Ribbon/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Shared/GlobalAssemblyInfo.cs b/Shared/GlobalAssemblyInfo.cs index b5ed0f5cd..8f77d5d90 100644 --- a/Shared/GlobalAssemblyInfo.cs +++ b/Shared/GlobalAssemblyInfo.cs @@ -11,7 +11,7 @@ #endif [assembly: AssemblyCompany("https://github.com/fluentribbon/Fluent.Ribbon")] [assembly: AssemblyProduct("Fluent Ribbon Control Suite")] -[assembly: AssemblyCopyright("Copyright © 2009 - 2015 Degtyarev Daniel, Rikker Serg, Bastian Schmidt")] +[assembly: AssemblyCopyright("Copyright © 2012 - 2016 Bastian Schmidt; Copyright © 2009 - 2012 Degtyarev Daniel, Rikker Serg")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]