Expand Properties Box Access

Author: lukeblevins

Files UWP/GenericFileBrowser.xaml

@@ -168,18 +168,11 @@
                             <KeyboardAccelerator Modifiers="Control" Key="V"/>
                         </MenuFlyoutItem.KeyboardAccelerators>
                     </MenuFlyoutItem>
-                    <MenuFlyoutItem Text="Open in PowerShell...">
+                    <MenuFlyoutItem IsEnabled="False" Text="Open in PowerShell...">
                         <MenuFlyoutItem.Icon>
                             <FontIcon Glyph="&#xE756;"/>
                         </MenuFlyoutItem.Icon>
                     </MenuFlyoutItem>
-                    <MenuFlyoutSeparator/>
-                    <MenuFlyoutItem Text="Properties">
-                        <MenuFlyoutItem.Icon>
-                            <FontIcon Glyph="&#xE946;"/>
-                        </MenuFlyoutItem.Icon>
-                    </MenuFlyoutItem>
-
                 </MenuFlyout.Items>
             </MenuFlyout>
         </Grid.ContextFlyout>

Files UWP/GenericFileBrowser.xaml.cs

@@ -100,6 +100,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             AllView.DoubleTapped += instanceInteraction.List_ItemClick;
 
             var CurrentInstance = ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>();
+            PropertiesItem.Click += CurrentInstance.ShowPropertiesButton_Click;
             CurrentInstance.BackButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoBack;
             CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;
             CurrentInstance.RefreshButton.IsEnabled = true;

Files UWP/PhotoAlbum.xaml

@@ -395,10 +395,9 @@
                             <KeyboardAccelerator Modifiers="Control" Key="V"/>
                         </MenuFlyoutItem.KeyboardAccelerators>
                     </MenuFlyoutItem>
-                    <MenuFlyoutSeparator/>
-                    <MenuFlyoutItem Click="PropertiesItemGrid_Click" Text="Properties" Name="PropertiesItemGrid">
+                    <MenuFlyoutItem IsEnabled="False" Text="Open in PowerShell...">
                         <MenuFlyoutItem.Icon>
-                            <FontIcon Glyph="&#xE946;"/>
+                            <FontIcon Glyph="&#xE756;"/>
                         </MenuFlyoutItem.Icon>
                     </MenuFlyoutItem>
                 </MenuFlyout.Items>

Files UWP/PhotoAlbum.xaml.cs

@@ -203,11 +203,10 @@ private void CopyItem_Click(object sender, RoutedEventArgs e)
             instanceInteraction.CopyItem_ClickAsync(null, null);
         }
 
-        private async void PropertiesItem_Click(object sender, RoutedEventArgs e)
+        private void PropertiesItem_Click(object sender, RoutedEventArgs e)
         {
-            ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().accessiblePropertiesFrame.Navigate(typeof(Properties), (this.gv.SelectedItem as ListedItem).FilePath, new SuppressNavigationTransitionInfo());
-            await ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().propertiesBox.ShowAsync();
-            
+            var CurrentInstance = ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>();
+            CurrentInstance.ShowPropertiesButton_Click(null, null);
         }
 
         private void RefreshGrid_Click(object sender, RoutedEventArgs e)

Files UWP/ProHome.xaml

@@ -776,7 +776,7 @@
                 <TextBox Padding="8" Name="RenameInput" PlaceholderText="Enter an item name without the file extension" Width="300"/>
             </Grid>
         </ContentDialog>
-        <ContentDialog Windows10version1809:CornerRadius="4" Name="PropertiesDialog" Grid.RowSpan="4" Title="Properties" >
+        <ContentDialog Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Windows10version1809:CornerRadius="4" Name="PropertiesDialog" Grid.RowSpan="4" Title="Properties" >
             <Windows10version1903:ContentDialog.Shadow>
                 <Windows10version1903:ThemeShadow/>
             </Windows10version1903:ContentDialog.Shadow>

Files UWP/ProHome.xaml.cs

@@ -905,7 +905,7 @@ private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialog
         {
             inputForRename = null;
         }
-        //AppWindow propertiesWindow;
+
         public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
         {
             if (this.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
@@ -915,14 +915,15 @@ public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
             }
             else if (this.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
             {
+                propertiesFrame.Tag = PropertiesDialog;
                 propertiesFrame.Navigate(typeof(Properties), (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems, new SuppressNavigationTransitionInfo());
             }
             await PropertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
         }
 
         public void PropertiesWindow_CancelButton_Click(object sender, RoutedEventArgs e)
         {
-            //propertiesWindow.RequestSize(new Windows.Foundation.Size(200, 450));
+
         }
 
         private void RibbonTip_Loaded(object sender, RoutedEventArgs e)

Files UWP/Properties.xaml.cs

@@ -34,7 +34,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             var result = e.Parameter as IEnumerable;
             IList<ListedItem> listedItems = result.OfType<ListedItem>().ToList();
             Item = listedItems[0];
-           PropertiesDialog = Frame.Tag as ContentDialog;
+            PropertiesDialog = Frame.Tag as ContentDialog;
             base.OnNavigatedTo(e);
         }
         private void OK_Button_Click(object sender, RoutedEventArgs e)