From 24d8b8e4ecf52f8d7d8a835f19b1136d86aa8943 Mon Sep 17 00:00:00 2001 From: maurosampietro Date: Tue, 19 Jan 2016 16:58:29 +0100 Subject: [PATCH 1/5] new generic StartScreenTabControl style, the old one has become the Office2013 specific one. --- Fluent.Ribbon/AttachedProperties/Margins.cs | 130 ++ Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj | 1553 ++++++++-------- Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj | 1557 +++++++++-------- .../Controls/StartScreenTabControl.xaml | 9 +- Fluent.Ribbon/Themes/Office2013/Generic.txt | 2 +- 5 files changed, 1693 insertions(+), 1558 deletions(-) create mode 100644 Fluent.Ribbon/AttachedProperties/Margins.cs diff --git a/Fluent.Ribbon/AttachedProperties/Margins.cs b/Fluent.Ribbon/AttachedProperties/Margins.cs new file mode 100644 index 000000000..93c86114c --- /dev/null +++ b/Fluent.Ribbon/AttachedProperties/Margins.cs @@ -0,0 +1,130 @@ + +namespace Fluent.AttachedProperties +{ + using System; + using System.Windows; + + public class Margins + { + #region Right Property + public static readonly DependencyProperty RightProperty = DependencyProperty.RegisterAttached( + "Right", + typeof( int ), + typeof( Margins ), + new UIPropertyMetadata( OnRightPropertyChanged ) ); + + public static int GetRight( FrameworkElement element ) + { + return (int)element.GetValue( RightProperty ); + } + + public static void SetRight( FrameworkElement element, string value ) + { + element.SetValue( RightProperty, value ); + } + + private static void OnRightPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) + { + var element = obj as FrameworkElement; + + if( element != null ) + { + var margin = element.Margin; + margin.Right = (int)args.NewValue; + element.Margin = margin; + } + } + + #endregion + + #region Left Property + public static readonly DependencyProperty LeftProperty = DependencyProperty.RegisterAttached( + "Left", + typeof( int ), + typeof( Margins ), + new UIPropertyMetadata( OnLeftPropertyChanged ) ); + + public static int GetLeft( FrameworkElement element ) + { + return (int)element.GetValue( LeftProperty ); + } + + public static void SetLeft( FrameworkElement element, string value ) + { + element.SetValue( LeftProperty, value ); + } + + private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) + { + var element = obj as FrameworkElement; + + if( element != null ) + { + var margin = element.Margin; + margin.Left = (int)args.NewValue; + element.Margin = margin; + } + } + #endregion + + #region Top Property + public static readonly DependencyProperty TopProperty = DependencyProperty.RegisterAttached( + "Top", + typeof( int ), + typeof( Margins ), + new UIPropertyMetadata( OnTopPropertyChanged ) ); + + public static int GetTop( FrameworkElement element ) + { + return (int)element.GetValue( TopProperty ); + } + + public static void SetTop( FrameworkElement element, string value ) + { + element.SetValue( TopProperty, value ); + } + + private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) + { + var element = obj as FrameworkElement; + + if( element != null ) + { + var margin = element.Margin; + margin.Top = (int)args.NewValue; + element.Margin = margin; + } + } + #endregion + + #region Bottom Property + public static readonly DependencyProperty BottomProperty = DependencyProperty.RegisterAttached( + "Bottom", + typeof( int ), + typeof( Margins ), + new UIPropertyMetadata( OnBottomPropertyChanged ) ); + + public static int GetBottom( FrameworkElement element ) + { + return (int)element.GetValue( BottomProperty ); + } + + public static void SetBottom( FrameworkElement element, string value ) + { + element.SetValue( BottomProperty, value ); + } + + private static void OnBottomPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) + { + var element = obj as FrameworkElement; + + if( element != null ) + { + var margin = element.Margin; + margin.Bottom = (int)args.NewValue; + element.Margin = margin; + } + } + #endregion + } +} diff --git a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj index 9739ab6b7..e43803575 100644 --- a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj +++ b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj @@ -1,777 +1,778 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {281095D8-D8B3-4A7F-8896-646483FB685C} - Library - Properties - Fluent - Fluent - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - Properties\FluentStrongName.snk - true - 4.0.20621.0 - ..\build\obj\NET 4.0 - $(BaseIntermediateOutputPath)\$(Configuration)\ - - - true - full - false - ..\build\bin\NET 4.0\Debug\ - TRACE;DEBUG;NET40;CODE_ANALYSIS - prompt - 4 - - - false - - - MinimumRecommendedRules.ruleset - false - - - pdbonly - true - ..\build\bin\NET 4.0\Release\ - TRACE;NET40;CODE_ANALYSIS - prompt - 4 - bin\NET 4.0\Release\Fluent.XML - true - - - MinimumRecommendedRules.ruleset - true - false - - - - ..\packages\ControlzEx.2.0.0-dev025\lib\net40\ControlzEx.dll - True - - - - - - - ..\packages\ControlzEx.2.0.0-dev025\lib\net40\System.Windows.Interactivity.dll - True - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {281095D8-D8B3-4A7F-8896-646483FB685C} + Library + Properties + Fluent + Fluent + v4.0 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + Properties\FluentStrongName.snk + true + 4.0.20621.0 + ..\build\obj\NET 4.0 + $(BaseIntermediateOutputPath)\$(Configuration)\ + + + true + full + false + ..\build\bin\NET 4.0\Debug\ + TRACE;DEBUG;NET40;CODE_ANALYSIS + prompt + 4 + + + false + + + MinimumRecommendedRules.ruleset + false + + + pdbonly + true + ..\build\bin\NET 4.0\Release\ + TRACE;NET40;CODE_ANALYSIS + prompt + 4 + bin\NET 4.0\Release\Fluent.XML + true + + + MinimumRecommendedRules.ruleset + true + false + + + + ..\packages\ControlzEx.2.0.0-dev025\lib\net40\ControlzEx.dll + True + + + + + + + ..\packages\ControlzEx.2.0.0-dev025\lib\net40\System.Windows.Interactivity.dll + True + + + + + + + + Properties\GlobalAssemblyInfo.cs + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SET tmpError=0 "$(ProjectDir)Themes\XamlCombine.exe" Office2010\Generic.txt Office2010\Generic.xaml SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 @@ -779,6 +780,6 @@ SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 "$(ProjectDir)Themes\XamlCombine.exe" Windows8\Generic.txt Windows8\Generic.xaml SET /a tmpError=%25tmpError%25 + %25ERRORLEVEL%25 -SET ERRORLEVEL=%25tmpError%25 - +SET ERRORLEVEL=%25tmpError%25 + \ No newline at end of file diff --git a/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj b/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj index c84c94d6f..278d819cb 100644 --- a/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj +++ b/Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj @@ -1,777 +1,782 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {4C92FCF4-3561-499F-BC5B-F2F089863047} - Library - Properties - Fluent - Fluent - v4.5 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - Properties\FluentStrongName.snk - true - 4.0.20621.0 - ..\build\obj\NET 4.5 - $(BaseIntermediateOutputPath)\$(Configuration)\ - - - true - full - false - ..\build\bin\NET 4.5\Debug\ - TRACE;DEBUG;CODE_ANALYSIS;NET45 - prompt - 4 - - - false - - - MinimumRecommendedRules.ruleset - false - - - pdbonly - true - ..\build\bin\NET 4.5\Release\ - TRACE;CODE_ANALYSIS;NET45 - prompt - 4 - bin\NET 4.5\Release\Fluent.XML - true - - - MinimumRecommendedRules.ruleset - true - false - - - - ..\packages\ControlzEx.2.0.0-dev025\lib\net45\ControlzEx.dll - True - - - - - - - ..\packages\ControlzEx.2.0.0-dev025\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {4C92FCF4-3561-499F-BC5B-F2F089863047} + Library + Properties + Fluent + Fluent + v4.5 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + Properties\FluentStrongName.snk + true + 4.0.20621.0 + ..\build\obj\NET 4.5 + $(BaseIntermediateOutputPath)\$(Configuration)\ + + + true + full + false + ..\build\bin\NET 4.5\Debug\ + TRACE;DEBUG;CODE_ANALYSIS;NET45 + prompt + 4 + + + false + + + MinimumRecommendedRules.ruleset + false + + + pdbonly + true + ..\build\bin\NET 4.5\Release\ + TRACE;CODE_ANALYSIS;NET45 + prompt + 4 + bin\NET 4.5\Release\Fluent.XML + true + + + MinimumRecommendedRules.ruleset + true + false + + + + ..\packages\ControlzEx.2.0.0-dev025\lib\net45\ControlzEx.dll + True + + + + + + + ..\packages\ControlzEx.2.0.0-dev025\lib\net45\System.Windows.Interactivity.dll + True + + + + + + + + Properties\GlobalAssemblyInfo.cs + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SET tmpError=0 "$(ProjectDir)Themes\XamlCombine.exe" Office2010\Generic.txt Office2010\Generic.xaml SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 @@ -779,6 +784,6 @@ SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25 "$(ProjectDir)Themes\XamlCombine.exe" Windows8\Generic.txt Windows8\Generic.xaml SET /a tmpError=%25tmpError%25 + %25ERRORLEVEL%25 -SET ERRORLEVEL=%25tmpError%25 - +SET ERRORLEVEL=%25tmpError%25 + \ No newline at end of file diff --git a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml index ad56176c8..91ca475b4 100644 --- a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml +++ b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml @@ -1,7 +1,8 @@  + xmlns:Converters="clr-namespace:Fluent.Converters" + xmlns:AttachedProperties="clr-namespace:Fluent.AttachedProperties"> @@ -29,16 +30,14 @@ Width="Auto" /> - + - Date: Tue, 19 Jan 2016 17:20:59 +0100 Subject: [PATCH 2/5] Office2013 status bar height value is 23 --- Fluent.Ribbon.Showcase/TestContent.xaml | 2 +- .../Themes/Office2013/Controls/RibbonStatusBar.xaml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml index 2070ae206..1d48aad31 100644 --- a/Fluent.Ribbon.Showcase/TestContent.xaml +++ b/Fluent.Ribbon.Showcase/TestContent.xaml @@ -2793,7 +2793,7 @@ + Value="0,0,0,-1" /> + - From ccf7ab87e2cdbfca100bb0a1f252fbd0209e8dbf Mon Sep 17 00:00:00 2001 From: maurosampietro Date: Wed, 20 Jan 2016 09:10:04 +0100 Subject: [PATCH 3/5] Office2013 StartScreenTabControl file missing from both framework 4.0 and 4.5 projects. Removed Margins AttachedProperties and replaced its usage with ThicknessConverter --- Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj | 5 +- .../Controls/StartScreenTabControl.xaml | 13 +++- .../Controls/StartScreenTabControl.xaml | 77 +++++++++++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 Fluent.Ribbon/Themes/Office2013/Controls/StartScreenTabControl.xaml diff --git a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj index e43803575..a673cdcf0 100644 --- a/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj +++ b/Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj @@ -72,7 +72,6 @@ Properties\GlobalAssemblyInfo.cs - @@ -341,6 +340,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml index 91ca475b4..8f20738ed 100644 --- a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml +++ b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml @@ -30,8 +30,17 @@ Width="Auto" /> - + + + + + + + + + + + + + + + \ No newline at end of file From 6de407780b4ad5aef16e3768055e1087890a5f7a Mon Sep 17 00:00:00 2001 From: maurosampietro Date: Wed, 20 Jan 2016 09:14:44 +0100 Subject: [PATCH 4/5] Delete Margins.cs --- Fluent.Ribbon/AttachedProperties/Margins.cs | 130 -------------------- 1 file changed, 130 deletions(-) delete mode 100644 Fluent.Ribbon/AttachedProperties/Margins.cs diff --git a/Fluent.Ribbon/AttachedProperties/Margins.cs b/Fluent.Ribbon/AttachedProperties/Margins.cs deleted file mode 100644 index 93c86114c..000000000 --- a/Fluent.Ribbon/AttachedProperties/Margins.cs +++ /dev/null @@ -1,130 +0,0 @@ - -namespace Fluent.AttachedProperties -{ - using System; - using System.Windows; - - public class Margins - { - #region Right Property - public static readonly DependencyProperty RightProperty = DependencyProperty.RegisterAttached( - "Right", - typeof( int ), - typeof( Margins ), - new UIPropertyMetadata( OnRightPropertyChanged ) ); - - public static int GetRight( FrameworkElement element ) - { - return (int)element.GetValue( RightProperty ); - } - - public static void SetRight( FrameworkElement element, string value ) - { - element.SetValue( RightProperty, value ); - } - - private static void OnRightPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) - { - var element = obj as FrameworkElement; - - if( element != null ) - { - var margin = element.Margin; - margin.Right = (int)args.NewValue; - element.Margin = margin; - } - } - - #endregion - - #region Left Property - public static readonly DependencyProperty LeftProperty = DependencyProperty.RegisterAttached( - "Left", - typeof( int ), - typeof( Margins ), - new UIPropertyMetadata( OnLeftPropertyChanged ) ); - - public static int GetLeft( FrameworkElement element ) - { - return (int)element.GetValue( LeftProperty ); - } - - public static void SetLeft( FrameworkElement element, string value ) - { - element.SetValue( LeftProperty, value ); - } - - private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) - { - var element = obj as FrameworkElement; - - if( element != null ) - { - var margin = element.Margin; - margin.Left = (int)args.NewValue; - element.Margin = margin; - } - } - #endregion - - #region Top Property - public static readonly DependencyProperty TopProperty = DependencyProperty.RegisterAttached( - "Top", - typeof( int ), - typeof( Margins ), - new UIPropertyMetadata( OnTopPropertyChanged ) ); - - public static int GetTop( FrameworkElement element ) - { - return (int)element.GetValue( TopProperty ); - } - - public static void SetTop( FrameworkElement element, string value ) - { - element.SetValue( TopProperty, value ); - } - - private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) - { - var element = obj as FrameworkElement; - - if( element != null ) - { - var margin = element.Margin; - margin.Top = (int)args.NewValue; - element.Margin = margin; - } - } - #endregion - - #region Bottom Property - public static readonly DependencyProperty BottomProperty = DependencyProperty.RegisterAttached( - "Bottom", - typeof( int ), - typeof( Margins ), - new UIPropertyMetadata( OnBottomPropertyChanged ) ); - - public static int GetBottom( FrameworkElement element ) - { - return (int)element.GetValue( BottomProperty ); - } - - public static void SetBottom( FrameworkElement element, string value ) - { - element.SetValue( BottomProperty, value ); - } - - private static void OnBottomPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args ) - { - var element = obj as FrameworkElement; - - if( element != null ) - { - var margin = element.Margin; - margin.Bottom = (int)args.NewValue; - element.Margin = margin; - } - } - #endregion - } -} From ec79563aa9fb4f1dd8ad10bfbe2392f5e21ec832 Mon Sep 17 00:00:00 2001 From: maurosampietro Date: Wed, 20 Jan 2016 09:20:06 +0100 Subject: [PATCH 5/5] ns removed --- .../Themes/Generic/Controls/StartScreenTabControl.xaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml index 8f20738ed..773bd19db 100644 --- a/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml +++ b/Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml @@ -1,8 +1,7 @@  + xmlns:Converters="clr-namespace:Fluent.Converters">