Browse Source

调整样式路径为 工程相对路径

样式分支
fyf 2 years ago
parent
commit
7058c848a9
2 changed files with 6 additions and 6 deletions
  1. +3
    -3
      BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs
  2. +3
    -3
      BPASmartClient.SCADAControl/Themes/Generic.xaml

+ 3
- 3
BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs View File

@@ -75,13 +75,13 @@ namespace BPASmartClient.SCADAControl.CustomerControls
image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State0.png", UriKind.Relative));
break;
case -1:
image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State11.png", UriKind.Absolute));
image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State11.png", UriKind.Relative));
break;
case 1:
image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State1.png", UriKind.Absolute));
image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State1.png", UriKind.Relative));
break;
case 2:
image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State2.png", UriKind.Absolute));
image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State2.png", UriKind.Relative));
break;
default:
break;


+ 3
- 3
BPASmartClient.SCADAControl/Themes/Generic.xaml View File

@@ -1429,11 +1429,11 @@
<Setter Property="FocusVisualStyle" Value="{StaticResource CheckRadioFocusVisual}" />
<Setter Property="Foreground" Value="{DynamicResource foreground}" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<!--<Setter Property="Background">
<Setter Property="Background">
<Setter.Value>
<ImageBrush ImageSource="../Images/btnkeys.png" />
<ImageBrush ImageSource="/BPASmartClient.SCADAControl;component/Images/btnkeys.png" />
</Setter.Value>
</Setter>-->
</Setter>
<Setter Property="Padding" Value="2,0,0,0" />
<Setter Property="Template">
<Setter.Value>


Loading…
Cancel
Save