summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mkvtool-gui/MainWindow.axaml62
-rw-r--r--mkvtool-gui/MainWindow.axaml.cs131
-rw-r--r--mkvtool-gui/mkvtool.csproj9
3 files changed, 178 insertions, 24 deletions
diff --git a/mkvtool-gui/MainWindow.axaml b/mkvtool-gui/MainWindow.axaml
index a6d2d94..4023497 100644
--- a/mkvtool-gui/MainWindow.axaml
+++ b/mkvtool-gui/MainWindow.axaml
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="600"
d:DesignHeight="600"
- Width="850"
+ Width="1050"
Height="670"
x:Class="mkvtool.MainWindow"
WindowStartupLocation="CenterScreen"
@@ -37,7 +37,7 @@
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal">
- <TextBlock Text="Fonts:" />
+ <TextBlock Text="Extra fonts folder:" />
<ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<TextBlock Name="sa2" />
@@ -168,7 +168,7 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="Default Subtitle language:" VerticalAlignment="Center"
TextAlignment="Center" />
- <TextBox Name="ma4" />
+ <TextBox Name="ma4" Text="chi" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
@@ -211,7 +211,7 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <TextBlock Text="Fonts folder:" />
+ <TextBlock Text="Extra fonts folder:" />
<ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<TextBlock Name="ca3" />
@@ -233,7 +233,7 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="Default Subtitle language:" VerticalAlignment="Center"
TextAlignment="Center" />
- <TextBox Name="ca5" />
+ <TextBox Name="ca5" Text="chi" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
@@ -250,6 +250,58 @@
</Controlz:GroupBox>
</StackPanel>
</TabItem>
+ <TabItem Header="Cache / Settings">
+ <StackPanel>
+ <StackPanel>
+ <Controlz:GroupBox Header="Create cache" Margin="10">
+ <StackPanel Margin="5" HorizontalAlignment="Center">
+ <StackPanel Orientation="Horizontal" Margin="5">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="Fonts folder:" />
+ <ScrollViewer HorizontalScrollBarVisibility="Auto"
+ VerticalScrollBarVisibility="Auto">
+ <TextBlock Name="cca1" />
+ </ScrollViewer>
+ </StackPanel>
+ </StackPanel>
+ <Button Content="Select..." Click="CacheSelectBtns_OnClick" />
+ </StackPanel>
+ <Controls:ToggleSwitch Content="Clean old caches" IsChecked="False" Name="cca2" />
+ <Button Margin="10" Content="Go" Click="CacheBtn_OnClick"
+ HorizontalAlignment="Center" />
+ </StackPanel>
+ </Controlz:GroupBox>
+ </StackPanel>
+ <StackPanel>
+ <Controlz:GroupBox Header="Settings" Margin="10">
+ <StackPanel Margin="5" HorizontalAlignment="Center">
+ <Controls:ToggleSwitch Content="Ass to pgs" IsChecked="False" Name="ssa1" />
+ <Controls:ToggleSwitch Content="Ass and pgs coexist" IsChecked="False" Name="ssa2" />
+ <Controls:ToggleSwitch Content="Check mode" IsChecked="True" Name="ssa3" />
+ <Controls:ToggleSwitch Content="Strict for check mode" IsChecked="True" Name="ssa4" />
+ <Controls:ToggleSwitch Content="Not rename subsetted font" IsChecked="False" Name="ssa5" />
+ <StackPanel Orientation="Horizontal" Margin="5">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <TextBlock Text="PGS resolution:" VerticalAlignment="Center"
+ TextAlignment="Center" />
+ <TextBox Name="ssa6" Text="1080p" />
+ </StackPanel>
+ </StackPanel>
+ <StackPanel Orientation="Horizontal" Margin="5">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <TextBlock Text="PGS frame rate:" VerticalAlignment="Center"
+ TextAlignment="Center" />
+ <TextBox Name="ssa7" Text="23.976" />
+ </StackPanel>
+ </StackPanel>
+ <Button Margin="10" Content="Save" Click="SaveBtn_OnClick"
+ HorizontalAlignment="Center" />
+ </StackPanel>
+ </Controlz:GroupBox>
+ </StackPanel>
+ </StackPanel>
+ </TabItem>
</TabControl>
<Controls:BusyIndicator Name="busyBox" />
</Grid>
diff --git a/mkvtool-gui/MainWindow.axaml.cs b/mkvtool-gui/MainWindow.axaml.cs
index 807462e..dae4549 100644
--- a/mkvtool-gui/MainWindow.axaml.cs
+++ b/mkvtool-gui/MainWindow.axaml.cs
@@ -1,4 +1,8 @@
using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Avalonia.Controls;
@@ -24,7 +28,7 @@ namespace mkvtool
private async void CheckFileBtn_OnClick(object? sender, RoutedEventArgs e)
{
- string[] files = await ShowSelectFileDialog("MKV file", new string[] {"mkv"}, false);
+ string[] files = await ShowSelectFileDialog("MKV file", new string[] { "mkv" }, false);
if (files != null && files.Length > 0)
{
SetBusy(true);
@@ -69,7 +73,11 @@ namespace mkvtool
void lcb(string str)
{
DoUIThread(() =>
- this.FindControl<TextBox>("logBox").Text += str + Environment.NewLine);
+ {
+ TextBox box = this.FindControl<TextBox>("logBox");
+ box.Text += str + Environment.NewLine;
+ box.CaretIndex = box.Text.Length;
+ });
}
private async void TopLevel_OnOpened(object? sender, EventArgs e)
@@ -86,8 +94,13 @@ namespace mkvtool
}
else
{
- PrintResult("Init", "Init successfully.");
- DoUIThread(() => this.FindControl<Grid>("mainBox").IsEnabled = true);
+ PrintResult("Init", $"Init mkvlib {mkvlib.Version()} successfully.");
+ Cache();
+ DoUIThread(() =>
+ {
+ SaveSettings();
+ this.FindControl<Grid>("mainBox").IsEnabled = true;
+ });
}
}
catch
@@ -109,14 +122,14 @@ namespace mkvtool
private async void SubsetSelectBtns_OnClick(object? sender, RoutedEventArgs e)
{
- Button btn = (Button) sender;
+ Button btn = (Button)sender;
string dir;
switch (btn.Tag.ToString())
{
case "asses":
SubsetArg.Asses = null;
this.FindControl<TextBlock>("sa1").Text = string.Empty;
- string[] files = await ShowSelectFileDialog("ASS file(s)", new[] {"ass"}, true);
+ string[] files = await ShowSelectFileDialog("ASS file(s)", new[] { "ass" }, true);
if (files != null && files.Length > 0)
{
SubsetArg.Asses = files;
@@ -163,8 +176,7 @@ namespace mkvtool
private async void DoSubsetBtn_OnClick(object? sender, RoutedEventArgs e)
{
- if (SubsetArg.Asses != null && SubsetArg.Asses.Length > 0 && !string.IsNullOrEmpty(SubsetArg.Fonts) &&
- !string.IsNullOrEmpty(SubsetArg.Output))
+ if (SubsetArg.Asses != null && SubsetArg.Asses.Length > 0)
{
SetBusy(true);
SubsetArg.DirSafe = this.FindControl<ToggleSwitch>("sa4").IsChecked == true;
@@ -203,7 +215,7 @@ namespace mkvtool
private async void DumpSelectBtns_OnClick(object? sender, RoutedEventArgs e)
{
- Button btn = (Button) sender;
+ Button btn = (Button)sender;
string dir;
switch (btn.Tag.ToString())
{
@@ -212,7 +224,7 @@ namespace mkvtool
DumpArg.Dir = false;
this.FindControl<TextBlock>("da1").Text = string.Empty;
string[] files = await ShowSelectFileDialog("MKV file",
- new[] {"mkv"},
+ new[] { "mkv" },
false);
if (files != null && files.Length > 0)
{
@@ -291,7 +303,7 @@ namespace mkvtool
private async void MakeSelectBtns_OnClick(object? sender, RoutedEventArgs e)
{
- Button btn = (Button) sender;
+ Button btn = (Button)sender;
string dir;
switch (btn.Tag.ToString())
{
@@ -379,7 +391,7 @@ namespace mkvtool
private async void CreateSelectBtns_OnClick(object? sender, RoutedEventArgs e)
{
- Button btn = (Button) sender;
+ Button btn = (Button)sender;
string dir;
switch (btn.Tag.ToString())
{
@@ -432,8 +444,7 @@ namespace mkvtool
private async void DoCreateBtn_OnClick(object? sender, RoutedEventArgs e)
{
- if (!string.IsNullOrEmpty(CreateArg.vDir) && !string.IsNullOrEmpty(CreateArg.sDir) &&
- !string.IsNullOrEmpty(CreateArg.fDir) && !string.IsNullOrEmpty(CreateArg.oDir))
+ if (!string.IsNullOrEmpty(CreateArg.vDir) && !string.IsNullOrEmpty(CreateArg.sDir) && !string.IsNullOrEmpty(CreateArg.oDir))
{
CreateArg.slang = this.FindControl<TextBox>("ca5").Text;
CreateArg.stitle = this.FindControl<TextBox>("ca6").Text;
@@ -478,7 +489,7 @@ namespace mkvtool
private async void WorkflowSelectBtns_OnClick(object? sender, RoutedEventArgs e)
{
- Button btn = (Button) sender;
+ Button btn = (Button)sender;
string dir;
switch (btn.Tag.ToString())
{
@@ -548,12 +559,102 @@ namespace mkvtool
}
}
+ private async void SaveBtn_OnClick(object? sender, RoutedEventArgs e)
+ {
+ SaveSettings();
+ }
+
+ class CacheArg
+ {
+ public static string Dir { get; set; }
+ public static bool Clean { get; set; }
+ }
+
+ private async void CacheSelectBtns_OnClick(object? sender, RoutedEventArgs e)
+ {
+ WorkflowArg.Dir = string.Empty;
+ this.FindControl<TextBlock>("wa1").Text = string.Empty;
+ string dir = await new OpenFolderDialog().ShowAsync(this);
+ if (!string.IsNullOrEmpty(dir))
+ {
+ CacheArg.Dir = dir;
+ this.FindControl<TextBlock>("cca1").Text = dir;
+ }
+ }
+ private async void CacheBtn_OnClick(object? sender, RoutedEventArgs e)
+ {
+ CacheArg.Clean = this.FindControl<ToggleSwitch>("cca2").IsChecked == true;
+ if (!string.IsNullOrEmpty(CacheArg.Dir))
+ {
+ SetBusy(true);
+ new Thread(() =>
+ {
+ if (CacheArg.Clean)
+ try
+ {
+ Directory.Delete(cache, true);
+ }
+ catch { }
+ string output = $"{MD5Str(CacheArg.Dir)}.cache";
+ output = Path.Join(cache, output);
+ string[] el = mkvlib.CreateFontsCache(CacheArg.Dir, output, lcb);
+ if (el.Length > 0)
+ {
+ lcb("Not cache font list:");
+ lcb(" ----- Begin ----- ");
+ lcb(string.Join(Environment.NewLine, el));
+ lcb(" ----- End ----- ");
+ }
+ else
+ PrintResult("Create cache", "Create cache successfully.");
+ CacheArg.Dir = string.Empty;
+ CacheArg.Clean = false;
+ DoUIThread(() =>
+ {
+ this.FindControl<TextBlock>("cca1").Text = string.Empty;
+ this.FindControl<ToggleSwitch>("cca2").IsChecked = false;
+ });
+ SetBusy(false);
+ }).Start();
+ }
+
+ }
+
+ string cache = Path.Join(Environment.GetEnvironmentVariable(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "USERPROFILE" : "HOME"), ".mkvtool", "caches");
+ void Cache()
+ {
+ string[] ccs = Directory.GetFiles(cache, "*.cache");
+ mkvlib.Cache(ccs);
+ }
+
+ void SaveSettings()
+ {
+ bool a2p = this.FindControl<ToggleSwitch>("ssa1").IsChecked == true;
+ bool apc = this.FindControl<ToggleSwitch>("ssa2").IsChecked == true;
+ bool ck = this.FindControl<ToggleSwitch>("ssa3").IsChecked == true;
+ bool cks = this.FindControl<ToggleSwitch>("ssa4").IsChecked == true;
+ bool n = this.FindControl<ToggleSwitch>("ssa5").IsChecked == true;
+ string pr = this.FindControl<TextBox>("ssa6").Text;
+ string pf = this.FindControl<TextBox>("ssa7").Text;
+ mkvlib.A2P(a2p, apc, pr, pf);
+ mkvlib.Check(ck, cks);
+ mkvlib.NRename(n);
+ }
+
void PrintResult(string str1, string str2)
{
string str = $"##### {str1} result: \"{str2}\"";
lcb(str);
}
+ string MD5Str(string str)
+ {
+ MD5 md5 = MD5.Create();
+ byte[] byteOld = Encoding.UTF8.GetBytes(str);
+ byte[] byteNew = md5.ComputeHash(byteOld);
+ return Convert.ToHexString(byteNew).ToLower();
+ }
+
async void DoUIThread(Action action)
{
await Dispatcher.UIThread.InvokeAsync(action);
diff --git a/mkvtool-gui/mkvtool.csproj b/mkvtool-gui/mkvtool.csproj
index e0f7638..7d7285a 100644
--- a/mkvtool-gui/mkvtool.csproj
+++ b/mkvtool-gui/mkvtool.csproj
@@ -3,19 +3,20 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <DefineConstants>Windows</DefineConstants>
+ <DefineConstants></DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <DefineConstants>Windows</DefineConstants>
+ <DefineConstants></DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Remove=".gitignore" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Avalonia" Version="0.10.8" />
- <PackageReference Include="Avalonia.Desktop" Version="0.10.8" />
+ <PackageReference Include="Avalonia" Version="0.10.13" />
+ <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
<PackageReference Include="mameolan.Avalonia.Controlz" Version="1.0.0-CI-20211017-144151" />
<PackageReference Include="mameolan.Avalonia.ExtendedToolkit" Version="1.0.0-CI-20211017-144151" />
</ItemGroup>
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-14 22:59:57 +0000