fix design of alert tone widget; fix incorrect storage of the key for placement (should be the filename not the name);

pull/1/head
Bryan Biedenkapp 11 months ago
parent 09020a440c
commit b6096aa0b2

@ -2,30 +2,32 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Height="55" Width="105"
DataContext="{Binding RelativeSource={RelativeSource Self}}" Background="#FF848484">
DataContext="{Binding RelativeSource={RelativeSource Self}}">
<UserControl.Effect>
<DropShadowEffect ShadowDepth="1" BlurRadius="16" Color="#FF686767" Opacity="0.3" />
</UserControl.Effect>
<Grid Margin="1,1,1,1" Background="#FF00BC48">
<Grid.RowDefinitions>
<RowDefinition Height="31*"/>
<RowDefinition Height="39*"/>
</Grid.RowDefinitions>
<Border BorderBrush="LightGray" BorderThickness="1,1,1,1" CornerRadius="8" Background="#FF00BC48">
<Grid Margin="2.5" Background="#FF00BC48">
<Grid.RowDefinitions>
<RowDefinition Height="31*"/>
<RowDefinition Height="39*"/>
</Grid.RowDefinitions>
<Button Click="PlayAlert_Click" VerticalContentAlignment="Bottom" HorizontalAlignment="Left" Margin="46,21,0,0" VerticalAlignment="Top" Height="28" Width="48" BorderBrush="#FFC1C1C1" BorderThickness="1,1,1,1" FontSize="10" FontFamily="Arial" Grid.RowSpan="2">
<Button.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="2"/>
</Style>
</Button.Resources>
<Button.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFF0F0F0" Offset="0.485"/>
<GradientStop Color="#FFE3E3E3" Offset="0.517"/>
</LinearGradientBrush>
</Button.Background>
<Image Height="40" Width="63" Source="/dvmconsole;component/Assets/page.png" Margin="0,-8,0,0"/>
</Button>
<TextBlock HorizontalAlignment="Center" FontWeight="Bold" FontSize="10" TextWrapping="Wrap" Text="{Binding AlertFileName}" TextAlignment="Center" VerticalAlignment="Top" Width="100" Background="{x:Null}" Height="24" Margin="0,4,0,0" Grid.RowSpan="2" Foreground="White"/>
</Grid>
<Button Click="PlayAlert_Click" VerticalContentAlignment="Bottom" HorizontalAlignment="Left" Margin="46,20,0,0" VerticalAlignment="Top" Height="28" Width="48" BorderBrush="#FFC1C1C1" BorderThickness="1,1,1,1" FontSize="10" FontFamily="Arial" Grid.RowSpan="2">
<Button.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="2"/>
</Style>
</Button.Resources>
<Button.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFF0F0F0" Offset="0.485"/>
<GradientStop Color="#FFE3E3E3" Offset="0.517"/>
</LinearGradientBrush>
</Button.Background>
<Image Height="40" Width="63" Source="/dvmconsole;component/Assets/page.png" Margin="0,-8,0,0"/>
</Button>
<TextBlock HorizontalAlignment="Center" FontWeight="Bold" FontSize="10" TextWrapping="Wrap" Text="{Binding AlertFileName}" TextAlignment="Center" VerticalAlignment="Top" Width="100" Background="{x:Null}" Height="24" Margin="0,4,0,0" Grid.RowSpan="2" Foreground="White"/>
</Grid>
</Border>
</UserControl>

@ -1905,7 +1905,7 @@ namespace dvmconsole
{
double x = Canvas.GetLeft(alertTone);
double y = Canvas.GetTop(alertTone);
settingsManager.UpdateAlertTonePosition(alertTone.AlertFileName, x, y);
settingsManager.UpdateAlertTonePosition(alertTone.AlertFilePath, x, y);
ChannelBox_MouseRightButtonUp(sender, e);
}

Loading…
Cancel
Save

Powered by TurnKey Linux.