linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#214 Filename not being always shown in title bar.

Browse Source
This commit is contained in:
Frank Skare
2020-12-13 23:08:16 +01:00
parent 4d985c7b7c
commit 3968fa50f5
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@@ -2,6 +2,7 @@
5.4.8.6 Beta (not yet released) 5.4.8.6 Beta (not yet released)
============ ============
- Filename not being always shown in title bar. (#214)
- Improved OSD message when cycling audio. - Improved OSD message when cycling audio.
- Finally support DVD audio and subtitle track selection. - Finally support DVD audio and subtitle track selection.
- Profiles can be shown on the command line with --profile=help - Profiles can be shown on the command line with --profile=help

9
mpv.net/WPF/AboutWindow.xaml
View File

@@ -7,19 +7,18 @@
mc:Ignorable="d" mc:Ignorable="d"
Title="About mpv.net" Title="About mpv.net"
Height="230"
Width="400"
FontSize="16" FontSize="16"
ShowInTaskbar="False" ShowInTaskbar="False"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
ResizeMode="NoResize" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
Foreground="{x:Static mpvnet:Theme.Foreground}" Foreground="{x:Static mpvnet:Theme.Foreground}"
Background="{x:Static mpvnet:Theme.Background}"> Background="{x:Static mpvnet:Theme.Background}">
<Grid> <Grid>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Center">
<TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock> <TextBlock FontSize="30" TextAlignment="Center" Margin="10,10,10,0">mpv.net</TextBlock>
<TextBlock Name="ContentBlock" TextAlignment="Center"></TextBlock> <TextBlock Name="ContentBlock" TextAlignment="Center" Margin="20,10,20,20"></TextBlock>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Window> </Window>

2
mpv.net/WPF/AboutWindow.xaml.cs
View File

@@ -12,7 +12,7 @@ namespace mpvnet
public AboutWindow() public AboutWindow()
{ {
InitializeComponent(); InitializeComponent();
ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare (stax76)\n" + ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare\n" +
$"mpv.net {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})\n" + $"mpv.net {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})\n" +
$"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})\nffmpeg {core.get_property_string("ffmpeg-version")}\nMIT License"; $"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})\nffmpeg {core.get_property_string("ffmpeg-version")}\nMIT License";
} }

4
mpv.net/WinForms/MainForm.cs
View File

@@ -488,10 +488,8 @@ namespace mpvnet
BeginInvoke(new Action(() => { BeginInvoke(new Action(() => {
if (path.Contains("://")) if (path.Contains("://"))
Text = core.get_property_string("media-title") + " - mpv.net " + Application.ProductVersion; Text = core.get_property_string("media-title") + " - mpv.net " + Application.ProductVersion;
else if (path.Contains(":\\") || path.StartsWith("\\\\"))
Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
else else
Text = "mpv.net " + Application.ProductVersion; Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
int interval = (int)(core.Duration.TotalMilliseconds / 100); int interval = (int)(core.Duration.TotalMilliseconds / 100);

7
mpv.net/mpv/Core.cs
View File

@@ -1164,7 +1164,12 @@ namespace mpvnet
if (!File.Exists(path) || get_property_int("playlist-count") != 1) if (!File.Exists(path) || get_property_int("playlist-count") != 1)
return; return;
List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList(); string dir = Environment.CurrentDirectory;
if (path.Contains(Path.DirectorySeparatorChar))
dir = Path.GetDirectoryName(path);
List<string> files = Directory.GetFiles(dir).ToList();
files = files.Where(file => files = files.Where(file =>
App.VideoTypes.Contains(file.Ext()) || App.VideoTypes.Contains(file.Ext()) ||