Skip to content

Commit

Permalink
Fixes #301 by removing Office 2010 and Windows 8 themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@batzen
batzen committed Apr 15, 2016
1 parent 2d450d9 commit 2dbed0f
Show file tree
Hide file tree
Showing 127 changed files with 97 additions and 29,585 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog for Fluent.Ribbon

## 5.0.0 (preview)

- ### Breaking changes
- Office 2010 and Windows 8 themes got removed. This was a [community voted decision](../../issues/282).
- [#301](../../issues/301) - Remove Office 2010 and Windows 8 themes

## 4.0.3

- ### Bug fixes
Expand Down
2 changes: 0 additions & 2 deletions Fluent.Ribbon.Showcase/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
<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>
Expand Down
95 changes: 5 additions & 90 deletions Fluent.Ribbon.Showcase/TestContent.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,47 +155,6 @@
</Fluent:BackstageTabItem.ContentTemplate>
</Fluent:BackstageTabItem>

<Fluent:BackstageTabItem Header="Change theme with fluent controls"
Content="Hello">
<Fluent:BackstageTabItem.ContentTemplate>
<DataTemplate>
<StackPanel>
<Fluent:Button Background="Blue"
Foreground="Black"
Click="OnOffice2010SilverClick">Office 2010 Silver</Fluent:Button>
<Fluent:Button Background="Blue"
Foreground="Black"
Click="OnOffice2010BlackClick">Office 2010 Black</Fluent:Button>
<Fluent:Button Background="Blue"
Foreground="Black"
Click="OnOffice2010BlueClick">Office 2010 Blue</Fluent:Button>
<Fluent:Button Background="Blue"
Foreground="Black"
Click="OnOffice2013Click">Office 2013 White</Fluent:Button>
<Fluent:Button Background="Blue"
Foreground="Black"
Click="OnWindows8Click">Windows8 White</Fluent:Button>
</StackPanel>
</DataTemplate>
</Fluent:BackstageTabItem.ContentTemplate>
</Fluent:BackstageTabItem>

<Fluent:BackstageTabItem Header="Change theme with standard controls"
Content="Hello">
<Fluent:BackstageTabItem.ContentTemplate>
<DataTemplate>
<StackPanel>
<TextBlock Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:BackstageTabControl}}, Path=ParentBackstage.ActualHeight}" />
<Button Click="OnOffice2010SilverClick">Office 2010 Silver</Button>
<Button Click="OnOffice2010BlackClick">Office 2010 Black</Button>
<Button Click="OnOffice2010BlueClick">Office 2010 Blue</Button>
<Button Click="OnOffice2013Click">Office 2013 White</Button>
<Button Click="OnWindows8Click">Windows8 White</Button>
</StackPanel>
</DataTemplate>
</Fluent:BackstageTabItem.ContentTemplate>
</Fluent:BackstageTabItem>

<Fluent:SeparatorTabItem Header="Separator" />

<Fluent:BackstageTabItem Header="Info"
Expand Down Expand Up @@ -268,7 +227,6 @@
IsEnabled="True"
Style="{DynamicResource ButtonBackstageStyle}"
HorizontalAlignment="Left"
Click="OnOffice2010BlueClick"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Paste.png"
LargeIcon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/PasteLarge.png">123</Fluent:Button>
<Fluent:ToggleButton Header="Toggle"
Expand Down Expand Up @@ -440,47 +398,6 @@
Header="Home"
KeyTip="H"
ToolTip="Regular Tool Tip">
<Fluent:RibbonGroupBox Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Default.png"
KeyTip="T10"
x:Name="C"
Header="Themes (Office 2010)"
CanAddToQuickAccessToolBar="False"
IsLauncherVisible="False">
<Fluent:Button Click="OnOffice2010SilverClick"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/SilverTheme.png"
SizeDefinition="Middle">Silver</Fluent:Button>
<Fluent:Button Click="OnOffice2010BlackClick"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/BlackTheme.png"
SizeDefinition="Middle">Black</Fluent:Button>
<Fluent:Button Click="OnOffice2010BlueClick"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/BlueTheme.png"
SizeDefinition="Middle">Blue</Fluent:Button>
<Fluent:CheckBox Name="DontUseDwm"
Click="HandleDontUseDwmClick">Don't use DWM</Fluent:CheckBox>
</Fluent:RibbonGroupBox>

<Fluent:RibbonGroupBox Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Default.png"
KeyTip="T13"
Header="Themes (Office 2013)"
CanAddToQuickAccessToolBar="False"
IsLauncherVisible="False"
MinWidth="150">
<Fluent:Button Click="OnOffice2013Click"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/SilverTheme.png"
SizeDefinition="Middle">White</Fluent:Button>
</Fluent:RibbonGroupBox>

<Fluent:RibbonGroupBox Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Default.png"
KeyTip="T13"
Header="Themes (Windows 8)"
CanAddToQuickAccessToolBar="False"
IsLauncherVisible="False"
MinWidth="150">
<Fluent:Button Click="OnWindows8Click"
Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/SilverTheme.png"
SizeDefinition="Middle">White</Fluent:Button>
</Fluent:RibbonGroupBox>

<Fluent:RibbonGroupBox Header="Menu">
<Fluent:ToggleButton GroupName="Menu"
Name="UseBackstage"
Expand Down Expand Up @@ -602,7 +519,7 @@

<Fluent:RibbonGroupBox Header="Gallery">
<Fluent:InRibbonGallery x:Name="InRibbonGallery"
Icon="pack://application:,,,/Fluent;component/Themes/Office2010/Images/Warning.png"
Icon="pack://application:,,,/Fluent;component/Themes/Office2013/Images/Warning.png"
Header="Split"
KeyTip="S"
GroupBy="Tag"
Expand Down Expand Up @@ -2259,19 +2176,19 @@
InputWidth="75"
Format="0 px"
Header="Left:"
Icon="pack://application:,,,/Fluent;component/Themes/Office2010/Images/Warning.png"
Icon="pack://application:,,,/Fluent;component/Themes/Office2013/Images/Warning.png"
IsEnabled="False" />
<Fluent:Spinner KeyTip="KB"
Value="{Binding BoundSpinnerValue}"
InputWidth="75"
Format="0 px"
Header="Right:"
Icon="pack://application:,,,/Fluent;component/Themes/Office2010/Images/Warning.png" />
Icon="pack://application:,,,/Fluent;component/Themes/Office2013/Images/Warning.png" />
<Fluent:Spinner KeyTip="KC"
InputWidth="75"
Format="0 px"
Header="Top:"
Icon="pack://application:,,,/Fluent;component/Themes/Office2010/Images/Warning.png" />
Icon="pack://application:,,,/Fluent;component/Themes/Office2013/Images/Warning.png" />
</Fluent:RibbonGroupBox>
</Fluent:RibbonTabItem>

Expand Down Expand Up @@ -2640,9 +2557,7 @@
<LineBreak />
Fluent.Ribbon is a library that implements an Office-like user interface for the Windows Presentation Foundation (WPF).
<LineBreak />
It provides controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on.
<LineBreak />
It is bundled with Office 2010, Office 2013 and Windows 8 themes.
It provides controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on.
</TextBlock>
</StackPanel>
</TabItem>
Expand Down
45 changes: 0 additions & 45 deletions Fluent.Ribbon.Showcase/TestContent.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,32 +105,6 @@ private enum Theme
Windows8
}

private void OnOffice2013Click(object sender, RoutedEventArgs e)
{
this.ChangeTheme(Theme.Office2013, "pack://application:,,,/Fluent;component/Themes/Office2013/Generic.xaml");
}

private void OnOffice2010SilverClick(object sender, RoutedEventArgs e)
{
this.ChangeTheme(Theme.Office2010, "pack://application:,,,/Fluent;component/Themes/Office2010/Silver.xaml");
}

private void OnOffice2010BlackClick(object sender, RoutedEventArgs e)
{
this.ChangeTheme(Theme.Office2010, "pack://application:,,,/Fluent;component/Themes/Office2010/Black.xaml");
}

private void OnOffice2010BlueClick(object sender, RoutedEventArgs e)
{
this.ChangeTheme(Theme.Office2010, "pack://application:,,,/Fluent;component/Themes/Office2010/Blue.xaml");
}

private void OnWindows8Click(object sender, RoutedEventArgs e)
{
this.ChangeTheme(Theme.Windows8, "pack://application:,,,/Fluent;component/Themes/Windows8/Silver.xaml");
}


private void ChangeTheme(Theme theme, string color)
{
this.Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, (ThreadStart)(() =>
Expand Down Expand Up @@ -189,25 +163,6 @@ private void ChangeTheme(Theme theme, string color)
}));
}

private void HandleDontUseDwmClick(object sender, RoutedEventArgs e)
{
var control = sender as UIElement;

if (control == null)
{
return;
}

var window = Window.GetWindow(control) as RibbonWindow;

if (window == null)
{
return;
}

window.DontUseDwm = this.DontUseDwm.IsChecked.GetValueOrDefault();
}

#endregion Theming

#region Logical tree
Expand Down
76 changes: 38 additions & 38 deletions Fluent.Ribbon.Showcase/app.manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,49 @@
xmlns:asmv2="urn:schemas-microsoft-com:asm.v2"
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.0.0.0"
name="Fluent.Ribbon.Showcase"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker"
uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<assemblyIdentity version="1.0.0.0"
name="Fluent.Ribbon.Showcase"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker"
uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
<!--The ID below indicates application support for Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!--The ID below indicates application support for Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!--The ID below indicates application support for Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!--The ID below indicates application support for Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!--The ID below indicates application support for Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
<!--The ID below indicates application support for Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!--The ID below indicates application support for Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!--The ID below indicates application support for Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!--The ID below indicates application support for Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!--The ID below indicates application support for Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>

<!--<asmv3:application>
<!--<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>True/PM</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>-->

<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*" />
</dependentAssembly>
</dependency>
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*" />
</dependentAssembly>
</dependency>
</asmv1:assembly>
4 changes: 2 additions & 2 deletions Fluent.Ribbon.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<version>$Version$</version>
<title>Fluent.Ribbon</title>
<summary>Fluent.Ribbon is a library that implements an Office-like Ribbon for WPF.</summary>
<description>Fluent.Ribbon 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.</description>
<description>Fluent.Ribbon 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.</description>
<releaseNotes>You can read the changelog at: https://github.com/fluentribbon/Fluent.Ribbon/blob/master/Changelog.md</releaseNotes>
<authors>batzen</authors>
<licenseUrl>https://github.com/fluentribbon/Fluent.Ribbon/blob/master/License.txt</licenseUrl>
<projectUrl>https://github.com/fluentribbon/Fluent.Ribbon</projectUrl>
<iconUrl>https://raw.githubusercontent.com/fluentribbon/Fluent.Ribbon/master/Images/Logo/Logo_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>ribbon fluent ribbon ribbonwindow office2010 office2013 windows8 backstage</tags>
<tags>fluent office ribbon ribbonwindow backstage</tags>
<dependencies>
<dependency id="ControlzEx" version="2.0.1.61" />
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Fluent.Ribbon/Effects/GrayscaleEffect.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ private PixelShader CreatePixelShader()

if (DesignerProperties.GetIsInDesignMode(this) == false)
{
pixelShader.UriSource = new Uri("/Fluent;component/Themes/Office2010/Effects/Grayscale.ps", UriKind.Relative);
pixelShader.UriSource = new Uri("/Fluent;component/Themes/Effects/Grayscale.ps", UriKind.Relative);
}

return pixelShader;
Expand Down
Loading

0 comments on commit 2dbed0f

Please sign in to comment.