Browse Source

zhao:修改UI

tags/录制修改前
耀 3 years ago
parent
commit
4055a22d51

+ 3
- 3
XHWK.WKTool/AppUpdateWin.xaml View File

@@ -45,14 +45,14 @@
45 45
                 </Grid.RowDefinitions>
46 46
                 <StackPanel Grid.Row="0" Orientation="Horizontal">
47 47
                     <Image
48
-                        Width="63"
49
-                        Margin="10,0,0,0"
48
+                        Width="35"
49
+                        Margin="10,5,0,0"
50 50
                         VerticalAlignment="Center"
51 51
                         Source="/Images/APP.png" />
52 52
 
53 53
                     <TextBlock
54 54
                         Grid.Row="0"
55
-                        Margin="0,0,0,0"
55
+                        Margin="10,0,0,0"
56 56
                         VerticalAlignment="Center"
57 57
                         FontSize="26"
58 58
                         Foreground="#333333"

+ 27
- 16
XHWK.WKTool/CreateAMicroLessonWindow.xaml View File

@@ -11,6 +11,31 @@
11 11
     <Window.Effect>
12 12
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
13 13
     </Window.Effect>
14
+    <Window.Resources>
15
+        <Style x:Key="Button_Menu" TargetType="{x:Type Button}">
16
+            <Setter Property="Width" Value="auto" />
17
+            <Setter Property="Height" Value="auto" />
18
+            <Setter Property="BorderThickness" Value="0" />
19
+            <Setter Property="Foreground" Value="Black"/>
20
+            <Setter Property="Template">
21
+                <Setter.Value>
22
+                    <ControlTemplate TargetType="{x:Type Button}">
23
+                        <Border Background="#c3c3c3">
24
+                            <Border x:Name="MyBackgroundElement" Background="#F7F7F7" BorderBrush="{DynamicResource ForgroundBrush}" BorderThickness="1">
25
+                                <ContentPresenter x:Name="ButtonContentPresenter" VerticalAlignment="Center" HorizontalAlignment="Center"/>
26
+                            </Border>
27
+                        </Border>
28
+                        <ControlTemplate.Triggers>
29
+                            <Trigger Property="IsMouseOver" Value="True">
30
+                                <Setter TargetName="MyBackgroundElement" Property="Background" Value="#EDF5FF"/>
31
+                                <Setter TargetName="MyBackgroundElement" Property="Opacity" Value="1"/>
32
+                            </Trigger>
33
+                        </ControlTemplate.Triggers>
34
+                    </ControlTemplate>
35
+                </Setter.Value>
36
+            </Setter>
37
+        </Style>
38
+    </Window.Resources>
14 39
     <Grid>
15 40
         <!--分4行-->
16 41
         <Grid.RowDefinitions>
@@ -44,22 +69,8 @@
44 69
                 <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="198" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
45 70
             </Border>
46 71
             <!--浏览按钮-->
47
-            <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="11,0,0,0" Click="BtnBrowse_Click">
48
-                <Button.Template>
49
-                    <ControlTemplate TargetType="{x:Type Button}">
50
-                        <Border
51
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
52
-                                BorderThickness="1"
53
-                                CornerRadius="2">
54
-                            <Border.Background>#CDD6E0</Border.Background>
55
-                            <ContentPresenter
56
-                                    HorizontalAlignment="Center"
57
-                                    VerticalAlignment="Center"
58
-                                    Content="{TemplateBinding ContentControl.Content}" />
59
-                        </Border>
60
-                    </ControlTemplate>
61
-                </Button.Template>
62
-            </Button>
72
+            <Button Cursor="Hand" x:Name="btnBrowse" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
73
+                                Background="#F7F7F7" Margin="11,0,0,0"/>
63 74
         </StackPanel>
64 75
         <!--第四行 开始按钮-->
65 76
         <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" IsDefault="True" Content="开始" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="386" Height="48" Margin="30,0,30,0" Click="BtnStart_Click" Grid.ColumnSpan="2">

+ 2
- 2
XHWK.WKTool/XHMicroLessonSystemWindow.xaml View File

@@ -217,7 +217,7 @@
217 217
 
218 218
                 <!--第二行-->
219 219
 
220
-                <StackPanel  Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,5" HorizontalAlignment="Left">
220
+                <StackPanel  Grid.Row="1" Orientation="Horizontal" Margin="10,0,0,0" HorizontalAlignment="Left">
221 221
                     <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
222 222
                         <StackPanel Orientation="Vertical">
223 223
                             <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
@@ -639,7 +639,7 @@
639 639
                     <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
640 640
                 </StackPanel>
641 641
                 <!--页码-->
642
-                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="95,0,0,0">
642
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Hidden" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="95,0,0,0">
643 643
                     <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="220" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
644 644
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
645 645
                     x:Name="last_button"

Loading…
Cancel
Save