Temporarily Hide Unfinished Extract Zip Option

lukeblevins · lukeblevins · commit 74badc337430 · 2019-11-01T23:48:31.000-04:00
diff --git a/Files UWP/Dialogs/ExtractFilesDialog.xaml b/Files UWP/Dialogs/ExtractFilesDialog.xaml
@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
+    CornerRadius="4"
     Title="Extract Compressed Archive"
     PrimaryButtonText="Extract"
     CloseButtonText="Cancel"
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -324,9 +324,10 @@ private void RightClickContextMenu_Opened(object sender, object e)
                 SidebarPinItem.Visibility = Visibility.Collapsed;
                 OpenInNewTab.Visibility = Visibility.Collapsed;
                 OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+
                 if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
                 {
-                    UnzipItem.Visibility = Visibility.Visible;
+                    UnzipItem.Visibility = Visibility.Collapsed;
                 }
                 else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
                 {
@@ -338,8 +339,9 @@ private void RightClickContextMenu_Opened(object sender, object e)
                 SidebarPinItem.Visibility = Visibility.Visible;
                 OpenInNewTab.Visibility = Visibility.Visible;
                 OpenInNewWindowItem.Visibility = Visibility.Visible;
+                UnzipItem.Visibility = Visibility.Collapsed;
             }
-            
+
         }
     }
 
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -303,21 +303,24 @@ private void RightClickContextMenu_Opened(object sender, object e)
                 SidebarPinItem.Visibility = Visibility.Collapsed;
                 OpenInNewTab.Visibility = Visibility.Collapsed;
                 OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+
+                if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                {
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
+                else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                {
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
             }
             else if (selectedDataItem.FileType == "Folder")
             {
                 SidebarPinItem.Visibility = Visibility.Visible;
                 OpenInNewTab.Visibility = Visibility.Visible;
                 OpenInNewWindowItem.Visibility = Visibility.Visible;
-            }
-            else if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
-            {
-                UnzipItem.Visibility = Visibility.Visible;
-            }
-            else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
-            {
                 UnzipItem.Visibility = Visibility.Collapsed;
             }
+
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -324,9 +324,10 @@ private void RightClickContextMenu_Opened(object sender, object e)`
`324`	`324`	`SidebarPinItem.Visibility = Visibility.Collapsed;`
`325`	`325`	`OpenInNewTab.Visibility = Visibility.Collapsed;`
`326`	`326`	`OpenInNewWindowItem.Visibility = Visibility.Collapsed;`
	`327`	`+`
`327`	`328`	`if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
`328`	`329`	`{`
`329`		`- UnzipItem.Visibility = Visibility.Visible;`
	`330`	`+ UnzipItem.Visibility = Visibility.Collapsed;`
`330`	`331`	`}`
`331`	`332`	`else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
`332`	`333`	`{`
`@@ -338,8 +339,9 @@ private void RightClickContextMenu_Opened(object sender, object e)`
`338`	`339`	`SidebarPinItem.Visibility = Visibility.Visible;`
`339`	`340`	`OpenInNewTab.Visibility = Visibility.Visible;`
`340`	`341`	`OpenInNewWindowItem.Visibility = Visibility.Visible;`
	`342`	`+ UnzipItem.Visibility = Visibility.Collapsed;`
`341`	`343`	`}`
`342`		`-`
	`344`	`+`
`343`	`345`	`}`
`344`	`346`	`}`
`345`	`347`
Original file line number	Diff line number	Diff line change
`@@ -303,21 +303,24 @@ private void RightClickContextMenu_Opened(object sender, object e)`
`303`	`303`	`SidebarPinItem.Visibility = Visibility.Collapsed;`
`304`	`304`	`OpenInNewTab.Visibility = Visibility.Collapsed;`
`305`	`305`	`OpenInNewWindowItem.Visibility = Visibility.Collapsed;`
	`306`	`+`
	`307`	`+ if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
	`308`	`+ {`
	`309`	`+ UnzipItem.Visibility = Visibility.Collapsed;`
	`310`	`+ }`
	`311`	`+ else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
	`312`	`+ {`
	`313`	`+ UnzipItem.Visibility = Visibility.Collapsed;`
	`314`	`+ }`
`306`	`315`	`}`
`307`	`316`	`else if (selectedDataItem.FileType == "Folder")`
`308`	`317`	`{`
`309`	`318`	`SidebarPinItem.Visibility = Visibility.Visible;`
`310`	`319`	`OpenInNewTab.Visibility = Visibility.Visible;`
`311`	`320`	`OpenInNewWindowItem.Visibility = Visibility.Visible;`
`312`		`- }`
`313`		`- else if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
`314`		`- {`
`315`		`- UnzipItem.Visibility = Visibility.Visible;`
`316`		`- }`
`317`		`- else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))`
`318`		`- {`
`319`	`321`	`UnzipItem.Visibility = Visibility.Collapsed;`
`320`	`322`	`}`
	`323`	`+`
`321`	`324`	`}`
`322`	`325`	`}`
`323`	`326`	`}`