bpa
/
BPASmartClient
2
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

冲突解决

样式分支
pry 2 years ago
parent
b6f9d66b5b 7e01eaea3c
commit
dcde03d68b
6 changed files with 76 additions and 20 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +61
    -2
      BPASmartClient.CustomResource/Themes/MyStyle.xaml
  2. +6
    -6
      BPASmartClient/Control/DataVView.xaml
  3. +1
    -1
      BPASmartClient/Control/DataVView.xaml.cs
  4. +2
    -2
      BPASmartClient/Control/LogOrAlarmView.xaml
  5. +2
    -2
      BPASmartClient/Control/LogView.xaml
  6. +4
    -7
      BPASmartClient/MainWindow.xaml

+ 61
- 2
BPASmartClient.CustomResource/Themes/MyStyle.xaml View File

@@ -957,7 +957,66 @@
</Setter> </Setter>
</Style.Setters> </Style.Setters>
</Style> </Style>

<Style TargetType="Button">
<Style.Setters>
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Foreground" Value="{DynamicResource foreground}" />
<Setter Property="Height" Value="25" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border x:Name="BD" Cursor="Hand">
<StackPanel
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<Border Width="16" Margin="5">
<Border.Background>
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png" />
</Border.Background>
</Border>-->
<TextBlock Margin="10,0,10,0"
x:Name="textBlock"
VerticalAlignment="Center"
FontSize="14"
Foreground="#4fade8"
Text="{TemplateBinding Content}" />
<!-- Text="{TemplateBinding Content}" -->
</StackPanel>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="BD" Property="Background">
<Setter.Value>
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
</Setter.Value>
</Setter>
<Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="BD" Property="Background">
<Setter.Value>
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
</Setter.Value>
</Setter>
<Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="BD" Property="Background">
<Setter.Value>
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
</Setter.Value>
</Setter>
<Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style.Setters>
</Style>
<Style x:Key="CommonBtn_返回" TargetType="Button"> <Style x:Key="CommonBtn_返回" TargetType="Button">
<Style.Setters> <Style.Setters>
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -1217,7 +1276,7 @@
</Style.Setters> </Style.Setters>
</Style> </Style>


<Style TargetType="Button">
<Style x:Key="Comm8" TargetType="Button">
<Style.Setters> <Style.Setters>
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />


+ 6
- 6
BPASmartClient/Control/DataVView.xaml View File

@@ -75,15 +75,15 @@
</StackPanel> </StackPanel>


<StackPanel Orientation="Horizontal" Margin="0,10,0,0" > <StackPanel Orientation="Horizontal" Margin="0,10,0,0" >
<Button Margin="80,0,0,0" Tag="Add" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="45">增加</Button>
<Button Margin="20,0,0,0" Tag="Update" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="45">修改</Button>
<Button Margin="20,0,0,0" Tag="Delete" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="45">删除</Button>
<Button Margin="80,0,0,0" Tag="Add" Click="Button_Click" Width="45">增加</Button>
<Button Margin="20,0,0,0" Tag="Update" Click="Button_Click" Width="45">修改</Button>
<Button Margin="20,0,0,0" Tag="Delete" Click="Button_Click" Width="45">删除</Button>


</StackPanel> </StackPanel>


<StackPanel Orientation="Horizontal" Margin="0,20,0,0" > <StackPanel Orientation="Horizontal" Margin="0,20,0,0" >
<Button Margin="80,0,0,0" Tag="Save" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="73">保存text</Button>
<Button Margin="20,0,0,0" Tag="Insert" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="73" Cursor="Hand">导入text</Button>
<Button Margin="80,0,0,0" Tag="Save" Click="Button_Click" >保存text</Button>
<Button Margin="20,0,0,0" Tag="Insert" Click="Button_Click" >导入text</Button>
</StackPanel> </StackPanel>


</StackPanel> </StackPanel>
@@ -156,7 +156,7 @@
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Width="80" FontSize="16" Margin="0,0,0,5">密码解锁:</TextBlock> <TextBlock Width="80" FontSize="16" Margin="0,0,0,5">密码解锁:</TextBlock>
<PasswordBox x:Name="passbox" Width="180" Height="22" ></PasswordBox> <PasswordBox x:Name="passbox" Width="180" Height="22" ></PasswordBox>
<Button HorizontalAlignment="Right" Margin="0,5,0,0" Tag="OkPass" Click="Button_Click" Style="{DynamicResource CommonBtn_返回}" Width="45" IsDefault="True">确定</Button>
<Button HorizontalAlignment="Right" Margin="0,5,0,0" Tag="OkPass" Click="Button_Click" IsDefault="True">确定</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>


+ 1
- 1
BPASmartClient/Control/DataVView.xaml.cs View File

@@ -44,7 +44,7 @@ namespace BPASmartClient.Control
dispatcherTimer.Stop(); dispatcherTimer.Stop();
})); }));
}; };
dispatcherTimer.Interval = TimeSpan.FromSeconds(20);
dispatcherTimer.Interval = TimeSpan.FromSeconds(120);
} }




+ 2
- 2
BPASmartClient/Control/LogOrAlarmView.xaml View File

@@ -34,8 +34,8 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<DatePicker Margin="10,0,10,0" Text="{Binding DateTimeStr,Mode=TwoWay,NotifyOnTargetUpdated=True}"></DatePicker> <DatePicker Margin="10,0,10,0" Text="{Binding DateTimeStr,Mode=TwoWay,NotifyOnTargetUpdated=True}"></DatePicker>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding QueryCommand}" Style="{DynamicResource CommonBtn_返回}" Width="75">查询数据</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" Style="{DynamicResource CommonBtn_返回}" Width="102">打开文件目录</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding QueryCommand}" >查询数据</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" >打开文件目录</Button>
</StackPanel> </StackPanel>


<!-- 表格栏 --> <!-- 表格栏 -->


+ 2
- 2
BPASmartClient/Control/LogView.xaml View File

@@ -33,8 +33,8 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding ExcelCommand}" Style="{DynamicResource CommonBtn_返回}" Width="75">导出日志</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" Style="{DynamicResource CommonBtn_返回}" Width="75">打开文件</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding ExcelCommand}" >导出日志</Button>
<Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" >打开文件</Button>
</StackPanel> </StackPanel>


<!--表格栏--> <!--表格栏-->


+ 4
- 7
BPASmartClient/MainWindow.xaml View File

@@ -227,9 +227,8 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Click="Button_Click" Click="Button_Click"
Content="返回"
Cursor="Hand"
Style="{DynamicResource CommonBtn_返回}" />
Content="测试"
Cursor="Hand" />
<Button <Button
Grid.Row="0" Grid.Row="0"
Width="100" Width="100"
@@ -238,8 +237,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Click="Button_Click_1" Click="Button_Click_1"
Content="测试消息弹窗" Content="测试消息弹窗"
Cursor="Hand"
Style="{DynamicResource CommonBtn_返回}" />
Cursor="Hand"/>


<!--<Button <!--<Button
Name="save" Name="save"
@@ -262,8 +260,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Click="init_Click" Click="init_Click"
Content="初始化设备" Content="初始化设备"
Cursor="Hand"
Style="{DynamicResource CommonBtn_返回}" />
Cursor="Hand"/>


<CheckBox <CheckBox
Margin="350,0,0,0" Margin="350,0,0,0"


Write Preview
Loading…
Cancel
Save