Merge pull request #577 from Mbucari/master

Fixed your issues

Source/LibationAvalonia/Controls/Settings/Important.axaml

@@ -53,7 +53,7 @@
 				Padding="20,0"
 				VerticalAlignment="Stretch"
 				Content="Open Log Folder"
-				Click="OpenLogFolderButton_Click" />
+				Command="{CompiledBinding OpenLogFolderButton}" />
 
 		</StackPanel>
 

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -1,14 +1,6 @@
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Dinah.Core;
-using FileManager;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
-using LibationUiBase;
-using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs
@@ -47,10 +39,5 @@ namespace LibationAvalonia.Dialogs
 
 		public async void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await SaveAndCloseAsync();
-
-		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
-		}
 	}
 }

Source/LibationAvalonia/ViewModels/Settings/ImportantSettingsVM.cs

@@ -1,4 +1,5 @@
-using FileManager;
+using Dinah.Core;
+using FileManager;
 using LibationFileManager;
 using ReactiveUI;
 using System;
@@ -38,6 +39,8 @@ namespace LibationAvalonia.ViewModels.Settings
 			Configuration.Instance.SetString(ThemeVariant, nameof(ThemeVariant));
 		}
 
+		public void OpenLogFolderButton() => Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+
 		public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
 		{
 			Configuration.KnownDirectories.UserProfile,

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -74,16 +74,15 @@
 		</NativeMenu>
 	</NativeMenu.Menu>
 
-	<Border BorderBrush="{DynamicResource DataGridGridLinesBrush}" BorderThickness="2" Padding="10,0,10,10">
 	<Grid RowDefinitions="Auto,Auto,*,Auto">
-			<Grid Grid.Row="0" ColumnDefinitions="1*,Auto">
+		<Border Grid.Row="0"  BorderBrush="{DynamicResource SystemBaseLowColor}" BorderThickness="0,1">
-
+			<Grid ColumnDefinitions="*,Auto">
 			<!-- Menu Strip -->
-				<Menu Grid.Column="0" VerticalAlignment="Top" IsVisible="{CompiledBinding MenuBarVisible}">
+			<Menu VerticalAlignment="Top" IsVisible="{CompiledBinding MenuBarVisible}">
-					<!-- Decrease height of menu strop -->
 					
+				<!-- Decrease height of menu strop -->					
 				<Menu.Styles>
-						<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+					<Style Selector="Menu /template/ ItemsPresenter#PART_ItemsPresenter">
 						<Setter Property="Height" Value="25"/>
 					</Style>
 				</Menu.Styles>
@@ -91,12 +90,6 @@
 				<!-- Import Menu -->
 					
 				<MenuItem Name="importToolStripMenuItem" Header="_Import">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
 					<MenuItem IsVisible="{CompiledBinding AnyAccounts}" Command="{CompiledBinding ToggleAutoScan}" Header="A_uto Scan Library">
 						<MenuItem.Icon>
 							<CheckBox BorderThickness="0" IsChecked="{CompiledBinding AutoScanChecked, Mode=TwoWay}" IsHitTestVisible="False" />
@@ -124,12 +117,6 @@
 				<!-- Liberate Menu -->
 
 				<MenuItem Header="_Liberate">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
 					<MenuItem Command="{CompiledBinding BackupAllBooks}" Header="{CompiledBinding BookBackupsToolStripText}" />
 					<MenuItem Command="{CompiledBinding BackupAllPdfs}" Header="{CompiledBinding PdfBackupsToolStripText}" />
 					<MenuItem Command="{CompiledBinding ConvertAllToMp3Async}" Header="Convert all _M4b to Mp3 [Long-running]..." />
@@ -140,34 +127,16 @@
 
 				<MenuItem Header="E_xport">
 					<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
 					<MenuItem IsEnabled="{CompiledBinding LibraryStats.HasBookResults}" Command="{CompiledBinding ExportLibraryAsync}" Header="E_xport Library" InputGesture="ctrl+S" />
 				</MenuItem>
 
 				<!-- Quick Filters Menu -->
 
-					<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{CompiledBinding QuickFilterMenuItems}">
+				<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{CompiledBinding QuickFilterMenuItems}" />
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-					</MenuItem>
 
 				<!-- Visible Books Menu -->
 
 				<MenuItem Header="{CompiledBinding VisibleCountMenuItemText}" >
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
 					<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText_2}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
 					<MenuItem Command="{CompiledBinding ReplaceTagsAsync}" Header="Replace _Tags..." />
 					<MenuItem Command="{CompiledBinding SetBookDownloadedAsync}" Header="Set book '_Downloaded' status manually..." />
@@ -179,12 +148,6 @@
 				<!-- Settings Menu -->
 
 				<MenuItem Header="_Settings" Name="settingsToolStripMenuItem">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
 					<MenuItem Name="accountsToolStripMenuItem" Command="{CompiledBinding ShowAccountsAsync}" Header="_Accounts..." InputGesture="ctrl+shift+A"/>
 					<MenuItem Name="basicSettingsToolStripMenuItem" Command="{CompiledBinding ShowSettingsAsync}" Header="_Settings..." InputGesture="ctrl+P" />
 					<Separator />
@@ -195,14 +158,15 @@
 					<MenuItem Command="{CompiledBinding ShowAboutAsync}" Header="A_bout..." />
 				</MenuItem>
 			</Menu>
+				
 			<StackPanel IsVisible="{CompiledBinding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
 				<Path VerticalAlignment="Center" Fill="{StaticResource IconFill}" Data="{StaticResource ImportIcon}" />
 				<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{CompiledBinding ScanningText}"/>
 			</StackPanel>
 		</Grid>
-
+		</Border>
 		<!-- Buttons and Search Box -->
-			<Grid Grid.Row="1" Margin="0,10,0,10" Height="30" ColumnDefinitions="Auto,*,Auto">
+		<Grid Grid.Row="1" Margin="8" Height="30" ColumnDefinitions="Auto,*,Auto">
 
 			<Grid.Styles>
 				<Style Selector="TextBox">
@@ -241,12 +205,15 @@
 			</StackPanel>
 
 		</Grid>
-			<Border Grid.Row="2" BorderThickness="1" BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+		
+		<Border Grid.Row="2" Margin="8,0" BorderThickness="1" BorderBrush="{DynamicResource SystemBaseMediumLowColor}">
 			<SplitView IsPaneOpen="{CompiledBinding QueueOpen}" DisplayMode="Inline" OpenPaneLength="400" MinWidth="400" PanePlacement="Right">
 
 				<!-- Process Queue -->
 				<SplitView.Pane>
+					<Border BorderThickness="1,0,0,0" BorderBrush="{DynamicResource SystemBaseMediumLowColor}">
 						<views:ProcessQueueControl DataContext="{CompiledBinding ProcessQueue}"/>
+					</Border>
 				</SplitView.Pane>
 
 				<!-- Product Display Grid -->
@@ -260,7 +227,7 @@
 		</Border>
 			
 		<!-- Bottom Status Strip -->
-			<Grid Grid.Row="3" Margin="0,10,0,0" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
+		<Grid Grid.Row="3" Margin="8" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
 			<Grid.Styles>
 				<Style Selector="ProgressBar:horizontal">
 					<Setter Property="MinWidth" Value="100" />
@@ -272,5 +239,4 @@
 			<TextBlock FontSize="14" Grid.Column="3" Text="{CompiledBinding LibraryStats.StatusString}" VerticalAlignment="Center" />		
 		</Grid>
 	</Grid>
-	</Border>
 </Window>

Source/LibationUiBase/GridView/EntryStatus.cs

@@ -58,7 +58,7 @@ namespace LibationUiBase.GridView
 		public abstract object BackgroundBrush { get; }
 		public object ButtonImage => GetLiberateIcon();
 		public string ToolTip => GetTooltip();
-		protected Book Book { get; }
+		protected internal Book Book { get; internal set; }
 
 		private DateTime lastBookUpdate;
 		private LiberatedStatus bookStatus;

Source/LibationUiBase/GridView/GridEntry[TStatus].cs

@@ -154,6 +154,10 @@ namespace LibationUiBase.GridView
 			if (udi.Book.AudibleProductId != Book.AudibleProductId)
 				return;
 
+			//If UserDefinedItem was changed on a different Book instance (such as when batch liberating via menus),
+			//EntryStatu's Book instance will not have the current DB state.
+			Liberate.Book = udi.Book;
+
 			// UDI changed, possibly in a different context/view. Update this viewmodel. Call NotifyPropertyChanged to notify view.
 			// - This method responds to tons of incidental changes. Do not persist to db from here. Committing to db must be a volitional action by the caller, not incidental. Otherwise batch changes would be impossible; we would only have slow one-offs
 			// - Don't restrict notifying view to 'only if property changed'. This same book instance can get passed to a different view, then changed there. When the chain of events makes its way back here, the property is unchanged (because it's the same instance), but this view is out of sync. NotifyPropertyChanged will then update this view.

Source/LibationWinForms/GridView/GridEntryBindingList.cs

@@ -24,7 +24,11 @@ namespace LibationWinForms.GridView
 	internal class GridEntryBindingList : BindingList<IGridEntry>, IBindingListView
 	{
 		public GridEntryBindingList() : base(new List<IGridEntry>()) { }
-		public GridEntryBindingList(IEnumerable<IGridEntry> enumeration) : base(new List<IGridEntry>(enumeration)) { }
+		public GridEntryBindingList(IEnumerable<IGridEntry> enumeration) : base(new List<IGridEntry>(enumeration))
+		{
+			SearchEngineCommands.SearchEngineUpdated += (_,_) => ApplyFilter(FilterString);
+		}
+
 
 		/// <returns>All items in the list, including those filtered out.</returns>
 		public List<IGridEntry> AllItems() => Items.Concat(FilterRemoved).ToList();