Skip to content

Commit

Permalink
Merge pull request #292 from fluentribbon/develop
Browse files Browse the repository at this point in the history
Merge v4.0.0 content to master
  • Loading branch information
batzen committed Apr 6, 2016
2 parents 838e7dd + 9d3d871 commit e7794d0
Show file tree
Hide file tree
Showing 425 changed files with 68,320 additions and 69,289 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
; Top-most http://editorconfig.org/ file
root = true

[*]
end_of_line = CRLF

[*.{cs,xaml,xml}]
indent_style = space
indent_size = 4

[*.{md,yml}]
indent_style = space
indent_size = 2
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--
### Environment

- Fluent.Ribbon __v?.?.?__
- Theme __?__
- Windows __?__
- .NET Framework __?.?__
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ publish/
*.nupkg

# Generated files
Fluent/Themes/**/Generic.xaml
!Fluent/Themes/Generic.xaml
Fluent.Ribbon/Themes/**/Generic.xaml
packages/
.tmp

# Allowed files
!Fluent.Ribbon/Themes/Generic.xaml
!Fluent.Ribbon/Themes/XamlCombine.exe
11 changes: 0 additions & 11 deletions Build.cmd

This file was deleted.

21 changes: 21 additions & 0 deletions Build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Param(
[Parameter(Mandatory=$False)]
[string]$Configuration = "Release",
[Parameter(Mandatory=$False)]
[switch]$Publish,
[Parameter(Mandatory=$False)]
[string]$PreRelease
)

$ErrorActionPreference = "Stop"

. $PSScriptRoot\MSBuildHelper.ps1

$target = "Build"
if ($Publish) { $target = "PublishVersion" }

Write-Output Building
$msbuild = Get-MSBuild
&$msbuild Fluent.Ribbon.msbuild /target:$target /property:Configuration=$Configuration /property:Prerelease=$PreRelease /v:m /nologo

if ($LASTEXITCODE -ne 0) { exit 1 }
21 changes: 0 additions & 21 deletions BuildForPublish.cmd

This file was deleted.

66 changes: 66 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,71 @@
# Changelog for Fluent.Ribbon

## 4.0.0 (preview)

- ### Notices
- **As of now the Office 2010 and Windows 8 themes will be removed in version 5.0. You can vote for this at [Future direction of this library](../../issues/282).**

- ### Breaking changes
- New nuget dependency: [ControlzEx](https://www.nuget.org/packages/ControlzEx). So don't forget to add ControlzEx.dll to your distribution/setup.
- BorderlessWindowBehavior was replaced by WindowChromeBehavior from [ControlzEx](https://github.com/ControlzEx/ControlzEx).
This also removes the dependency Microsoft.Windows.Shell as ControlzEx contains everything we need to use WindowChrome.
This behavior is initialized in code behind (InitializeWindowChromeBehavior) and shows which properties of RibbonWindow can be used to control the behavior.
- SaveWindowPosition and WindowSettingBehavior were removed [#196](../../issues/196)
- GlassBorderThickness was renamed to GlassFrameThickness to be consitent with WindowChrome and WindowChromeBehavior [#209](../../issues/209)
- FluentTest project was renamed to Fluent.Ribbon.Showcase [#212](../../issues/212)

- ### Development/Contributing changes
- We switched to Visual Studio 2015 so we can use nameof etc. [#219](../../issues/219)

- ### Bug fixes
- [#10](../../issues/10) - Maximising a ribbon window with DWM enabled results in it not maximising properly
- [#90](../../issues/90) - Window chrome turning black during window resize.
- [#116](../../issues/116) - MenuItem: When the description is long the MenuItem does not expands in Width or Height, does not wrap text
- [#129](../../issues/129) - DontUseDwm="True" case the window corner unpainted
- [#146](../../issues/146) - Rendering of Office 2010 theme incorrect on Windows 10
- [#191](../../issues/191) - Windows 8 Theme - Blue/black margin around the window in windows 10
- [#210](../../issues/210) - Fix wrong dimensions assumed for WindowCaptionButtons on Windows 10 in Office2010 and Windows 8 themes
- [#218](../../issues/218) - Not displaying properly when maximized
- [#221](../../issues/221) - Office2013 theme undesired space between tabItem and its content when showing unpinned
- [#223](../../issues/223) - RibbonContextualTabGroup ignores Window.ResizeMode
- [#226](../../issues/226) - Maximising a ribbon window on Win7 "Non-Aero" Mode causes rendering issues
- [#228](../../issues/228) - Backstage disappears when changing DontUseDwm
- [#234](../../issues/234) - Disable KeyTips when Ribbon isn't Enabled
- [#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
- [#240](../../issues/240) - Backstage closes when popup is dismissed inside backstage
- [#241](../../issues/241) - Keytips should be cancelled if Alt+Num0 is pressed
- [#244](../../issues/244) - KeyTip not working for childs of ContentPresenter
- [#246](../../issues/246) - Bind RibbonGroupBox.DataContext on QuickAccessToolBar (thanks to @nishy2000)
- [#251](../../issues/251) - Changing RibbonStatusBar height to 23 and RibbonStatusBarItem foreground to BackstageFontBrush (thanks to @maurosampietro)
- [#253](../../issues/253) - Icons of buttons not aligned correctly in Office 2013 theme (thanks to @floele-sp)
- [#254](../../issues/254) - Basic fix for KeyTips not working when focus is inside a WinForms control
- [#256](../../issues/256) - ComboBox items don't update properly on ItemsSource binding source collection changes
- [#255](../../issues/255) - Submenus don't show scroll viewer if items exceed the available space on screen (thanks to @floele-sp)
- [#257](../../issues/257) - Windows8 RibbonWindowTitleTextGlowBackground was missing (thanks to @maurosampietro)
- [#263](../../issues/263) - Changing theme from backstage is broken
- [#267](../../issues/267) - maximizing in Win 10
- [#269](../../issues/269) - Show underscore of header text on RibbonTabItem
- [#272](../../issues/272) - Changing RibbonThemeColorBrush does not change background of ItemsPanel in Backstage
- [#274](../../issues/274) - RadioButton Icon and LargeIcon
- [#280](../../issues/280) - Keytips of the Ribbon overlay StartScreen
- [#284](../../issues/284) - Overriding width of button does not work as it should
- [#285](../../issues/285) - MaterialDesign DialogHost issue with FluentRibbon
- [#291](../../issues/291) - BackStageTabItem leftmousedown event not firing
- OpenBackstage command was not acting on the correct backstage in a multiple backstage scenario (thanks to @maurosampietro)

- ### Enhancements
- [#120](../../issues/120) - Adding short-cuts or additional information to Application Menu Item
- [#185](../../issues/185) - Major refactoring of how WindowChrome is used
- [#194](../../issues/194) - There should be an option to disable animations in the whole control
- [#205](../../issues/205) - Fluent Spinner handles Format="P0" incorrectly.
- [#207](../../issues/207) - Enable DragMove on unused RibbonTabControl space like in Office 2013
- [#230](../../issues/230) - Option to disable the "Minimize"-Ribbon Button & Behavior (thanks to @robertmuehsig)
- [#242](../../issues/242) - Add start screen like in office 2013 and upwards
- [#258](../../issues/258) - Refactoring of KeyTipService and KeyTipAdorner (merged with [#264](../../issues/264))

## 3.6.1

- ### Bug fixes
Expand Down
20 changes: 20 additions & 0 deletions Dev.NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageRestore>
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<clear />
<add key="CI.ControlzEx" value="https://ci.appveyor.com/nuget/controlzex-wfy5aam7u23j" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<activePackageSource>
<clear />
<add key="CI.ControlzEx" value="https://ci.appveyor.com/nuget/controlzex-wfy5aam7u23j" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</activePackageSource>
</configuration>
27 changes: 14 additions & 13 deletions FluentTest/App.xaml → Fluent.Ribbon.Showcase/App.xaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="FluentTest.App"
StartupUri="TestWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />-->
<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2013/Generic.xaml" />
<!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Windows8/Generic.xaml" />-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="FluentTest.App"
StartupUri="TestWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />-->
<!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2010/Generic.xaml" />-->
<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2013/Generic.xaml" />
<!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Windows8/Generic.xaml" />-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
34 changes: 34 additions & 0 deletions Fluent.Ribbon.Showcase/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
namespace FluentTest
{
public partial class App
{
public App()
{
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("ru-RU");

//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("fa");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("ru");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("de");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("hu");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("cs");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("fr");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("pl");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("ja");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("nl");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("pt-PT");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("pt-br");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("es");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("sv");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("sk");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("uk");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("ro");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("it");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("ar");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("da");
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("az");

System.Threading.Thread.CurrentThread.CurrentCulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
}
}
}
11 changes: 11 additions & 0 deletions Fluent.Ribbon.Showcase/Commanding/IRelayCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace FluentTest.Commanding
{
using System;
using System.Windows.Input;

public interface IRelayCommand : ICommand
{
event EventHandler Executed;
event EventHandler Executing;
}
}
Loading

0 comments on commit e7794d0

Please sign in to comment.