Button Style Update

.gitignore

@@ -186,4 +186,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+*.nupkg
+/.vs

README.md

@@ -0,0 +1,58 @@
+# WPF.Bootstrap
+A Bootstrap Theme for WPF
+
+[![NuGet Version and Downloads count](https://buildstats.info/nuget/Bootstrap.Wpf)](https://www.nuget.org/packages/Bootstrap.Wpf) 
+
+## How to Use
+
+`Install-Package Bootstrap.Wpf`
+
+
+Put the following code in your App.xaml or MainWindow.xaml or any other window which use the resourse, for example, in `App.xaml`
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/WPF.Bootstrap;component/Themes/Default.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+
+Now you can use the controls, for example:
+
+        <bootstrap:BootstrapPanel Margin="10" Type="Default" Header="Default Panel">
+            <TextBlock>content</TextBlock>
+            <bootstrap:BootstrapPanel.Footer>
+                <TextBlock>footer</TextBlock>
+            </bootstrap:BootstrapPanel.Footer>
+        </bootstrap:BootstrapPanel>
+
+Remember to add `xmlns:bootstrap="http://github.com/scheshan/bootstrap"`
+
+## Use Wpf.Bootstrap in a WPF User Control Library (.dll) project
+
+If the solution contains one .exe project and several other WPF User Control Library (.dll) projects, the Wpf.Bootstrap package should be added to both the .dll projects and the exe project, even if the .exe project does not use Wpf.Bootstrap directly.
+
+## Project History
+
+This project originally is a fork from [scheshan/WPF.Bootstrap](https://github.com/scheshan/WPF.Bootstrap). This project uses a different nuget pakcage id: `Bootstrap.Wpf`. (Could you see the difference?)
+
+## Revision History
+
+### v0.0.5:
+
+Added TabInPanel control. (previous TabPanel is renamed to TabNavi)
+
+![TabPanel](./TabPanel.png)
+
+### v0.0.4:
+
+Added TabPanel:
+
+You can use TabPanel alone with as a navigation control. You don't need to bind it to tab content.
+
+### v0.0.3:
+
+1)Remove dependency of Microsoft.windows.shell
+
+After the removal of above dependencies, the dialog/window stype will be managed by the OS (Win7 or Win10). Thereafter this project will mainly focus on the style/theme of content of window or controls.

WPF.Bootstrap.Demo/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Weavers>
+    <ReactiveUI />
+</Weavers>

WPF.Bootstrap.Demo/MainWindow.xaml

@@ -1,9 +1,7 @@
-<wpf:Dialog
+<Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:b="http://www.scheshan.com/bootstrap"
         x:Class="WPF.Bootstrap.Demo.MainWindow"
-        xmlns:wpf="http://github.com/scheshan/bootstrap"
         xmlns:view="clr-namespace:WPF.Bootstrap.Demo.Views"
         Title="Demo" Height="700" Width="800">
 
@@ -24,5 +22,11 @@
         <TabItem Header="List">
             <view:List/>
         </TabItem>
+        <TabItem Header="TabNavi">
+            <view:TabNaviControl></view:TabNaviControl>
+        </TabItem>
+      <TabItem Header="TabInPanel">
+        <view:TabPanelControl></view:TabPanelControl>
+      </TabItem>
     </TabControl>
-</wpf:Dialog>
+</Window>

WPF.Bootstrap.Demo/ViewModels/TabInPanelViewModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ReactiveUI;
+
+namespace WPF.Bootstrap.Demo.ViewModels
+{
+    public class TabInPanelViewModel : ReactiveObject
+    {
+        public TabInPanelViewModel()
+        {
+            TabItems = new ReactiveList<TabItemViewModel>();
+
+            TabItems.Add(new TabItemViewModel("test"));
+            TabItems.Add(new TabItemViewModel("test 2"));
+        }
+
+        public ReactiveList<TabItemViewModel> TabItems { get; set; }
+    }
+}

WPF.Bootstrap.Demo/ViewModels/TabItemViewModel.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
+namespace WPF.Bootstrap.Demo.ViewModels
+{
+    public class TabItemViewModel : ReactiveObject
+    {
+        public TabItemViewModel(string header)
+        {
+            Header = header;
+        }
+
+        [Reactive]
+        public string Header { get; set; }
+    }
+}

WPF.Bootstrap.Demo/Views/List.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" x:Class="WPF.Bootstrap.Demo.Views.List"
+             x:Class="WPF.Bootstrap.Demo.Views.List"
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <Grid>

WPF.Bootstrap.Demo/Views/Panel.xaml

@@ -2,8 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:bootstrap="http://github.com/scheshan/bootstrap"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:bootstrap="clr-namespace:WPF.Bootstrap.Controls;assembly=WPF.Bootstrap"
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <Grid>
@@ -19,8 +19,8 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        
-        <bootstrap:BootstrapPanel Margin="10" Type="Default" Header="Default Panel">
+
+      <bootstrap:BootstrapPanel Margin="10" Type="Default" Header="Default Panel">
             <TextBlock>content</TextBlock>
             <bootstrap:BootstrapPanel.Footer>
                 <TextBlock>footer</TextBlock>

WPF.Bootstrap.Demo/Views/TabNaviControl.xaml

@@ -0,0 +1,20 @@
+<UserControl x:Class="WPF.Bootstrap.Demo.Views.TabNaviControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPF.Bootstrap.Demo.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            <TabControl TabStripPlacement="Left" Style="{DynamicResource TabNaviStyle}" 
+                        Width="200"
+                        VerticalAlignment="Center" HorizontalAlignment="Center">
+                <TabItem Header="1"></TabItem>
+                <TabItem Header="1 asdf "></TabItem>
+                <TabItem Header="1 asd asd adsf"></TabItem>
+                <TabItem Header="1 incalctive"></TabItem>
+                <TabItem Header="1 active"></TabItem>
+            </TabControl>
+    </Grid>
+</UserControl>

WPF.Bootstrap.Demo/Views/TabNaviControl.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WPF.Bootstrap.Demo.Views
+{
+    /// <summary>
+    /// Interaction logic for TabPanelControl.xaml
+    /// </summary>
+    public partial class TabNaviControl : UserControl
+    {
+        public TabNaviControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

WPF.Bootstrap.Demo/Views/TabPanelControl.xaml

@@ -0,0 +1,16 @@
+<UserControl x:Class="WPF.Bootstrap.Demo.Views.TabPanelControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:controls="clr-namespace:WPF.Bootstrap.Controls;assembly=WPF.Bootstrap"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+  <UserControl.Resources>
+  </UserControl.Resources>
+  <Grid>
+    <controls:TabInPanel TabStripPlacement="Top" Style="{DynamicResource TabInPanelStyle}" PanelBackground="{DynamicResource BgPrimary}"
+                         ItemsSource="{Binding TabItems}">
+    </controls:TabInPanel>
+  </Grid>
+</UserControl>