Merge pull request #1 from patrick330602/master

merge
wedotstudio · Feb 8, 2017 · 345b590 · 345b590
2 parents e8c507d + 6ce58c7
commit 345b590
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/Fcus/Fcus-Icon-file.png b/Fcus/Fcus-Icon-file.png
diff --git a/Fcus/Fcus.csproj b/Fcus/Fcus.csproj
@@ -18,7 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Fcus_StoreKey.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>AE2468B97205BB48128EB9D4DA803DF7BECBFE73</PackageCertificateThumbprint>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
   </PropertyGroup>
@@ -95,6 +95,7 @@
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="Fcus_StoreKey.pfx" />
     <None Include="project.json" />
+    <None Include="project.lock.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -254,7 +255,10 @@
     <Content Include="css\default.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Include="Package.StoreAssociation.xml" />
+    <None Include="Package.StoreAssociation.xml">
+      <SubType>Designer</SubType>
+    </None>
+    <Content Include="Fcus-Icon-file.png" />
     <Content Include="scripts\emojify.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/Fcus/MainPage.xaml b/Fcus/MainPage.xaml
@@ -37,6 +37,11 @@
                     <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE74E;" Foreground="LightGray"/>
                 </Button.Content>
             </Button>
+            <Button Background="Transparent" Width="40" Height="30" Click="FullScreen_Click" BorderThickness="0">
+                <Button.Content>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE740;" Foreground="LightGray"/>
+                </Button.Content>
+            </Button>
         </StackPanel>
         <WebView x:Name="editor" Source="ms-appx-web:///index.html" Grid.Row="2"/>
 

diff --git a/Fcus/MainPage.xaml.cs b/Fcus/MainPage.xaml.cs
@@ -69,9 +69,6 @@ private async void Editor_NavigationCompleted(WebView sender, WebViewNavigationC
         {
             NewWindowSetter();
 
-
-
-            //加载通过资源管理器打开的Markdown文件
             if (actfile!=null)
             {
                 await openfileasync(actfile);
@@ -150,6 +147,11 @@ private async System.Threading.Tasks.Task openfileasync(IStorageFile file)
             await editor.InvokeScriptAsync("setContent", new string[] { content });
         }
 
+        private void FullScreen()
+        {
+            ApplicationView.GetForCurrentView().TryEnterFullScreenMode();
+        }
+
         private async void SaveFile()
         {
             if (documentFile == null)
@@ -164,7 +166,7 @@ private async void SaveFile()
                     SaveDoc2File(file);
                     documentFile = file;
                     settitle();
-                    documentTitle = file.Name;
+                    documentTitle = file.Name + ".md";
                 }
             }
             else
@@ -194,5 +196,10 @@ private void New_Click(object sender, RoutedEventArgs e)
         {
             NewFile();
         }
+
+        private void FullScreen_Click(object sender, RoutedEventArgs e)
+        {
+            FullScreen();
+        }
     }
 }
diff --git a/Fcus/Package.appxmanifest b/Fcus/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="56367PatrickWu.Fcus" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="1.2.2.0" />
+  <Identity Name="56367PatrickWu.Fcus" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="1.2.5.0" />
   <mp:PhoneIdentity PhoneProductId="c9e00a60-ede4-4163-80a5-bd63429fba23" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Fcus</DisplayName>
@@ -30,11 +30,13 @@
         <uap:Extension Category="windows.fileTypeAssociation">
           <uap:FileTypeAssociation Name="markdown">
             <uap:DisplayName>Markdown File</uap:DisplayName>
+            <uap:Logo>Fcus-Icon-file.png</uap:Logo>
             <uap:SupportedFileTypes>
               <uap:FileType>.md</uap:FileType>
               <uap:FileType>.markdown</uap:FileType>
               <uap:FileType>.mmd</uap:FileType>
               <uap:FileType>.mdown</uap:FileType>
+              <uap:FileType>.text</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>

diff --git a/Fcus/_pkginfo.txt b/Fcus/_pkginfo.txt
@@ -1 +1 @@
-P:\Application\Fcus\Fcus\AppPackages\Fcus_1.2.2.0\Fcus_1.2.2.0_x86_x64_arm.appxbundle
+C:\Users\Patrick\Documents\Fcus\Fcus\AppPackages\Fcus_1.2.5.0\Fcus_1.2.5.0_x86_x64_arm.appxbundle
diff --git a/Fcus/_scale-100.appx b/Fcus/_scale-100.appx
diff --git a/Fcus/_scale-125.appx b/Fcus/_scale-125.appx
diff --git a/Fcus/_scale-150.appx b/Fcus/_scale-150.appx
diff --git a/Fcus/_scale-400.appx b/Fcus/_scale-400.appx
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		P:\Application\Fcus\Fcus\AppPackages\Fcus_1.2.2.0\Fcus_1.2.2.0_x86_x64_arm.appxbundle
		C:\Users\Patrick\Documents\Fcus\Fcus\AppPackages\Fcus_1.2.5.0\Fcus_1.2.5.0_x86_x64_arm.appxbundle