diff --git a/Fluent/Fluent dotNET 4.0.csproj b/Fluent/Fluent dotNET 4.0.csproj index 04cf4b445..5c0c9a9ce 100644 --- a/Fluent/Fluent dotNET 4.0.csproj +++ b/Fluent/Fluent dotNET 4.0.csproj @@ -18,7 +18,7 @@ true 4.0.20621.0 ..\build\obj\NET 4.0 - $(BaseIntermediateOutputPath)\$(Configuration)\ + $(BaseIntermediateOutputPath)\$(Configuration)\ true @@ -589,6 +589,218 @@ 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 + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + @@ -625,14 +837,20 @@ + + + + + "$(ProjectDir)Themes\XamlCombine.exe" Generic.txt Generic.xaml -"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml +"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml +"$(ProjectDir)Themes\XamlCombine.exe" Windows8\Generic.txt Windows8\Generic.xaml \ No newline at end of file diff --git a/Fluent/Fluent dotNET 4.5.csproj b/Fluent/Fluent dotNET 4.5.csproj index c5394361c..f899c7313 100644 --- a/Fluent/Fluent dotNET 4.5.csproj +++ b/Fluent/Fluent dotNET 4.5.csproj @@ -18,7 +18,7 @@ true 4.0.20621.0 ..\build\obj\NET 4.5 - $(BaseIntermediateOutputPath)\$(Configuration)\ + $(BaseIntermediateOutputPath)\$(Configuration)\ true @@ -585,6 +585,218 @@ 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 + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + @@ -621,14 +833,20 @@ + + + + + "$(ProjectDir)Themes\XamlCombine.exe" Generic.txt Generic.xaml -"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml +"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml +"$(ProjectDir)Themes\XamlCombine.exe" Windows8\Generic.txt Windows8\Generic.xaml \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Colors/Colors.xaml b/Fluent/Themes/Windows8/Colors/Colors.xaml new file mode 100644 index 000000000..5a7217b82 --- /dev/null +++ b/Fluent/Themes/Windows8/Colors/Colors.xaml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Colors/ColorsSilver.xaml b/Fluent/Themes/Windows8/Colors/ColorsSilver.xaml new file mode 100644 index 000000000..cf968eafe --- /dev/null +++ b/Fluent/Themes/Windows8/Colors/ColorsSilver.xaml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Common.xaml b/Fluent/Themes/Windows8/Common.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Common.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/ApplicationMenu.xaml b/Fluent/Themes/Windows8/Controls/ApplicationMenu.xaml new file mode 100644 index 000000000..c2e7a73ac --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ApplicationMenu.xaml @@ -0,0 +1,183 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/ApplicationMenuItem.xaml b/Fluent/Themes/Windows8/Controls/ApplicationMenuItem.xaml new file mode 100644 index 000000000..d4045a217 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ApplicationMenuItem.xaml @@ -0,0 +1,1667 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/Backstage.xaml b/Fluent/Themes/Windows8/Controls/Backstage.xaml new file mode 100644 index 000000000..d1208dd79 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Backstage.xaml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml b/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml new file mode 100644 index 000000000..4f8848576 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/BackstageTabItem.xaml b/Fluent/Themes/Windows8/Controls/BackstageTabItem.xaml new file mode 100644 index 000000000..09cd0d5a3 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/BackstageTabItem.xaml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/Button.xaml b/Fluent/Themes/Windows8/Controls/Button.xaml new file mode 100644 index 000000000..03b20ff84 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Button.xaml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/CheckBox.xaml b/Fluent/Themes/Windows8/Controls/CheckBox.xaml new file mode 100644 index 000000000..9ae284251 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/CheckBox.xaml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + Visible + + + + + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/ComboBox.xaml b/Fluent/Themes/Windows8/Controls/ComboBox.xaml new file mode 100644 index 000000000..d46e5f8b9 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ComboBox.xaml @@ -0,0 +1,659 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/ComboBoxItem.xaml b/Fluent/Themes/Windows8/Controls/ComboBoxItem.xaml new file mode 100644 index 000000000..615cd06de --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ComboBoxItem.xaml @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/DropDownButton.xaml b/Fluent/Themes/Windows8/Controls/DropDownButton.xaml new file mode 100644 index 000000000..334872cb6 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/DropDownButton.xaml @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/GalleryGroupContainer.xaml b/Fluent/Themes/Windows8/Controls/GalleryGroupContainer.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/GalleryGroupContainer.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/GalleryItem.xaml b/Fluent/Themes/Windows8/Controls/GalleryItem.xaml new file mode 100644 index 000000000..8955e9be2 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/GalleryItem.xaml @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/InRibbonGallery.xaml b/Fluent/Themes/Windows8/Controls/InRibbonGallery.xaml new file mode 100644 index 000000000..ea886eb90 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/InRibbonGallery.xaml @@ -0,0 +1,660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/KeyTip.xaml b/Fluent/Themes/Windows8/Controls/KeyTip.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/KeyTip.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/Menu.xaml b/Fluent/Themes/Windows8/Controls/Menu.xaml new file mode 100644 index 000000000..64f7947e3 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Menu.xaml @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RadioButton.xaml b/Fluent/Themes/Windows8/Controls/RadioButton.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RadioButton.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/Ribbon.xaml b/Fluent/Themes/Windows8/Controls/Ribbon.xaml new file mode 100644 index 000000000..7730183c2 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Ribbon.xaml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonContextualTabGroup.xaml b/Fluent/Themes/Windows8/Controls/RibbonContextualTabGroup.xaml new file mode 100644 index 000000000..33e322d59 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonContextualTabGroup.xaml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml new file mode 100644 index 000000000..5f1a13a77 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml @@ -0,0 +1,770 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonScrollViewer.xaml b/Fluent/Themes/Windows8/Controls/RibbonScrollViewer.xaml new file mode 100644 index 000000000..6f5d217b4 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonScrollViewer.xaml @@ -0,0 +1,478 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonSeparator.xaml b/Fluent/Themes/Windows8/Controls/RibbonSeparator.xaml new file mode 100644 index 000000000..dbb325712 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonSeparator.xaml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonStatusBar.xaml b/Fluent/Themes/Windows8/Controls/RibbonStatusBar.xaml new file mode 100644 index 000000000..488c37540 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonStatusBar.xaml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonTabItem.xaml b/Fluent/Themes/Windows8/Controls/RibbonTabItem.xaml new file mode 100644 index 000000000..cd93cd492 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonTabItem.xaml @@ -0,0 +1,469 @@ + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonTextBox.xaml b/Fluent/Themes/Windows8/Controls/RibbonTextBox.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonTextBox.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/RibbonTitleBar.xaml b/Fluent/Themes/Windows8/Controls/RibbonTitleBar.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonTitleBar.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/RibbonToolBar.xaml b/Fluent/Themes/Windows8/Controls/RibbonToolBar.xaml new file mode 100644 index 000000000..1f996271c --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonToolBar.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/RibbonToolBarControlGroup.xaml b/Fluent/Themes/Windows8/Controls/RibbonToolBarControlGroup.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/RibbonToolBarControlGroup.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/ScreenTip.xaml b/Fluent/Themes/Windows8/Controls/ScreenTip.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ScreenTip.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/ScrollBar.xaml b/Fluent/Themes/Windows8/Controls/ScrollBar.xaml new file mode 100644 index 000000000..abf3365b9 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ScrollBar.xaml @@ -0,0 +1,637 @@ + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/ScrollBarWhite.xaml b/Fluent/Themes/Windows8/Controls/ScrollBarWhite.xaml new file mode 100644 index 000000000..388fa6d15 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ScrollBarWhite.xaml @@ -0,0 +1,576 @@ + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/SeparatorTabItem.xaml b/Fluent/Themes/Windows8/Controls/SeparatorTabItem.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/SeparatorTabItem.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/Slider.xaml b/Fluent/Themes/Windows8/Controls/Slider.xaml new file mode 100644 index 000000000..dbfd0e089 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Slider.xaml @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/Spinner.xaml b/Fluent/Themes/Windows8/Controls/Spinner.xaml new file mode 100644 index 000000000..28e4727b9 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/Spinner.xaml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/SplitButton.xaml b/Fluent/Themes/Windows8/Controls/SplitButton.xaml new file mode 100644 index 000000000..643388857 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/SplitButton.xaml @@ -0,0 +1,541 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/StatusBar.xaml b/Fluent/Themes/Windows8/Controls/StatusBar.xaml new file mode 100644 index 000000000..251b20797 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/StatusBar.xaml @@ -0,0 +1,64 @@ + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/TextBox.xaml b/Fluent/Themes/Windows8/Controls/TextBox.xaml new file mode 100644 index 000000000..06cb1ac81 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/TextBox.xaml @@ -0,0 +1,6 @@ + + diff --git a/Fluent/Themes/Windows8/Controls/ToggleButton.xaml b/Fluent/Themes/Windows8/Controls/ToggleButton.xaml new file mode 100644 index 000000000..db2fd096b --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/ToggleButton.xaml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Controls/TwoLineLabel.xaml b/Fluent/Themes/Windows8/Controls/TwoLineLabel.xaml new file mode 100644 index 000000000..d8f8fe0e9 --- /dev/null +++ b/Fluent/Themes/Windows8/Controls/TwoLineLabel.xaml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Effects/Grayscale.fx b/Fluent/Themes/Windows8/Effects/Grayscale.fx new file mode 100644 index 000000000..35f75308a --- /dev/null +++ b/Fluent/Themes/Windows8/Effects/Grayscale.fx @@ -0,0 +1,31 @@ +/// MonochromeEffect +/// Shazzam.Shaders +/// An effect that turns the input into shades of a single color. + +//----------------------------------------------------------------------------------------- +// Shader constant register mappings (scalars - float, double, Point, Color, Point3D, etc.) +//----------------------------------------------------------------------------------------- + +/// The color used to tint the input. +/// Yellow +float4 FilterColor : register(C0); + +//-------------------------------------------------------------------------------------- +// Sampler Inputs (Brushes, including ImplicitInput) +//-------------------------------------------------------------------------------------- + +sampler2D implicitInputSampler : register(S0); + +//-------------------------------------------------------------------------------------- +// Pixel Shader +//-------------------------------------------------------------------------------------- + +float4 main(float2 uv : TEXCOORD) : COLOR +{ + float4 srcColor = tex2D(implicitInputSampler, uv); + float3 rgb = srcColor.rgb; + float3 luminance = dot(rgb, float3(0.30, 0.59, 0.11)); + return float4(luminance * FilterColor.rgb, srcColor.a); +} + + diff --git a/Fluent/Themes/Windows8/Effects/Grayscale.ps b/Fluent/Themes/Windows8/Effects/Grayscale.ps new file mode 100644 index 000000000..6aa017b78 Binary files /dev/null and b/Fluent/Themes/Windows8/Effects/Grayscale.ps differ diff --git a/Fluent/Themes/Windows8/Generic.txt b/Fluent/Themes/Windows8/Generic.txt new file mode 100644 index 000000000..f29fe78ae --- /dev/null +++ b/Fluent/Themes/Windows8/Generic.txt @@ -0,0 +1,53 @@ +Windows8\Colors\Colors.xaml +Windows8\Colors\ColorsSilver.xaml +Office2010\Images\Images.xaml +Office2010\Controls\EmptyFocusStyle.xaml +Windows8\Controls\ApplicationMenuItem.xaml +Windows8\Controls\ApplicationMenu.xaml +Windows8\Controls\Backstage.xaml +Windows8\Controls\RibbonTabControl.xaml +Windows8\Controls\RibbonTabItem.xaml +Windows8\Controls\RibbonGroupBox.xaml +Office2010\Controls\ScreenTip.xaml +Windows8\Controls\TwoLineLabel.xaml +Windows8\Controls\Button.xaml +Windows8\Controls\ToggleButton.xaml +Windows8\Controls\DropDownButton.xaml +Windows8\Controls\SplitButton.xaml +Windows8\Controls\CheckBox.xaml +Office2010\Controls\RadioButton.xaml +Office2010\Controls\GalleryGroupContainer.xaml +Windows8\Controls\RibbonScrollViewer.xaml +Windows8\Controls\RibbonContextualTabGroup.xaml +Office2010\Controls\RibbonTitleBar.xaml +Office2010\Controls\KeyTip.xaml +Windows8\Controls\RibbonTitleBar.xaml +Windows8\Controls\QuickAccessToolBar.xaml +Windows8\Controls\Menu.xaml +Windows8\Controls\MenuItem.xaml +Office2010\Controls\MenuSeparator.xaml +Windows8\Controls\RibbonMenu.xaml +Windows8\Controls\Gallery.xaml +Windows8\Controls\GalleryItem.xaml +Windows8\Controls\ComboBoxItem.xaml +Windows8\Controls\InRibbonGallery.xaml +Windows8\Controls\BackstageTabItem.xaml +Windows8\Controls\BackstageControls.xaml +Windows8\Controls\BackstageTabControl.xaml +Windows8\Controls\RibbonSeparator.xaml +Windows8\Controls\RibbonToolBar.xaml +Office2010\Controls\RibbonToolBarControlGroup.xaml +Windows8\Controls\StatusBar.xaml +Windows8\Controls\ScrollBar.xaml +Windows8\Controls\ScrollBarWhite.xaml +Office2010\Controls\RibbonTextBox.xaml +Office2010\Controls\TextBox.xaml +Windows8\Controls\Spinner.xaml +Windows8\Controls\ComboBox.xaml +Windows8\Controls\Ribbon.xaml +Windows8\Controls\ColorGallery.xaml +Office2010\Controls\SeparatorTabItem.xaml +Windows8\Controls\RibbonStatusBar.xaml +Windows8\Controls\Slider.xaml +Windows8\RibbonWindow.xaml +Office2010\Common.xaml \ No newline at end of file diff --git a/Fluent/Themes/Windows8/RibbonWindow.xaml b/Fluent/Themes/Windows8/RibbonWindow.xaml new file mode 100644 index 000000000..bcbe83aef --- /dev/null +++ b/Fluent/Themes/Windows8/RibbonWindow.xaml @@ -0,0 +1,674 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Fluent/Themes/Windows8/Silver.xaml b/Fluent/Themes/Windows8/Silver.xaml new file mode 100644 index 000000000..5ae5f0a45 --- /dev/null +++ b/Fluent/Themes/Windows8/Silver.xaml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/FluentTest/App.xaml b/FluentTest/App.xaml index b4747e140..5205f325c 100644 --- a/FluentTest/App.xaml +++ b/FluentTest/App.xaml @@ -5,8 +5,9 @@ - + + diff --git a/FluentTest/TestContent.xaml b/FluentTest/TestContent.xaml index 6fec2b772..948132ce0 100644 --- a/FluentTest/TestContent.xaml +++ b/FluentTest/TestContent.xaml @@ -234,8 +234,9 @@ + Icon="pack://application:,,,/FluentTest;component/Images/BlueLarge.png" + IsDefinitive="True"> + + Icon="pack://application:,,,/FluentTest;component/Images/GreenLarge.png"> + + + + + + + + + + + + + + + @@ -321,18 +342,29 @@ Click="HandleDontUseDwmClick">Don't use DWM - - White - + - + + White (Experimental) + + + + + + + + + + + + + + + + + + + + + + + + + +