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

5.4.9.5 Beta

Browse Source
This commit is contained in:
Frank Skare
2021-08-25 14:12:45 +02:00
parent d3baa47f93
commit 007fbf8be5
13 changed files with 41 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WPF/ConfWindow.xaml.cs
View File

@@ -329,7 +329,7 @@ namespace mpvnet
ProcessHelp.ShellExecute(Path.GetDirectoryName(Core.ConfPath));
void PreviewTextBlock_MouseUp(object sender, MouseButtonEventArgs e) =>
Msg.ShowInfo("mpv.conf Preview", GetContent("mpv"));
Msg.ShowInfo("mpv.conf Preview" + BR2 + GetContent("mpv"));
void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e) =>
ProcessHelp.ShellExecute("https://mpv.io/manual/master/");

2
src/WPF/InputWindow.xaml.cs
View File

@@ -40,7 +40,7 @@ namespace mpvnet
{
SearchControl.SearchTextBox.Text = "";
Msg.ShowInfo("Filtering",
Msg.ShowInfo("Filtering" + BR2 +
"Reduce the filter scope with:" + BR2 +
"i input" + BR2 +
"m menu" + BR2 +

14
src/WPF/MsgBox/MessageBoxEx.xaml
View File

@@ -159,8 +159,9 @@
</StackPanel>
</Border>
<Expander Grid.Row="4" Header="Details"
IsExpanded="{Binding Path=Expanded}"
<Expander Grid.Row="4" Header=" Details"
IsExpanded="{Binding Path=Expanded}"
Margin="3,8,0,0"
Visibility="{Binding Path=ShowDetailsBtn}"
>
<Expander.Template>
@@ -187,11 +188,10 @@
Style="{StaticResource GroupBoxExpanderToggleButtonStyle}"
IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
<ContentPresenter ContentSource="Header" RecognizesAccessKey="true"
TextElement.Foreground="{Binding ElementName=textboxMessage, Path=Foreground}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Grid.Column="1"
VerticalAlignment="Center" HorizontalAlignment="Left"
Margin="3,0,0,0" />
TextElement.Foreground="{Binding ElementName=textboxMessage, Path=Foreground}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left"
/>
</Grid>
<ContentPresenter x:Name="ExpandSite" Visibility="Collapsed" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
Margin="{TemplateBinding Padding}"

10
src/WPF/MsgBox/MessageBoxEx.xaml.cs
View File

@@ -320,13 +320,6 @@ namespace MsgBoxEx
protected virtual void Init(string msg, string title, MessageBoxButton buttons, MessageBoxImage image)
{
if (Theme.Current != null)
{
MessageForeground = Theme.Current.GetBrush("heading");
MessageBackground = Theme.Current.GetBrush("background");
ButtonBackground = Theme.Current.GetBrush("highlight");
}
InitTop(msg, title);
usingExButtons = false;
ButtonsEx = null;
@@ -376,9 +369,6 @@ namespace MsgBoxEx
private void InitBottom(MessageBoxImage image)
{
// set the form's colors (you can also set these colors in your program's startup code
// (either in app.xaml.cs or MainWindow.cs) before you use the MessageBox for the
// first time
MessageBackground = (MessageBackground == null) ? new SolidColorBrush(Colors.White) : MessageBackground;
MessageForeground = (MessageForeground == null) ? new SolidColorBrush(Colors.Black) : MessageForeground;
ButtonBackground = (ButtonBackground == null) ? new SolidColorBrush(ColorFromString("#cdcdcd")) : ButtonBackground;

38
src/WPF/MsgBox/MessageBoxExStatic.cs
View File

@@ -99,45 +99,9 @@ namespace MsgBoxEx
#region static configuration methods
public static void SetMessageBackground(Color color)
{
try
{
MessageBackground = new SolidColorBrush(color);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, ex.ToString());
}
}
public static void SetMessageForeground(Color color)
{
try
{
MessageForeground = new SolidColorBrush(color);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, ex.ToString());
}
}
public static void SetButtonBackground(System.Windows.Media.Color color)
{
try
{
ButtonBackground = new SolidColorBrush(color);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, ex.ToString());
}
}
public static Color ColorFromString(string colorString)
{
Color wpfColor = System.Windows.Media.Colors.Black;
Color wpfColor = Colors.Black;
try
{