Watchlist changes

- added space saved on hover
- added tooltip for folder path

Author: Iridium-IO

CompactGUI.Watcher/WatchedFolder.vb

@@ -24,6 +24,12 @@ Public Class WatchedFolder : Inherits ObservableObject
         End Get
     End Property
 
+    Public ReadOnly Property SavedSpace As Long
+        Get
+            Return LastUncompressedSize - LastCompressedSize
+        End Get
+    End Property
+
     Public Sub RefreshProperties()
         For Each prop In Me.GetType.GetProperties
             Me.OnPropertyChanged(prop.Name)

CompactGUI/Components/Converters/Converters.xaml

@@ -17,5 +17,6 @@
       <local:NonZeroToVisConverter x:Key="NonZeroToVisConverter" />
       <local:WindowScalingConverter x:Key="WindowScalingConverter"/>
       <local:BooleanToInverseVisibilityConverter x:Key="BooleanToInverseVisibilityConverter"  />
-  
+    <local:TokenisedFolderPathConverter x:Key="TokenisedFolderPathConverter" />
+
 </ResourceDictionary>

CompactGUI/Components/Converters/IValueConverters.vb

@@ -23,7 +23,17 @@ Public Class BytesToReadableConverter : Implements IValueConverter
         If value = 0 Then Return "0" & suf(0)
         Dim bytes As Long = Math.Abs(value)
         Dim place As Integer = CInt(Math.Floor(Math.Log(bytes, 1024)))
-        Dim num As Double = Math.Round(bytes / Math.Pow(1024, place), 1)
+
+        Dim roundingPrecision As Integer = 1
+        If parameter IsNot Nothing AndAlso Integer.TryParse(parameter.ToString(), roundingPrecision) Then
+            roundingPrecision = Math.Max(0, roundingPrecision)
+            'We want to round to 1 decimal place if the value is in the GB range or higher
+            If Array.IndexOf(suf, suf(place)) > 2 AndAlso roundingPrecision = 0 Then
+                roundingPrecision = 1
+            End If
+        End If
+
+        Dim num As Double = Math.Round(bytes / Math.Pow(1024, place), roundingPrecision)
 
         Return (Math.Sign(value) * num).ToString() & suf(place)
     End Function
@@ -47,6 +57,20 @@ Public Class StrippedFolderPathConverter : Implements IValueConverter
 End Class
 
 
+Public Class TokenisedFolderPathConverter : Implements IValueConverter
+    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+        If value Is Nothing Then Return Nothing
+        Dim Str = CType(value, String)
+        Dim formattedString = Str.Replace("\"c, " 🢒 ")
+        Return formattedString
+    End Function
+
+    Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+        Throw New NotImplementedException()
+    End Function
+End Class
+
+
 Public Class RelativeDateConverter : Implements IValueConverter
     Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
         Dim dt = CType(value, DateTime)

CompactGUI/Views/Components/FolderWatcherCard.xaml

@@ -31,7 +31,7 @@
 
         <Button VerticalAlignment="Top" Content="Add To Watchlist" Background="#A26B8399" Foreground="White" HorizontalAlignment="Right" Margin="0,-26,10,0" Command="{Binding ManuallyAddFolderToWatcherCommand}" />
 
-        <ui:ListView x:Name="uiWatcherListView" ScrollViewer.VerticalScrollBarVisibility="Hidden" Margin="-20,60,-20,0" Padding="10,0,10,0" ItemsSource="{Binding Source = {StaticResource src}}" d:ItemsSource="{Binding Source = {StaticResource dtd}}"   KeyboardNavigation.TabNavigation="None" ui:ScrollViewerHelper.AutoHideScrollBars="False">
+        <ui:ListView x:Name="uiWatcherListView"  Margin="-20,60,-20,0" Padding="10,0,10,0" ItemsSource="{Binding Source = {StaticResource src}}" d:ItemsSource="{Binding Source = {StaticResource dtd}}"   KeyboardNavigation.TabNavigation="None" ui:ScrollViewerHelper.AutoHideScrollBars="True" >
             <ui:ListView.Background>
                 <LinearGradientBrush StartPoint="0.5, 0" EndPoint="0.5, 1">
                     <GradientStop Color="#00000000" Offset="0"/>
@@ -93,9 +93,15 @@
                                 <TextBlock Text="{Binding CompressionLevel, Converter={StaticResource CompressionLevelAbbreviatedConverter}}" d:Text="fds" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFF" FontWeight="SemiBold" />
                             </Border>
 
-                            <TextBlock Width="220" Text="{Binding Folder}" TextTrimming="CharacterEllipsis" FontSize="12" Foreground="#80FFFFFF"  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,20,0,0"/>
-                            <TextBlock Text="{Binding DecayPercentage, StringFormat={}{0}% decayed, Mode=OneWay, Converter={StaticResource DecimalToPercentageConverter}}" FontSize="12" Foreground="#FFBFC7CE"  VerticalAlignment="Top" Margin="0,-2,30,0" HorizontalAlignment="Right"/>
-
+                            <TextBlock Width="220" Text="{Binding Folder, Converter={StaticResource TokenisedFolderPathConverter}}" TextTrimming="CharacterEllipsis" FontSize="12" Foreground="#80FFFFFF"  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,20,0,0">
+                                <TextBlock.ToolTip >
+                                    <ToolTip Background="#304257" Placement="RelativePoint" >
+                                        <TextBlock Text="{Binding Folder, Converter={StaticResource TokenisedFolderPathConverter}}" TextWrapping="NoWrap" Foreground="#FFBFC7CE"  FontSize="12"/>
+                                    </ToolTip>
+                                </TextBlock.ToolTip>
+                            </TextBlock>
+                            <TextBlock x:Name="DecayedText" Text="{Binding DecayPercentage, StringFormat={}{0}% decayed, Mode=OneWay, Converter={StaticResource DecimalToPercentageConverter}}" FontSize="12" Foreground="#FFBFC7CE"  VerticalAlignment="Top" Margin="0,-2,30,0" HorizontalAlignment="Right" d:Text="7% decayed"/>
+                            <TextBlock x:Name="SavedText" Visibility="Collapsed" Text="{Binding SavedSpace, StringFormat={}{0} saved, Mode=OneWay, Converter={StaticResource BytesToReadableConverter}, ConverterParameter=0}" FontSize="12" Foreground="#FFBFC7CE"  VerticalAlignment="Top" Margin="0,-2,30,0" HorizontalAlignment="Right" d:Text="39GB saved"/>
                             <ui:ProgressBar Height="6" Width="108" CornerRadius="3" Value="{Binding DecayPercentage, Mode=OneWay, Converter={StaticResource DecimalToPercentageConverter}, ConverterParameter='I'}" Foreground="{Binding DecayPercentage, Converter={StaticResource ProgressBarColorConverter}}" Background="#808B9FB3" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,25,30,0" >
                                 <ui:ProgressBar.Effect>
                                     <DropShadowEffect Direction="-135" Opacity="0.2" ShadowDepth="3" BlurRadius="4"/>
@@ -114,6 +120,9 @@
                                     <TextBlock FontSize="12" Foreground="#FF8B9FB3" Text="last modified:" Margin="0,0,27,0"/>
                                     <TextBlock FontSize="12" Foreground="#FF8B9FB3" Text="{Binding LastSystemModifiedDate, Converter={StaticResource RelativeDateConverter}}"  d:Text="fds"/>
                                 </StackPanel>
+
+                               
+
                                 <Button  HorizontalAlignment="Right" Command="{Binding ElementName=uiWatcherListView, Path=DataContext.RemoveWatcherCommand}" CommandParameter="{Binding}" Background="#DD6B6B" Foreground="White">
                                     <ui:FontIcon Glyph="&#xE74D;" FontSize="14"/>
                                 </Button>

CompactGUI/Views/Components/FolderWatcherCard.xaml.vb

@@ -8,16 +8,26 @@ Public Class FolderWatcherCard : Inherits UserControl
         Dim border As Border = DirectCast(sender, Border)
         Dim newHeight As Double = If(border.Height = 100, 50, 100)
 
+        Dim childSavedText = FindChild(Of TextBlock)(border, "SavedText")
+        Dim childDecayedText = FindChild(Of TextBlock)(border, "DecayedText")
+
+        Dim previousBorderChildSavedText = FindChild(Of TextBlock)(currentlyExpandedBorder, "SavedText")
+        Dim previousBorderChildDecayedText = FindChild(Of TextBlock)(currentlyExpandedBorder, "DecayedText")
+
         If currentlyExpandedBorder Is border AndAlso border.Height = 100 AndAlso TypeOf (e) IsNot MouseButtonEventArgs Then
             ' Do nothing, keep it expanded
             Return
         End If
 
         If currentlyExpandedBorder IsNot Nothing AndAlso currentlyExpandedBorder IsNot border Then
             AnimateBorderHeight(currentlyExpandedBorder, 50)
-        End If
+            previousBorderChildSavedText.Visibility = Visibility.Collapsed
+            previousBorderChildDecayedText.Visibility = Visibility.Visible
 
+        End If
         AnimateBorderHeight(border, newHeight)
+        childSavedText.Visibility = If(newHeight = 100, Visibility.Visible, Visibility.Collapsed)
+        childDecayedText.Visibility = If(newHeight = 100, Visibility.Collapsed, Visibility.Visible)
         currentlyExpandedBorder = If(newHeight = 100, border, Nothing)
     End Sub
 
@@ -35,4 +45,32 @@ Public Class FolderWatcherCard : Inherits UserControl
         storyboard.Begin()
     End Sub
 
+    Public Shared Function FindChild(Of T As DependencyObject)(parent As DependencyObject, childName As String) As T
+        If parent Is Nothing Then Return Nothing
+        Dim foundChild As T = Nothing
+        Dim childrenCount As Integer = VisualTreeHelper.GetChildrenCount(parent)
+        For i As Integer = 0 To childrenCount - 1
+            Dim child As DependencyObject = VisualTreeHelper.GetChild(parent, i)
+            Dim childType As T = TryCast(child, T)
+            If childType Is Nothing Then
+                ' The child is not of the request type, so recurse down the tree
+                foundChild = FindChild(Of T)(child, childName)
+                If foundChild IsNot Nothing Then Exit For
+            ElseIf Not String.IsNullOrEmpty(childName) Then
+                Dim frameworkElement As FrameworkElement = TryCast(child, FrameworkElement)
+                ' If the child has the correct name and type
+                If frameworkElement IsNot Nothing AndAlso frameworkElement.Name = childName Then
+                    foundChild = DirectCast(child, T)
+                    Exit For
+                End If
+            Else
+                ' Child is of the requested type but has no name, return it
+                foundChild = DirectCast(child, T)
+                Exit For
+            End If
+        Next
+        Return foundChild
+    End Function
+
+
 End Class