Merge pull request #2 from chenguanzhou/master

merge

LatestVersion.json

@@ -1,8 +1,8 @@
 {
   "AppName": "MarkDownEditor",
   "LatestVersion": {
-    "Version": "0.3.8.0",
-    "UpdateTime": "2016/8/15",
-    "Description": "1. Fix a bug. ( export markdown to pdf/image failed );  2. Add mathjax support; 3. Fix a crash bug"
+    "Version": "0.3.9.0",
+    "UpdateTime": "2016/9/17",
+    "Description": "1. Customized Qiniu Key;  2. Fix win7 crash bug"
   }
 }

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="{CC4B9A3B-7F84-4B70-8687-142E970639AA}" Name="MarkDownEditor" Language="1033" Version="0.3.8" Manufacturer="Chen Guanzhou" UpgradeCode="5d30c639-0761-41c7-b4ef-e0c1b75eeb3f">
-    <Package Id="{E995066D-7D8D-4C5D-9B4D-86AC6AA735A4}" InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
+  <Product Id="{325B5305-18DC-4086-B39E-3B07BEBA76EB}" Name="MarkDownEditor" Language="1033" Version="0.3.8" Manufacturer="Chen Guanzhou" UpgradeCode="5d30c639-0761-41c7-b4ef-e0c1b75eeb3f">
+    <Package Id="{835D85DC-1CC7-473A-BDD9-9C1F044763E7}" InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
 
     <MajorUpgrade Schedule="afterInstallInitialize"
       DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>

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.8.0")]
-[assembly: AssemblyFileVersion("0.3.8.0")]
+[assembly: AssemblyVersion("0.3.9.0")]
+[assembly: AssemblyFileVersion("0.3.9.0")]

MarkDownEditor/Properties/Resources.resx

@@ -573,13 +573,13 @@
   <data name="ShowMathJax" xml:space="preserve">
     <value>Show MathJax</value>
   </data>
-     <data name="QiniuConf" xml:space="preserve">
+  <data name="QiniuConf" xml:space="preserve">
     <value>QiniuConf</value>
   </data>
-   <data name="UserDomainName" xml:space="preserve">
-    <value>QiniuUserDomainName：</value>
+  <data name="QiniuUserDomainName" xml:space="preserve">
+    <value>QiniuUserDomainName</value>
   </data>
-    <data name="UserScope" xml:space="preserve">
+  <data name="QiniuUserScope" xml:space="preserve">
     <value>QiniuUserScope</value>
   </data>
 </root>

MarkDownEditor/Properties/Resources.zh-CN.resx

@@ -573,13 +573,13 @@
   <data name="ShowMathJax" xml:space="preserve">
     <value>显示MathJax公式</value>
   </data>
-   <data name="QiniuConf" xml:space="preserve">
+  <data name="QiniuConf" xml:space="preserve">
     <value>七牛云配置</value>
   </data>
-   <data name="UserDomainName" xml:space="preserve">
-    <value>七牛用户外链域名：</value>
+  <data name="QiniuUserDomainName" xml:space="preserve">
+    <value>七牛用户外链域名</value>
   </data>
-    <data name="UserScope" xml:space="preserve">
-    <value>七牛用户存储空间：</value>
+  <data name="QiniuUserScope" xml:space="preserve">
+    <value>七牛用户存储空间</value>
   </data>
 </root>

MarkDownEditor/View/SettingsControl.xaml

@@ -65,7 +65,7 @@
                             </DockPanel>
                         </StackPanel>
                     </Expander>
-                    <Expander IsExpanded="True" Header="{x:Static p:Resources.QiniuConf}" Height="300">
+                    <Expander Header="{x:Static p:Resources.QiniuConf}" Height="300">
                         <StackPanel>
                             <DockPanel Margin="0,5,0,5">
                                 <TextBlock Text="ACCESS_KEY：" Style="{StaticResource SettingKeyStyle}" Margin="5,0,0,0"/>

Readme.md

@@ -47,6 +47,7 @@ The editor has the following `features`:
 - Editing Mode & Reading Mode
 - Full Screen support
 - MathJax support (Only for markdown processor)
+- Customized Qiniu Key
 - ......