Fixes #158 by moving theme files around

.gitignore

@@ -36,4 +36,5 @@ publish/
 
 # Generated files
 Fluent/Themes/**/Generic.xaml
+!Fluent/Themes/Generic.xaml
 packages/

Fluent/Fluent dotNET 4.0.csproj

@@ -199,6 +199,10 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Office2010\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -756,7 +760,7 @@
     <Resource Include="Themes\Office2010\Images\MoreColors.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Themes\Generic.txt" />
+    <None Include="Themes\Office2010\Generic.txt" />
     <None Include="Themes\Office2013\Generic.txt" />
     <None Include="Themes\XamlCombine.exe" />
   </ItemGroup>
@@ -769,7 +773,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>SET tmpError=0
-"$(ProjectDir)Themes\XamlCombine.exe" Generic.txt Generic.xaml
+"$(ProjectDir)Themes\XamlCombine.exe" Office2010\Generic.txt Office2010\Generic.xaml
 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25
 "$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml
 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25

Fluent/Fluent dotNET 4.5.csproj

@@ -195,6 +195,10 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Office2010\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -752,7 +756,7 @@
     <Resource Include="Themes\Office2010\Images\MoreColors.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Themes\Generic.txt" />
+    <None Include="Themes\Office2010\Generic.txt" />
     <None Include="Themes\Office2013\Generic.txt" />
     <None Include="Themes\XamlCombine.exe" />
   </ItemGroup>
@@ -765,7 +769,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>SET tmpError=0
-"$(ProjectDir)Themes\XamlCombine.exe" Generic.txt Generic.xaml
+"$(ProjectDir)Themes\XamlCombine.exe" Office2010\Generic.txt Office2010\Generic.xaml
 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25
 "$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml
 SET tmpError=%25tmpError%25 + %25ERRORLEVEL%25

Fluent/Themes/Generic.xaml

@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2010/Generic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>

Fluent/Themes/Generic.txt → Fluent/Themes/Office2010/Generic.txt

@@ -1,52 +1,52 @@
-Office2010\Colors\Colors.xaml
-Office2010\Colors\ColorsSilver.xaml
-Office2010\Images\Images.xaml
-Generic\Controls\EmptyFocusStyle.xaml
-Office2010\Controls\ApplicationMenuItem.xaml
-Office2010\Controls\ApplicationMenu.xaml
-Office2010\Controls\Backstage.xaml
-Office2010\Controls\RibbonTabControl.xaml
-Office2010\Controls\RibbonTabItem.xaml
-Office2010\Controls\RibbonGroupBox.xaml
-Office2010\Controls\ScreenTip.xaml
-Generic\Controls\TwoLineLabel.xaml
-Office2010\Controls\Button.xaml
-Office2010\Controls\ToggleButton.xaml
-Office2010\Controls\DropDownButton.xaml
-Office2010\Controls\SplitButton.xaml
-Office2010\Controls\CheckBox.xaml
-Generic\Controls\RadioButton.xaml
-Generic\Controls\GalleryGroupContainer.xaml
-Generic\Controls\RibbonScrollViewer.xaml
-Office2010\Controls\RibbonContextualTabGroup.xaml
-Generic\Controls\RibbonTitleBar.xaml
-Office2010\Controls\KeyTip.xaml
-Office2010\Controls\QuickAccessToolBar.xaml
-Office2010\Controls\Menu.xaml
-Office2010\Controls\MenuItem.xaml
-Generic\Controls\MenuSeparator.xaml
-Generic\Controls\RibbonMenu.xaml
-Office2010\Controls\Gallery.xaml
-Office2010\Controls\GalleryItem.xaml
-Office2010\Controls\ComboBoxItem.xaml
-Office2010\Controls\InRibbonGallery.xaml
-Office2010\Controls\BackstageTabItem.xaml
-Office2010\Controls\BackstageControls.xaml
-Office2010\Controls\BackstageTabControl.xaml
-Office2010\Controls\RibbonSeparator.xaml
-Generic\Controls\RibbonToolBar.xaml
-Generic\Controls\RibbonToolBarControlGroup.xaml
-Office2010\Controls\StatusBar.xaml
-Office2010\Controls\ScrollBar.xaml
-Office2010\Controls\ScrollBarWhite.xaml
-Generic\Controls\RibbonTextBox.xaml
-Generic\Controls\TextBox.xaml
-Office2010\Controls\Spinner.xaml
-Office2010\Controls\ComboBox.xaml
-Office2010\Controls\Ribbon.xaml
-Office2010\Controls\ColorGallery.xaml
-Generic\Controls\SeparatorTabItem.xaml
-Office2010\Controls\RibbonStatusBar.xaml
-Office2010\Controls\Slider.xaml
-Office2010\RibbonWindow.xaml
+Office2010\Colors\Colors.xaml
+Office2010\Colors\ColorsSilver.xaml
+Office2010\Images\Images.xaml
+Generic\Controls\EmptyFocusStyle.xaml
+Office2010\Controls\ApplicationMenuItem.xaml
+Office2010\Controls\ApplicationMenu.xaml
+Office2010\Controls\Backstage.xaml
+Office2010\Controls\RibbonTabControl.xaml
+Office2010\Controls\RibbonTabItem.xaml
+Office2010\Controls\RibbonGroupBox.xaml
+Office2010\Controls\ScreenTip.xaml
+Generic\Controls\TwoLineLabel.xaml
+Office2010\Controls\Button.xaml
+Office2010\Controls\ToggleButton.xaml
+Office2010\Controls\DropDownButton.xaml
+Office2010\Controls\SplitButton.xaml
+Office2010\Controls\CheckBox.xaml
+Generic\Controls\RadioButton.xaml
+Generic\Controls\GalleryGroupContainer.xaml
+Generic\Controls\RibbonScrollViewer.xaml
+Office2010\Controls\RibbonContextualTabGroup.xaml
+Generic\Controls\RibbonTitleBar.xaml
+Office2010\Controls\KeyTip.xaml
+Office2010\Controls\QuickAccessToolBar.xaml
+Office2010\Controls\Menu.xaml
+Office2010\Controls\MenuItem.xaml
+Generic\Controls\MenuSeparator.xaml
+Generic\Controls\RibbonMenu.xaml
+Office2010\Controls\Gallery.xaml
+Office2010\Controls\GalleryItem.xaml
+Office2010\Controls\ComboBoxItem.xaml
+Office2010\Controls\InRibbonGallery.xaml
+Office2010\Controls\BackstageTabItem.xaml
+Office2010\Controls\BackstageControls.xaml
+Office2010\Controls\BackstageTabControl.xaml
+Office2010\Controls\RibbonSeparator.xaml
+Generic\Controls\RibbonToolBar.xaml
+Generic\Controls\RibbonToolBarControlGroup.xaml
+Office2010\Controls\StatusBar.xaml
+Office2010\Controls\ScrollBar.xaml
+Office2010\Controls\ScrollBarWhite.xaml
+Generic\Controls\RibbonTextBox.xaml
+Generic\Controls\TextBox.xaml
+Office2010\Controls\Spinner.xaml
+Office2010\Controls\ComboBox.xaml
+Office2010\Controls\Ribbon.xaml
+Office2010\Controls\ColorGallery.xaml
+Generic\Controls\SeparatorTabItem.xaml
+Office2010\Controls\RibbonStatusBar.xaml
+Office2010\Controls\Slider.xaml
+Office2010\RibbonWindow.xaml
 Generic\Common.xaml