QuickLook Icon + QuickLook in PhotoView (#355)

lampenlampen · yaira2 · commit 7e3158d70e54 · 2019-12-23T10:18:14.000-05:00
* QuickLook Icon
* Enable QuickLook in PhotoView
diff --git a/Files/Assets/QuickLook/quicklook_icon_black.png b/Files/Assets/QuickLook/quicklook_icon_black.png
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.Storage;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -24,6 +25,8 @@ namespace Files
     /// </summary>
     public class BaseLayout : Page
     {
+        protected bool IsQuickLookEnabled { get; set; } = false;
+
         public ItemViewModel AssociatedViewModel = null;
         public Interaction AssociatedInteractions = null;
         public bool isRenamingItem = false;
@@ -68,6 +71,15 @@ public BaseLayout()
         {
             this.Loaded += Page_Loaded;
             Page_Loaded(null, null);
+
+            // QuickLook Integration
+            ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
+            var isQuickLookIntegrationEnabled = localSettings.Values["quicklook_enabled"];
+
+            if (isQuickLookIntegrationEnabled != null && isQuickLookIntegrationEnabled.Equals(true))
+            {
+                IsQuickLookEnabled = true;
+            }
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
diff --git a/Files/Files.csproj b/Files/Files.csproj
@@ -233,6 +233,7 @@
     <Content Include="Assets\FilesDrive.png" />
     <Content Include="Assets\logo.bmp" />
     <None Include="Package.StoreAssociation.xml" />
+    <Content Include="Assets\QuickLook\quicklook_icon_black.png" />
     <Content Include="Assets\StoreLogo.png" />
     <Content Include="Assets\WSL\alpine.svg" />
     <Content Include="Assets\WSL\alpinepng.png" />
diff --git a/Files/GenericFileBrowser.xaml b/Files/GenericFileBrowser.xaml
@@ -147,7 +147,10 @@
                     <FontIcon Glyph="&#xE946;"/>
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
-            <MenuFlyoutItem Click="{x:Bind AssociatedInteractions.ToggleQuickLook_Click}" Text="QuickLook" x:Name="QuickLook" Visibility="{x:Bind _isQuickLookEnabled}">
+            <MenuFlyoutItem Click="{x:Bind AssociatedInteractions.ToggleQuickLook_Click}" Text="QuickLook" x:Name="QuickLook" Visibility="{x:Bind IsQuickLookEnabled}">
+                <MenuFlyoutItem.Icon>
+                    <BitmapIcon UriSource="ms-appx:///Assets/QuickLook/quicklook_icon_black.png"/>
+                </MenuFlyoutItem.Icon>
                 <MenuFlyoutItem.KeyboardAccelerators>
                     <KeyboardAccelerator Key="Space"/>
                 </MenuFlyoutItem.KeyboardAccelerators>
@@ -220,4 +223,4 @@
 
 
     </Grid>
-</local:BaseLayout>
+</local:BaseLayout>
diff --git a/Files/GenericFileBrowser.xaml.cs b/Files/GenericFileBrowser.xaml.cs
@@ -16,7 +16,6 @@ namespace Files
 {
     public sealed partial class GenericFileBrowser : BaseLayout
     {
-        private bool _isQuickLookEnabled { get; set; } = false;
         public string previousFileName;
         private DataGridColumn _sortedColumn;
         public DataGridColumn SortedColumn
@@ -70,15 +69,6 @@ public GenericFileBrowser()
             }
 
             App.OccupiedInstance.instanceViewModel.PropertyChanged += ViewModel_PropertyChanged;
-
-            // QuickLook Integration
-            ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
-            var isQuickLookIntegrationEnabled = localSettings.Values["quicklook_enabled"];
-
-            if (isQuickLookIntegrationEnabled != null && isQuickLookIntegrationEnabled.Equals(true))
-            {
-                _isQuickLookEnabled = true;
-            }
         }
 
         private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/Files/PhotoAlbum.xaml b/Files/PhotoAlbum.xaml
@@ -149,6 +149,14 @@
                     <FontIcon Glyph="&#xE946;"/>
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
+            <MenuFlyoutItem Click="{x:Bind AssociatedInteractions.ToggleQuickLook_Click}" Text="QuickLook" x:Name="QuickLook" Visibility="{x:Bind IsQuickLookEnabled}">
+                <MenuFlyoutItem.Icon>
+                    <BitmapIcon UriSource="ms-appx:///Assets/QuickLook/quicklook_icon_black.png"/>
+                </MenuFlyoutItem.Icon>
+                <MenuFlyoutItem.KeyboardAccelerators>
+                    <KeyboardAccelerator Key="Space"/>
+                </MenuFlyoutItem.KeyboardAccelerators>
+            </MenuFlyoutItem>
         </MenuFlyout>
     </local:BaseLayout.Resources>
 
diff --git a/Files/SettingsPages/About.xaml b/Files/SettingsPages/About.xaml
@@ -11,7 +11,8 @@
     <Grid Margin="24,14">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Spacing="24" Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
             <Grid Height="150" Width="150">
@@ -45,5 +46,25 @@
             </ListView>
         </StackPanel>
 
+        <StackPanel Grid.Row="2">
+            <TextBlock Text="Third Party Licenses" FontSize="18" Margin="0,16,0,0"/>
+            <ListView>
+                <ListViewItem>
+                    <StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <BitmapIcon UriSource="ms-appx:///Assets/QuickLook/quicklook_icon_black.png" Width="16" VerticalAlignment="Center"/>
+                            <TextBlock Text="QuickLook" FontSize="16" VerticalAlignment="Bottom" Margin="2,0,16,0"/>
+                            <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Margin="0,0,8,0">
+                                <Span xml:space="preserve"><Run>Website: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook">Link</Hyperlink></Span>
+                            </TextBlock>
+                            <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom">
+                                <Span xml:space="preserve"><Run>License: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook/blob/master/LICENSE-GPL.txt">Link</Hyperlink></Span>
+                            </TextBlock>
+                        </StackPanel>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+        </StackPanel>
+
     </Grid>
 </Page>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ namespace Files`
`16`	`16`	`{`
`17`	`17`	`public sealed partial class GenericFileBrowser : BaseLayout`
`18`	`18`	`{`
`19`		`- private bool _isQuickLookEnabled { get; set; } = false;`
`20`	`19`	`public string previousFileName;`
`21`	`20`	`private DataGridColumn _sortedColumn;`
`22`	`21`	`public DataGridColumn SortedColumn`
`@@ -70,15 +69,6 @@ public GenericFileBrowser()`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`App.OccupiedInstance.instanceViewModel.PropertyChanged += ViewModel_PropertyChanged;`
`73`		`-`
`74`		`- // QuickLook Integration`
`75`		`- ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;`
`76`		`- var isQuickLookIntegrationEnabled = localSettings.Values["quicklook_enabled"];`
`77`		`-`
`78`		`- if (isQuickLookIntegrationEnabled != null && isQuickLookIntegrationEnabled.Equals(true))`
`79`		`- {`
`80`		`- _isQuickLookEnabled = true;`
`81`		`- }`
`82`	`72`	`}`
`83`	`73`
`84`	`74`	`private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)`