Revert Solution Changes

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -104,7 +104,7 @@ namespace AaxDecrypter
 					&& DownloadOptions.OutputFormat is OutputFormat.M4b
 					&& DownloadOptions.MoveMoovToBeginning)
 				{
-					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 					aaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
 					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
 					await aaxConversion;

Source/Libation.sln

@@ -93,14 +93,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacOSConfigApp", "LoadByOS\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{5F65A509-26E3-4B02-B403-EEB6F0EF391F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAXClean.Codecs", "..\..\AaxClean\AaxTest\AAXClean.Codecs\src\AAXClean.Codecs\AAXClean.Codecs.csproj", "{EE7189CE-D9BB-4CE9-AC82-2688E1F5A838}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAXClean", "..\..\AaxClean\AaxTest\AAXClean\src\AAXClean\AAXClean.csproj", "{3252C885-DED3-4119-8C69-7DADD3EC22E9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mpeg4Lib", "..\..\AaxClean\AaxTest\AAXClean\src\Mpeg4Lib\Mpeg4Lib.csproj", "{9E9F33F4-1F03-43D9-BA88-B3BFC98D6AEF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NAudio.Lame_SA", "..\..\AaxClean\AaxTest\NAudio.Lame_SA\NAudio.Lame_SA\NAudio.Lame_SA.csproj", "{EF8F35AD-581C-434A-A2FB-E82F428C4DD8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -215,22 +207,6 @@ Global
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE7189CE-D9BB-4CE9-AC82-2688E1F5A838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE7189CE-D9BB-4CE9-AC82-2688E1F5A838}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE7189CE-D9BB-4CE9-AC82-2688E1F5A838}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE7189CE-D9BB-4CE9-AC82-2688E1F5A838}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3252C885-DED3-4119-8C69-7DADD3EC22E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3252C885-DED3-4119-8C69-7DADD3EC22E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3252C885-DED3-4119-8C69-7DADD3EC22E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3252C885-DED3-4119-8C69-7DADD3EC22E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E9F33F4-1F03-43D9-BA88-B3BFC98D6AEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E9F33F4-1F03-43D9-BA88-B3BFC98D6AEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E9F33F4-1F03-43D9-BA88-B3BFC98D6AEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E9F33F4-1F03-43D9-BA88-B3BFC98D6AEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF8F35AD-581C-434A-A2FB-E82F428C4DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF8F35AD-581C-434A-A2FB-E82F428C4DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF8F35AD-581C-434A-A2FB-E82F428C4DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF8F35AD-581C-434A-A2FB-E82F428C4DD8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml

@@ -2,8 +2,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="680"
+        mc:Ignorable="d" d:DesignWidth="850" d:DesignHeight="620"
-		MinWidth="900" MinHeight="680"
+		MinWidth="800" MinHeight="620"
         x:Class="LibationAvalonia.Dialogs.SettingsDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Edit Settings"
@@ -34,6 +34,362 @@
 					<Setter Property="MinHeight" Value="5"/>
 				</Style>
 			</TabControl.Styles>
+
+
+			<TabItem>
+
+				<TabItem.Header>
+
+					<TextBlock
+						FontSize="14"
+						VerticalAlignment="Center"
+						Text="Important Settings"/>
+
+				</TabItem.Header>
+
+				<Border
+					Grid.Column="0"
+					Grid.Row="0"
+					BorderThickness="2"
+					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+
+					<Grid RowDefinitions="Auto,Auto,*">
+
+						<controls:GroupBox
+							Grid.Row="0"
+							Margin="5"
+							BorderWidth="1"
+							Label="Books Location">
+
+							<StackPanel>
+								<TextBlock
+									Margin="5"
+									Text="{Binding ImportantSettings.BooksText}" />
+
+								<controls:DirectoryOrCustomSelectControl Margin="0,10,0,10"
+									SubDirectory="Books"
+									Directory="{Binding ImportantSettings.BooksDirectory, Mode=TwoWay}"
+									KnownDirectories="{Binding ImportantSettings.KnownDirectories}" />
+
+								<CheckBox IsChecked="{Binding ImportantSettings.SavePodcastsToParentFolder, Mode=TwoWay}">
+									<TextBlock Text="{Binding ImportantSettings.SavePodcastsToParentFolderText}" />
+								</CheckBox>
+
+							</StackPanel>
+
+						</controls:GroupBox>
+
+						<StackPanel
+							Grid.Row="1" Margin="5"
+							Orientation="Horizontal">
+
+							<TextBlock
+								Margin="0,0,10,0"
+								VerticalAlignment="Center"
+								Text="Logging level" />
+
+							<controls:WheelComboBox
+								Width="150"
+								Height="25"
+								HorizontalContentAlignment="Stretch"
+								SelectedItem="{Binding ImportantSettings.LoggingLevel, Mode=TwoWay}"
+								Items="{Binding ImportantSettings.LoggingLevels}" />
+
+							<Button
+								Margin="50,0,0,0"
+								Padding="20,3,20,3"
+								Content="Open Log Folder"
+								Click="OpenLogFolderButton_Click" />
+
+						</StackPanel>
+						<!--
+						<CheckBox
+							Grid.Row="2"
+							Margin="5"
+							VerticalAlignment="Bottom"
+							IsChecked="{Binding ImportantSettings.BetaOptIn, Mode=TwoWay}">
+
+							<TextBlock Text="{Binding ImportantSettings.BetaOptInText}" />
+
+						</CheckBox>
+-->
+					</Grid>
+				</Border>
+			</TabItem>
+
+
+			<TabItem>
+
+				<TabItem.Header>
+
+					<TextBlock
+						FontSize="14"
+						VerticalAlignment="Center"
+						Text="Import Library"/>
+
+				</TabItem.Header>
+
+				<Border
+					Grid.Column="0"
+					Grid.Row="0"
+					BorderThickness="2"
+					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+
+					<StackPanel Margin="5">
+
+						<CheckBox
+							Margin="0,0,0,10"
+							IsChecked="{Binding ImportSettings.AutoScan, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding ImportSettings.AutoScanText}" />
+						</CheckBox>
+
+						<CheckBox
+							Margin="0,0,0,10"
+							IsChecked="{Binding ImportSettings.ShowImportedStats, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding ImportSettings.ShowImportedStatsText}" />
+
+						</CheckBox>
+
+						<CheckBox
+							Margin="0,0,0,10"
+							IsChecked="{Binding ImportSettings.ImportEpisodes, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding ImportSettings.ImportEpisodesText}" />
+
+						</CheckBox>
+
+						<CheckBox
+							Margin="0,0,0,10"
+							IsChecked="{Binding ImportSettings.DownloadEpisodes, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding ImportSettings.DownloadEpisodesText}" />
+
+						</CheckBox>
+
+						<CheckBox
+							Margin="0,0,0,10"
+							IsChecked="{Binding ImportSettings.AutoDownloadEpisodes, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding ImportSettings.AutoDownloadEpisodesText}" />
+
+						</CheckBox>
+					</StackPanel>
+				</Border>
+			</TabItem>
+
+			<TabItem>
+
+				<TabItem.Header>
+
+					<TextBlock
+						FontSize="14"
+						VerticalAlignment="Center"
+						Text="Download/Decrypt"/>
+
+				</TabItem.Header>
+
+				<Border
+					Grid.Column="0"
+					Grid.Row="0"
+					BorderThickness="2"
+					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+
+					<Grid RowDefinitions="Auto,Auto,Auto,*">
+						<controls:GroupBox
+							Grid.Row="0"
+							Margin="5"
+							BorderWidth="1"
+							Label="{Binding DownloadDecryptSettings.BadBookGroupboxText}">
+
+							<Grid
+								ColumnDefinitions="*,*"
+								RowDefinitions="Auto,Auto">
+
+								<RadioButton
+									Grid.Column="0"
+									Grid.Row="0"
+									Margin="0,5,0,5"
+									IsChecked="{Binding DownloadDecryptSettings.BadBookAsk, Mode=TwoWay}">
+
+									<TextBlock
+										TextWrapping="Wrap"
+										Text="{Binding DownloadDecryptSettings.BadBookAskText}" />
+
+								</RadioButton>
+
+								<RadioButton
+									Grid.Column="1"
+									Grid.Row="0"
+									Margin="0,5,0,5"
+									IsChecked="{Binding DownloadDecryptSettings.BadBookAbort, Mode=TwoWay}">
+
+									<TextBlock
+										TextWrapping="Wrap"
+										Text="{Binding DownloadDecryptSettings.BadBookAbortText}" />
+
+								</RadioButton>
+
+								<RadioButton
+									Grid.Column="0"
+									Grid.Row="1"
+									Margin="0,5,0,5"
+									IsChecked="{Binding DownloadDecryptSettings.BadBookRetry, Mode=TwoWay}">
+
+									<TextBlock
+										TextWrapping="Wrap"
+										Text="{Binding DownloadDecryptSettings.BadBookRetryText}" />
+
+								</RadioButton>
+
+								<RadioButton
+									Grid.Column="1"
+									Grid.Row="1"
+									Margin="0,5,0,5"
+									IsChecked="{Binding DownloadDecryptSettings.BadBookIgnore, Mode=TwoWay}">
+
+									<TextBlock
+										TextWrapping="Wrap"
+										Text="{Binding DownloadDecryptSettings.BadBookIgnoreText}" />
+
+								</RadioButton>
+							</Grid>
+						</controls:GroupBox>
+
+						<controls:GroupBox
+							Margin="5"
+							Grid.Row="1"
+							BorderWidth="1"
+							Label="Custom File Naming">
+
+							<Grid
+								RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
+								ColumnDefinitions="*,Auto">
+
+								<TextBlock
+									Grid.Row="0"
+									Grid.Column="0"
+									Margin="0,5,0,0"
+									Text="{Binding DownloadDecryptSettings.FolderTemplateText}" />
+
+								<TextBox
+									Grid.Row="1"
+									Grid.Column="0"
+									Margin="0,5,10,10"
+									FontSize="14"
+									IsReadOnly="True"
+									Text="{Binding DownloadDecryptSettings.FolderTemplate}" />
+
+								<Button
+									Grid.Row="1"
+									Grid.Column="1"
+									Content="Edit"
+									Height="30"
+									Padding="30,3,30,3"
+									Click="EditFolderTemplateButton_Click" />
+
+								<TextBlock
+									Grid.Row="2"
+									Grid.Column="0"
+									Text="{Binding DownloadDecryptSettings.FileTemplateText}" />
+
+								<TextBox
+									Grid.Row="3"
+									Grid.Column="0"
+									Margin="0,5,10,10"
+									FontSize="14"
+									IsReadOnly="True"
+									Text="{Binding DownloadDecryptSettings.FileTemplate}" />
+
+								<Button
+									Grid.Row="3"
+									Grid.Column="1"
+									Content="Edit"
+									Height="30"
+									Padding="30,3,30,3"
+									Click="EditFileTemplateButton_Click" />
+
+								<TextBlock
+									Grid.Row="4"
+									Grid.Column="0"
+									Text="{Binding DownloadDecryptSettings.ChapterFileTemplateText}" />
+
+								<TextBox
+									Grid.Row="5"
+									Grid.Column="0"
+									Margin="0,5,10,10"
+									FontSize="14"
+									IsReadOnly="True"
+									Text="{Binding DownloadDecryptSettings.ChapterFileTemplate}" />
+
+								<Button
+									Grid.Row="5"
+									Grid.Column="1"
+									Content="Edit"
+									Height="30"
+									Padding="30,3,30,3"
+									Click="EditChapterFileTemplateButton_Click" />
+
+								<Button
+									Grid.Row="6"
+									Grid.Column="0"
+									Content="{Binding DownloadDecryptSettings.EditCharReplacementText}"
+									Height="30"
+									Padding="30,3,30,3"
+									Click="EditCharReplacementButton_Click" />
+
+							</Grid>
+						</controls:GroupBox>
+						<controls:GroupBox
+							Grid.Row="2"
+							Margin="5"
+							BorderWidth="1"
+							Label="Temporary Files Location">
+
+							<StackPanel
+								Margin="5" >
+
+								<TextBlock
+									Margin="0,0,0,10"
+									Text="{Binding DownloadDecryptSettings.InProgressDescriptionText}" />
+
+								<controls:DirectoryOrCustomSelectControl
+									SubDirectory="Libation"
+									Directory="{Binding DownloadDecryptSettings.InProgressDirectory, Mode=TwoWay}"
+									KnownDirectories="{Binding DownloadDecryptSettings.KnownDirectories}" />
+
+
+							</StackPanel>
+						</controls:GroupBox>
+
+						<CheckBox
+							Grid.Row="3"
+							Margin="5"
+							VerticalAlignment="Top"
+							IsVisible="{Binding IsWindows}"
+							IsChecked="{Binding DownloadDecryptSettings.UseCoverAsFolderIcon, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding DownloadDecryptSettings.UseCoverAsFolderIconText}" />
+
+						</CheckBox>
+
+					</Grid>
+				</Border>
+			</TabItem>
+
 			<TabItem>
 
 				<TabItem.Header>
@@ -406,361 +762,6 @@
 					</Grid>
 				</Border>
 			</TabItem>
-
-
-			<TabItem>
-
-				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Important Settings"/>
-
-				</TabItem.Header>
-
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<Grid RowDefinitions="Auto,Auto,*">
-
-						<controls:GroupBox
-							Grid.Row="0"
-							Margin="5"
-							BorderWidth="1"
-							Label="Books Location">
-
-							<StackPanel>
-								<TextBlock
-									Margin="5"
-									Text="{Binding ImportantSettings.BooksText}" />
-
-								<controls:DirectoryOrCustomSelectControl Margin="0,10,0,10"
-									SubDirectory="Books"
-									Directory="{Binding ImportantSettings.BooksDirectory, Mode=TwoWay}"
-									KnownDirectories="{Binding ImportantSettings.KnownDirectories}" />
-
-								<CheckBox IsChecked="{Binding ImportantSettings.SavePodcastsToParentFolder, Mode=TwoWay}">
-									<TextBlock Text="{Binding ImportantSettings.SavePodcastsToParentFolderText}" />
-								</CheckBox>
-
-							</StackPanel>
-
-						</controls:GroupBox>
-
-						<StackPanel
-							Grid.Row="1" Margin="5"
-							Orientation="Horizontal">
-
-							<TextBlock
-								Margin="0,0,10,0"
-								VerticalAlignment="Center"
-								Text="Logging level" />
-
-							<controls:WheelComboBox
-								Width="150"
-								Height="25"
-								HorizontalContentAlignment="Stretch"
-								SelectedItem="{Binding ImportantSettings.LoggingLevel, Mode=TwoWay}"
-								Items="{Binding ImportantSettings.LoggingLevels}" />
-
-							<Button
-								Margin="50,0,0,0"
-								Padding="20,3,20,3"
-								Content="Open Log Folder"
-								Click="OpenLogFolderButton_Click" />
-
-						</StackPanel>
-						<!--
-						<CheckBox
-							Grid.Row="2"
-							Margin="5"
-							VerticalAlignment="Bottom"
-							IsChecked="{Binding ImportantSettings.BetaOptIn, Mode=TwoWay}">
-
-							<TextBlock Text="{Binding ImportantSettings.BetaOptInText}" />
-
-						</CheckBox>
--->
-					</Grid>
-				</Border>
-			</TabItem>
-
-			<TabItem>
-
-				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Import Library"/>
-
-				</TabItem.Header>
-
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<StackPanel Margin="5">
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.AutoScan, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.AutoScanText}" />
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.ShowImportedStats, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.ShowImportedStatsText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.ImportEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.ImportEpisodesText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.DownloadEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.DownloadEpisodesText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.AutoDownloadEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.AutoDownloadEpisodesText}" />
-
-						</CheckBox>
-					</StackPanel>
-				</Border>
-			</TabItem>
-
-			<TabItem>
-
-				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Download/Decrypt"/>
-
-				</TabItem.Header>
-
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<Grid RowDefinitions="Auto,Auto,Auto,*">
-						<controls:GroupBox
-							Grid.Row="0"
-							Margin="5"
-							BorderWidth="1"
-							Label="{Binding DownloadDecryptSettings.BadBookGroupboxText}">
-
-							<Grid
-								ColumnDefinitions="*,*"
-								RowDefinitions="Auto,Auto">
-
-								<RadioButton
-									Grid.Column="0"
-									Grid.Row="0"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookAsk, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookAskText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="1"
-									Grid.Row="0"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookAbort, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookAbortText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="0"
-									Grid.Row="1"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookRetry, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookRetryText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="1"
-									Grid.Row="1"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookIgnore, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookIgnoreText}" />
-
-								</RadioButton>
-							</Grid>
-						</controls:GroupBox>
-
-						<controls:GroupBox
-							Margin="5"
-							Grid.Row="1"
-							BorderWidth="1"
-							Label="Custom File Naming">
-
-							<Grid
-								RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-								ColumnDefinitions="*,Auto">
-
-								<TextBlock
-									Grid.Row="0"
-									Grid.Column="0"
-									Margin="0,5,0,0"
-									Text="{Binding DownloadDecryptSettings.FolderTemplateText}" />
-
-								<TextBox
-									Grid.Row="1"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.FolderTemplate}" />
-
-								<Button
-									Grid.Row="1"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditFolderTemplateButton_Click" />
-
-								<TextBlock
-									Grid.Row="2"
-									Grid.Column="0"
-									Text="{Binding DownloadDecryptSettings.FileTemplateText}" />
-
-								<TextBox
-									Grid.Row="3"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.FileTemplate}" />
-
-								<Button
-									Grid.Row="3"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditFileTemplateButton_Click" />
-
-								<TextBlock
-									Grid.Row="4"
-									Grid.Column="0"
-									Text="{Binding DownloadDecryptSettings.ChapterFileTemplateText}" />
-
-								<TextBox
-									Grid.Row="5"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.ChapterFileTemplate}" />
-
-								<Button
-									Grid.Row="5"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditChapterFileTemplateButton_Click" />
-
-								<Button
-									Grid.Row="6"
-									Grid.Column="0"
-									Content="{Binding DownloadDecryptSettings.EditCharReplacementText}"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditCharReplacementButton_Click" />
-
-							</Grid>
-						</controls:GroupBox>
-						<controls:GroupBox
-							Grid.Row="2"
-							Margin="5"
-							BorderWidth="1"
-							Label="Temporary Files Location">
-
-							<StackPanel
-								Margin="5" >
-
-								<TextBlock
-									Margin="0,0,0,10"
-									Text="{Binding DownloadDecryptSettings.InProgressDescriptionText}" />
-
-								<controls:DirectoryOrCustomSelectControl
-									SubDirectory="Libation"
-									Directory="{Binding DownloadDecryptSettings.InProgressDirectory, Mode=TwoWay}"
-									KnownDirectories="{Binding DownloadDecryptSettings.KnownDirectories}" />
-
-
-							</StackPanel>
-						</controls:GroupBox>
-
-						<CheckBox
-							Grid.Row="3"
-							Margin="5"
-							VerticalAlignment="Top"
-							IsVisible="{Binding IsWindows}"
-							IsChecked="{Binding DownloadDecryptSettings.UseCoverAsFolderIcon, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding DownloadDecryptSettings.UseCoverAsFolderIconText}" />
-
-						</CheckBox>
-
-					</Grid>
-				</Border>
-			</TabItem>
-
 		</TabControl>
 	</Grid>
 </Window>