Browse Source

煮面机调试修改

样式分支
pry 2 years ago
parent
commit
07bdf33059
6 changed files with 23 additions and 8 deletions
  1. +2
    -2
      BPASmartClient.CustomResource/Pages/View/MainView.xaml
  2. +2
    -2
      BPASmartClient.CustomResource/RecDictionarys/RecIcoButtonStyle.xaml
  3. +7
    -0
      BPASmartClient.MorkS/View/Debug.xaml
  4. +9
    -1
      BPASmartClient.MorkS/View/Debug.xaml.cs
  5. +1
    -1
      BPASmartClient.MorkS/View/ParSet.xaml
  6. +2
    -2
      DosingSystem/View/RecipeSettingsView.xaml

+ 2
- 2
BPASmartClient.CustomResource/Pages/View/MainView.xaml View File

@@ -21,7 +21,7 @@
</Window.DataContext>

<Window.Resources>

<!--#region 静态资源-->
<ImageBrush x:Key="leftImage" ImageSource="../../Image/leftImage.png" />
@@ -511,7 +511,7 @@
</Grid.Background>

<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="80" />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">


+ 2
- 2
BPASmartClient.CustomResource/RecDictionarys/RecIcoButtonStyle.xaml View File

@@ -33,10 +33,10 @@
</ControlTemplate.Triggers>
</ControlTemplate>

<Style x:Key="NewButtonStyle" TargetType="local:IcoButton">
<Style x:Key="IcoButtonStyle" TargetType="local:IcoButton">
<Setter Property="FontFamily" Value="../Fonts/#iconfont" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Background" Value="#2219b7ec" />
<Setter Property="BorderBrush" Value="#ff19b7ec" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="EnterBackground" Value="#2219b7ec" />


+ 7
- 0
BPASmartClient.MorkS/View/Debug.xaml View File

@@ -65,6 +65,13 @@
Command="{Binding InitCommand}"
Content="初始化设备"
Style="{StaticResource ButtonStyle}" />
<Button
Name="AA"
Width="120"
Click="Button_Click"
Command="{Binding InitCommand}"
Content="停止模拟"
Style="{StaticResource ButtonStyle}" />
</StackPanel>
</StackPanel>



+ 9
- 1
BPASmartClient.MorkS/View/Debug.xaml.cs View File

@@ -1,4 +1,5 @@
using System;
using BPASmartClient.MorkS.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -24,5 +25,12 @@ namespace BPASmartClient.MorkS.View
{
InitializeComponent();
}

private void Button_Click(object sender, RoutedEventArgs e)
{
Global.EnableLocalSimOrder = !Global.EnableLocalSimOrder;
if (Global.EnableLocalSimOrder) AA.Content = "模拟中";
if (!Global.EnableLocalSimOrder) AA.Content = "停止模拟";
}
}
}

+ 1
- 1
BPASmartClient.MorkS/View/ParSet.xaml View File

@@ -62,7 +62,7 @@
Content="保存配置"
FontSize="16"
IcoText="&#xe936;"
Style="{StaticResource NewButtonStyle}">
Style="{StaticResource IcoButtonStyle}">
<pry:IcoButton.Foreground>
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
<GradientStop Color="#FFBB662A" />


+ 2
- 2
DosingSystem/View/RecipeSettingsView.xaml View File

@@ -62,7 +62,7 @@
FontSize="16"
Foreground="Aqua"
IcoText="&#xe626;"
Style="{StaticResource NewButtonStyle}" />
Style="{StaticResource IcoButtonStyle}" />

<pry:IcoButton
Grid.Column="3"
@@ -76,7 +76,7 @@
Foreground="Aqua"
IcoText="&#xe936;"
IsEnabled="True"
Style="{StaticResource NewButtonStyle}" />
Style="{StaticResource IcoButtonStyle}" />
</StackPanel>
<!--#endregion-->



Loading…
Cancel
Save