Improve UI: Refine Recycle Bin icon display #1610

Author: emako

QuickLook.Plugin/QuickLook.Plugin.CLSIDViewer/CLSIDInfoPanel.xaml.cs

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using QuickLook.Common.Plugin;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -28,26 +29,18 @@ public CLSIDInfoPanel()
         InitializeComponent();
     }
 
-    public void DisplayInfo(string path)
+    public void DisplayInfo(string path, ContextObject context)
     {
-        switch (path.ToUpper())
+        Content = path.ToUpper() switch
         {
-            case CLSIDRegister.RecycleBin:
-                Content = new RecycleBinPanel();
-                break;
-
-            case CLSIDRegister.ThisPC:
-                Content = new ThisPCPanel();
-                break;
-
-            default:
-                Content = new TextBlock()
-                {
-                    Text = $"Unsupported for {path}",
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center,
-                };
-                break;
-        }
+            CLSIDRegister.RecycleBin => new RecycleBinPanel(context),
+            CLSIDRegister.ThisPC => new ThisPCPanel(context),
+            _ => new TextBlock()
+            {
+                Text = $"Unsupported for {path}",
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            },
+        };
     }
 }

QuickLook.Plugin/QuickLook.Plugin.CLSIDViewer/Plugin.cs

@@ -49,7 +49,7 @@ public void Prepare(string path, ContextObject context)
     {
         context.PreferredSize = path switch
         {
-            CLSIDRegister.RecycleBin => new Size { Width = 520, Height = 192 },
+            CLSIDRegister.RecycleBin => new Size { Width = 400, Height = 150 },
             CLSIDRegister.ThisPC => new Size { Width = 900, Height = 800 },
             _ => new Size { Width = 520, Height = 192 },
         };
@@ -59,13 +59,11 @@ public void View(string path, ContextObject context)
     {
         _path = path;
         _ip = new CLSIDInfoPanel();
-
-        _ip.DisplayInfo(_path);
-        _ip.Tag = context;
+        _ip.DisplayInfo(path, context);
 
         context.ViewerContent = _ip;
         context.Title = $"{CLSIDRegister.GetName(path) ?? path}";
-        context.IsBusy = false;
+        context.IsBusy = true;
     }
 
     public void Cleanup()

QuickLook.Plugin/QuickLook.Plugin.CLSIDViewer/RecycleBinPanel.xaml

@@ -2,23 +2,54 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:QuickLook.Plugin.CLSIDViewer"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="450"
              d:DesignWidth="800"
              mc:Ignorable="d">
-    <Grid>
-        <TextBlock x:Name="EmptyRecycleBinText"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Text="Recycle Bin is empty" />
-        <Grid>
-            <Button x:Name="EmptyRecycleBinButton"
-                    Grid.Column="0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Click="OnEmptyRecycleBinClick"
-                    Content="Empty Recycle Bin" />
+    <Grid Margin="0,-50,0,0">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Image x:Name="image"
+               Grid.Row="0"
+               Grid.Column="0"
+               Width="48"
+               Height="48"
+               Opacity="1"
+               Stretch="Fill">
+            <Image.Style>
+                <Style TargetType="{x:Type Image}">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Source, ElementName=image}" Value="{x:Null}">
+                            <DataTrigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         From="0"
+                                                         To="1"
+                                                         Duration="0:0:0.05" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.ExitActions>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Image.Style>
+        </Image>
+        <Grid Grid.Column="1" VerticalAlignment="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <TextBlock x:Name="totalSizeAndCount"
+                       Grid.Row="0"
+                       Padding="3" />
+            <Button x:Name="emptyButton"
+                    Grid.Row="1"
+                    Margin="0,5,0,0"
+                    Command="{Binding EmptyRecycleBinCommand}" />
         </Grid>
     </Grid>
 </UserControl>