From 7235278b41235cb6c97b7b0718606f2e65723995 Mon Sep 17 00:00:00 2001
From: chenguanzhou <chenguanzhou123@163.com>
Date: Wed, 16 Mar 2016 15:10:58 +0800
Subject: [PATCH] v0.3.6

1. fix bug for save
2. move about to settings
---
 MarkDownEditor.Setup/Product.wxs              |  4 ++--
 MarkDownEditor/Properties/AssemblyInfo.cs     |  4 ++--
 MarkDownEditor/View/AboutControl.xaml         | 14 ++++++++++----
 MarkDownEditor/View/MainWindow.xaml           |  6 +-----
 MarkDownEditor/View/SettingsControl.xaml      |  3 +++
 MarkDownEditor/ViewModel/MainViewModel.cs     |  5 ++---
 MarkDownEditor/ViewModel/SettingsViewModel.cs |  3 ++-
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/MarkDownEditor.Setup/Product.wxs b/MarkDownEditor.Setup/Product.wxs
index 3e055bc..51e127e 100644
--- a/MarkDownEditor.Setup/Product.wxs
+++ b/MarkDownEditor.Setup/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?define MarkDownEditor_TargetDir=$(var.MarkDownEditor.TargetDir)?>
-  <Product Id="{EC0950BB-ADC2-4C2C-8202-301132B9D7DF}" Name="MarkDownEditor" Language="1033" Version="0.3.5" Manufacturer="Chen Guanzhou" UpgradeCode="5d30c639-0761-41c7-b4ef-e0c1b75eeb3f">
-    <Package Id="{DC6CD43F-21AC-4ABB-B424-3D56E7D59A84}" InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
+  <Product Id="{2AF37E4D-580B-4CF0-AF5C-6CB26A553499}" Name="MarkDownEditor" Language="1033" Version="0.3.6" Manufacturer="Chen Guanzhou" UpgradeCode="5d30c639-0761-41c7-b4ef-e0c1b75eeb3f">
+    <Package Id="{858655DC-1061-4319-BD09-C791DFD23B81}" InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
 
     <MajorUpgrade Schedule="afterInstallInitialize"
       DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>
diff --git a/MarkDownEditor/Properties/AssemblyInfo.cs b/MarkDownEditor/Properties/AssemblyInfo.cs
index 93b9020..6df9ca4 100644
--- a/MarkDownEditor/Properties/AssemblyInfo.cs
+++ b/MarkDownEditor/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.5.0")]
-[assembly: AssemblyFileVersion("0.3.5.0")]
+[assembly: AssemblyVersion("0.3.6.0")]
+[assembly: AssemblyFileVersion("0.3.6.0")]
diff --git a/MarkDownEditor/View/AboutControl.xaml b/MarkDownEditor/View/AboutControl.xaml
index c2049d4..2cc1997 100644
--- a/MarkDownEditor/View/AboutControl.xaml
+++ b/MarkDownEditor/View/AboutControl.xaml
@@ -7,9 +7,15 @@
              xmlns:local="clr-namespace:MarkDownEditor.View"
              mc:Ignorable="d" 
              d:DesignHeight="500" d:DesignWidth="400">
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
-            <Image Margin="50" Source="../MarkdownEditorLogo.png"></Image>
+            <Button Margin="20" Background="{DynamicResource AccentColorBrush}" Command="{Binding ClickSourceCodeWebCommand}">
+                <Button.Style>
+                    <Style></Style>
+                </Button.Style>
+                <Image Margin="50" Source="../MarkdownEditorLogo.png"></Image>
+            </Button>
+            
             <StackPanel Margin="20">
                 <StackPanel.Resources>
                     <Style TargetType="TextBlock">
@@ -19,7 +25,7 @@
                 <TextBlock Text="{Binding ApplicationName}" FontSize="25"></TextBlock>
                 <TextBlock Text="{Binding VersionNumber}" FontSize="16"></TextBlock>
                 <TextBlock FontSize="16">
-                <Hyperlink Foreground="{DynamicResource WhiteBrush}" Command="{Binding ClickSourceCodeWebCommand}">
+                <Hyperlink Command="{Binding ClickSourceCodeWebCommand}">
                     <TextBlock Text="{x:Static p:Resources.SourceCode}">
                             <TextBlock.Style>
                                 <Style></Style>
@@ -28,7 +34,7 @@
                 </Hyperlink>
             </TextBlock>
                 <TextBlock FontSize="16">
-                    <Hyperlink Foreground="{DynamicResource WhiteBrush}" Command="{Binding CheckForUpdateCommand}">
+                    <Hyperlink Command="{Binding CheckForUpdateCommand}">
                         <TextBlock Text="{x:Static p:Resources.CheckForUpdate}">
                                 <TextBlock.Style>
                                     <Style></Style>
diff --git a/MarkDownEditor/View/MainWindow.xaml b/MarkDownEditor/View/MainWindow.xaml
index ebb3bcb..f65bdd9 100644
--- a/MarkDownEditor/View/MainWindow.xaml
+++ b/MarkDownEditor/View/MainWindow.xaml
@@ -31,7 +31,6 @@
             <ToggleButton Content="{x:Static p:Resources.ShowPreview}" IsChecked="{Binding IsShowPreview}" IsEnabled="{Binding IsReadingMode,Converter={StaticResource OppositeConverter}}"></ToggleButton>
             <ToggleButton Content="{x:Static p:Resources.FullScreen}" IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ToggleFullScreen}"></ToggleButton>
             <Button Content="{x:Static p:Resources.SETTINGS}" Command="{Binding SettingsViewModel.ShowSettingCommand}"></Button>
-            <Button Content="{x:Static p:Resources.About}" Command="{Binding AboutViewModel.ShowAboutCommand}"></Button>
         </Controls:WindowCommands>
     </Controls:MetroWindow.RightWindowCommands>
 
@@ -59,10 +58,7 @@
 
     <Controls:MetroWindow.Flyouts>
         <Controls:FlyoutsControl>
-            <Controls:Flyout Position="Right" IsModal="True" Theme="Adapt" Width="300" IsOpen="{Binding AboutViewModel.ShowAboutControl}">
-                <view:AboutControl DataContext="{Binding AboutViewModel}"></view:AboutControl>
-            </Controls:Flyout>
-            <Controls:Flyout Position="Right" IsModal="True" Theme="Adapt" Width="500" IsOpen="{Binding SettingsViewModel.ShowSettingsControl}">
+            <Controls:Flyout Position="Right" IsModal="True" Theme="Adapt" Width="400" IsOpen="{Binding SettingsViewModel.ShowSettingsControl}">
                 <view:SettingsControl DataContext="{Binding SettingsViewModel}"></view:SettingsControl>
             </Controls:Flyout>
         </Controls:FlyoutsControl>
diff --git a/MarkDownEditor/View/SettingsControl.xaml b/MarkDownEditor/View/SettingsControl.xaml
index c06f7e6..4d98f9a 100644
--- a/MarkDownEditor/View/SettingsControl.xaml
+++ b/MarkDownEditor/View/SettingsControl.xaml
@@ -127,5 +127,8 @@
                 </StackPanel>
             </ScrollViewer>
         </Controls:MetroTabItem>
+        <Controls:MetroTabItem Header="{x:Static p:Resources.About}">
+            <local:AboutControl DataContext="{Binding AboutViewModel}"></local:AboutControl>
+        </Controls:MetroTabItem>
     </Controls:MetroAnimatedSingleRowTabControl>
 </UserControl>
diff --git a/MarkDownEditor/ViewModel/MainViewModel.cs b/MarkDownEditor/ViewModel/MainViewModel.cs
index 0c55b2c..225d704 100644
--- a/MarkDownEditor/ViewModel/MainViewModel.cs
+++ b/MarkDownEditor/ViewModel/MainViewModel.cs
@@ -75,7 +75,6 @@ public override void Cleanup()
         #region SubViewModels
 
         public SettingsViewModel SettingsViewModel { get; } = new SettingsViewModel();
-        public AboutViewModel AboutViewModel { get; } = new AboutViewModel();
         public FindReplaceViewModel FindReplaceViewModel { get; } = new FindReplaceViewModel();
 
         #endregion //SubViewModels
@@ -656,8 +655,8 @@ await DialogCoordinator.Instance.ShowMessageAsync(this, Properties.Resources.Sav
         {
             try
             {
-                Save();
-                IsModified = false;
+                if (Save())
+                    IsModified = false;
             }
             catch (Exception ex)
             {
diff --git a/MarkDownEditor/ViewModel/SettingsViewModel.cs b/MarkDownEditor/ViewModel/SettingsViewModel.cs
index f2d7150..4658f1a 100644
--- a/MarkDownEditor/ViewModel/SettingsViewModel.cs
+++ b/MarkDownEditor/ViewModel/SettingsViewModel.cs
@@ -50,7 +50,8 @@ public override void Cleanup()
             base.Cleanup();
         }
 
-        
+        public AboutViewModel AboutViewModel { get; } = new AboutViewModel();
+
         private bool showSettingsControl = false;
         public bool ShowSettingsControl
         {